couchbase-jruby-client 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b70e454af837900912ab334c577374656157b1df
-  data.tar.gz: cd773d813f362ffd5eb695458800fab40ff2d3f0
+  metadata.gz: e7083d15093935a06d4e97e63ba51002d380017c
+  data.tar.gz: 276b3d3e2a9a5234accd1137408ad9e6f04a6941
 SHA512:
-  metadata.gz: cee4caac6a388131d089bac920d651240710b59caeac1dfa8595e301cad01ff0a89f49953b6657ce641831e1f36f25acf7d8678bb0f53d88311e2881b8b5b9b3
-  data.tar.gz: 8c8127b194702f2a58237f2f71f6064e2782cb89c07365adb5217804c3df2c7eec9ceb32bfdbed9ca2d1c625856740376b5914da2bdcb53d1dbc06c49bf0ef4a
+  metadata.gz: 8ee1b9dc433b9765a2ab46c09a2fc18cfc55319696d5f7253783ecbd5371c02090e2501951af4d6b5d82a4ec9ea6a7512b6e1d4f56b358d7958e15d8d3c82e7e
+  data.tar.gz: c10067130e72f705671fccd0b032ae9707ce26d24e1053b81abbe36e3926fe146596f0de473478d97bf82c9c8710877cc72ad7b99a8ad59df6278a5a59051bab

data/lib/couchbase.rb

@@ -48,7 +48,7 @@ require 'couchbase/query'
 
 include Java
 
-import Java::com.couchbase.client.CouchbaseClient;
+java_import Java::com.couchbase.client.CouchbaseClient
 
 at_exit do
   Couchbase.disconnect

data/lib/couchbase/design_doc.rb

@@ -16,7 +16,11 @@
 #
 
 module Couchbase
-  class DesignDoc
+  class DesignDoc < ViewRow
+
+    # It isn't allowed to change design document ID after
+    # initialization
+    undef id=
 
     def initialize(bucket, doc)
       @all_views = {}
@@ -24,6 +28,7 @@ module Couchbase
       @name      = doc.name
       @views     = doc.views
       @spatial   = doc.spatial_views
+      @doc       = {}
       @views.each   { |view| @all_views[view.name] = "#{@name}/_view/#{view.name}" }
       @spatial.each { |view| @all_views[view.name] = "#{@name}/_spatial/#{view.name}" }
     end

data/lib/couchbase/operations/design_docs.rb

@@ -63,16 +63,16 @@ module Couchbase::Operations
               else
                 raise ArgumentError, "Document should be Hash, String or IO instance"
               end
-      
+
       id = attrs.delete('_id').to_s.split('/')[1]
 
       design_doc = DesignDocument.new(id)
 
-      attrs['views'].each_pair do |view, functions| 
+      attrs['views'].each_pair do |view, functions|
         view_design = if functions['reduce']
-                        ViewDesign.new(view, functions['map'], functions['reduce'])
+                        ViewDesign.new(view.to_s.to_java_string, functions['map'].to_java_string, functions['reduce'].to_java_string)
                       else
-                        ViewDesign.new(view, functions['map'])
+                        ViewDesign.new(view.to_s.to_java_string, functions['map'].to_java_string)
                       end
         design_doc.getViews.add(view_design)
       end

data/lib/couchbase/query.rb

@@ -69,21 +69,21 @@ module Couchbase
       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.
-    # @option params [String, Symbol] :on_error (:continue) Sets the
-    #   response in the event of an error. Supported values:
-    #   :continue:: Continue to generate view information in the event of an
-    #               error, including the error information in the view
-    #               response stream.
-    #   :stop::     Stop immediately when an error condition occurs. No
-    #               further view information will be returned.
-    # @option params [Fixnum] :connection_timeout (75000) Timeout before the
-    #   view request is dropped (milliseconds)
+      # @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.
+      # @option params [String, Symbol] :on_error (:continue) Sets the
+      #   response in the event of an error. Supported values:
+      #   :continue:: Continue to generate view information in the event of an
+      #               error, including the error information in the view
+      #               response stream.
+      #   :stop::     Stop immediately when an error condition occurs. No
+      #               further view information will be returned.
+      # @option params [Fixnum] :connection_timeout (75000) Timeout before the
+      #   view request is dropped (milliseconds)
 
 
-    # @option params [Hash] :body
+      # @option params [Hash] :body
       query
     end
 

data/lib/couchbase/version.rb

@@ -16,5 +16,5 @@
 #
 
 module Couchbase
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/lib/couchbase/view.rb

@@ -88,8 +88,8 @@ module Couchbase
       @bucket   = bucket
       @endpoint = endpoint
       @design_doc, @name = parse_endpoint(endpoint)
-      @params   = { :connection_timeout => 75_000 }.merge(params)
       @wrapper_class = params.delete(:wrapper_class) || ViewRow
+      @params   = { :connection_timeout => 75_000 }.merge(params)
       unless @wrapper_class.respond_to?(:wrap)
         raise ArgumentError, "wrapper class should reposond to :wrap, check the options"
       end
@@ -297,13 +297,13 @@ module Couchbase
       if block_given?
         block = Proc.new
         request.each do |data|
-          doc = @wrapper_class.wrap(@bucket, data)
+          doc = @wrapper_class.wrap(@bucket, data.getDocument)
           block.call(doc)
         end
         nil
       else
         docs = request.to_a.map { |data|
-          @wrapper_class.wrap(@bucket, data)
+          @wrapper_class.wrap(@bucket, data.getDocument)
         }
         docs = ArrayWithTotalRows.new(docs)
         docs.total_rows = request.size

data/test/test_store.rb

@@ -120,7 +120,6 @@ class TestStore < MiniTest::Test
   end
 
   def test_append
-    skip 'Plain encoding isnt working correctly'
     cb.default_format = :plain
 
     cas1 = cb.set(uniq_id, "foo")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: couchbase-jruby-client
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Mike Evans
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
+date: 2013-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -146,8 +146,6 @@ files:
 - lib/couchbase/constants.rb
 - lib/couchbase/design_doc.rb
 - lib/couchbase/error.rb
-- lib/couchbase/jruby/couchbase_client.rb
-- lib/couchbase/jruby/future.rb
 - lib/couchbase/operations.rb
 - lib/couchbase/operations/arithmetic.rb
 - lib/couchbase/operations/delete.rb

data/lib/couchbase/jruby/couchbase_client.rb

@@ -1,22 +0,0 @@
-module Couchbase
-  module Jruby
-    class CouchbaseClient < Java::ComCouchbaseClient::CouchbaseClient
-
-      # Futures
-      %w(add set append asyncCAS asyncDecr asyncGet asyncGetAndTouch asyncGetBulk
-        asyncGets asyncIncr delete flush prepend replace set touch).each do |op|
-        define_method(op) do |*|
-          super
-        end
-      end
-
-      def get(*)
-        super
-      end
-
-      VALUE_OPS = %w(
-
-      ).freeze
-    end
-  end
-end

data/lib/couchbase/jruby/future.rb

@@ -1,8 +0,0 @@
-module Couchbase
-  module Jruby
-    module Future
-
-
-    end
-  end
-end