Merge branch 'release/2.3.6'

CHANGELOG.markdown

@@ -1,3 +1,16 @@
+## v2.3.6
+
+ * Change grippie cursor to `row-resize` — Thanks @Zatsugami.
+ * Fix "unable to connect" errors for some driver versions (PHP backend) — Thanks @redexp.
+ * [Fix #117][i117] — Update JSON gem dependency (Ruby backend).
+ * [Fix #112][i112] — Add support for Sinatra v1.4.0 (Ruby backend).
+ * Support latest Mongo driver version (Ruby backend).
+ * Update to latest Bootstrap, CodeMirror, Esprima, Hogan.js, jQuery, Mousetrap and tablesorter vendor libraries.
+
+[i117]: https://github.com/bobthecow/genghis/issues/117
+[i112]: https://github.com/bobthecow/genghis/issues/112
+
+
 ## v2.3.5
 
  * Improve "remove server" button and confirmation dialog to clarify that this removes settings but not data.

VERSION

@@ -1 +1 @@
-2.3.5
+2.3.6

genghisapp.gemspec

@@ -11,11 +11,11 @@ Gem::Specification.new do |gem|
   gem.rubyforge_project         = 'genghisapp'
 
   gem.add_dependency 'vegas',            '~> 0.1.8'
-  gem.add_dependency 'sinatra',          '~> 1.3.3'
-  gem.add_dependency 'sinatra-contrib',  '~> 1.3.1'
+  gem.add_dependency 'sinatra',          '>= 1.3.3', '< 1.5.0'
+  gem.add_dependency 'sinatra-contrib',  '>= 1.3.1', '< 1.5.0'
   gem.add_dependency 'sinatra-mustache', '>= 0.0.4', '< 0.2.0'
-  gem.add_dependency 'mongo',            '~> 1.8.0'
-  gem.add_dependency 'json',             '~> 1.7.0'
+  gem.add_dependency 'mongo',            '>= 1.8.0', '<= 1.9.0'
+  gem.add_dependency 'json',             '>= 1.7.0', '< 1.9.0'
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'active_support'

src/css/navbar.less

@@ -51,6 +51,7 @@
         background-position: center center;
         background-repeat:   repeat-x;
         border: none;
+        cursor: row-resize;
         .opacity(50);
         &:hover {
             .opacity(100);

src/php/Genghis/Models/Server.php

@@ -8,6 +8,7 @@ class Genghis_Models_Server implements ArrayAccess, Genghis_JsonEncodable
     public $default;
     public $db;
     public $error;
+    public $defaultOptions = array();
 
     private $connection;
     private $databases = array();
@@ -16,6 +17,12 @@ public function __construct($dsn, $default = false)
     {
         $this->default = $default;
 
+        if (version_compare(phpversion("mongo"), '1.3.4', '>=')) {
+            $this->defaultOptions['connectTimeoutMS'] = 1000;
+        } else {
+            $this->defaultOptions['timeout'] = 1000;
+        }
+
         try {
             $config = self::parseDsn($dsn);
             $this->name    = $config['name'];
@@ -60,7 +67,8 @@ public function offsetGet($name)
     public function getConnection()
     {
         if (!isset($this->connection)) {
-            $this->connection = new Mongo($this->dsn, array_merge(array('connectTimeoutMS' => 1000), $this->options));
+            $class = class_exists('MongoClient') ? 'MongoClient' : 'Mongo';
+            $this->connection = new $class($this->dsn, array_merge($this->defaultOptions, $this->options));
         }
 
         return $this->connection;
@@ -149,7 +157,7 @@ public function asJson()
                 'databases' => $dbs,
             ));
         } catch (Exception $e) {
-            $server['error'] = sprintf("Unable to connect to Mongo server at '%s'", $this->name);
+            $server['error'] = $e->getMessage();
 
             return $server;
         }

src/rb/genghis/helpers.rb

@@ -24,11 +24,15 @@ def page_param
     end
 
     def request_json
-      ::JSON.parse request.body.read rescue raise Genghis::MalformedDocument.new
+      @request_json ||= ::JSON.parse request.body.read
+    rescue
+      raise Genghis::MalformedDocument.new
     end
 
     def request_genghis_json
-      ::Genghis::JSON.decode request.body.read rescue raise Genghis::MalformedDocument.new
+      @request_genghis_json ||= ::Genghis::JSON.decode request.body.read
+    rescue
+      raise Genghis::MalformedDocument.new
     end
 
     def thunk_mongo_id(id)

src/rb/genghis/server.rb

@@ -41,15 +41,15 @@ def error_response(status, message)
       end
     end
 
-    not_found do
-      error_response(404, env['sinatra.error'].message.sub(/^Sinatra::NotFound$/, 'Not Found'))
-    end
-
-    error do
+    error 400..599 do
       err = env['sinatra.error']
       error_response(err.respond_to?(:http_status) ? err.http_status : 500, err.message)
     end
 
+    not_found do
+      error_response(404, env['sinatra.error'].message.sub(/^Sinatra::NotFound$/, 'Not Found'))
+    end
+
 
     ### Asset routes ###
 

src/templates/partials/servers.mustache

@@ -15,7 +15,7 @@
 </div>
 <div class="add-form inactive form-horizontal">
     <span class="input-append">
-        <input class="name span4" type="text" size="30"><span class="add-on help" title="user:pass@localhost:27017\db">?</span>
+        <input class="name span4" type="text" size="30"><span class="add-on help" title="user:pass@localhost:27017/db">?</span>
     </span>
     <button class="show btn">Add server</button>
     <button class="add btn btn-primary">Add server</button>