riak-client 2.2.0.pre1 → 2.2.0

data/spec/support/crdt_search_fixtures.rb

@@ -0,0 +1,42 @@
+module CrdtSearchFixtures
+  def map_result_score
+    43.21
+  end
+
+  def maps_type_name
+    'maps'
+  end
+
+  def maps_bucket_type
+    return @maps_bucket_type if defined? @maps_bucket_type
+
+    @maps_bucket_type = instance_double('Riak::BucketType').tap do |bt|
+      allow(bt).to receive(:bucket).
+                    with(bucket_name).
+                    and_return(map_bucket)
+      allow(bt).to receive(:data_type_class).
+                    and_return(Riak::Crdt::Map)
+    end
+  end
+
+  def map_bucket
+    @map_bucket ||= instance_double('Riak::BucketTyped::Bucket')
+  end
+
+  def map_raw
+    @map_raw ||= {
+      'score'=>map_result_score,
+      '_yz_rb'=>bucket_name,
+      '_yz_rt'=>maps_type_name,
+      '_yz_rk'=>'map-key'
+    }
+  end
+
+  def map_results
+    @map_results ||= Riak::Search::ResultDocument.new client, map_raw
+  end
+end
+
+RSpec.configure do |config|
+  config.include CrdtSearchFixtures, crdt_search_fixtures: true
+end

data/spec/support/search_config.rb

@@ -11,15 +11,17 @@ module SearchConfig
     @index_name ||= search_bucket.name
   end
 
+  def index
+    return @index if defined? @index
+    create_index
+    @index = Riak::Search::Index.new test_client, index_name
+  end
+
   def create_index
     return if defined? @index_exists
 
     test_client.create_search_index index_name
 
-    wait_until do
-      test_client.get_search_index index_name
-    end
-
     @index_exists = true
   end
 
@@ -28,7 +30,7 @@ module SearchConfig
 
     create_index
 
-    test_client.set_bucket_props(search_bucket, 
+    test_client.set_bucket_props(search_bucket,
                                  { search_index: index_name },
                                  'yokozuna')
 

data/spec/support/search_corpus_setup.rb

@@ -28,9 +28,9 @@ shared_context "search corpus setup" do
       end
     end
     Encoding.default_external = old_encoding
-    
+
     wait_until do
-      results = @backend.search(@search_bucket.name, 
+      results = @backend.search(@search_bucket.name,
                                 'contain your entire keyspace',
                                 df: 'text')
       results['docs'].length > 0

data/spec/support/test_client.rb

@@ -7,7 +7,7 @@ module TestClient
     candidate_client = Riak::Client.new test_client_configuration
 
     live = candidate_client.ping
-    
+
     return $test_client = candidate_client if live
   end
 
@@ -31,7 +31,7 @@ module TestClient
     $test_client_configuration = config
   end
 
-  def random_bucket(name='test_client')
+  def random_bucket(name = 'test_client')
     bucket_name = [name, Time.now.to_i, random_key].join('-')
     test_client.bucket bucket_name
   end

data/spec/support/unified_backend_examples.rb

@@ -45,7 +45,7 @@ shared_examples_for "Unified backend API" do
       expect(@exception).to be_not_found
     end
 
-    [1,2,3,:one,:quorum,:all,:default].each do |q|
+    [1, 2, 3, :one, :quorum, :all, :default].each do |q|
       it "accepts a R value of #{q.inspect} for the request" do
         robj = @backend.fetch_object(@bucket.name, "fetch", :r => q)
         expect(robj).to be_kind_of(Riak::RObject)
@@ -82,7 +82,7 @@ shared_examples_for "Unified backend API" do
       @backend.reload_object(@robject)
     end
 
-    [1,2,3,:one,:quorum,:all,:default].each do |q|
+    [1, 2, 3, :one, :quorum, :all, :default].each do |q|
       it "accepts a valid R value of #{q.inspect} for the request" do
         @backend.reload_object(@robject, :r => q)
       end
@@ -117,7 +117,7 @@ shared_examples_for "Unified backend API" do
       expect(@robject.vclock).to be_present
     end
 
-    [1,2,3,:one,:quorum,:all,:default].each do |q|
+    [1, 2, 3, :one, :quorum, :all, :default].each do |q|
       it "accepts a W value of #{q.inspect} for the request" do
         @backend.store_object(@robject, :returnbody => false, :w => q)
         expect(@bucket.exists?(@robject.key)).to be_truthy
@@ -158,7 +158,7 @@ shared_examples_for "Unified backend API" do
       expect(@obj.bucket.exists?("delete")).to be_falsey
     end
 
-    [1,2,3,:one,:quorum,:all,:default].each do |q|
+    [1, 2, 3, :one, :quorum, :all, :default].each do |q|
       it "accepts an RW value of #{q.inspect} for the request" do
         @backend.delete_object("test", "delete", :rw => q)
       end
@@ -273,7 +273,7 @@ shared_examples_for "Unified backend API" do
     end
 
     it "finds keys for a range query" do
-      expect(@backend.get_index('test', 'index_int', 19..21)).to match_array(["19","20", "21"])
+      expect(@backend.get_index('test', 'index_int', 19..21)).to match_array(%w(19 20 21))
     end
 
     it "returns an empty array for a query that does not match any keys" do

data/spec/support/version_filter.rb

@@ -1,10 +1,12 @@
 require 'rubygems'
 
 RSpec.configure do |config|
-  config.before(:each, :version => lambda {|v| !!v }) do |example|
+  config.before(:each, version: ->(v) { v }) do |example|
     required = Gem::Requirement.create(example.metadata[:version])
     actual = Gem::Version.new(test_server.version)
-    skip("SKIP: Tests feature for Riak #{required.to_s}, but testing against #{actual.to_s}",
-            :unless => required.satisfied_by?(actual))
+    skip(
+      "SKIP: Tests feature for Riak #{required}, but testing against #{actual}",
+      unless: required.satisfied_by?(actual)
+    )
   end
 end

data/spec/support/wait_until.rb

@@ -1,8 +1,14 @@
+# This module is used for search testing, and other testing activities that may
+# take time to "settle" in Riak.
 module WaitUntil
-  def wait_until(attempts=10)
+  def wait_until(attempts = 10)
     (0..attempts).each do |a|
-      break if yield rescue nil
-      
+      begin
+        break if yield
+      rescue
+        nil
+      end
+
       sleep a
     end
   end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riak-client
 version: !ruby/object:Gem::Version
-  version: 2.2.0.pre1
+  version: 2.2.0
 platform: ruby
 authors:
-- Sean Cribbs
 - Bryce Kerley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-05 00:00:00.000000000 Z
+date: 2015-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -73,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: instrumentable
   requirement: !ruby/object:Gem::Requirement
@@ -95,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.28.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.28.0
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -115,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -169,7 +182,6 @@ description: riak-client is a rich client for Riak, the distributed database by
   It supports the full HTTP and Protocol Buffers interfaces including storage operations,
   bucket configuration, link-walking, secondary indexes and map-reduce.
 email:
-- sean@basho.com
 - bryce@basho.com
 executables: []
 extensions: []
@@ -259,6 +271,7 @@ files:
 - lib/riak/map_reduce/results.rb
 - lib/riak/map_reduce_error.rb
 - lib/riak/multiget.rb
+- lib/riak/preflist_item.rb
 - lib/riak/rcontent.rb
 - lib/riak/robject.rb
 - lib/riak/search.rb
@@ -292,9 +305,12 @@ files:
 - spec/integration/riak/bucket_types_spec.rb
 - spec/integration/riak/conflict_resolution_spec.rb
 - spec/integration/riak/counters_spec.rb
+- spec/integration/riak/crdt/configuration_spec.rb
+- spec/integration/riak/crdt_search_spec.rb
 - spec/integration/riak/crdt_spec.rb
 - spec/integration/riak/crdt_validation/map_spec.rb
 - spec/integration/riak/crdt_validation/set_spec.rb
+- spec/integration/riak/preflist_spec.rb
 - spec/integration/riak/properties_spec.rb
 - spec/integration/riak/protobuffs/interrupted_request_spec.rb
 - spec/integration/riak/protobuffs_backends_spec.rb
@@ -313,7 +329,7 @@ files:
 - spec/riak/bucket_properties_spec.rb
 - spec/riak/bucket_spec.rb
 - spec/riak/bucket_type_spec.rb
-- spec/riak/bucket_typed/bucket.rb
+- spec/riak/bucket_typed/bucket_spec.rb
 - spec/riak/client_spec.rb
 - spec/riak/core_ext/to_param_spec.rb
 - spec/riak/counter_spec.rb
@@ -360,6 +376,8 @@ files:
 - spec/support/certs/server.crl
 - spec/support/certs/server.crt
 - spec/support/certs/server.key
+- spec/support/crdt_search_config.rb
+- spec/support/crdt_search_fixtures.rb
 - spec/support/integration_setup.rb
 - spec/support/search_config.rb
 - spec/support/search_corpus_setup.rb
@@ -384,12 +402,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: riak-client is a rich client for Riak, the distributed database by Basho.
@@ -410,9 +428,12 @@ test_files:
 - spec/integration/riak/bucket_types_spec.rb
 - spec/integration/riak/conflict_resolution_spec.rb
 - spec/integration/riak/counters_spec.rb
+- spec/integration/riak/crdt/configuration_spec.rb
+- spec/integration/riak/crdt_search_spec.rb
 - spec/integration/riak/crdt_spec.rb
 - spec/integration/riak/crdt_validation/map_spec.rb
 - spec/integration/riak/crdt_validation/set_spec.rb
+- spec/integration/riak/preflist_spec.rb
 - spec/integration/riak/properties_spec.rb
 - spec/integration/riak/protobuffs/interrupted_request_spec.rb
 - spec/integration/riak/protobuffs_backends_spec.rb
@@ -431,7 +452,7 @@ test_files:
 - spec/riak/bucket_properties_spec.rb
 - spec/riak/bucket_spec.rb
 - spec/riak/bucket_type_spec.rb
-- spec/riak/bucket_typed/bucket.rb
+- spec/riak/bucket_typed/bucket_spec.rb
 - spec/riak/client_spec.rb
 - spec/riak/core_ext/to_param_spec.rb
 - spec/riak/counter_spec.rb
@@ -478,6 +499,8 @@ test_files:
 - spec/support/certs/server.crl
 - spec/support/certs/server.crt
 - spec/support/certs/server.key
+- spec/support/crdt_search_config.rb
+- spec/support/crdt_search_fixtures.rb
 - spec/support/integration_setup.rb
 - spec/support/search_config.rb
 - spec/support/search_corpus_setup.rb

data/spec/riak/bucket_typed/bucket.rb

@@ -1,43 +0,0 @@
-require 'spec_helper'
-require 'riak/bucket_typed/bucket'
-
-describe Riak::BucketTyped::Bucket do
-  let(:client){ Riak::Client.allocate }
-  let(:type){ client.bucket_type 'type' }
-  let(:name){ 'bucket_typed_bucket_spec' }
-
-  subject{ described_class.new client, name, type }
-
-  it 'initializes a typed RObject' do
-    typed_robject = subject.new 'panther'
-    expect(typed_robject).to be_a Riak::RObject
-    expect(typed_robject.key).to eq 'panther'
-    expect(typed_robject.type).to eq type
-  end
-
-  it 'has a bucket type' do
-    expect(subject.type).to eq type
-    expect(subject.type.name).to eq 'type'
-  end
-
-  describe 'bucket properties' do
-    it 'returns properties scoped by bucket and type' do
-      expect(client).to receive(:get_bucket_props).with(subject, { type: subject.type.name }).and_return('allow_mult' => true)
-
-      expect(props = subject.props).to be_a Hash
-      expect(props['allow_mult']).to be
-    end
-
-    it 'clears properties scoped by bucket and type' do
-      expect(client).to receive(:clear_bucket_props).with(subject, { type: subject.type.name })
-
-      expect{ subject.clear_props }.to_not raise_error
-    end
-
-    it 'sets properties scoped by bucket and type' do
-      expect(client).to receive(:set_bucket_props).with(subject, { 'allow_mult' => true }, subject.type.name)
-
-     expect{ subject.props = { 'allow_mult' => true } }.to_not raise_error
-    end
-  end
-end