couchbase 1.3.0 → 1.3.1

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,181 +1,183 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: couchbase
-version: !ruby/object:Gem::Version 
-  hash: 27
+version: !ruby/object:Gem::Version
+  version: 1.3.1
   prerelease: 
-  segments: 
-  - 1
-  - 3
-  - 0
-  version: 1.3.0
 platform: ruby
-authors: 
+authors:
 - Couchbase
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-05-08 00:00:00 +03:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2013-06-05 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: yaji
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 3
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.3.2
-  name: yaji
-  version_requirements: *id001
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: 0.3.2
+- !ruby/object:Gem::Dependency
   name: multi_json
-  version_requirements: *id002
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
-        version: 0.9.2
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
   name: connection_pool
-  version_requirements: *id003
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
   prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: *id004
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: minitest
-  version_requirements: *id005
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 0
-        - 7
-        - 5
-        version: 0.7.5
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rake-compiler
-  version_requirements: *id006
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.5
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.5
+- !ruby/object:Gem::Dependency
   name: mini_portile
-  version_requirements: *id007
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.1.0
-  name: yajl-ruby
-  version_requirements: *id008
-  prerelease: false
-- !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
   name: active_support
-  version_requirements: *id009
-  prerelease: false
-- !ruby/object:Gem::Dependency 
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: eventmachine
-  version_requirements: *id010
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: The official client library for use with Couchbase Server.
 email: support@couchbase.com
 executables: []
-
-extensions: 
+extensions:
 - ext/couchbase_ext/extconf.rb
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - .yardopts
@@ -266,39 +268,35 @@ files:
 - test/test_unlock.rb
 - test/test_utils.rb
 - test/test_version.rb
-has_rdoc: true
 homepage: http://couchbase.org
-licenses: 
+licenses:
 - ASL-2
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 2195573418213071980
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 2195573418213071980
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Couchbase ruby driver
 test_files: []
-