riak-client 2.1.0 → 2.2.0.pre1

data/spec/riak/search/result_collection_spec.rb

@@ -0,0 +1,87 @@
+require 'spec_helper'
+require 'riak/search/result_collection'
+
+describe Riak::Search::ResultCollection 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)
+    end
+  end
+
+  let(:bucket_type) do
+    instance_double('Riak::BucketType').tap do |bt|
+      allow(bt).to receive(:bucket).
+        with(bucket_name).
+        and_return(bucket)
+    end
+  end
+
+  let(:bucket) do
+    instance_double('Riak::BucketTyped::Bucket')
+  end
+
+  let(:backend) do
+    instance_double('Riak::Client::BeefcakeProtobuffsBackend').tap do |be|
+      allow(client).to receive(:backend).and_yield(be)
+    end
+  end
+
+  let(:results_hash) do
+    {
+      "max_score"=>0.7729485034942627,
+      "num_found"=>3,
+      "docs"=>[
+               {"score"=>"7.72948500000000038312e-01",
+                 "_yz_rb"=>"search_test-1419261439-ew70sak2qr",
+                 "_yz_rt"=>"yokozuna",
+                 "_yz_rk"=>"bitcask-10"},
+               {"score"=>"2.35808490000000009479e-01",
+                 "_yz_rb"=>"search_test-1419261439-ew70sak2qr",
+                 "_yz_rt"=>"yokozuna",
+                 "_yz_rk"=>"bitcask-9"},
+               {"score"=>"6.73738599999999937529e-02",
+                 "_yz_rb"=>"search_test-1419261439-ew70sak2qr",
+                 "_yz_rt"=>"yokozuna",
+                 "_yz_rk"=>"bitcask-4"}
+              ]
+    }
+  end
+
+  let(:bucket_name){ 'search_test-1419261439-ew70sak2qr' }
+  let(:bucket_type_name){ 'yokozuna' }
+  let(:first_key){ 'bitcask-10' }
+  let(:first_result) do
+    instance_double('Riak::RObject').tap do |o|
+      allow(o).to receive(:key).and_return(first_key)
+    end
+  end
+
+  let(:fetch_first_expectation) do
+    expect(bucket).to receive(:get).with(first_key).and_return(first_result)
+  end
+
+  subject{ described_class.new client, results_hash }
+
+  it 'is creatable with a search results hash' do
+    expect{ described_class.new client, results_hash }.to_not raise_error
+  end
+
+  it 'exposes the raw search results hash' do
+    expect(subject.raw).to eq results_hash
+  end
+
+  it 'exposes the max score and entry scores' do
+    expect(subject.max_score).to eq results_hash['max_score']
+    expect(subject.docs.first.score).to eq Float(
+                                                 results_hash['docs'].
+                                                 first['score'])
+  end
+
+  it 'fetches individual documents on demand' do
+    fetch_first_expectation
+    
+    expect(subject.first).to eq first_result
+  end
+end

data/spec/riak/search/result_document_spec.rb

@@ -0,0 +1,63 @@
+require 'spec_helper'
+require 'riak/search/result_document'
+
+describe Riak::Search::ResultDocument 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 
+    instance_double('Riak::Client').tap do |c|
+      allow(c).to receive(:bucket_type).
+        with(bucket_type_name).
+        and_return(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)
+    end
+  end
+
+  let(:bucket) do
+    instance_double('Riak::BucketTyped::Bucket').tap do |b|
+      allow(b).to receive(:get).
+        with(key).
+        and_return(robject)
+    end
+  end
+
+  let(:robject){ instance_double 'Riak::RObject' }
+
+  let(:raw) do
+    {
+      "score"=>score,
+      "_yz_rb"=>bucket_name,
+      "_yz_rt"=>bucket_type_name,
+      "_yz_rk"=>key,
+      'other_field'=>other_field
+    }
+  end
+
+  subject{ described_class.new client, raw }
+
+  it 'has key, bucket, bucket type, and score accessors' do
+    expect(subject.key).to eq key
+    expect(subject.bucket).to eq bucket
+    expect(subject.bucket_type).to eq bucket_type
+    expect(subject.score).to eq score
+  end
+
+  it 'makes other yz fields aavailable' do
+    expect(subject[:other_field]).to eq other_field
+  end
+
+  it 'fetches the robject it identifies' do
+    expect(subject.robject).to eq robject
+  end
+end

data/spec/riak/search/schema_spec.rb

@@ -0,0 +1,63 @@
+require 'spec_helper'
+require 'riak/search/schema'
+
+describe Riak::Search::Schema do
+  let(:schema_name){ 'schema_name' }
+  let(:schema_content){ '<xml />' }
+
+  let(:schema_exists_expectation) do
+    expect(backend).to receive(:get_search_schema).
+      with(schema_name).
+      and_return(schema_exists_response)
+  end
+
+  let(:schema_exists_response) 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
+
+  let(:client){ instance_double 'Riak::Client' }
+  let(:backend) do
+    be = instance_double 'Riak::Client::BeefcakeProtobuffsBackend'
+    allow(client).to receive(:backend).and_yield be
+    be
+  end
+
+  subject { described_class.new client, schema_name }
+
+  it 'creates schema objects with a client and schema name' do
+    expect{ described_class.new client, schema_name }.to_not raise_error
+  end
+
+  it 'tests for schema existence' do
+    schema_exists_expectation
+    expect(subject).to be_exists
+  end
+
+  it 'permits schema creation' do
+    expect(backend).to receive(:get_search_schema).
+      with(schema_name).
+      and_return(nil)
+
+    expect(backend).to receive(:create_search_schema).
+      with(schema_name, schema_content).
+      and_return(true)
+
+    expect{ subject.create! schema_content }.to_not raise_error
+  end
+
+  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
+
+  it 'returns data about the schema' do
+    schema_exists_expectation
+
+    expect(subject.content).to eq schema_content
+  end
+end

data/spec/spec_helper.rb

@@ -19,7 +19,8 @@ Riak.disable_list_keys_warnings = true
    wait_until
    search_corpus_setup
    unified_backend_examples
-   test_client].each do |file|
+   test_client
+   search_config].each do |file|
   require File.join("support", file)
 end
 

data/spec/support/search_config.rb

@@ -0,0 +1,81 @@
+module SearchConfig
+  include TestClient
+
+  def search_bucket
+    return @search_bucket if defined? @search_bucket
+    type = test_client.bucket_type 'yokozuna'
+    @search_bucket = type.bucket "search_config-#{random_key}"
+  end
+
+  def index_name
+    @index_name ||= search_bucket.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
+
+  def configure_bucket
+    return if defined? @bucket_configured
+
+    create_index
+
+    test_client.set_bucket_props(search_bucket, 
+                                 { search_index: index_name },
+                                 'yokozuna')
+
+    wait_until do
+      props = test_client.get_bucket_props search_bucket, type: 'yokozuna'
+      props['search_index'] == index_name
+    end
+
+    @bucket_configred = true
+  end
+
+  def load_corpus
+    return if defined? @corpus_loaded
+
+    configure_bucket
+
+    old_encoding = Encoding.default_external
+    Encoding.default_external = Encoding::UTF_8
+
+    IO.foreach('spec/fixtures/bitcask.txt').with_index do |para, idx|
+      next if para =~ /^\s*$|introduction|chapter/ui
+
+      Riak::RObject.new(search_bucket, "bitcask-#{idx}") do |obj|
+        obj.content_type = 'text/plain'
+        obj.raw_data = para
+        obj.store
+      end
+    end
+
+    Encoding.default_external = old_encoding
+
+    wait_until do
+      results = @client.search(index_name,
+                               'contain your entire keyspace',
+                               df: 'text')
+
+      results['docs'].length > 0
+    end
+
+    @corpus_loaded = true
+  end
+
+  def schema_xml(schema_name)
+    File.read('spec/fixtures/yz_schema_template.xml').sub('SCHEMA_NAME', schema_name)
+  end
+end
+
+RSpec.configure do |config|
+  config.include SearchConfig, search_config: true
+end

data/spec/support/test_client.yml

@@ -1,7 +1,14 @@
-# protip: don't run more than one node, tests are sensitive to quorums
-nodes:
-  - {host: 'localhost', pb_port: 17017}
-authentication: 
-  user: 'user'
-  password: 'password'
-  ca_file: /Users/bkerley/Documents/riak-ruby-client/spec/support/certs/ca.crt
+# This file is used for configuring test_client used by
+# many of the integration tests.
+#
+# Simply set the arguments you'd normally pass to
+# Riak::Client.new in the file.
+#
+# Don't run multiple nodes, integration tests include
+# quorum checks that may result in race conditions.
+
+pb_port: 17017
+# authentication:
+#   user: user
+#   password: password
+#   ca_file: /Users/bkerley/Documents/riak-ruby-client/spec/support/certs/ca.crt

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: riak-client
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0.pre1
 platform: ruby
 authors:
 - Sean Cribbs
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-03 00:00:00.000000000 Z
+date: 2015-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -186,7 +186,11 @@ files:
 - Rakefile
 - lib/riak.rb
 - lib/riak/bucket.rb
+- lib/riak/bucket_properties.rb
+- lib/riak/bucket_type.rb
+- lib/riak/bucket_typed/bucket.rb
 - lib/riak/client.rb
+- lib/riak/client/beefcake/bucket_properties_operator.rb
 - lib/riak/client/beefcake/crdt/counter_loader.rb
 - lib/riak/client/beefcake/crdt/map_loader.rb
 - lib/riak/client/beefcake/crdt/set_loader.rb
@@ -240,6 +244,7 @@ files:
 - lib/riak/errors/crdt_error.rb
 - lib/riak/errors/failed_request.rb
 - lib/riak/errors/protobuffs_error.rb
+- lib/riak/errors/search_error.rb
 - lib/riak/i18n.rb
 - lib/riak/index_collection.rb
 - lib/riak/instrumentation.rb
@@ -256,6 +261,12 @@ files:
 - lib/riak/multiget.rb
 - lib/riak/rcontent.rb
 - lib/riak/robject.rb
+- lib/riak/search.rb
+- lib/riak/search/index.rb
+- lib/riak/search/query.rb
+- lib/riak/search/result_collection.rb
+- lib/riak/search/result_document.rb
+- lib/riak/search/schema.rb
 - lib/riak/secondary_index.rb
 - lib/riak/serializers.rb
 - lib/riak/stamp.rb
@@ -277,24 +288,32 @@ files:
 - spec/fixtures/server.cert.crt
 - spec/fixtures/server.cert.key
 - spec/fixtures/test.pem
+- spec/fixtures/yz_schema_template.xml
 - spec/integration/riak/bucket_types_spec.rb
+- spec/integration/riak/conflict_resolution_spec.rb
 - spec/integration/riak/counters_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/properties_spec.rb
 - spec/integration/riak/protobuffs/interrupted_request_spec.rb
 - spec/integration/riak/protobuffs_backends_spec.rb
+- spec/integration/riak/search_spec.rb
 - spec/integration/riak/secondary_index_spec.rb
 - spec/integration/riak/security_spec.rb
 - spec/integration/riak/threading_spec.rb
 - spec/integration/yokozuna/index_spec.rb
 - spec/integration/yokozuna/queries_spec.rb
 - spec/integration/yokozuna/schema_spec.rb
+- spec/riak/beefcake_protobuffs_backend/bucket_properties_operator_spec.rb
 - spec/riak/beefcake_protobuffs_backend/crdt_operator_spec.rb
 - spec/riak/beefcake_protobuffs_backend/object_methods_spec.rb
 - spec/riak/beefcake_protobuffs_backend/protocol_spec.rb
 - spec/riak/beefcake_protobuffs_backend_spec.rb
+- 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/client_spec.rb
 - spec/riak/core_ext/to_param_spec.rb
 - spec/riak/counter_spec.rb
@@ -320,6 +339,11 @@ files:
 - spec/riak/multiget_spec.rb
 - spec/riak/node_spec.rb
 - spec/riak/robject_spec.rb
+- spec/riak/search/index_spec.rb
+- spec/riak/search/query_spec.rb
+- spec/riak/search/result_collection_spec.rb
+- spec/riak/search/result_document_spec.rb
+- spec/riak/search/schema_spec.rb
 - spec/riak/search_spec.rb
 - spec/riak/secondary_index_spec.rb
 - spec/riak/serializers_spec.rb
@@ -337,6 +361,7 @@ files:
 - spec/support/certs/server.crt
 - spec/support/certs/server.key
 - spec/support/integration_setup.rb
+- spec/support/search_config.rb
 - spec/support/search_corpus_setup.rb
 - spec/support/test_client.rb
 - spec/support/test_client.yml
@@ -359,12 +384,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: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: riak-client is a rich client for Riak, the distributed database by Basho.
@@ -381,24 +406,32 @@ test_files:
 - spec/fixtures/server.cert.crt
 - spec/fixtures/server.cert.key
 - spec/fixtures/test.pem
+- spec/fixtures/yz_schema_template.xml
 - spec/integration/riak/bucket_types_spec.rb
+- spec/integration/riak/conflict_resolution_spec.rb
 - spec/integration/riak/counters_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/properties_spec.rb
 - spec/integration/riak/protobuffs/interrupted_request_spec.rb
 - spec/integration/riak/protobuffs_backends_spec.rb
+- spec/integration/riak/search_spec.rb
 - spec/integration/riak/secondary_index_spec.rb
 - spec/integration/riak/security_spec.rb
 - spec/integration/riak/threading_spec.rb
 - spec/integration/yokozuna/index_spec.rb
 - spec/integration/yokozuna/queries_spec.rb
 - spec/integration/yokozuna/schema_spec.rb
+- spec/riak/beefcake_protobuffs_backend/bucket_properties_operator_spec.rb
 - spec/riak/beefcake_protobuffs_backend/crdt_operator_spec.rb
 - spec/riak/beefcake_protobuffs_backend/object_methods_spec.rb
 - spec/riak/beefcake_protobuffs_backend/protocol_spec.rb
 - spec/riak/beefcake_protobuffs_backend_spec.rb
+- 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/client_spec.rb
 - spec/riak/core_ext/to_param_spec.rb
 - spec/riak/counter_spec.rb
@@ -424,6 +457,11 @@ test_files:
 - spec/riak/multiget_spec.rb
 - spec/riak/node_spec.rb
 - spec/riak/robject_spec.rb
+- spec/riak/search/index_spec.rb
+- spec/riak/search/query_spec.rb
+- spec/riak/search/result_collection_spec.rb
+- spec/riak/search/result_document_spec.rb
+- spec/riak/search/schema_spec.rb
 - spec/riak/search_spec.rb
 - spec/riak/secondary_index_spec.rb
 - spec/riak/serializers_spec.rb
@@ -441,6 +479,7 @@ test_files:
 - spec/support/certs/server.crt
 - spec/support/certs/server.key
 - spec/support/integration_setup.rb
+- spec/support/search_config.rb
 - spec/support/search_corpus_setup.rb
 - spec/support/test_client.rb
 - spec/support/test_client.yml