riak-client 2.3.2 → 2.4.0.pre1

data/spec/integration/riak/time_series_spec.rb

@@ -5,7 +5,8 @@ describe 'Time Series',
          test_client: true, integration: true, time_series: true do
   let(:table_name){ 'GeoCheckin' }
 
-  let(:now){ Time.at(Time.now.to_i) }
+  let(:now_ts) { Time.now.to_i }
+  let(:now){ Time.at(now_ts) }
   let(:five_minutes_ago){ now - 300 }
   let(:now_range_str) do
     past = (now.to_i - 100) * 1000
@@ -18,16 +19,17 @@ describe 'Time Series',
     "time > #{range_start} AND time < #{range_end}"
   end
 
-  let(:family){ 'family-' + random_key }
-  let(:series){ 'series-' + random_key }
+  let(:family){ 'geohash-' + random_key }
+  let(:series){ 'user-' + random_key }
 
   let(:key){ [family, series, now] }
+  let(:key_ts){ [family, series, now_ts * 1000] }
   let(:key2){ [family, series, five_minutes_ago] }
   let(:datum){ [*key, 'cloudy', 27.1] }
   let(:datum_null){ [*key2, 'cloudy', nil] }
 
   let(:family_series_str) do
-    "myfamily = '#{family}' AND myseries = '#{series}'"
+    "geohash = '#{family}' AND user = '#{series}'"
   end
 
   let(:query) do
@@ -192,7 +194,7 @@ SQL
       lister = Riak::TimeSeries::List.new test_client, table_name
 
       lister.issue! do |row|
-        found_expectation.found! if row.to_a == key
+        found_expectation.found! if row.to_a == key_ts
       end
     end
 
@@ -204,7 +206,7 @@ SQL
 
       results = lister.issue!
 
-      expect(results).to include key
+      expect(results).to include key_ts
     end
   end
 end

data/spec/riak/beefcake_protobuffs_backend/object_methods_spec.rb

@@ -12,6 +12,7 @@ describe Riak::Client::BeefcakeProtobuffsBackend::ObjectMethods do
       :value => '',
       :vtag => nil,
       :content_type => nil,
+      :content_encoding => nil,
       :links => nil,
       :usermeta => nil,
       :last_mod => nil,

data/spec/riak/beefcake_protobuffs_backend/ts_cell_codec_spec.rb

@@ -5,14 +5,22 @@ require 'time'
 Riak::Client::BeefcakeProtobuffsBackend.configured?
 
 describe Riak::Client::BeefcakeProtobuffsBackend::TsCellCodec do
-  describe 'symmetric serialziation' do
+  describe 'symmetric serialization' do
     it { is_expected.to symmetric_serialize("hello", varchar_value: "hello")}
     it { is_expected.to symmetric_serialize(5, sint64_value: 5)}
     it { is_expected.to symmetric_serialize(123.45, double_value: 123.45) }
     it do
+      subject.convert_timestamp = true
       is_expected.to symmetric_serialize(Time.parse("June 23, 2015 at 9:46:28 EDT"),
                                          timestamp_value: 1_435_067_188_000)
     end
+    # GH-274
+    it do
+      subject.convert_timestamp = true
+      ts = 1_459_444_070_103
+      t = Time.at(1_459_444_070, 103_000)
+      is_expected.to symmetric_serialize(t, timestamp_value: ts)
+    end
     it { is_expected.to symmetric_serialize(true, boolean_value: true) }
     it { is_expected.to symmetric_serialize(false, boolean_value: false) }
     it { is_expected.to symmetric_serialize(nil, {}) }

data/spec/riak/client_spec.rb

@@ -17,6 +17,7 @@ describe Riak::Client, test_client: true do
     it "accepts a Protobuffs port" do
       client = Riak::Client.new :pb_port => 9000
       expect(client.nodes.size).to eq(1)
+      expect(client.nodes.first.host).to eq('127.0.0.1')
       expect(client.nodes.first.pb_port).to eq(9000)
     end
 
@@ -25,7 +26,7 @@ describe Riak::Client, test_client: true do
       expect(client.client_id).to eq("AAAAAA==")
     end
 
-    it "creates a client ID if not specified" do
+    it "creates a client ID if not specified", :integration => true do
       expect(Riak::Client.new(pb_port: test_client.nodes.first.pb_port).
               client_id).to_not be_nil
     end
@@ -39,6 +40,52 @@ describe Riak::Client, test_client: true do
       expect(client.nodes.size).to eq(3)
       expect(client.nodes.first.host).to eq("riak1.basho.com")
     end
+
+    it "maps port to unset nodes, and does not create localhost node" do
+      client = Riak::Client.new nodes: [
+                                  {host: 'riak1.basho.com'},
+                                  {host: 'riak2.basho.com', pb_port: 1234},
+                                  {host: 'riak3.basho.com', pb_port: 5678}
+                                ], pb_port: 4321
+      expect(client.nodes.size).to eq(3)
+      expect(client.nodes[0].host).to eq("riak1.basho.com")
+      expect(client.nodes[0].pb_port).to eq(4321)
+      expect(client.nodes[1].host).to eq("riak2.basho.com")
+      expect(client.nodes[1].pb_port).to eq(1234)
+    end
+
+    it "defaults to max_retries = 2" do
+      client = Riak::Client.new
+      expect(client.max_retries).to eq(2)
+    end
+
+    it "accepts max_retries option" do
+      client = Riak::Client.new :max_retries => 42
+      expect(client.max_retries).to eq(42)
+    end
+
+    it "accepts timeouts" do
+      client = Riak::Client.new(
+        :connect_timeout => 1,
+        :read_timeout    => 2,
+        :write_timeout   => 3
+      )
+      expect(client.connect_timeout).to eq(1)
+      expect(client.read_timeout).to eq(2)
+      expect(client.write_timeout).to eq(3)
+    end
+
+    it "accepts convert_timestamp" do
+      client = Riak::Client.new(
+        :convert_timestamp => true
+      )
+      expect(client.convert_timestamp).to be
+    end
+
+    it "has default convert_timestamp of false" do
+      client = Riak::Client.new
+      expect(client.convert_timestamp).to_not be
+    end
   end
 
   it "exposes a Stamp object" do
@@ -226,7 +273,7 @@ describe Riak::Client, test_client: true do
       rescue RuntimeError
       end
 
-      expect(call_count).to eq(3)
+      expect(call_count).to eq(@client.max_retries + 1)
     end
 
     it "throws a RuntimeError if it runs out of retries" do

data/spec/riak/robject_spec.rb

@@ -8,7 +8,7 @@ describe Riak::RObject do
 
   describe "initialization" do
     it "sets the bucket" do
-      @object = Riak::RObject.new(@bucket)
+      @object = Riak::RObject.new(@bucket, "bar")
       expect(@object.bucket).to eq(@bucket)
     end
 
@@ -293,6 +293,7 @@ describe Riak::RObject do
     end
 
     it "passes quorum parameters and returnbody to the backend" do
+      @object.key = 'foo'
       expect(@backend).to receive(:store_object).
                            with(@object,
                                 returnbody: false,

data/spec/riak/stamp_spec.rb

@@ -1,54 +1,54 @@
-require 'spec_helper'
-require 'riak/stamp'
-
-describe Riak::Stamp, test_client: true do
-  subject { described_class.new test_client }
-  it "generates always increasing integer identifiers" do
-    1000.times do
-      one = subject.next
-      two = subject.next
-      expect([one, two]).to be_all {|i| Integer === i }
-      expect(two).to be > one
-    end
-  end
-
-  it "delays until the next millisecond when the sequence overflows" do
-    old = subject.instance_variable_get(:@timestamp) + 0
-    subject.instance_variable_set(:@sequence, described_class::SEQUENCE_MASK)
-    count = 0
-    # Simulate the time_gen method returning the same thing multiple times
-    allow(subject).to receive(:time_gen) do
-      count += 1
-      if count < 10
-        old
-      else
-        old + 1
-      end
-    end
-    expect((subject.next >> described_class::TIMESTAMP_SHIFT) & described_class::TIMESTAMP_MASK).to eq(old + 1)
-  end
-
-  it "raises an exception when the system clock moves backwards" do
-    old = subject.instance_variable_get(:@timestamp)
-    expect(subject).to receive(:time_gen).and_return(old - 10)
-    expect {
-      subject.next
-    }.to raise_error(Riak::BackwardsClockError)
-  end
-
-  # The client/worker ID should be used for disambiguation, not for
-  # primary ordering.  This breaks from the Snowflake model where the
-  # worker ID is in more significant bits.
-  it "uses the client ID as the bottom component of the identifier" do
-    expect(subject.next & described_class::CLIENT_ID_MASK).to eq(subject.client.client_id.hash & described_class::CLIENT_ID_MASK)
-  end
-
-  context "using a non-integer client ID" do
-    subject { described_class.new(Riak::Client.new(:client_id => "ripple")) }
-    let(:hash) { "ripple".hash }
-
-    it "uses the hash of the client ID as the bottom component of the identifier" do
-      expect(subject.next & described_class::CLIENT_ID_MASK).to eq(subject.client.client_id.hash & described_class::CLIENT_ID_MASK)
-    end
-  end
-end
+require 'spec_helper'
+require 'riak/stamp'
+
+describe Riak::Stamp, test_client: true, integration: true do
+  subject { described_class.new test_client }
+  it "generates always increasing integer identifiers" do
+    1000.times do
+      one = subject.next
+      two = subject.next
+      expect([one, two]).to be_all {|i| Integer === i }
+      expect(two).to be > one
+    end
+  end
+
+  it "delays until the next millisecond when the sequence overflows" do
+    old = subject.instance_variable_get(:@timestamp) + 0
+    subject.instance_variable_set(:@sequence, described_class::SEQUENCE_MASK)
+    count = 0
+    # Simulate the time_gen method returning the same thing multiple times
+    allow(subject).to receive(:time_gen) do
+      count += 1
+      if count < 10
+        old
+      else
+        old + 1
+      end
+    end
+    expect((subject.next >> described_class::TIMESTAMP_SHIFT) & described_class::TIMESTAMP_MASK).to eq(old + 1)
+  end
+
+  it "raises an exception when the system clock moves backwards" do
+    old = subject.instance_variable_get(:@timestamp)
+    expect(subject).to receive(:time_gen).and_return(old - 10)
+    expect {
+      subject.next
+    }.to raise_error(Riak::BackwardsClockError)
+  end
+
+  # The client/worker ID should be used for disambiguation, not for
+  # primary ordering.  This breaks from the Snowflake model where the
+  # worker ID is in more significant bits.
+  it "uses the client ID as the bottom component of the identifier" do
+    expect(subject.next & described_class::CLIENT_ID_MASK).to eq(subject.client.client_id.hash & described_class::CLIENT_ID_MASK)
+  end
+
+  context "using a non-integer client ID" do
+    subject { described_class.new(Riak::Client.new(:client_id => "ripple")) }
+    let(:hash) { "ripple".hash }
+
+    it "uses the hash of the client ID as the bottom component of the identifier" do
+      expect(subject.next & described_class::CLIENT_ID_MASK).to eq(subject.client.client_id.hash & described_class::CLIENT_ID_MASK)
+    end
+  end
+end

data/spec/riak/time_series/listing_spec.rb

@@ -8,6 +8,7 @@ describe Riak::TimeSeries::List do
   let(:backend) do
     instance_double('Riak::Client::BeefcakeProtobuffsBackend').tap do |be|
       allow(client).to receive(:backend).and_yield be
+      allow(client).to receive(:convert_timestamp).and_return(true)
     end
   end
   let(:operator) do

data/spec/riak/util/gzip_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+# Borrowed from ActiveSupport
+# https://github.com/rails/rails/blob/master/activesupport/test/gzip_test.rb
+
+describe Riak::Util::Gzip do
+  describe ".compress" do
+    it "decompresses to the same value" do
+      expect(Riak::Util::Gzip.decompress(Riak::Util::Gzip.compress("Hello World"))).to eq("Hello World")
+      expect(Riak::Util::Gzip.decompress(Riak::Util::Gzip.compress("Hello World", Zlib::NO_COMPRESSION))).to eq("Hello World")
+      expect(Riak::Util::Gzip.decompress(Riak::Util::Gzip.compress("Hello World", Zlib::BEST_SPEED))).to eq("Hello World")
+      expect(Riak::Util::Gzip.decompress(Riak::Util::Gzip.compress("Hello World", Zlib::BEST_COMPRESSION))).to eq("Hello World")
+      expect(Riak::Util::Gzip.decompress(Riak::Util::Gzip.compress("Hello World", nil, Zlib::FILTERED))).to eq("Hello World")
+      expect(Riak::Util::Gzip.decompress(Riak::Util::Gzip.compress("Hello World", nil, Zlib::HUFFMAN_ONLY))).to eq("Hello World")
+      expect(Riak::Util::Gzip.decompress(Riak::Util::Gzip.compress("Hello World", nil, nil))).to eq("Hello World")
+    end
+
+    it "returns a binary string" do
+      compressed = Riak::Util::Gzip.compress('')
+
+      expect(compressed.encoding).to eq(Encoding.find('binary'))
+      expect(compressed).not_to be_blank
+    end
+
+    it "returns gzipped string by compression level" do
+      source_string = "Hello World"*100
+
+      gzipped_by_speed = Riak::Util::Gzip.compress(source_string, Zlib::BEST_SPEED)
+      expect(Zlib::GzipReader.new(StringIO.new(gzipped_by_speed)).level).to eq(1)
+
+      gzipped_by_best_compression = Riak::Util::Gzip.compress(source_string, Zlib::BEST_COMPRESSION)
+      expect(Zlib::GzipReader.new(StringIO.new(gzipped_by_best_compression)).level).to eq(9)
+
+      expect(gzipped_by_best_compression.bytesize < gzipped_by_speed.bytesize).to be true
+    end
+  end
+end

data/spec/support/unified_backend_examples.rb

@@ -377,4 +377,26 @@ shared_examples_for "Unified backend API" do
       expect(found).to be_truthy
     end
   end
+
+  # gzip
+  context "using gzip" do
+    before do
+      @robject = Riak::RObject.new(@bucket, "fetch")
+      @robject.content_type = "application/json"
+      @robject.content_encoding = "gzip"
+      @robject.data = { "test" => "pass" }
+      @backend.store_object(@robject)
+    end
+
+    it "stores a compressed object" do
+      expected_data = @robject.deserialize(@robject.decompress(@robject.raw_data))
+      expect(expected_data).to eq(@robject.data)
+    end
+
+    it "loads a compressed object" do
+      robj = @backend.fetch_object(@bucket.name, "fetch")
+      expect(robj).to be_kind_of(Riak::RObject)
+      expect(robj.data).to eq(@robject.data)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riak-client
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.4.0.pre1
 platform: ruby
 authors:
 - Bryce Kerley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-13 00:00:00.000000000 Z
+date: 2016-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -30,28 +30,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.1.1
+        version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.1.1
+        version: '10.1'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
@@ -72,56 +72,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: instrumentable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: '0.40'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.28.0
+        version: '0.40'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.8
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.8
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: beefcake
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: cert_validator
   requirement: !ruby/object:Gem::Requirement
@@ -193,7 +193,7 @@ files:
 - Gemfile
 - Guardfile
 - LICENSE.md
-- README.markdown
+- README.md
 - RELEASE_NOTES.md
 - Rakefile
 - lib/riak.rb
@@ -300,6 +300,7 @@ files:
 - lib/riak/time_series/row.rb
 - lib/riak/time_series/submission.rb
 - lib/riak/util/escape.rb
+- lib/riak/util/gzip.rb
 - lib/riak/util/tcp_socket_extensions.rb
 - lib/riak/util/translation.rb
 - lib/riak/version.rb
@@ -332,6 +333,7 @@ files:
 - spec/integration/riak/preflist_spec.rb
 - spec/integration/riak/properties_spec.rb
 - spec/integration/riak/protobuffs/interrupted_request_spec.rb
+- spec/integration/riak/protobuffs/timeouts_spec.rb
 - spec/integration/riak/protobuffs_backends_spec.rb
 - spec/integration/riak/search_spec.rb
 - spec/integration/riak/secondary_index_spec.rb
@@ -388,6 +390,7 @@ files:
 - spec/riak/time_series/deletion_spec.rb
 - spec/riak/time_series/listing_spec.rb
 - spec/riak/time_series/submission_spec.rb
+- spec/riak/util/gzip_spec.rb
 - spec/riak/walk_spec_spec.rb
 - spec/spec_helper.rb
 - spec/support/certs/README.md
@@ -413,7 +416,7 @@ files:
 - spec/support/wait_until.rb
 homepage: http://github.com/basho/riak-ruby-client
 licenses:
-- Apache 2.0
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -426,12 +429,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.5.0
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: riak-client is a rich client for Riak, the distributed database by Basho.
@@ -463,6 +466,7 @@ test_files:
 - spec/integration/riak/preflist_spec.rb
 - spec/integration/riak/properties_spec.rb
 - spec/integration/riak/protobuffs/interrupted_request_spec.rb
+- spec/integration/riak/protobuffs/timeouts_spec.rb
 - spec/integration/riak/protobuffs_backends_spec.rb
 - spec/integration/riak/search_spec.rb
 - spec/integration/riak/secondary_index_spec.rb
@@ -519,6 +523,7 @@ test_files:
 - spec/riak/time_series/deletion_spec.rb
 - spec/riak/time_series/listing_spec.rb
 - spec/riak/time_series/submission_spec.rb
+- spec/riak/util/gzip_spec.rb
 - spec/riak/walk_spec_spec.rb
 - spec/spec_helper.rb
 - spec/support/certs/README.md