couchbase-jruby-client 0.2.2-java → 1.0.4-java

data/test/test_view.rb

@@ -1,140 +1,86 @@
-# 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')
+require 'helper'
 
 class TestView < Minitest::Test
 
   def setup
-    return unless $mock.real?
-
-    cb.save_design_doc(design_doc)
-    { bob: 32, frank: 25, sam: 42, fred: 21 }.each_pair do |name, age|
-      cb.set(name, { type: 'user', name: name, age: age })
-    end
+    @bucket = Couchbase.bucket
+    @design_doc = {
+      test_map: {
+        map: <<-JS
+          function(doc, meta) {
+            emit(meta.id);
+          }
+        JS
+      },
+      test_reduce: {
+        map: 'function(doc, meta) { emit(meta.id, null); }',
+        reduce: '_count'
+      }
+    }
+    @bucket.save_design_doc('test', @design_doc)
   end
 
-  def view
-    @view ||= Couchbase::View.new(cb, '_design/users/_view/by_age')
-  end
+  def test_view_query
+    @bucket.upsert(uniq_id, true)
+    results = @bucket.query('test', 'test_map')
+      .fresh
+      .fetch
 
-  def reduce_view
-    @reduce_view ||= Couchbase::View.new(cb, '_design/users/_view/all')
+    assert_equal true, results[uniq_id].data
   end
 
-  def test_initialize
-    skip unless $mock.real?
-    assert_equal 'users',  view.design_doc
-    assert_equal 'by_age', view.name
-  end
+  def test_key
+    @bucket.upsert(uniq_id, true)
+    results = @bucket.query('test', 'test_map')
+      .key(uniq_id)
+      .fresh
+      .fetch
 
-  def test_simple_fetch
-    skip unless $mock.real?
-    assert results = view.fetch
-    assert results.is_a?(Couchbase::View::ArrayWithTotalRows)
+    assert_equal 1, results.size
+    assert_equal true, results[uniq_id].data
   end
 
-  def test_fetch_without_stale
-    skip unless $mock.real?
-    assert results = view.fetch(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
+  def test_keys
+    @bucket.upsert(uniq_id(:a), true)
+    @bucket.upsert(uniq_id(:b), true)
+    results = @bucket.query('test', 'test_map')
+      .keys([uniq_id(:a), uniq_id(:b)])
+      .fresh
+      .fetch
+
+    assert_equal 2, results.size
+    assert_equal true, results[uniq_id(:a)].data
+    assert_equal true, results[uniq_id(:b)].data
   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
+  def test_returns_nils_as_appropriate
+    100.times { |i| @bucket.upsert(uniq_id(i), true) }
+    # Force an index
+    @bucket.query('test', 'test_map').fresh.fetch
+    100.times { |i| @bucket.remove(uniq_id(i)) }
+    results = @bucket.query('test', 'test_map').fetch
+    assert_nil results[uniq_id(23)]
   end
 
-  def test_fetch_with_docs
-    skip unless $mock.real?
-    assert results = view.fetch(stale: false, include_docs: true)
-    assert_instance_of Couchbase::View::ArrayWithTotalRows, results
-    assert_instance_of Hash, results.first.doc
-  end
+  def test_reduced_view
+    @bucket.upsert(uniq_id, true)
+    results = @bucket.query('test', 'test_reduce')
+      .fresh
+      .fetch
 
-  def test_fetch_with_block
-    skip unless $mock.real?
-    refute view.fetch(stale: false, include_docs: true) { |row|
-      assert_instance_of Couchbase::ViewRow, row
-      assert row.doc['name'].is_a?(String)
-      assert row.doc['age'].is_a?(Fixnum)
-    }
+    assert_instance_of Fixnum, results
+    assert results > 0
   end
 
-  def test_fetch_reduce
-    skip unless $mock.real?
-    assert results = reduce_view.fetch(stale: false, include_docs: false)
-    assert_equal '4', results.first
-  end
+  def test_non_reduced_view
+    @bucket.upsert(uniq_id, true)
+    results = @bucket.query('test', 'test_reduce')
+      .fresh
+      .reduce(false)
+      .fetch
 
-  def test_fetch_without_reduce
-    skip unless $mock.real?
-    assert results = reduce_view.fetch(stale: false, reduce: 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.key)
-    end
+    assert_equal true, results[uniq_id].data
   end
 
-  def test_design_doc_access
-    skip unless $mock.real?
-    view.fetch(stale: false, include_docs: true)
-    assert results = cb.design_docs['users'].by_age.to_a
-    assert_instance_of Couchbase::ViewRow, results.first
-  end
 
-  def design_doc
-    {
-      '_id'      => '_design/users',
-      'language' => 'javascript',
-      'views' => {
-        'by_age' => {
-          'map' => <<-JS
-            function (doc, meta) {
-              if (doc.type && doc.type == 'user')
-                emit(meta.id, doc.age);
-            }
-          JS
-        },
-        'all' => {
-          'reduce' => '_count',
-          'map' => <<-JS
-            function (doc, meta) {
-              if (doc.type && doc.type == 'user')
-                emit(meta.id, null);
-            }
-          JS
-        }
-      }
-    }
-  end
 end

metadata

@@ -1,127 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: couchbase-jruby-client
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 1.0.4
 platform: java
 authors:
 - Mike Evans
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-11-11 00:00:00.000000000 Z
+date: 2015-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: multi_json
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '1.0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
+  name: multi_json
   prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: thread_safe
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.1.2
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency
+        version: '0'
   name: bundler
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
+  name: rake
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: minitest
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: minitest
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: '0'
+  name: jrjackson
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: jrjackson
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: '0'
+  name: pry
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: pry
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+  name: rubocop
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: mocha
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  prerelease: false
-  type: :development
 description: Couchbase JRuby driver
 email:
 - mike@urlgonomics.com
@@ -131,6 +117,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .jrubyrc
+- .rubocop.yml
 - .ruby-version
 - .travis.yml
 - Gemfile
@@ -139,76 +126,28 @@ files:
 - Rakefile
 - couchbase-jruby-client.gemspec
 - lib/couchbase.rb
-- lib/couchbase/async.rb
-- lib/couchbase/async/callback.rb
-- lib/couchbase/async/queue.rb
 - lib/couchbase/bucket.rb
 - lib/couchbase/cluster.rb
-- lib/couchbase/constants.rb
+- lib/couchbase/configuration.rb
 - lib/couchbase/design_doc.rb
+- lib/couchbase/document.rb
 - lib/couchbase/error.rb
 - lib/couchbase/operations.rb
-- lib/couchbase/operations/arithmetic.rb
-- lib/couchbase/operations/delete.rb
-- lib/couchbase/operations/design_docs.rb
-- lib/couchbase/operations/fetch.rb
-- lib/couchbase/operations/get.rb
-- lib/couchbase/operations/stats.rb
-- lib/couchbase/operations/store.rb
-- lib/couchbase/operations/touch.rb
-- lib/couchbase/operations/unlock.rb
-- lib/couchbase/operations/utils.rb
-- lib/couchbase/query.rb
-- lib/couchbase/result.rb
-- lib/couchbase/transcoder.rb
-- lib/couchbase/utils.rb
 - lib/couchbase/version.rb
 - lib/couchbase/view.rb
-- lib/couchbase/view_row.rb
-- lib/jars/commons-codec-1.5.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.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
-- test/mock.rb
-- test/profile/.gitignore
-- test/profile/.jrubyrc
-- test/profile/Gemfile
-- test/profile/benchmark.rb
-- test/profile/profile.rb
-- test/setup.rb
-- test/test_arithmetic.rb
-- test/test_async.rb
+- lib/jars/couchbase-core-io-1.1.4.jar
+- lib/jars/couchbase-java-client-2.1.4.jar
+- lib/jars/rxjava-1.0.8.jar
+- lib/jars/rxjruby-0.0.1.jar
+- test/helper.rb
 - test/test_bucket.rb
-- test/test_cas.rb
 - test/test_cluster.rb
+- test/test_configuration.rb
 - test/test_couchbase.rb
-- test/test_couchbase_rails_cache_store.rb
-- test/test_delete.rb
-- test/test_design_docs.rb
-- test/test_errors.rb
-- test/test_fetch.rb
-- test/test_format.rb
-- test/test_get.rb
-- test/test_query.rb
-- test/test_result.rb
-- test/test_stats.rb
-- test/test_store.rb
-- test/test_touch.rb
-- test/test_unlock.rb
-- test/test_utils.rb
-- test/test_version.rb
+- test/test_design_doc.rb
+- test/test_document.rb
+- test/test_operations.rb
 - test/test_view.rb
-- test/test_view_row.rb
 homepage: https://github.com/mje113/couchbase-jruby-client
 licenses:
 - Apache
@@ -229,38 +168,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.4.8
 signing_key:
 specification_version: 4
 summary: The unofficial jruby client library for use with Couchbase Server.
 test_files:
-- test/mock.rb
-- test/profile/.gitignore
-- test/profile/.jrubyrc
-- test/profile/Gemfile
-- test/profile/benchmark.rb
-- test/profile/profile.rb
-- test/setup.rb
-- test/test_arithmetic.rb
-- test/test_async.rb
+- test/helper.rb
 - test/test_bucket.rb
-- test/test_cas.rb
 - test/test_cluster.rb
+- test/test_configuration.rb
 - test/test_couchbase.rb
-- test/test_couchbase_rails_cache_store.rb
-- test/test_delete.rb
-- test/test_design_docs.rb
-- test/test_errors.rb
-- test/test_fetch.rb
-- test/test_format.rb
-- test/test_get.rb
-- test/test_query.rb
-- test/test_result.rb
-- test/test_stats.rb
-- test/test_store.rb
-- test/test_touch.rb
-- test/test_unlock.rb
-- test/test_utils.rb
-- test/test_version.rb
+- test/test_design_doc.rb
+- test/test_document.rb
+- test/test_operations.rb
 - test/test_view.rb
-- test/test_view_row.rb

data/lib/couchbase/async/callback.rb

@@ -1,38 +0,0 @@
-# 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 Async
-    class Callback
-      include Java::NetSpyMemcachedInternal::OperationCompletionListener
-      include Java::NetSpyMemcachedInternal::GetCompletionListener
-
-      def initialize(params, &callback)
-        @params   = params
-        @callback = callback
-      end
-
-      def onComplete(future)
-        result = Couchbase::Result.new(@params.merge(future: future))
-        @callback.call(result)
-      rescue Exception => e
-        result.error = e
-        return result
-      end
-    end
-  end
-end

data/lib/couchbase/async/queue.rb

@@ -1,26 +0,0 @@
-module Couchbase
-  module Async
-    class Queue
-
-      def initialize(bucket)
-        @bucket  = bucket
-        @futures = []
-      end
-
-      def add_future(future, options, &block)
-        @futures << [ future, options, block ]
-      end
-
-      def join
-        while future = @futures.pop
-          begin
-            future, options, callback = future
-            future.get
-            result = Couchbase::Result.new({ bucket: @bucket, future: future }.merge(options))
-            callback.call(result) unless callback.nil?
-          end
-        end
-      end
-    end
-  end
-end

data/lib/couchbase/async.rb

@@ -1,32 +0,0 @@
-# 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'
-
-module Couchbase
-  module Async
-
-    private
-
-    def register_future(future, params, &block)
-      callback = Callback.new(params, &block)
-      future.addListener(callback)
-      future
-    end
-  end
-end

data/lib/couchbase/constants.rb

@@ -1,29 +0,0 @@
-# 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
-    S_DOC = 'doc'.freeze
-    S_VALUE = 'value'.freeze
-    S_META = 'meta'.freeze
-    S_FLAGS = 'flags'.freeze
-    S_CAS = 'cas'.freeze
-    S_KEY = 'key'.freeze
-    S_IS_LAST = Object.new.freeze
-  end
-end