couchbase-jruby-client 0.2.0-java → 0.2.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71bccd5819d83c3e1493076d252d676a36fe311f
-  data.tar.gz: ca2c16285b9d3fc2672d6af3467db5a14d19b8ca
+  metadata.gz: 3602c5d2a676e611e016787b1dfaea84f82dd738
+  data.tar.gz: a107ce06192daa7153e2e84c3e153404315f1aab
 SHA512:
-  metadata.gz: df3f4ddb4342333fe81bc7ed140b934cefcd4f3ce3d5e204c1b3409b88ebe2c7eb7baed3380fe8d11bc8f7efd2682021664f721e6ac4d0fb1d0184a3871af6ae
-  data.tar.gz: e557ddfa428849542ea131d55d98ac3a0280d367dfd46624391e6402f564932040e4afd73f5ee6070418b6588cb461fee3d10f62be32711a11a56e7deb91c717
+  metadata.gz: 0b1fcf6aa920b132318d3b0952b0e578a7220bb948f8ea35dba12f7c1bea9da89a6de07f83fb46a019bb2e2e31e7d54185ee63f2cd23eeef525a17b7ec529b0c
+  data.tar.gz: a82c445f29e05d27fb37d558c6258d6978db1c334dc56f103a28cb348d8ea1f3f5439a4d1b1afd5218f4818cfad40dbf688fd8576e7dd05616f54975436fda57

data/.ruby-version

@@ -1 +1 @@
-jruby-1.7.9
+jruby-1.7.11

data/lib/couchbase/operations/arithmetic.rb

@@ -222,7 +222,7 @@ module Couchbase::Operations
 
       key = args.size == 1 ? args.first : args
 
-      [key, delta, options]
+      [validate_key(key), delta, options]
     end
 
     def single_arithmetic(op, key, delta, options = {})

data/lib/couchbase/operations/delete.rb

@@ -82,7 +82,7 @@ module Couchbase::Operations
       key, options = expand_get_args(args)
 
       if key.respond_to?(:to_str)
-        [key, options[:cas], options]
+        [validate_key(key), options[:cas], options]
       else
         cas = if key.size > 1 &&
                  key.last.respond_to?(:to_int)
@@ -93,7 +93,7 @@ module Couchbase::Operations
 
         key = key.size == 1 ? key.first : key
 
-        [key, cas, options]
+        [validate_key(key), cas, options]
       end
     end
 

data/lib/couchbase/operations/get.rb

@@ -155,6 +155,7 @@ module Couchbase::Operations
     end
 
     def get_bulk(keys, options)
+      keys = keys.map { |key| validate_key(key) }
       results = if options[:extended]
                   get_bulk_extended(keys, options)
                 else
@@ -175,11 +176,13 @@ module Couchbase::Operations
 
       case key
       when String, Symbol
+        key = validate_key(key)
         meta = { op: :get, key: key }
         future = client.asyncGet(key)
       when Array
+        keys = key.map { |key| validate_key(key) }
         meta = { op: :get }
-        future = client.asyncGetBulk(key)
+        future = client.asyncGetBulk(keys)
       when Hash
         # async_get_and_touch(key, options, &block)
       end
@@ -203,7 +206,7 @@ module Couchbase::Operations
       options = extract_options_hash(args)
       key = args.size == 1 ? args.first : args
 
-      [key, options]
+      [validate_key(key), options]
     end
 
     def get_single(key, options)

data/lib/couchbase/operations/store.rb

@@ -386,7 +386,7 @@ module Couchbase::Operations
       ttl = options.delete(:ttl) || default_ttl
       transcoder = @transcoders[options.delete(:format)] || self.transcoder
 
-      [key, value, ttl, transcoder]
+      [validate_key(key), value, ttl, transcoder]
     end
 
     def store_op(op, key, value, options = {})

data/lib/couchbase/operations/touch.rb

@@ -111,7 +111,7 @@ module Couchbase::Operations
                              end
       key = args.size > 1 ? args : args.pop
 
-      [key, ttl, options]
+      [validate_key(key), ttl, options]
     end
 
     def multi_touch_hash(keys, options = {})

data/lib/couchbase/operations/utils.rb

@@ -21,11 +21,22 @@ module Couchbase::Operations
     private
 
     def validate_key(key)
-      if key_prefix
-        "#{key_prefix}key"
-      else
-        key.to_s
+      raise ArgumentError, "key cannot be blank" if !key || key.length == 0
+      key = key_with_prefix(key)
+
+      if key.length > 250
+        max_length = key_prefix ? 212 - key_prefix.size : 212
+        key = "#{key[0, max_length]}:md5:#{Digest::MD5.hexdigest(key)}"
       end
+      return key
+    end
+
+    def key_with_prefix(key)
+      (prefix = key_prefix) ? "#{prefix}:#{key}" : key
+    end
+
+    def key_without_prefix(key)
+      (prefix = key_prefix) ? key.sub(%r(\A#{prefix}:), '') : key
     end
 
     def extract_options_hash(args)

data/lib/couchbase/version.rb

@@ -16,5 +16,5 @@
 #
 
 module Couchbase
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/lib/couchbase/view_row.rb

@@ -126,10 +126,10 @@ module Couchbase
       @data   = data
       @key    = data.key
       @last   = false
+      @id     = data.id unless data.is_a?(ViewRowReduced)
 
       case data
       when ViewRowWithDocs, SpatialViewRowWithDocs
-        @id       = data.id
         @doc      = data.document
       when ViewRowReduced
         @value    = MultiJson.load(data.value)

data/lib/couchbase.rb

@@ -22,12 +22,12 @@ end
 
 require 'java'
 require 'jars/commons-codec-1.5.jar'
-require 'jars/couchbase-client-1.2.3.jar'
+require 'jars/couchbase-client-1.3.2.jar'
 require 'jars/jettison-1.1.jar'
-require 'jars/httpcore-4.1.1.jar'
+require 'jars/httpcore-4.3.1.jar'
+require 'jars/httpcore-nio-4.3.1.jar'
 require 'jars/netty-3.5.5.Final.jar'
-require 'jars/spymemcached-2.10.3.jar'
-require 'jars/httpcore-nio-4.1.1.jar'
+require 'jars/spymemcached-2.10.5.jar'
 require 'couchbase/version'
 require 'uri'
 require 'thread_safe'

data/test/test_store.rb

@@ -73,7 +73,7 @@ class TestStore < Minitest::Test
     cas = cb.set(uniq_id.to_s, "bar")
     assert cas > 0
 
-    assert_raises(TypeError) do
+    assert_raises(ArgumentError) do
       cb.set(nil, "bar")
     end
 

data/test/test_utils.rb

@@ -19,6 +19,24 @@ require File.join(File.dirname(__FILE__), 'setup')
 
 class TestUtils < Minitest::Test
 
+  def test_nil_or_empty_key
+    assert_raises ArgumentError do
+      cb.set(nil, 'fu')
+    end
+
+    assert_raises ArgumentError do
+      cb.set('', 'bar')
+    end
+  end
+
+  def test_truncate_long_keys
+    key = 'a' * 500
+
+    assert cb.set(key, 'fu')
+    assert_equal 'fu', cb.get(key)
+    assert cb.delete(key)
+  end
+
   def test_complex_startkey
     assert_equal "all_docs?startkey=%5B%22Deadmau5%22%2C%22%22%5D", Couchbase::Utils.build_query("all_docs", :startkey =>  ["Deadmau5", ""])
   end

data/test/test_view.rb

@@ -55,6 +55,19 @@ class TestView < Minitest::Test
     assert results.first.doc.nil?
     assert_equal 4, results.total_rows
     results.each do |result|
+      %w(bob frank sam fred).include?(result.id)
+      %w(bob frank sam fred).include?(result.key)
+    end
+  end
+
+  def test_fetch_no_docs
+    skip unless $mock.real?
+    assert results = view.fetch(include_docs: false, stale: false)
+    assert_instance_of Couchbase::ViewRow, results.first
+    assert results.first.doc.nil?
+    assert_equal 4, results.total_rows
+    results.each do |result|
+      %w(bob frank sam fred).include?(result.id)
       %w(bob frank sam fred).include?(result.key)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: couchbase-jruby-client
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: java
 authors:
 - Mike Evans
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-02-12 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -166,16 +166,16 @@ files:
 - lib/couchbase/view.rb
 - lib/couchbase/view_row.rb
 - lib/jars/commons-codec-1.5.jar
-- lib/jars/couchbase-client-1.2.3-javadoc.jar
-- lib/jars/couchbase-client-1.2.3-sources.jar
-- lib/jars/couchbase-client-1.2.3.jar
-- lib/jars/httpcore-4.1.1.jar
-- lib/jars/httpcore-nio-4.1.1.jar
+- lib/jars/couchbase-client-1.3.2-javadoc.jar
+- lib/jars/couchbase-client-1.3.2-sources.jar
+- lib/jars/couchbase-client-1.3.2.jar
+- lib/jars/httpcore-4.3.1.jar
+- lib/jars/httpcore-nio-4.3.1.jar
 - lib/jars/jettison-1.1.jar
 - lib/jars/netty-3.5.5.Final.jar
-- lib/jars/spymemcached-2.10.3-javadoc.jar
-- lib/jars/spymemcached-2.10.3-sources.jar
-- lib/jars/spymemcached-2.10.3.jar
+- lib/jars/spymemcached-2.10.5-javadoc.jar
+- lib/jars/spymemcached-2.10.5-sources.jar
+- lib/jars/spymemcached-2.10.5.jar
 - tasks/benchmark.rake
 - tasks/test.rake
 - tasks/util.rake