riak-client 1.0.0.beta → 1.0.0

data/spec/support/version_filter.rb

@@ -0,0 +1,14 @@
+RSpec.configure do |config|
+  config.before(:each, :integration => true,
+                :version => lambda {|v| !!v },
+                :test_server => lambda {|ts| ts != false }) do
+    required = example.metadata[:version]
+    actual = test_server.version
+    case required
+    when String
+      pending("SKIP: Tests feature for Riak #{required}, but testing against #{actual}") if actual < required
+    when Range
+      pending("SKIP: Tests feature for Riak versions #{required.begin} through #{required.end}, but testing against #{actual}") unless required.include?(actual)
+    end
+  end
+end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: riak-client
 version: !ruby/object:Gem::Version 
-  hash: 31098193
-  prerelease: 6
+  hash: 23
+  prerelease: 
   segments: 
   - 1
   - 0
   - 0
-  - beta
-  version: 1.0.0.beta
+  version: 1.0.0
 platform: ruby
 authors: 
 - Sean Cribbs
@@ -16,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-08 00:00:00 -03:00
-default_executable: 
+date: 2012-02-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -27,12 +25,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
+        hash: 47
         segments: 
         - 2
-        - 6
+        - 8
         - 0
-        version: 2.6.0
+        version: 2.8.0
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -87,14 +85,12 @@ dependencies:
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 49
+        hash: 3
         segments: 
         - 0
-        - 8
-        - 7
-        version: 0.8.7
+        version: "0"
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -171,18 +167,20 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- erl_src/riak_kv_test014_backend.beam
+- erl_src/riak_kv_test014_backend.erl
 - erl_src/riak_kv_test_backend.beam
 - erl_src/riak_kv_test_backend.erl
 - erl_src/riak_search_test_backend.beam
 - erl_src/riak_search_test_backend.erl
 - Gemfile
 - Guardfile
-- lib/active_support/cache/riak_store.rb
 - lib/riak/bucket.rb
-- lib/riak/cache_store.rb
+- lib/riak/client/#http_backend.rb#
 - lib/riak/client/beefcake/messages.rb
 - lib/riak/client/beefcake/object_methods.rb
 - lib/riak/client/beefcake_protobuffs_backend.rb
+- lib/riak/client/decaying.rb
 - lib/riak/client/excon_backend.rb
 - lib/riak/client/http_backend/configuration.rb
 - lib/riak/client/http_backend/key_streamer.rb
@@ -191,8 +189,9 @@ files:
 - lib/riak/client/http_backend/transport_methods.rb
 - lib/riak/client/http_backend.rb
 - lib/riak/client/net_http_backend.rb
+- lib/riak/client/node.rb
+- lib/riak/client/pool.rb
 - lib/riak/client/protobuffs_backend.rb
-- lib/riak/client/pump.rb
 - lib/riak/client/search.rb
 - lib/riak/client.rb
 - lib/riak/cluster.rb
@@ -215,6 +214,7 @@ files:
 - lib/riak/map_reduce/phase.rb
 - lib/riak/map_reduce.rb
 - lib/riak/map_reduce_error.rb
+- lib/riak/node/#console.rb#
 - lib/riak/node/configuration.rb
 - lib/riak/node/console.rb
 - lib/riak/node/control.rb
@@ -229,7 +229,6 @@ files:
 - lib/riak/stamp.rb
 - lib/riak/test_server.rb
 - lib/riak/util/escape.rb
-- lib/riak/util/fiber1.8.rb
 - lib/riak/util/headers.rb
 - lib/riak/util/multipart/stream_parser.rb
 - lib/riak/util/multipart.rb
@@ -238,8 +237,12 @@ files:
 - lib/riak/version.rb
 - lib/riak/walk_spec.rb
 - lib/riak.rb
+- LICENSE
 - Rakefile
+- README.markdown
+- RELEASE_NOTES.md
 - riak-client.gemspec
+- spec/failover/failover.rb
 - spec/fixtures/cat.jpg
 - spec/fixtures/multipart-blank.txt
 - spec/fixtures/multipart-mapreduce.txt
@@ -249,12 +252,13 @@ files:
 - spec/fixtures/server.cert.crt
 - spec/fixtures/server.cert.key
 - spec/fixtures/test.pem
-- spec/integration/riak/cache_store_spec.rb
 - spec/integration/riak/cluster_spec.rb
 - spec/integration/riak/http_backends_spec.rb
 - spec/integration/riak/node_spec.rb
 - spec/integration/riak/protobuffs_backends_spec.rb
 - spec/integration/riak/test_server_spec.rb
+- spec/integration/riak/threading_spec.rb
+- spec/riak/beefcake_protobuffs_backend/object_methods_spec.rb
 - spec/riak/beefcake_protobuffs_backend_spec.rb
 - spec/riak/bucket_spec.rb
 - spec/riak/client_spec.rb
@@ -272,6 +276,8 @@ files:
 - spec/riak/map_reduce_spec.rb
 - spec/riak/multipart_spec.rb
 - spec/riak/net_http_backend_spec.rb
+- spec/riak/node_spec.rb
+- spec/riak/pool_spec.rb
 - spec/riak/robject_spec.rb
 - spec/riak/search_spec.rb
 - spec/riak/serializers_spec.rb
@@ -284,12 +290,13 @@ files:
 - spec/support/integration_setup.rb
 - spec/support/mock_server.rb
 - spec/support/mocks.rb
+- spec/support/sometimes.rb
 - spec/support/test_server.rb
 - spec/support/test_server.yml.example
 - spec/support/unified_backend_examples.rb
+- spec/support/version_filter.rb
 - .gitignore
-has_rdoc: true
-homepage: http://seancribbs.github.com/ripple
+homepage: http://github.com/basho/riak-ruby-client
 licenses: []
 
 post_install_message: 
@@ -309,22 +316,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: riak-client is a rich client for Riak, the distributed database by Basho.
 test_files: 
+- spec/failover/failover.rb
 - spec/fixtures/cat.jpg
 - spec/fixtures/multipart-blank.txt
 - spec/fixtures/multipart-mapreduce.txt
@@ -334,12 +340,13 @@ test_files:
 - spec/fixtures/server.cert.crt
 - spec/fixtures/server.cert.key
 - spec/fixtures/test.pem
-- spec/integration/riak/cache_store_spec.rb
 - spec/integration/riak/cluster_spec.rb
 - spec/integration/riak/http_backends_spec.rb
 - spec/integration/riak/node_spec.rb
 - spec/integration/riak/protobuffs_backends_spec.rb
 - spec/integration/riak/test_server_spec.rb
+- spec/integration/riak/threading_spec.rb
+- spec/riak/beefcake_protobuffs_backend/object_methods_spec.rb
 - spec/riak/beefcake_protobuffs_backend_spec.rb
 - spec/riak/bucket_spec.rb
 - spec/riak/client_spec.rb
@@ -357,6 +364,8 @@ test_files:
 - spec/riak/map_reduce_spec.rb
 - spec/riak/multipart_spec.rb
 - spec/riak/net_http_backend_spec.rb
+- spec/riak/node_spec.rb
+- spec/riak/pool_spec.rb
 - spec/riak/robject_spec.rb
 - spec/riak/search_spec.rb
 - spec/riak/serializers_spec.rb
@@ -369,7 +378,9 @@ test_files:
 - spec/support/integration_setup.rb
 - spec/support/mock_server.rb
 - spec/support/mocks.rb
+- spec/support/sometimes.rb
 - spec/support/test_server.rb
 - spec/support/test_server.yml.example
 - spec/support/unified_backend_examples.rb
+- spec/support/version_filter.rb
 - .gitignore

data/lib/active_support/cache/riak_store.rb

@@ -1,2 +0,0 @@
-require 'riak'
-require 'riak/cache_store'

data/lib/riak/cache_store.rb

@@ -1,84 +0,0 @@
-
-require 'yaml'
-require 'riak/client'
-require 'riak/bucket'
-require 'riak/robject'
-require 'riak/failed_request'
-require 'active_support/version'
-
-if ActiveSupport::VERSION::STRING < "3.0.0"
-  raise LoadError, "ActiveSupport 3.0.0 or greater is required to use Riak::CacheStore."
-else
-  require 'active_support/cache'
-end
-
-module Riak
-  # An ActiveSupport::Cache::Store implementation that uses Riak.
-  # Compatible only with ActiveSupport version 3 or greater.
-  class CacheStore < ActiveSupport::Cache::Store
-    attr_accessor :client
-
-    # Creates a Riak-backed cache store.
-    def initialize(options = {})
-      super
-      @bucket_name = options.delete(:bucket) || '_cache'
-      @n_value = options.delete(:n_value) || 2
-      @r = options.delete(:r) || 1
-      @w = options.delete(:w) || 1
-      @dw = options.delete(:dw) || 0
-      @rw = options.delete(:rw) || "quorum"
-      @client = Riak::Client.new(options)
-      set_bucket_defaults
-    end
-
-    def bucket
-      @bucket ||= @client.bucket(@bucket_name)
-    end
-
-    def delete_matched(matcher, options={})
-      instrument(:delete_matched, matcher) do
-        bucket.keys do |keys|
-          keys.grep(matcher).each do |k|
-            bucket.delete(k)
-          end
-        end
-      end
-    end
-
-    protected
-    def set_bucket_defaults
-      begin
-        new_values = {}
-        new_values['n_val'] = @n_value unless bucket.n_value == @n_value
-        new_values['r']     = @r       unless bucket.r == @r
-        new_values['w']     = @w       unless bucket.w == @w
-        new_values['dw']    = @dw      unless bucket.dw == @dw
-        new_values['rw']    = @rw      unless bucket.rw == @rw
-        bucket.props = new_values      unless new_values.empty?
-      rescue
-      end
-    end
-
-    def write_entry(key, value, options={})
-      object = bucket.get_or_new(key)
-      object.content_type = 'application/yaml'
-      object.data = value
-      object.store
-    end
-
-    def read_entry(key, options={})
-      begin
-        bucket.get(key).data
-      rescue Riak::FailedRequest => fr
-        raise fr unless fr.not_found?
-        nil
-      end
-    end
-
-    def delete_entry(key, options={})
-      bucket.delete(key)
-    end
-  end
-end
-
-ActiveSupport::Cache::RiakStore = Riak::CacheStore unless defined?(ActiveSupport::Cache::RiakStore)

data/lib/riak/client/pump.rb

@@ -1,30 +0,0 @@
-
-begin
-  require 'fiber'
-rescue LoadError
-  require 'riak/util/fiber1.8'
-end
-
-module Riak
-  class Client
-    # @private
-    class Pump
-      def initialize(block)
-        @fiber = Fiber.new do
-          loop do
-            block.call Fiber.yield
-          end
-        end
-        @fiber.resume
-      end
-
-      def pump(input)
-        @fiber.resume input
-      end
-
-      def to_proc
-        method(:pump).to_proc
-      end
-    end
-  end
-end

data/lib/riak/util/fiber1.8.rb

@@ -1,48 +0,0 @@
-# Poor Man's Fiber (API compatible Thread based Fiber implementation for Ruby 1.8)
-# (c) 2008 Aman Gupta (tmm1)
-
-unless defined? Fiber
-  require 'thread'
-
-  class FiberError < StandardError; end
-
-  class Fiber
-    def initialize
-      raise ArgumentError, 'new Fiber requires a block' unless block_given?
-
-      @yield = Queue.new
-      @resume = Queue.new
-
-      @thread = Thread.new{ @yield.push [ *yield(*@resume.pop) ] }
-      @thread.abort_on_exception = true
-      @thread[:fiber] = self
-    end
-    attr_reader :thread
-
-    def resume *args
-      raise FiberError, 'dead fiber called' unless @thread.alive?
-      @resume.push(args)
-      result = @yield.pop
-      result.size > 1 ? result : result.first
-    end
-
-    def yield *args
-      @yield.push(args)
-      result = @resume.pop
-      result.size > 1 ? result : result.first
-    end
-
-    def self.yield *args
-      raise FiberError, "can't yield from root fiber" unless fiber = Thread.current[:fiber]
-      fiber.yield(*args)
-    end
-
-    def self.current
-      Thread.current[:fiber] or raise FiberError, 'not inside a fiber'
-    end
-
-    def inspect
-      "#<#{self.class}:0x#{self.object_id.to_s(16)}>"
-    end
-  end
-end

data/spec/integration/riak/cache_store_spec.rb

@@ -1,129 +0,0 @@
-require 'spec_helper'
-require 'riak/cache_store'
-
-describe Riak::CacheStore do
-  before do
-    @web_port = $test_server.http_port
-    @cache = ActiveSupport::Cache.lookup_store(:riak_store, :http_port => @web_port)
-  end
-
-  describe "Riak integration" do
-    it "should have a client" do
-      @cache.should respond_to(:client)
-      @cache.client.should be_kind_of(Riak::Client)
-    end
-
-    it "should have a bucket to store entries in" do
-      @cache.bucket.should be_kind_of(Riak::Bucket)
-    end
-
-    it "should configure the client according to the initialized options" do
-      @cache = ActiveSupport::Cache.lookup_store(:riak_store, :http_port => 10000)
-      @cache.client.http_port.should == 10000
-    end
-
-    it "should choose the bucket according to the initializer option" do
-      @cache = ActiveSupport::Cache.lookup_store(:riak_store, :bucket => "foobar", :http_port => @web_port)
-      @cache.bucket.name.should == "foobar"
-    end
-
-    it "should set the N value to 2 by default" do
-      @cache.bucket.n_value.should == 2
-    end
-
-    it "should set the N value to the specified value" do
-      @cache = ActiveSupport::Cache.lookup_store(:riak_store, :n_value => 1, :http_port => @web_port)
-      @cache.bucket.n_value.should == 1
-    end
-
-    it "should set the bucket R value to 1 by default" do
-      @cache.bucket.r.should == 1
-    end
-
-    it "should set the bucket R default to the specified value" do
-      @cache = ActiveSupport::Cache.lookup_store(:riak_store, :r => "quorum", :http_port => @web_port)
-      @cache.bucket.r.should == "quorum"
-    end
-
-    it "should set the bucket W value to 1 by default" do
-      @cache.bucket.w.should == 1
-    end
-
-    it "should set the bucket W default to the specified value" do
-      @cache = ActiveSupport::Cache.lookup_store(:riak_store, :w => "all", :http_port => @web_port)
-      @cache.bucket.w.should == "all"
-    end
-
-    it "should set the bucket DW value to 0 by default" do
-      @cache.bucket.dw.should == 0
-    end
-
-    it "should set the bucket DW default to the specified value" do
-      @cache = ActiveSupport::Cache.lookup_store(:riak_store, :dw => "quorum", :http_port => @web_port)
-      @cache.bucket.dw.should == "quorum"
-    end
-
-    it "should set the bucket RW value to quorum by default" do
-      @cache.bucket.rw.should == "quorum"
-    end
-
-    it "should set the bucket RW default to the specified value" do
-      @cache = ActiveSupport::Cache.lookup_store(:riak_store, :rw => "all", :http_port => @web_port)
-      @cache.bucket.rw.should == "all"
-    end
-  end
-
-
-  it "should read and write strings" do
-    @cache.write('foo', 'bar')
-    @cache.read('foo').should == 'bar'
-  end
-
-  it "should read and write hashes" do
-    @cache.write('foo', {:a => "b"})
-    @cache.read('foo').should == {:a => "b"}
-  end
-
-  it "should read and write integers" do
-    @cache.write('foo', 1)
-    @cache.read('foo').should == 1
-  end
-
-  it "should read and write nil" do
-    @cache.write('foo', nil)
-    @cache.read('foo').should be_nil
-  end
-
-  it "should return the stored value when fetching on hit" do
-    @cache.write('foo', 'bar')
-    @cache.fetch('foo'){'baz'}.should == 'bar'
-  end
-
-  it "should return the default value when fetching on miss" do
-    @cache.fetch('foo'){ 'baz' }.should == 'baz'
-  end
-
-  it "should return the default value when forcing a miss" do
-    @cache.fetch('foo', :force => true){'bar'}.should == 'bar'
-  end
-
-  it "should detect if a value exists in the cache" do
-    @cache.write('foo', 'bar')
-    @cache.exist?('foo').should be_true
-  end
-
-  it "should delete matching keys from the cache" do
-    @cache.write('foo', 'bar')
-    @cache.write('green', 'thumb')
-    @cache.delete_matched(/foo/)
-    @cache.read('foo').should be_nil
-    @cache.read('green').should == 'thumb'
-  end
-
-  it "should delete a single key from the cache" do
-    @cache.write('foo', 'bar')
-    @cache.read('foo').should == 'bar'
-    @cache.delete('foo')
-    @cache.read('foo').should be_nil
-  end
-end