riak-client 2.2.0.pre1 → 2.2.0

data/spec/riak/search/query_spec.rb

@@ -2,15 +2,15 @@ require 'spec_helper'
 require 'riak/search/query'
 
 describe Riak::Search::Query do
-  let(:client) do 
+  let(:client) do
     instance_double('Riak::Client').tap do |c|
       allow(c).to receive(:backend).and_yield(backend)
     end
   end
-  let(:index) do 
+  let(:index) do
     instance_double(
                     'Riak::Search::Index',
-                    name: index_name, 
+                    name: index_name,
                     'exists?' => true).tap do |i|
       allow(i).to receive(:is_a?).with(String).and_return(false)
       allow(i).to receive(:is_a?).with(Riak::Search::Index).and_return(true)
@@ -48,7 +48,7 @@ describe Riak::Search::Query do
     expect{ described_class.new client, index, term }.to_not raise_error
   end
 
-  it 'creates query objects with a client, index name, and query string' do   
+  it 'creates query objects with a client, index name, and query string' do
     class_double('Riak::Search::Index', new: index).as_stubbed_const
     allow(index).to receive(:is_a?).with(Riak::Search::Index).and_return(true)
 

data/spec/riak/search/result_collection_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 require 'riak/search/result_collection'
 
-describe Riak::Search::ResultCollection do  
-  let(:client) do 
+describe Riak::Search::ResultCollection, crdt_search_fixtures: true do
+  let(:client) do
     instance_double('Riak::Client').tap do |c|
       allow(c).to receive(:bucket_type).
         with(bucket_type_name).
@@ -44,7 +44,8 @@ describe Riak::Search::ResultCollection do
                {"score"=>"6.73738599999999937529e-02",
                  "_yz_rb"=>"search_test-1419261439-ew70sak2qr",
                  "_yz_rt"=>"yokozuna",
-                 "_yz_rk"=>"bitcask-4"}
+                 "_yz_rk"=>"bitcask-4"},
+               map_raw
               ]
     }
   end
@@ -81,7 +82,8 @@ describe Riak::Search::ResultCollection do
 
   it 'fetches individual documents on demand' do
     fetch_first_expectation
-    
+    allow(bucket_type).to receive(:data_type_class).and_return nil
+
     expect(subject.first).to eq first_result
   end
 end

data/spec/riak/search/result_document_spec.rb

@@ -1,26 +1,31 @@
 require 'spec_helper'
 require 'riak/search/result_document'
 
-describe Riak::Search::ResultDocument do
+describe Riak::Search::ResultDocument, crdt_search_fixtures: true do
   let(:key){ 'bitcask-10' }
   let(:bucket_name){ 'search_test' }
   let(:bucket_type_name){ 'yokozuna' }
   let(:score){ 43.21 }
   let(:other_field){ 'banana' }
 
-  let(:client) do 
+  let(:client) do
     instance_double('Riak::Client').tap do |c|
       allow(c).to receive(:bucket_type).
-        with(bucket_type_name).
-        and_return(bucket_type)
+                   with(bucket_type_name).
+                   and_return(bucket_type)
+      allow(c).to receive(:bucket_type).
+                   with(maps_type_name).
+                   and_return(maps_bucket_type)
     end
   end
 
   let(:bucket_type) do
     instance_double('Riak::BucketType').tap do |bt|
       allow(bt).to receive(:bucket).
-        with(bucket_name).
-        and_return(bucket)
+                    with(bucket_name).
+                    and_return(bucket)
+      allow(bt).to receive(:data_type_class).
+                    and_return(nil)
     end
   end
 
@@ -53,11 +58,49 @@ describe Riak::Search::ResultDocument do
     expect(subject.score).to eq score
   end
 
-  it 'makes other yz fields aavailable' do
+  it 'makes other yz fields available' do
     expect(subject[:other_field]).to eq other_field
   end
 
-  it 'fetches the robject it identifies' do
-    expect(subject.robject).to eq robject
+  describe 'identifying a key-value object' do
+    it 'fetches the robject it identifies' do
+      expect(subject.robject).to eq robject
+    end
+
+    it 'returns the data type class the document is' do
+      expect(subject.type_class).to eq Riak::RObject
+    end
+
+    it 'refuses to return a CRDT' do
+      expect{ subject.crdt }.to raise_error Riak::CrdtError::NotACrdt
+    end
+  end
+
+  describe 'identifying a CRDT map object' do
+    subject { map_results }
+
+    it 'returns the data type class the document is' do
+      expect(subject.type_class).to eq Riak::Crdt::Map
+    end
+
+    let(:fake_map){ instance_double 'Riak::Crdt::Map' }
+
+    it 'fetches the map it identifies' do
+      expect(Riak::Crdt::Map).
+        to receive(:new).
+            with(map_bucket, 'map-key', maps_bucket_type).
+            and_return(fake_map).
+            twice
+
+      expect(subject.map).to eq fake_map
+      expect(subject.crdt).to eq fake_map
+    end
+
+    it 'refuses to fetch a counter or set' do
+      expect{ subject.counter }.
+        to raise_error Riak::CrdtError::UnexpectedDataType
+      expect{ subject.set }.
+        to raise_error Riak::CrdtError::UnexpectedDataType
+    end
   end
 end

data/spec/riak/search/schema_spec.rb

@@ -15,7 +15,7 @@ describe Riak::Search::Schema do
     resp = instance_double 'Riak::Client::BeefcakeProtobuffsBackend::RpbYokozunaSchema'
     allow(resp).to receive(:name).and_return(schema_name)
     allow(resp).to receive(:content).and_return(schema_content)
-    
+
     resp
   end
 
@@ -51,7 +51,7 @@ describe Riak::Search::Schema do
 
   it 'raises an error when creating a schema that already exists' do
     schema_exists_expectation
-    
+
     expect{ subject.create! schema_content }.to raise_error(Riak::SearchError::SchemaExistsError)
   end
 

data/spec/riak/secondary_index_spec.rb

@@ -80,8 +80,8 @@ describe Riak::SecondaryIndex do
 
 
       @index = Riak::SecondaryIndex.new(
-                                        @bucket, 
-                                        'asdf', 
+                                        @bucket,
+                                        'asdf',
                                         'aaaa'..'zzzz',
                                         :max_results => @max_results
                                         )
@@ -115,8 +115,8 @@ describe Riak::SecondaryIndex do
 
 
       @index = Riak::SecondaryIndex.new(
-                                        @bucket, 
-                                        'asdf', 
+                                        @bucket,
+                                        'asdf',
                                         'aaaa'..'zzzz',
                                         max_results: @max_results,
                                         continuation: 'examplecontinuation'
@@ -151,8 +151,8 @@ describe Riak::SecondaryIndex do
 
 
       @index = Riak::SecondaryIndex.new(
-                                        @bucket, 
-                                        'asdf', 
+                                        @bucket,
+                                        'asdf',
                                         'aaaa'..'zzzz',
                                         :max_results => @max_results
                                         )

data/spec/riak/serializers_spec.rb

@@ -8,7 +8,8 @@ describe Riak::Serializers do
       end
 
       it "deserializes #{serialized} to #{deserialized}" do
-        expect(described_class.deserialize(type, serialized)).to eq(deserialized)
+        expect(described_class.deserialize(type, serialized)).
+          to eq(deserialized)
       end
 
       it "round trips properly" do
@@ -19,11 +20,17 @@ describe Riak::Serializers do
   end
 
   it_behaves_like "a serializer", "text/plain", "a string", "a string"
-  it_behaves_like "a serializer", "application/json", { "a" => 7 }, %q|{"a":7}|
-  it_behaves_like "a serializer", "application/x-ruby-marshal", { :a => 3 }, Marshal.dump({ :a => 3 })
+  it_behaves_like "a serializer", "application/json", { "a" => 7 }, '{"a":7}'
+  it_behaves_like "a serializer",
+                  "application/x-ruby-marshal",
+                  { a: 3 },
+                  Marshal.dump({ a: 3 })
 
   described_class::YAML_MIME_TYPES.each do |mime_type|
-    it_behaves_like "a serializer", mime_type, { "a" => 7 }, YAML.dump({ "a" => 7 })
+    it_behaves_like "a serializer",
+                    mime_type,
+                    { "a" => 7 },
+                    YAML.dump({ "a" => 7 })
   end
 
   %w[ serialize deserialize ].each do |meth|
@@ -38,7 +45,8 @@ describe Riak::Serializers do
 
   describe "plain text serializer" do
     it 'calls #to_s to convert the object to a string' do
-      expect(described_class.serialize("text/plain", :a_string)).to eq("a_string")
+      expect(described_class.serialize('text/plain', :a_string)).
+        to eq('a_string')
     end
   end
 
@@ -80,11 +88,15 @@ describe Riak::Serializers do
 
     it 'can be registered' do
       described_class['application/custom-type-1'] = custom_serializer
-      expect(described_class['application/custom-type-1']).to be(custom_serializer)
+      expect(described_class['application/custom-type-1']).
+        to be(custom_serializer)
       # fail
     end
 
-    it_behaves_like "a serializer", "application/custom-type-a", "foo", "The string is: foo" do
+    it_behaves_like "a serializer",
+                    "application/custom-type-a",
+                    "foo",
+                    "The string is: foo" do
       before(:each) do
         described_class['application/custom-type-a'] = custom_serializer
       end
@@ -98,7 +110,12 @@ describe Riak::Serializers do
     end
   end
 
-  it_behaves_like "a serializer", "application/json; charset=UTF-8", { "a" => 7 }, %q|{"a":7}|
-  it_behaves_like "a serializer", "application/json ;charset=UTF-8", { "a" => 7 }, %q|{"a":7}|
+  it_behaves_like "a serializer",
+                  "application/json; charset=UTF-8",
+                  { "a" => 7 },
+                  '{"a":7}'
+  it_behaves_like "a serializer",
+                  "application/json ;charset=UTF-8",
+                  { "a" => 7 },
+                  '{"a":7}'
 end
-

data/spec/riak/walk_spec_spec.rb

@@ -65,7 +65,7 @@ describe Riak::WalkSpec do
     it "raises an ArgumentError for invalid arguments" do
       expect { Riak::WalkSpec.new }.to raise_error(ArgumentError)
       expect { Riak::WalkSpec.new("foo") }.to raise_error(ArgumentError)
-      expect { Riak::WalkSpec.new("foo","bar") }.to raise_error(ArgumentError)
+      expect { Riak::WalkSpec.new("foo", "bar") }.to raise_error(ArgumentError)
     end
   end
 
@@ -96,7 +96,7 @@ describe Riak::WalkSpec do
 
   describe "creating from a list of parameters" do
     it "detects hashes and WalkSpecs interleaved with other parameters" do
-      specs = Riak::WalkSpec.normalize(nil,"next",nil,{:bucket => "foo"},Riak::WalkSpec.new({:tag => "child", :keep => true}))
+      specs = Riak::WalkSpec.normalize(nil, "next", nil, {:bucket => "foo"}, Riak::WalkSpec.new({:tag => "child", :keep => true}))
       expect(specs.size).to eq(3)
       expect(specs).to be_all {|s| s.kind_of?(Riak::WalkSpec) }
       expect(specs.join("/")).to eq("_,next,_/foo,_,_/_,child,1")
@@ -171,12 +171,14 @@ describe Riak::WalkSpec do
       end
 
       it "matches a walk spec with the same bucket" do
-        @other.bucket = "foo"; @spec.bucket = "foo"
+        @other.bucket = "foo"
+        @spec.bucket = "foo"
         expect(@spec).to be === @other
       end
 
       it "doesn't match a walk spec with a different bucket" do
-        @other.bucket = "foo"; @spec.bucket = "bar"
+        @other.bucket = "foo"
+        @spec.bucket = "bar"
         expect(@spec).not_to be === @other
       end
 
@@ -186,12 +188,14 @@ describe Riak::WalkSpec do
       end
 
       it "matches a walk spec with the same tag" do
-        @other.tag = "next"; @spec.tag = "next"
+        @other.tag = "next"
+        @spec.tag = "next"
         expect(@spec).to be === @other
       end
 
       it "doesn't match a walk spec with a different tag" do
-        @other.tag = "next"; @spec.tag = "previous"
+        @other.tag = "next"
+        @spec.tag = "previous"
         expect(@spec).not_to be === @other
       end
     end

data/spec/spec_helper.rb

@@ -3,7 +3,13 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 if ENV['COVERAGE']
   require 'simplecov'
-  SimpleCov.start
+  SimpleCov.start do
+    if ENV['COVERAGE_SUITE']
+      SimpleCov.command_name ENV['COVERAGE_SUITE']
+    end
+    add_filter 'vendor/'
+  end
+
 end
 
 require 'rubygems' # Use the gems path only for the spec suite
@@ -20,7 +26,10 @@ Riak.disable_list_keys_warnings = true
    search_corpus_setup
    unified_backend_examples
    test_client
-   search_config].each do |file|
+   search_config
+   crdt_search_config
+   crdt_search_fixtures
+].each do |file|
   require File.join("support", file)
 end
 

data/spec/support/crdt_search_config.rb

@@ -0,0 +1,112 @@
+module CrdtSearchConfig
+  include SearchConfig
+
+  def counter_bucket
+    @counter_bucket ||= bucket_for :counter
+  end
+
+  def map_bucket
+    @map_bucket ||= bucket_for :map
+  end
+
+  def set_bucket
+    @set_bucket ||= bucket_for :set
+  end
+
+  def first_counter
+    return @first_counter if defined? @first_counter
+
+    @first_counter = Riak::Crdt::Counter.new counter_bucket, nil
+    @first_counter.increment 83475 # BEANS in leet, i guess
+
+    @first_counter.tap do |c|
+      wait_until do
+        index.query('counter:83475').results.length > 0
+      end
+    end
+  end
+
+  def first_map
+    return @first_map if defined? @first_map
+
+    @first_map = Riak::Crdt::Map.new map_bucket, nil
+    @first_map.registers['arroz'] = 'frijoles'
+
+    @first_map.tap do |m|
+      wait_until do
+        index.query('arroz_register:frijoles').results.length > 0
+      end
+    end
+  end
+
+  def first_set
+    return @first_set if defined? @first_set
+
+    @first_set = Riak::Crdt::Set.new set_bucket, nil
+    @first_set.add 'frijoles'
+
+    @first_set.tap do |s|
+      wait_until do
+        index.query('set:frijoles').results.length > 0
+      end
+    end
+  end
+
+  def configure_crdt_buckets
+    return if defined? @crdt_buckets_configured
+
+    create_index
+
+    cp = Riak::BucketProperties.new counter_bucket
+    mp = Riak::BucketProperties.new map_bucket
+    sp = Riak::BucketProperties.new set_bucket
+
+    cp['search_index'] = index_name
+    cp.store
+    mp['search_index'] = index_name
+    mp.store
+    sp['search_index'] = index_name
+    sp.store
+
+    wait_until do
+      cp.reload
+      cp['search_index'] == index_name
+    end
+    wait_until do
+      mp.reload
+      mp['search_index'] == index_name
+    end
+    wait_until do
+      sp.reload
+      sp['search_index'] == index_name
+    end
+
+    @crdt_buckets_configured = true
+  end
+
+  private
+
+  def bucket_for(type)
+    @bucket_for ||= Hash.new
+    return @bucket_for[type] if @bucket_for[type]
+
+    test_client.
+      bucket_type(Riak::Crdt::DEFAULT_BUCKET_TYPES[type]).
+      bucket("crdt-search-#{ type }-#{ random_key }").
+      tap do |bucket|
+      @bucket_for[type] = bucket
+      props = Riak::BucketProperties.new bucket
+      props['search_index'] = index.name
+      props.store
+
+      wait_until do
+        props.reload
+        props['search_index'] == index.name
+      end
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.include CrdtSearchConfig, crdt_search_config: true
+end