couchbase-jruby-client 0.2.1-java → 0.2.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3602c5d2a676e611e016787b1dfaea84f82dd738
-  data.tar.gz: a107ce06192daa7153e2e84c3e153404315f1aab
+  metadata.gz: 8ec71506555414ea67468af719e184392afa4704
+  data.tar.gz: 74653b08496b561fcf60bae9c03a836c47acff4c
 SHA512:
-  metadata.gz: 0b1fcf6aa920b132318d3b0952b0e578a7220bb948f8ea35dba12f7c1bea9da89a6de07f83fb46a019bb2e2e31e7d54185ee63f2cd23eeef525a17b7ec529b0c
-  data.tar.gz: a82c445f29e05d27fb37d558c6258d6978db1c334dc56f103a28cb348d8ea1f3f5439a4d1b1afd5218f4818cfad40dbf688fd8576e7dd05616f54975436fda57
+  metadata.gz: 5bbc04e04898e8505bc3ffd4ce5223c2ab2f13a0200c4c7eae0ddd3eb8ca61797f1f9e3b244f1aaff7c862c0e108e00469345c42e1420e137ffb5d2992c7ab9e
+  data.tar.gz: dfa98216f38e6ce0d8282ef7befe1bc85a2efe5332692df1f113e12d1d94a2e1332784f31e0fa5c9f9b28750ca895f1515461afff9abc062f1ad0b3150b1ec98

data/lib/couchbase/version.rb

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

data/lib/couchbase/view.rb

@@ -91,7 +91,7 @@ module Couchbase
       @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"
+        raise ArgumentError, "wrapper class should respond to :wrap, check the options"
       end
     end
 
@@ -352,7 +352,11 @@ module Couchbase
     end
 
     def wrap_or_parse_data(data)
-      @wrapper_class.wrap(@bucket, data)
+      if data.is_a? ViewRowReduced
+        data.value
+      else
+        @wrapper_class.wrap(@bucket, data)
+      end
     end
 
     def send_error(*args)

data/lib/couchbase/view_row.rb

@@ -23,8 +23,17 @@ module Couchbase
   java_import com.couchbase.client.protocol.views.SpatialViewRowNoDocs
   java_import com.couchbase.client.protocol.views.SpatialViewRowWithDocs
 
-  module Java::ComCouchbaseClientProtocolViews::ViewRow
+  class Java::ComCouchbaseClientProtocolViews::ViewRowNoDocs
+    def doc
+      {
+        id:    getId,
+        key:   getKey,
+        value: getValue
+      }
+    end
+  end
 
+  class Java::ComCouchbaseClientProtocolViews::ViewRowWithDocs
     def doc
       {
         'meta'  => {
@@ -33,7 +42,9 @@ module Couchbase
         'value' => document
       }
     end
+  end
 
+  module Java::ComCouchbaseClientProtocolViews::ViewRow
     def [](key)
       if respond_to?(key)
         send(key)
@@ -43,6 +54,7 @@ module Couchbase
     end
   end
 
+
   # This class encapsulates structured JSON document
   #
   # @since 1.2.0

data/test/test_view.rb

@@ -91,8 +91,7 @@ class TestView < Minitest::Test
   def test_fetch_reduce
     skip unless $mock.real?
     assert results = reduce_view.fetch(stale: false, include_docs: false)
-    assert_instance_of Couchbase::ViewRow, results.first
-    assert_equal 4, results.first.value
+    assert_equal '4', results.first
   end
 
   def test_fetch_without_reduce

data/test/test_view_row.rb

@@ -0,0 +1,74 @@
+# 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 File.join(File.dirname(__FILE__), 'setup')
+
+class TestViewRow < Minitest::Test
+
+  def setup
+    return unless $mock.real?
+
+    cb.save_design_doc(design_doc)
+    { baltimore: 'md' , philadelphia: 'pa', pittsburgh: 'pa' }.each_pair do |city, state|
+      cb.set(city, { type: 'city', city: city, state: state })
+    end
+  end
+
+  def view
+    @view ||= Couchbase::View.new(cb, '_design/cities/_view/by_state')
+  end
+
+  def test_doc
+    skip unless $mock.real?
+    assert result = view.fetch(include_docs: true, stale: false).first
+
+    data = result.data
+
+    assert_instance_of Java::ComCouchbaseClientProtocolViews::ViewRowWithDocs, data
+
+    assert_equal({'id' => result.id}, data.doc['meta'])
+    assert_equal({'type' => result['type'], 'city' => result['city'], 'state' => result['state']}, data.doc['value'])
+  end
+
+  def test_doc_for_ViewRowNoDocs_objects
+    skip unless $mock.real?
+    assert result = view.fetch(include_docs: false, stale: false).first
+
+    data = result.data
+
+    assert_instance_of Java::ComCouchbaseClientProtocolViews::ViewRowNoDocs, data
+    assert_equal({ id: result.id, key: data.key, value: data.value }, data.doc)
+  end
+
+  def design_doc
+    {
+      '_id'      => '_design/cities',
+      'language' => 'javascript',
+      'views' => {
+        'by_state' => {
+          'map' => <<-JS
+            function (doc, meta) {
+              if (doc.type && doc.type == 'city')
+                emit(meta.id, doc.state);
+            }
+          JS
+        }
+      }
+    }
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: couchbase-jruby-client
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: java
 authors:
 - Mike Evans
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2014-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -208,6 +208,7 @@ files:
 - test/test_utils.rb
 - test/test_version.rb
 - test/test_view.rb
+- test/test_view_row.rb
 homepage: https://github.com/mje113/couchbase-jruby-client
 licenses:
 - Apache
@@ -228,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.2.2
+rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
 summary: The unofficial jruby client library for use with Couchbase Server.
@@ -262,3 +263,4 @@ test_files:
 - test/test_utils.rb
 - test/test_version.rb
 - test/test_view.rb
+- test/test_view_row.rb