couchbase-jruby-client 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d294ee0ebe7d4a3e0c7d595413e2d42b69a7e74
-  data.tar.gz: d5eeaef344e704480c2abeb397a2b5cbc4ed5786
+  metadata.gz: 2cec53577bf9d3e2636d2b23c743e3ac1e3b28c6
+  data.tar.gz: e9ea82a72e30c618b76245bf4489f179bd45691e
 SHA512:
-  metadata.gz: d5c54ae264472fd04ac3d4ecbbc2b1b591cd2a4c34ac9bc26eaa6611f54bd3ae00dd7a038a06a8a8d8e8ebfed67b07e23e8b0aeb1537f47bfd5397701cac0748
-  data.tar.gz: d372bb4689d8922bd787789308b4edff0b5828c7fe287d583fa2ed4728fb1f48c63e84940f72935451c15a3f597dd20e203812f9de038d4b4fcfda0afe8a2a99
+  metadata.gz: ed49ef81b60faadd9542d19f747eb1cd5ed9a8eb8527be7669b976edfb744888144523bbd6d7744d4273628976c20a25f84f6f6a1a85666f603007144418f65d
+  data.tar.gz: 0b4dfb1870cebcd69f8e5d9ddd74768b28e9ec4d75a9bf7a6820490eb566522f3d0b333175354447b199540f104443db7507b8fb5dc3c31905dd46fc0b19f44a

data/README.md

@@ -21,12 +21,15 @@ Or install it yourself as:
 
 Please consider this project a very incomplete "alpha" version at best. I'm getting close
 to full coverage, though there are still some missing features.  In fact, as I've gotten
-more familiar with the differences between the native ruby api and the java, there are 
+more familiar with the differences between the native ruby api and the java, there are
 definitely some features that don't make sense to implement.
 
 Ultimately hoping to get to 100% support of the couchbase-ruby-model gem.
 
-## Usage (Copied from couchbase-ruby-client)
+## Usage
+
+See https://github.com/couchbase/couchbase-ruby-client for usage instructions as
+they are largely the same. Important bits copied below:
 
 First of all you need to load library:
 
@@ -67,89 +70,6 @@ connection options via `Couchbase.connection_options`:
     Couchbase.bucket.name                   #=> "blog"
     Couchbase.bucket.set("foo", "bar")      #=> 3289400178357895424
 
-The library supports both synchronous and asynchronous mode. In
-asynchronous mode all operations will return control to caller
-without blocking current thread. You can pass the block to method and it
-will be called with result when the operation will be completed. You
-need to run event loop when you scheduled your operations:
-
-    c = Couchbase.connect
-    c.run do |conn|
-      conn.get("foo") {|ret| puts ret.value}
-      conn.set("bar", "baz")
-    end
-
-The handlers could be nested
-
-    c.run do |conn|
-      conn.get("foo") do |ret|
-        conn.incr(ret.value, :initial => 0)
-      end
-    end
-
-The asynchronous callback receives instance of `Couchbase::Result` which
-responds to several methods to figure out what was happened:
-
-  * `success?`. Returns `true` if operation succed.
-
-  * `error`. Returns `nil` or exception object (subclass of
-    `Couchbase::Error::Base`) if something went wrong.
-
-  * `key`
-
-  * `value`
-
-  * `flags`
-
-  * `cas`. The CAS version tag.
-
-  * `node`. Node address. It is used in flush and stats commands.
-
-  * `operation`. The symbol, representing an operation.
-
-
-To handle global errors in async mode `#on_error` callback should be
-used. It can be set in following fashions:
-
-    c.on_error do |opcode, key, exc|
-      # ...
-    end
-
-    handler = lambda {|opcode, key, exc| }
-    c.on_error = handler
-
-By default connection uses `:quiet` mode. This mean it won't raise
-exceptions when the given key is not exists:
-
-    c.get("missing-key")            #=> nil
-
-It could be useful when you are trying to make you code a bit efficient
-by avoiding exception handling. (See `#add` and `#replace` operations).
-You can turn on these exception by passing `:quiet => false` when you
-are instantiating the connection or change corresponding attribute:
-
-    c.quiet = false
-    c.get("missing-key")                    #=> raise Couchbase::Error::NotFound
-    c.get("missing-key", :quiet => true)    #=> nil
-
-The library supports three different formats for representing values:
-
-* `:document` (default) format supports most of ruby types which could
-  be mapped to JSON data (hashes, arrays, string, numbers). A future
-  version will be able to run map/reduce queries on the values in the
-  document form (hashes)
-
-* `:plain` This format avoids any conversions to be applied to your
-  data, but your data should be passed as String. This is useful for
-  building custom algorithms or formats. For example to implement a set:
-  http://dustin.github.com/2011/02/17/memcached-set.html
-
-* `:marshal` Use this format if you'd like to transparently serialize your
-  ruby object with standard `Marshal.dump` and `Marshal.load` methods
-
-The couchbase API is the superset of [Memcached binary protocol][5], so
-you can use its operations.
-
 ### Get
 
     val = c.get("foo")

data/lib/couchbase/async.rb

@@ -1,3 +1,20 @@
+# Author:: Mike Evans <mike@urlgonomics.com>
+# Copyright:: 2013 Urlgonomics LLC.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 require 'couchbase/async/callback'
 require 'couchbase/async/queue'
 

data/lib/couchbase/bucket.rb

@@ -1,3 +1,20 @@
+# Author:: Mike Evans <mike@urlgonomics.com>
+# Copyright:: 2013 Urlgonomics LLC.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 module Couchbase
 
   class Bucket
@@ -160,6 +177,8 @@ module Couchbase
                       url
                     end
 
+      options = Hash[ options.map { |k, v| [k.to_sym, v] } ]
+
       connection_options = default_options.merge(options).merge(url_options)
 
       connection_options.each_pair do |key, value|

data/lib/couchbase/constants.rb

@@ -1,3 +1,20 @@
+# Author:: Couchbase <info@couchbase.com>
+# Copyright:: 2011, 2012 Couchbase, Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 module Couchbase
   module Constants # :nodoc:
     S_ID = 'id'.freeze

data/lib/couchbase/design_doc.rb

@@ -1,3 +1,20 @@
+# Author:: Mike Evans <mike@urlgonomics.com>
+# Copyright:: 2013 Urlgonomics LLC.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 module Couchbase
   class DesignDoc
 
@@ -58,4 +75,4 @@ module Couchbase
     end
 
   end
-end
+end

data/lib/couchbase/error.rb

@@ -1,3 +1,19 @@
+# Author:: Mike Evans <mike@urlgonomics.com>
+# Copyright:: 2013 Urlgonomics LLC.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 module Couchbase
   module Error

data/lib/couchbase/operations/arithmetic.rb

@@ -1,3 +1,20 @@
+# Author:: Mike Evans <mike@urlgonomics.com>
+# Copyright:: 2013 Urlgonomics LLC.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 module Couchbase::Operations
   module Arithmetic
 

data/lib/couchbase/operations/delete.rb

@@ -1,3 +1,20 @@
+# Author:: Mike Evans <mike@urlgonomics.com>
+# Copyright:: 2013 Urlgonomics LLC.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 module Couchbase::Operations
   module Delete
 

data/lib/couchbase/operations/get.rb

@@ -1,3 +1,20 @@
+# Author:: Mike Evans <mike@urlgonomics.com>
+# Copyright:: 2013 Urlgonomics LLC.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 module Couchbase::Operations
   module Get
 
@@ -128,25 +145,19 @@ module Couchbase::Operations
     #     c.get("foo" => 10, "bar" => 20, :lock => true)
     #     #=> {"foo" => val1, "bar" => val2}
     #
-    def get(*args)
+    def get(*args, &block)
       key, options = expand_get_args(args)
 
       if async?
-        if block_given?
-          async_get(key, &Proc.new)
-        else
-          async_get(key)
-        end
+        async_get(key, &block)
+        # if block_given?
+        #   async_get(key, &Proc.new)
+        # else
+        #   async_get(key)
+        # end
       else
         sync_block_error if block_given?
-        case key
-        when String, Symbol
-          get_single(key, options)
-        when Array
-          get_bulk(key, options)
-        when Hash
-          get_and_touch(key, options)
-        end
+        get_key(key, options)
       end
     end
 
@@ -177,7 +188,7 @@ module Couchbase::Operations
         future = client.asyncGet(key)
       when Array
         meta = { op: :get }
-        future = client.asyncGetBulk(keys)
+        future = client.asyncGetBulk(key)
       when Hash
         # async_get_and_touch(key, options, &block)
       end
@@ -186,6 +197,17 @@ module Couchbase::Operations
 
     private
 
+    def get_key(key, options)
+      case key
+      when String, Symbol
+        get_single(key, options)
+      when Array
+        get_bulk(key, options)
+      when Hash
+        get_and_touch(key, options)
+      end
+    end
+
     def expand_get_args(args)
       options = extract_options_hash(args)
       key = args.size == 1 ? args.first : args

data/lib/couchbase/operations/stats.rb

@@ -1,3 +1,20 @@
+# Author:: Mike Evans <mike@urlgonomics.com>
+# Copyright:: 2013 Urlgonomics LLC.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 module Couchbase::Operations
   module Stats
 

data/lib/couchbase/operations/store.rb

@@ -1,6 +1,31 @@
+# Author:: Mike Evans <mike@urlgonomics.com>
+# Copyright:: 2013 Urlgonomics LLC.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 module Couchbase::Operations
   module Store
 
+    STORE_OP_METHODS = {
+      set:     -> client, key, value, ttl, transcoder { client.set(key, ttl, value, transcoder) },
+      add:     -> client, key, value, ttl, transcoder { client.add(key, ttl, value, transcoder) },
+      replace: -> client, key, value, ttl, transcoder { client.replace(key, ttl, value, transcoder) },
+      append:  -> client, key, value, ttl, transcoder { client.append(key, value) },
+      prepend: -> client, key, value, ttl, transcoder { client.prepend(key, value) }
+    }.freeze
+
     # Unconditionally store the object in the Couchbase
     #
     # @since 1.0.0
@@ -390,34 +415,33 @@ module Couchbase::Operations
     def store_op(op, key, value, options = {})
       key, value, ttl, transcoder = store_args_parser(key, value, options)
 
-      case key
-      when String, Symbol
-        key = key.to_s
-        if options[:cas] && op == :set
-          client_cas(key, value, ttl, options[:cas], transcoder)
-        else
-          future = client_store_op(op, key, value, ttl, transcoder)
-          if cas = future_cas(future)
-            cas
-          else
-            case op
-            when :replace
-              fail Couchbase::Error::NotFound
-            when :append, :prepend
-              fail Couchbase::Error::NotStored
-            else
-              fail Couchbase::Error::KeyExists
-            end
-          end
-        end
-      when Hash
-        fail TypeError.new if !value.nil?
-        multi_op(op, key)
+      if key.is_a?(String) || key.is_a?(Symbol)
+        store_by_string(op, key.to_s, value, ttl, transcoder, options)
+      elsif key.is_a?(Hash)
+        store_by_hash(op, key, value)
       else
         fail TypeError.new
       end
     end
 
+    def store_by_string(op, key, value, ttl, transcoder, options)
+      if options[:cas] && op == :set
+        client_cas(key, value, ttl, options[:cas], transcoder)
+      else
+        future = client_store_op(op, key, value, ttl, transcoder)
+        if cas = future_cas(future)
+          cas
+        else
+          fail_store_op(op)
+        end
+      end
+    end
+
+    def store_by_hash(op, key, value)
+      fail TypeError.new if !value.nil?
+      multi_op(op, key)
+    end
+
     def async_store_op(op, key, value, options, &block)
       key, value, ttl, transcoder = store_args_parser(key, value, options)
       future = client_store_op(op, key, value, ttl, transcoder)
@@ -433,18 +457,7 @@ module Couchbase::Operations
     end
 
     def client_store_op(op, key, value, ttl, transcoder)
-      case op
-      when :set
-        client.set(key, ttl, value, transcoder)
-      when :add
-        client.add(key, ttl, value, transcoder)
-      when :replace
-        client.replace(key, ttl, value, transcoder)
-      when :append
-        client.append(key, value)
-      when :prepend
-        client.prepend(key, value)
-      end
+      STORE_OP_METHODS[op].call(self.client, key, value, ttl, transcoder)
     end
 
     def client_cas(key, value, ttl, cas, transcoder)
@@ -456,6 +469,17 @@ module Couchbase::Operations
       end
     end
 
+    def fail_store_op(op)
+      case op
+      when :replace
+        fail Couchbase::Error::NotFound
+      when :append, :prepend
+        fail Couchbase::Error::NotStored
+      else
+        fail Couchbase::Error::KeyExists
+      end
+    end
+
   end
 
 end

data/lib/couchbase/operations/touch.rb

@@ -1,3 +1,20 @@
+# Author:: Mike Evans <mike@urlgonomics.com>
+# Copyright:: 2013 Urlgonomics LLC.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 module Couchbase::Operations
   module Touch
 

data/lib/couchbase/operations/unlock.rb

@@ -1,3 +1,20 @@
+# Author:: Mike Evans <mike@urlgonomics.com>
+# Copyright:: 2013 Urlgonomics LLC.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 module Couchbase::Operations
   module Unlock
 

data/lib/couchbase/operations/utils.rb

@@ -1,3 +1,20 @@
+# Author:: Mike Evans <mike@urlgonomics.com>
+# Copyright:: 2013 Urlgonomics LLC.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 module Couchbase::Operations
   module Utils
 

data/lib/couchbase/operations.rb

@@ -1,3 +1,20 @@
+# Author:: Mike Evans <mike@urlgonomics.com>
+# Copyright:: 2013 Urlgonomics LLC.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 require 'couchbase/operations/touch'
 require 'couchbase/operations/store'
 require 'couchbase/operations/get'

data/lib/couchbase/query.rb

@@ -1,3 +1,21 @@
+# Author:: Mike Evans <mike@urlgonomics.com>
+# Copyright:: 2013 Urlgonomics LLC.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+
 module Couchbase
   class Query
 
@@ -50,7 +68,7 @@ module Couchbase
         end
       end
 
-      
+
     # @option params [true, false] :quiet (true) Do not raise error if
     #   associated document not found in the memory. If the parameter +true+
     #   will use +nil+ value instead.
@@ -65,7 +83,7 @@ module Couchbase
     #   view request is dropped (milliseconds)
 
 
-    # @option params [Hash] :body 
+    # @option params [Hash] :body
       query
     end
 

data/lib/couchbase/result.rb

@@ -1,3 +1,20 @@
+# Author:: Mike Evans <mike@urlgonomics.com>
+# Copyright:: 2013 Urlgonomics LLC.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 module Couchbase
   class Result
 

data/lib/couchbase/transcoder.rb

@@ -27,8 +27,8 @@ module Couchbase
     class Document < Base
 
       def decode(d)
-        data = case decoded = super
-               when String
+        decoded = super
+        data = if decoded.respond_to?(:to_str)
                  decoded
                else
                  decoded.getData.to_s

data/lib/couchbase/version.rb

@@ -1,3 +1,20 @@
+# Author:: Mike Evans <mike@urlgonomics.com>
+# Copyright:: 2013 Urlgonomics LLC.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
 module Couchbase
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
 end

data/lib/couchbase.rb

@@ -1,3 +1,19 @@
+# Author:: Mike Evans <mike@urlgonomics.com>
+# Copyright:: 2013 Urlgonomics LLC.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 unless RUBY_PLATFORM =~ /java/
   error "This gem is only compatible with a java-based ruby environment like JRuby."
@@ -129,7 +145,7 @@ module Couchbase
                else
                  "default"
                end
-      @@buckets.update { |buckets| buckets[name] ||= connect(connection_options) }
+      @@buckets.update { |buckets| buckets[name] ||= connect(connection_options.merge(bucket: name)) }
       @@buckets.value[name]
     end
 

data/test/profile/benchmark.rb

@@ -54,6 +54,7 @@ class Bench
       @k6 = "Long3" * 40]
 
     @cb = Couchbase.new
+    @cl = @cb.client
 
     # Ensure it is JITed
     2_000.times do
@@ -71,9 +72,9 @@ class Bench
       end
 
       x.report('java set') do
-        @cb.client.set(@k1, MultiJson.dump(@value)).get
-        @cb.client.set(@k2, MultiJson.dump(@value)).get
-        @cb.client.set(@k3, MultiJson.dump(@value)).get
+        @cl.set(@k1, MultiJson.dump(@value)).get
+        @cl.set(@k2, MultiJson.dump(@value)).get
+        @cl.set(@k3, MultiJson.dump(@value)).get
       end
 
       x.report('jruby get') do
@@ -83,9 +84,17 @@ class Bench
       end
 
       x.report('java get') do
-        MultiJson.load @cb.client.get(@k1)
-        MultiJson.load @cb.client.get(@k2)
-        MultiJson.load @cb.client.get(@k3)
+        MultiJson.load @cl.get(@k1)
+        MultiJson.load @cl.get(@k2)
+        MultiJson.load @cl.get(@k3)
+      end
+
+      x.report('jruby get multi') do
+        @cb.get([@k1, @k2, @k3])
+      end
+
+      x.report('java get multi') do
+        @cl.getBulk([@k1, @k2, @k3])
       end
 
       x.report('jruby delete') do
@@ -98,12 +107,12 @@ class Bench
       end
 
       x.report('java delete') do
-        @cb.set @k1, ''
-        @cb.set @k2, ''
-        @cb.set @k3, ''
-        @cb.client.delete @k1
-        @cb.client.delete @k2
-        @cb.client.delete @k3
+        @cl.set @k1, ''
+        @cl.set @k2, ''
+        @cl.set @k3, ''
+        @cl.delete @k1
+        @cl.delete @k2
+        @cl.delete @k3
       end
 
       x.report('jruby get missing') do
@@ -113,50 +122,50 @@ class Bench
       end
 
       x.report('java get missing') do
-        @cb.client.get @k1
-        @cb.client.get @k2
-        @cb.client.get @k3
+        @cl.get @k1
+        @cl.get @k2
+        @cl.get @k3
       end
 
-      x.report('jruby async set') do
-        @cb.run do
-          100.times do
-            @cb.set @k1, @value
-            @cb.set @k2, @value
-            @cb.set @k3, @value
-          end
-        end
-      end
-
-      x.report('java async set') do
-        futures = []
-        100.times do
-          futures << @cb.client.set(@k1, MultiJson.dump(@value))
-          futures << @cb.client.set(@k2, MultiJson.dump(@value))
-          futures << @cb.client.set(@k3, MultiJson.dump(@value))
-        end
-        futures.each(&:get)
-      end
-
-      x.report('jruby async get') do
-        @cb.run do
-          100.times do
-            @cb.get @k1
-            @cb.get @k2
-            @cb.get @k3
-          end
-        end
-      end
-
-      x.report('java async get') do
-        futures = []
-        100.times do
-          futures << @cb.client.asyncGet(@k1)
-          futures << @cb.client.asyncGet(@k2)
-          futures << @cb.client.asyncGet(@k3)
-        end
-        futures.each(&:get)
-      end
+      # x.report('jruby async set') do
+      #   @cb.run do
+      #     100.times do
+      #       @cb.set @k1, @value
+      #       @cb.set @k2, @value
+      #       @cb.set @k3, @value
+      #     end
+      #   end
+      # end
+
+      # x.report('java async set') do
+      #   futures = []
+      #   100.times do
+      #     futures << @cb.client.set(@k1, MultiJson.dump(@value))
+      #     futures << @cb.client.set(@k2, MultiJson.dump(@value))
+      #     futures << @cb.client.set(@k3, MultiJson.dump(@value))
+      #   end
+      #   futures.each(&:get)
+      # end
+
+      # x.report('jruby async get') do
+      #   @cb.run do
+      #     100.times do
+      #       @cb.get @k1
+      #       @cb.get @k2
+      #       @cb.get @k3
+      #     end
+      #   end
+      # end
+
+      # x.report('java async get') do
+      #   futures = []
+      #   100.times do
+      #     futures << @cb.client.asyncGet(@k1)
+      #     futures << @cb.client.asyncGet(@k2)
+      #     futures << @cb.client.asyncGet(@k3)
+      #   end
+      #   futures.each(&:get)
+      # end
 
     end
 

data/test/test_bucket.rb

@@ -210,4 +210,10 @@ class TestBucket < MiniTest::Test
     end
   end
 
+  def test_it_converts_options_keys_to_symbols
+    bucket = Couchbase::Bucket.new('bucket' => 'notdefault', 'hostname' => 'example.com', 'async' => true)
+    assert_equal 'notdefault',  bucket.bucket
+    assert_equal 'example.com', bucket.hostname
+  end
+
 end

data/test/test_couchbase.rb

@@ -26,4 +26,11 @@ class TestCouchbase < MiniTest::Test
     end
   end
 
+  def test_global_bucket_access
+    with_mock do |mock|
+      assert_instance_of Couchbase::Bucket, Couchbase.bucket
+      assert_equal Couchbase.bucket, Couchbase.bucket
+    end
+  end
+
 end

data/test/test_get.rb

@@ -114,7 +114,6 @@ class TestGet < MiniTest::Test
   end
 
   def test_missing_in_quiet_mode
-    skip
     connection = Couchbase.new(:hostname => @mock.host, :port => @mock.port, :quiet => true)
     cas1 = connection.set(uniq_id(1), "foo1")
     cas2 = connection.set(uniq_id(2), "foo2")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: couchbase-jruby-client
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Mike Evans
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-11-10 00:00:00.000000000 Z
+date: 2013-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json