couchbase 1.3.0-x86-mingw32 → 1.3.1-x86-mingw32

data/RELEASE_NOTES.markdown

@@ -3,7 +3,15 @@
 This document is a list of user visible feature changes and important
 bugfixes. Do not forget to update this doc in every important patch.
 
-## 1.3.0 (2014-05-07)
+## 1.3.1 (2013-06-05)
+
+* [major] RCBC-131 Couchbase::Cluster instance shouldn't require
+  persistent connection.
+
+* Fix compatibility with multi_json 1.7.5. They removed VERSION
+  constant
+
+## 1.3.0 (2013-05-07)
 
 * [major] RCBC-46 implement Couchbase::ConnectionPool to allow
   applications (and ActiveSupport::Cache::CouchbaseStore) use it in

data/couchbase.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'yaji', '~> 0.3.2'
   s.add_runtime_dependency 'multi_json', '~> 1.0'
-  s.add_runtime_dependency 'connection_pool', '~> 0.9.2'
+  s.add_runtime_dependency 'connection_pool', '~> 1.0.0'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'minitest'

data/ext/couchbase_ext/utils.c

@@ -68,7 +68,8 @@ cb_async_error_notify(struct cb_bucket_st *bucket, VALUE exc)
     int
 cb_bucket_connected_bang(struct cb_bucket_st *bucket, VALUE operation)
 {
-    if (bucket->handle == NULL || !bucket->connected) {
+    if (bucket->type == LCB_TYPE_BUCKET &&
+            (bucket->handle == NULL || !bucket->connected)) {
         VALUE exc = rb_exc_new2(cb_eConnectError, "not connected to the server");
         rb_ivar_set(exc, cb_id_iv_operation, operation);
         rb_ivar_set(exc, cb_id_iv_value, bucket->self);

data/lib/couchbase/version.rb

@@ -17,5 +17,5 @@
 
 # Couchbase ruby client
 module Couchbase
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

data/lib/couchbase/view.rb

@@ -36,8 +36,13 @@ module Couchbase
       def parse_body!
         if @body
           hash = MultiJson.load(@body)
-          @type = hash["error"]
-          @reason = hash["reason"]
+          if hash["errors"]
+            @type = :invalid_arguments
+            @reason = hash["errors"].values.join(" ")
+          else
+            @type = hash["error"]
+            @reason = hash["reason"]
+          end
         end
       rescue MultiJson::DecodeError
         @type = @reason = nil

data/lib/ext/multi_json_fix.rb

@@ -27,7 +27,12 @@ end
 
 # Patch for MultiJson versions < 1.3.3
 require 'multi_json/version'
-if Gem::Version.new(MultiJson::VERSION) < Gem::Version.new('1.3.3')
+version = begin
+            MultiJson::VERSION
+          rescue NameError
+            MultiJson::Version.to_s
+          end
+if Gem::Version.new(version) < Gem::Version.new('1.3.3')
   class << MultiJson
     alias :dump :encode
     alias :load :decode

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: couchbase
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
   prerelease: 
 platform: x86-mingw32
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-08 00:00:00.000000000 Z
+date: 2013-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yaji
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -285,7 +285,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3514560369886917635
+      hash: 2195573418213071980
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -294,7 +294,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3514560369886917635
+      hash: 2195573418213071980
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23