Merge pull request #2 from cbodin/dev

Dev

Author: cbodin

README.md

@@ -14,7 +14,6 @@ This is still in an early development phase. Features and API can change overnig
 ## External libraries
 Some built in modules requires some libraries to be installed via composer:
 
-- The RedBeanPHP module requires the [RedBeanPHP library](https://github.com/gabordemooij/redbean).
 - The VeloxFacebook module requires the [Facebook PHP SDK](https://github.com/facebook/facebook-php-sdk).
 - The Message::debug() method will output the code using [Krumo](https://github.com/oodle/krumo) if it's installed.
 - The Sass module requires the [scssphp library](https://github.com/leafo/scssphp/).

composer.example.json

@@ -0,0 +1,7 @@
+{
+  "require": {
+    "leafo/scssphp": "dev-master",
+    "facebook/php-sdk": "@stable",
+    "oodle/krumo": "dev-master"
+  }
+}

framework/modules/ImageStyle/classes/ImageStyle.inc

@@ -59,7 +59,7 @@ class ImageStyle {
     }
 
     // Include effects class.
-    Module::loadInclude('ImageStyle', 'ImageStyleEffects.inc');
+    Module::loadInclude('ImageStyle', 'classes/ImageStyleEffects.inc');
 
     $create_function = 'imagecreatefrom' . $type;
     $save_function = 'image' . $type;

framework/modules/RedBeanPHP/RedBeanPHP.inc

@@ -1,32 +1,24 @@
 <?php
-if (!class_exists('RedBean_Facade')) {
-  Message::set(
-    'Missing RedBeanPHP library. Install it using Composer.',
-    Message::ERROR
-  );
-}
-else {
-  class R extends RedBean_Facade {}
-
-  /**
-   * Configure RedBeanPHP.
-   *
-   * Configures all databases to RedBeanPHP.
-   */
-  foreach (Settings::get('database', array()) as $dbkey => $dbinfo) {
-    $method = 'addDatabase';
+Module::loadInclude('RedBeanPHP', 'lib/RedBeanPHP4_0_0/rb.phar');
 
-    // Setup RedBeanPHP with the default db
-    if ($dbkey == 'default') {
-      $method = 'setup';
-    }
+/**
+ * Configure RedBeanPHP.
+ *
+ * Configures all databases to RedBeanPHP.
+ */
+foreach (Settings::get('database', array()) as $dbkey => $dbinfo) {
+  $method = 'addDatabase';
 
-    $args = Database::getConnectionArgs($dbinfo);
-    call_user_func_array(array('R', $method), $args);
+  // Setup RedBeanPHP with the default db
+  if ($dbkey == 'default') {
+    $method = 'setup';
   }
 
-  // dont change the database after deployment
-  if (!Settings::get('development', false)) {
-    R::freeze(true);
-  }
+  $args = Database::getConnectionArgs($dbinfo);
+  call_user_func_array(array('R', $method), $args);
+}
+
+// dont change the database after deployment
+if (!Settings::get('development', false)) {
+  R::freeze(true);
 }