riak-client 2.3.0 → 2.3.1

data/spec/fixtures/multipart-blank.txt

@@ -1,7 +1,7 @@
-
---73NmmA8dJxSB5nL2dVerpFIi8ze
-Content-Type: multipart/mixed; boundary=8fPXq9XfV15txMoV1IbA3hovEij
-
---8fPXq9XfV15txMoV1IbA3hovEij--
-
---73NmmA8dJxSB5nL2dVerpFIi8ze--
+
+--73NmmA8dJxSB5nL2dVerpFIi8ze
+Content-Type: multipart/mixed; boundary=8fPXq9XfV15txMoV1IbA3hovEij
+
+--8fPXq9XfV15txMoV1IbA3hovEij--
+
+--73NmmA8dJxSB5nL2dVerpFIi8ze--

data/spec/fixtures/multipart-mapreduce.txt

@@ -1,10 +1,10 @@
-
---NT6cqYFYCfbYZsocVt15tNWCpG9
-Content-Type: application/json
-
-{"phase":0,"data":["source :gemcutter\n\ngem 'i18n'\ngem 'builder'\ngem 'rspec', \"~>2.0.0\"\ngem 'fakeweb', \">=1.2\"\ngem 'rack', '>=1.0'\ngem 'rake'\ngem 'bundler'\ngem 'excon', \"~>0.3.4\"\n\nif defined? JRUBY_VERSION\n  gem 'json'\n  gem 'jruby-openssl'\nelse\n  gem 'curb', '>=0.6'\n  gem 'yajl-ruby'\nend\n\ngroup :integration do\n  gem 'activesupport', '~>3.0'\nend\n"]}
---NT6cqYFYCfbYZsocVt15tNWCpG9
-Content-Type: application/json
-
-{"phase":0,"data":["source \"http://rubygems.org\"\n\ngem 'rake'\ngem 'gollum-site'\ngem 'rdiscount'\ngem 'RedCloth'\ngem 'rspec'\n"]}
---NT6cqYFYCfbYZsocVt15tNWCpG9--
+
+--NT6cqYFYCfbYZsocVt15tNWCpG9
+Content-Type: application/json
+
+{"phase":0,"data":["source :gemcutter\n\ngem 'i18n'\ngem 'builder'\ngem 'rspec', \"~>2.0.0\"\ngem 'fakeweb', \">=1.2\"\ngem 'rack', '>=1.0'\ngem 'rake'\ngem 'bundler'\ngem 'excon', \"~>0.3.4\"\n\nif defined? JRUBY_VERSION\n  gem 'json'\n  gem 'jruby-openssl'\nelse\n  gem 'curb', '>=0.6'\n  gem 'yajl-ruby'\nend\n\ngroup :integration do\n  gem 'activesupport', '~>3.0'\nend\n"]}
+--NT6cqYFYCfbYZsocVt15tNWCpG9
+Content-Type: application/json
+
+{"phase":0,"data":["source \"http://rubygems.org\"\n\ngem 'rake'\ngem 'gollum-site'\ngem 'rdiscount'\ngem 'RedCloth'\ngem 'rspec'\n"]}
+--NT6cqYFYCfbYZsocVt15tNWCpG9--

data/spec/fixtures/multipart-with-body.txt

@@ -1,16 +1,16 @@
-
---5EiMOjuGavQ2IbXAqsJPLLfJNlA
-Content-Type: multipart/mixed; boundary=7extjTzvYIKVMVHowUiTn0LfvSs
-
---7extjTzvYIKVMVHowUiTn0LfvSs
-X-Riak-Vclock: a85hYGBgyWDKBVHMr9s3ZzAlMuaxMtyZcPAIH1RYyObHDqiwxIZjcOG1M98chAq3bUQIz7SSFQEKM4FUbwMKZwEA
-Location: /riak/foo/baz
-Content-Type: text/plain
-Link: </riak/foo>; rel="up"
-Etag: 6JdI51eFrvv5lDwY6un7a2
-Last-Modified: Sat, 16 Jan 2010 22:13:44 GMT
-
-SCP sloooow....
---7extjTzvYIKVMVHowUiTn0LfvSs--
-
---5EiMOjuGavQ2IbXAqsJPLLfJNlA--
+
+--5EiMOjuGavQ2IbXAqsJPLLfJNlA
+Content-Type: multipart/mixed; boundary=7extjTzvYIKVMVHowUiTn0LfvSs
+
+--7extjTzvYIKVMVHowUiTn0LfvSs
+X-Riak-Vclock: a85hYGBgyWDKBVHMr9s3ZzAlMuaxMtyZcPAIH1RYyObHDqiwxIZjcOG1M98chAq3bUQIz7SSFQEKM4FUbwMKZwEA
+Location: /riak/foo/baz
+Content-Type: text/plain
+Link: </riak/foo>; rel="up"
+Etag: 6JdI51eFrvv5lDwY6un7a2
+Last-Modified: Sat, 16 Jan 2010 22:13:44 GMT
+
+SCP sloooow....
+--7extjTzvYIKVMVHowUiTn0LfvSs--
+
+--5EiMOjuGavQ2IbXAqsJPLLfJNlA--

data/spec/fixtures/multipart-with-marked-tombstones.txt

@@ -1,17 +1,17 @@
-
---ADqgQtdmA5iQgyR5UGzX6V3HZtI
-Content-Type: multipart/mixed; boundary=Ljz1mP3hZzqPu6DH1Y4L8k7hfxy
-
---Ljz1mP3hZzqPu6DH1Y4L8k7hfxy
-X-Riak-Vclock: a85hYGBgzGDKBVIcypz/fvrNPcuWwZTIlMfKIOotdIIvCwA=
-Location: /buckets/links/keys/target
-Content-Type: application/octet-stream
-Link: </buckets/links>; rel="up"
-Etag: 5bUNdzHJhZDdCr7KlWxXq
-Last-Modified: Tue, 18 Oct 2011 19:10:13 GMT
-X-Riak-Deleted: true
-
-
---Ljz1mP3hZzqPu6DH1Y4L8k7hfxy--
-
---ADqgQtdmA5iQgyR5UGzX6V3HZtI--
+
+--ADqgQtdmA5iQgyR5UGzX6V3HZtI
+Content-Type: multipart/mixed; boundary=Ljz1mP3hZzqPu6DH1Y4L8k7hfxy
+
+--Ljz1mP3hZzqPu6DH1Y4L8k7hfxy
+X-Riak-Vclock: a85hYGBgzGDKBVIcypz/fvrNPcuWwZTIlMfKIOotdIIvCwA=
+Location: /buckets/links/keys/target
+Content-Type: application/octet-stream
+Link: </buckets/links>; rel="up"
+Etag: 5bUNdzHJhZDdCr7KlWxXq
+Last-Modified: Tue, 18 Oct 2011 19:10:13 GMT
+X-Riak-Deleted: true
+
+
+--Ljz1mP3hZzqPu6DH1Y4L8k7hfxy--
+
+--ADqgQtdmA5iQgyR5UGzX6V3HZtI--

data/spec/fixtures/multipart-with-unmarked-tombstone.txt

@@ -1,16 +1,16 @@
-
---CvfrSTCWwIiwezy0Zt1B2zwKgS7
-Content-Type: multipart/mixed; boundary=E9n2ZOKHIazIoPHzXj9XsWYWJjJ
-
---E9n2ZOKHIazIoPHzXj9XsWYWJjJ
-X-Riak-Vclock: a85hYGBgzGDKBVIcypz/fvpN53+WwZTIlMfKcNVJ6ARfFgA=
-Location: /buckets/links/keys/target
-Content-Type: application/octet-stream
-Link: </buckets/links>; rel="up"
-Etag: 50FOyLo7juvEVUO33MRJwP
-Last-Modified: Tue, 18 Oct 2011 18:35:01 GMT
-
-
---E9n2ZOKHIazIoPHzXj9XsWYWJjJ--
-
---CvfrSTCWwIiwezy0Zt1B2zwKgS7--
+
+--CvfrSTCWwIiwezy0Zt1B2zwKgS7
+Content-Type: multipart/mixed; boundary=E9n2ZOKHIazIoPHzXj9XsWYWJjJ
+
+--E9n2ZOKHIazIoPHzXj9XsWYWJjJ
+X-Riak-Vclock: a85hYGBgzGDKBVIcypz/fvpN53+WwZTIlMfKcNVJ6ARfFgA=
+Location: /buckets/links/keys/target
+Content-Type: application/octet-stream
+Link: </buckets/links>; rel="up"
+Etag: 50FOyLo7juvEVUO33MRJwP
+Last-Modified: Tue, 18 Oct 2011 18:35:01 GMT
+
+
+--E9n2ZOKHIazIoPHzXj9XsWYWJjJ--
+
+--CvfrSTCWwIiwezy0Zt1B2zwKgS7--

data/spec/fixtures/server.cert.crt

@@ -1,15 +1,15 @@
------BEGIN CERTIFICATE-----
-MIICPzCCAagCCQDfZhEdJjSgTDANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJV
-UzELMAkGA1UECBMCTkMxEjAQBgNVBAcTCUNoYXJsb3R0ZTEOMAwGA1UEChMFQmFz
-aG8xEDAOBgNVBAsTB1N1cHBvcnQxEjAQBgNVBAMTCTEyNy4wLjAuMTAeFw0xMTAz
-MjYxNjMzMzNaFw0zODA4MTAxNjMzMzNaMGQxCzAJBgNVBAYTAlVTMQswCQYDVQQI
-EwJOQzESMBAGA1UEBxMJQ2hhcmxvdHRlMQ4wDAYDVQQKEwVCYXNobzEQMA4GA1UE
-CxMHU3VwcG9ydDESMBAGA1UEAxMJMTI3LjAuMC4xMIGfMA0GCSqGSIb3DQEBAQUA
-A4GNADCBiQKBgQCtfHMCsR86HQEAsO52/WvtFWCEigXll0rxYjXvdqeszEPEMFIy
-Qlg3GlRxH51YrBzp46ReF9Qv5sf0Nh6SR7HGzlWmMEVfPeuAKcz1fzVcjD+IXWHK
-qklAQjpxz+18dvaGxQ7ZJMPsBlq1v64siTLXI0yhjxXOuQPJWrWsvuuXkQIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4GBAIqt1A5Ah7s2oUoYQ8YCKC83fKbXbbNCiLFLwIzy
-TGYXd8j7JTfeY8ettbtitlYgP+ouf23LzonuMo47GRuMgVKRWm4l+ZVMP5Qbkx9t
-uspx+6lHUWnMT9aRdP9/2I7dscyfuhtzs0UxddADLzL9Cif4Y06E1NhR/KK+zo46
-Nep8
------END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICPzCCAagCCQDfZhEdJjSgTDANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJV
+UzELMAkGA1UECBMCTkMxEjAQBgNVBAcTCUNoYXJsb3R0ZTEOMAwGA1UEChMFQmFz
+aG8xEDAOBgNVBAsTB1N1cHBvcnQxEjAQBgNVBAMTCTEyNy4wLjAuMTAeFw0xMTAz
+MjYxNjMzMzNaFw0zODA4MTAxNjMzMzNaMGQxCzAJBgNVBAYTAlVTMQswCQYDVQQI
+EwJOQzESMBAGA1UEBxMJQ2hhcmxvdHRlMQ4wDAYDVQQKEwVCYXNobzEQMA4GA1UE
+CxMHU3VwcG9ydDESMBAGA1UEAxMJMTI3LjAuMC4xMIGfMA0GCSqGSIb3DQEBAQUA
+A4GNADCBiQKBgQCtfHMCsR86HQEAsO52/WvtFWCEigXll0rxYjXvdqeszEPEMFIy
+Qlg3GlRxH51YrBzp46ReF9Qv5sf0Nh6SR7HGzlWmMEVfPeuAKcz1fzVcjD+IXWHK
+qklAQjpxz+18dvaGxQ7ZJMPsBlq1v64siTLXI0yhjxXOuQPJWrWsvuuXkQIDAQAB
+MA0GCSqGSIb3DQEBBQUAA4GBAIqt1A5Ah7s2oUoYQ8YCKC83fKbXbbNCiLFLwIzy
+TGYXd8j7JTfeY8ettbtitlYgP+ouf23LzonuMo47GRuMgVKRWm4l+ZVMP5Qbkx9t
+uspx+6lHUWnMT9aRdP9/2I7dscyfuhtzs0UxddADLzL9Cif4Y06E1NhR/KK+zo46
+Nep8
+-----END CERTIFICATE-----

data/spec/fixtures/server.cert.key

@@ -1,15 +1,15 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQCtfHMCsR86HQEAsO52/WvtFWCEigXll0rxYjXvdqeszEPEMFIy
-Qlg3GlRxH51YrBzp46ReF9Qv5sf0Nh6SR7HGzlWmMEVfPeuAKcz1fzVcjD+IXWHK
-qklAQjpxz+18dvaGxQ7ZJMPsBlq1v64siTLXI0yhjxXOuQPJWrWsvuuXkQIDAQAB
-AoGBAJIguzdPPgBTId8VKSes+lVupie9oo3qy8NaeBfGGCIixAnisbmHzIpNcUb/
-3CcuggQ4LODcrWvTtiTr2QBZx1FL7E4POBJl/N7zJMaQd+pGjmrJGfv5haSSQN+H
-r74Ix3HCd0RPdSgt5pmlT4KfsqkfRmqsPd6Nw54zbyLFMlTpAkEA4ar3ZJi2+Y+u
-FH3AycXuPdDtVW0tKFtxfvKlS48gshB6gmkd06Ugss5eZkdbSY0voAp88Tr2shOJ
-+pXc++Zl6wJBAMTN9K9k728cVCf41pR6mDVxIaaqjJeY4DWppGQFSqw/fmYz/Quu
-PlTvk6pGRYiGN6y9CZFNoL2I/SWcd4ukrXMCQCyfYOHsbKn2Zka5Awki8VQZ3wQ4
-XWiQhGXE1ziUqbNsHL1yyaoTCd8xfWseCwgFOficek49CZD22h7JyXOqAFcCQCn2
-mFPFu9//NFqJjod+VHIgu0IkX3H7oOMQVwMUtcVgjH0SXMRe1N+bbesCrNTdeYWV
-kTKwULPZP9EDOeJGrM0CQQCsX+8VZ15yKTy6ADINrOt26PNpD4ib4552TE6T/1wG
-LKdjn5l0qB5K7ILc22z3LCenNBa0Uxbg5/RSdoX57aHA
------END RSA PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQCtfHMCsR86HQEAsO52/WvtFWCEigXll0rxYjXvdqeszEPEMFIy
+Qlg3GlRxH51YrBzp46ReF9Qv5sf0Nh6SR7HGzlWmMEVfPeuAKcz1fzVcjD+IXWHK
+qklAQjpxz+18dvaGxQ7ZJMPsBlq1v64siTLXI0yhjxXOuQPJWrWsvuuXkQIDAQAB
+AoGBAJIguzdPPgBTId8VKSes+lVupie9oo3qy8NaeBfGGCIixAnisbmHzIpNcUb/
+3CcuggQ4LODcrWvTtiTr2QBZx1FL7E4POBJl/N7zJMaQd+pGjmrJGfv5haSSQN+H
+r74Ix3HCd0RPdSgt5pmlT4KfsqkfRmqsPd6Nw54zbyLFMlTpAkEA4ar3ZJi2+Y+u
+FH3AycXuPdDtVW0tKFtxfvKlS48gshB6gmkd06Ugss5eZkdbSY0voAp88Tr2shOJ
++pXc++Zl6wJBAMTN9K9k728cVCf41pR6mDVxIaaqjJeY4DWppGQFSqw/fmYz/Quu
+PlTvk6pGRYiGN6y9CZFNoL2I/SWcd4ukrXMCQCyfYOHsbKn2Zka5Awki8VQZ3wQ4
+XWiQhGXE1ziUqbNsHL1yyaoTCd8xfWseCwgFOficek49CZD22h7JyXOqAFcCQCn2
+mFPFu9//NFqJjod+VHIgu0IkX3H7oOMQVwMUtcVgjH0SXMRe1N+bbesCrNTdeYWV
+kTKwULPZP9EDOeJGrM0CQQCsX+8VZ15yKTy6ADINrOt26PNpD4ib4552TE6T/1wG
+LKdjn5l0qB5K7ILc22z3LCenNBa0Uxbg5/RSdoX57aHA
+-----END RSA PRIVATE KEY-----

data/spec/fixtures/test.pem

@@ -1 +1 @@
-i-am-a-pem
+i-am-a-pem

data/spec/integration/riak/threading_spec.rb

@@ -1,150 +1,150 @@
-require 'spec_helper'
-
-describe "Multithreaded client", :test_client => true do
-  class Synchronizer
-    def initialize(n)
-      @mutex = Mutex.new
-      @n = n
-      @waiting = Set.new
-    end
-
-    def sync
-      stop = false
-      @mutex.synchronize do
-        @waiting << Thread.current
-
-        if @waiting.size >= @n
-          # All threads are waiting.
-          @waiting.each do |t|
-            t.run
-          end
-        else
-          stop = true
-        end
-      end
-
-      if stop
-        Thread.stop
-      end
-    end
-  end
-
-  def threads(n, opts = {})
-    if opts[:synchronize]
-      s1 = Synchronizer.new n
-      s2 = Synchronizer.new n
-    end
-
-    threads = (0...n).map do |i|
-      Thread.new do
-        if opts[:synchronize]
-          s1.sync
-        end
-
-        yield i
-
-        if opts[:synchronize]
-          s2.sync
-        end
-      end
-    end
-
-    threads.each do |t|
-      t.join
-    end
-  end
-
-  [
-   {:protobuffs_backend => :Beefcake}
-  ].each do |opts|
-    describe opts.inspect do
-      before do
-        @bucket = random_bucket 'threading'
-      end
-
-      it 'gets in parallel' do
-        data = "the gun is good"
-        ro = @bucket.new('test')
-        ro.content_type = "application/json"
-        ro.data = [data]
-        ro.store
-
-        threads 10, :synchronize => true do
-          x = @bucket['test']
-          expect(x.content_type).to eq("application/json")
-          expect(x.data).to eq([data])
-        end
-      end
-
-      it 'puts in parallel' do
-        data = "the tabernacle is indestructible and everlasting"
-
-        n = 10
-        threads n, :synchronize => true do |i|
-          x = @bucket.new("test-#{i}")
-          x.content_type = "application/json"
-          x.data = ["#{data}-#{i}"]
-          x.store
-        end
-
-        (0...n).each do |i|
-          read = @bucket["test-#{i}"]
-          expect(read.content_type).to eq("application/json")
-          expect(read.data).to eq(["#{data}-#{i}"])
-        end
-      end
-
-      # This is a 1.0+ spec because putting with the same client ID
-      # will not create siblings on 0.14 in the same way. This will
-      # also likely fail for nodes with vnode_vclocks = false.
-      it 'puts conflicts in parallel' do
-        @bucket.allow_mult = true
-        expect(@bucket.allow_mult).to eq(true)
-
-        init = @bucket.new('test')
-        init.content_type = "application/json"
-        init.data = ''
-        init.store
-
-        # Create conflicting writes
-        n = 10
-        s = Synchronizer.new n
-        threads n, :synchronize => true do |i|
-          x = @bucket["test"]
-          s.sync
-          x.data = [i]
-          x.store
-        end
-
-        read = @bucket["test"]
-        expect(read.conflict?).to eq(true)
-        expect(read.siblings.map do |sibling|
-          sibling.data.first
-        end.to_set).to eq((0...n).to_set)
-      end
-
-      it 'lists-keys and gets in parallel', :slow => true do
-        count = 100
-        threads = 2
-
-        # Create items
-        count.times do |i|
-          o = @bucket.new("#{i}")
-          o.content_type = 'application/json'
-          o.data = [i]
-          o.store
-        end
-
-        threads(threads) do
-          set = Set.new
-          @bucket.keys do |stream|
-            stream.each do |key|
-              set.merge @bucket[key].data
-            end
-          end
-          expect(set).to eq((0...count).to_set)
-        end
-      end
-    end
-  end
-end
+require 'spec_helper'
+
+describe "Multithreaded client", :test_client => true do
+  class Synchronizer
+    def initialize(n)
+      @mutex = Mutex.new
+      @n = n
+      @waiting = Set.new
+    end
+
+    def sync
+      stop = false
+      @mutex.synchronize do
+        @waiting << Thread.current
+
+        if @waiting.size >= @n
+          # All threads are waiting.
+          @waiting.each do |t|
+            t.run
+          end
+        else
+          stop = true
+        end
+      end
+
+      if stop
+        Thread.stop
+      end
+    end
+  end
+
+  def threads(n, opts = {})
+    if opts[:synchronize]
+      s1 = Synchronizer.new n
+      s2 = Synchronizer.new n
+    end
+
+    threads = (0...n).map do |i|
+      Thread.new do
+        if opts[:synchronize]
+          s1.sync
+        end
+
+        yield i
+
+        if opts[:synchronize]
+          s2.sync
+        end
+      end
+    end
+
+    threads.each do |t|
+      t.join
+    end
+  end
+
+  [
+   {:protobuffs_backend => :Beefcake}
+  ].each do |opts|
+    describe opts.inspect do
+      before do
+        @bucket = random_bucket 'threading'
+      end
+
+      it 'gets in parallel' do
+        data = "the gun is good"
+        ro = @bucket.new('test')
+        ro.content_type = "application/json"
+        ro.data = [data]
+        ro.store
+
+        threads 10, :synchronize => true do
+          x = @bucket['test']
+          expect(x.content_type).to eq("application/json")
+          expect(x.data).to eq([data])
+        end
+      end
+
+      it 'puts in parallel' do
+        data = "the tabernacle is indestructible and everlasting"
+
+        n = 10
+        threads n, :synchronize => true do |i|
+          x = @bucket.new("test-#{i}")
+          x.content_type = "application/json"
+          x.data = ["#{data}-#{i}"]
+          x.store
+        end
+
+        (0...n).each do |i|
+          read = @bucket["test-#{i}"]
+          expect(read.content_type).to eq("application/json")
+          expect(read.data).to eq(["#{data}-#{i}"])
+        end
+      end
+
+      # This is a 1.0+ spec because putting with the same client ID
+      # will not create siblings on 0.14 in the same way. This will
+      # also likely fail for nodes with vnode_vclocks = false.
+      it 'puts conflicts in parallel' do
+        @bucket.allow_mult = true
+        expect(@bucket.allow_mult).to eq(true)
+
+        init = @bucket.new('test')
+        init.content_type = "application/json"
+        init.data = ''
+        init.store
+
+        # Create conflicting writes
+        n = 10
+        s = Synchronizer.new n
+        threads n, :synchronize => true do |i|
+          x = @bucket["test"]
+          s.sync
+          x.data = [i]
+          x.store
+        end
+
+        read = @bucket["test"]
+        expect(read.conflict?).to eq(true)
+        expect(read.siblings.map do |sibling|
+          sibling.data.first
+        end.to_set).to eq((0...n).to_set)
+      end
+
+      it 'lists-keys and gets in parallel', :slow => true do
+        count = 100
+        threads = 2
+
+        # Create items
+        count.times do |i|
+          o = @bucket.new("#{i}")
+          o.content_type = 'application/json'
+          o.data = [i]
+          o.store
+        end
+
+        threads(threads) do
+          set = Set.new
+          @bucket.keys do |stream|
+            stream.each do |key|
+              set.merge @bucket[key].data
+            end
+          end
+          expect(set).to eq((0...count).to_set)
+        end
+      end
+    end
+  end
+end