riak-sessions 0.9.0.beta2 → 0.9.0

data/Rakefile

@@ -19,22 +19,17 @@ gemspec = Gem::Specification.new do |gem|
   gem.add_dependency "riak-client", "~>#{version}"
   gem.add_dependency "rack", ">=1.0"
 
-  gem.files =  %W{
-     Gemfile
-     lib/riak/session_store.rb
-     lib/riak-sessions.rb
-     lib/ripple/session_store.rb
-     Rakefile
-     riak-sessions.gemspec
-     spec/fixtures/session_autoload_test/session_autoload_test/foo.rb
-     spec/riak_session_store_spec.rb
-     spec/ripple_session_store_spec.rb
-     spec/spec_helper.rb
-     spec/support/ripple_session_support.rb
-     spec/support/rspec-rails-neuter.rb
-     spec/support/test_server.rb
-     spec/support/test_server.yml.example
-   }
+  files = FileList["**/*"]
+  # Editor and O/S files
+  files.exclude ".DS_Store", "*~", "\#*", ".\#*", "*.swp", "*.tmproj", "tmtags"
+  # Generated artifacts
+  files.exclude "coverage", "rdoc", "pkg", "doc", ".bundle", "*.rbc", ".rvmrc", ".watchr", ".rspec"
+  # Project-specific
+  files.exclude "Gemfile.lock", %r{spec/support/test_server.yml$}, "bin"
+  # Remove directories
+  files.exclude {|d| File.directory?(d) }
+
+  gem.files = files.to_a
 
   gem.test_files = gem.files.grep(/_spec\.rb$/)
 end

data/lib/riak/session_store.rb

@@ -29,7 +29,7 @@ module Riak
   class SessionStore < Rack::Session::Abstract::ID
     DEFAULT_OPTIONS = Rack::Session::Abstract::ID::DEFAULT_OPTIONS.merge \
     :host => "127.0.0.1",
-    :port => 8098,
+    :http_port => 8098,
     :bucket => "_sessions",
     :r => 1,
     :w => 1,
@@ -47,15 +47,9 @@ module Riak
     # @see Rack::Session::Abstract::ID#initialize
     def initialize(app, options={})
       super
-      @client = Riak::Client.new(default_options.slice(:host,:port))
-      # @client.http.send(:curl).verbose = true
-      @bucket = @client.bucket(default_options[:bucket]).tap do |b|
-        new_props = {}
-        [:r,:w,:dw,:rw,:n_val].each do |q|
-          new_props[q.to_s] = default_options[q] unless b.send(q) == default_options[q]
-        end
-        b.props = new_props unless new_props.blank?
-      end
+      @client = Riak::Client.new(@default_options.slice(*Riak::Client::VALID_OPTIONS))
+      @bucket = @client.bucket(default_options[:bucket])
+      set_bucket_defaults
       self
     end
 
@@ -116,5 +110,15 @@ module Riak
       robject.store
       [session_id, robject.data]
     end
+
+    private
+    def set_bucket_defaults
+      bucket_opts = @default_options.slice(:r,:w,:dw,:rw,:n_val,:last_write_wins).stringify_keys
+      new_props = bucket_opts.inject({}) do |hash,(k,v)|
+        hash[k] = v unless @bucket.props[k] == v
+        hash
+      end
+      @bucket.props = new_props unless new_props.empty?
+    end
   end
 end

data/lib/ripple/session_store.rb

@@ -33,9 +33,9 @@ module Ripple
         :n_val => 2,
         :last_write_wins => false,
         :host => "127.0.0.1",
-        :port => 8098
+        :http_port => 8098
       }.merge(@default_options)
-      @client = Riak::Client.new(@default_options.slice(:host,:port,:client_id))
+      @client = Riak::Client.new(@default_options.slice(*Riak::Client::VALID_OPTIONS))
       @bucket = @client.bucket(@default_options[:bucket])
       set_bucket_defaults
     end

data/riak-sessions.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{riak-sessions}
-  s.version = "0.9.0.beta2"
+  s.version = "0.9.0"
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sean Cribbs"]
-  s.date = %q{2011-03-28}
+  s.date = %q{2011-04-03}
   s.description = %q{riak-sessions is a session store backed by Riak, the distributed database by Basho. It includes session implementations for both Rack and Rails 3.}
   s.email = %q{sean@basho.com}
   s.files = ["Gemfile", "lib/riak/session_store.rb", "lib/riak-sessions.rb", "lib/ripple/session_store.rb", "Rakefile", "riak-sessions.gemspec", "spec/fixtures/session_autoload_test/session_autoload_test/foo.rb", "spec/riak_session_store_spec.rb", "spec/ripple_session_store_spec.rb", "spec/spec_helper.rb", "spec/support/ripple_session_support.rb", "spec/support/rspec-rails-neuter.rb", "spec/support/test_server.rb", "spec/support/test_server.yml.example"]
@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<yajl-ruby>, [">= 0"])
       s.add_development_dependency(%q<rails>, ["~> 3.0.0"])
       s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_runtime_dependency(%q<riak-client>, ["~> 0.9.0.beta2"])
+      s.add_runtime_dependency(%q<riak-client>, ["~> 0.9.0"])
       s.add_runtime_dependency(%q<rack>, [">= 1.0"])
     else
       s.add_dependency(%q<rspec>, ["~> 2.4.0"])
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<yajl-ruby>, [">= 0"])
       s.add_dependency(%q<rails>, ["~> 3.0.0"])
       s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<riak-client>, ["~> 0.9.0.beta2"])
+      s.add_dependency(%q<riak-client>, ["~> 0.9.0"])
       s.add_dependency(%q<rack>, [">= 1.0"])
     end
   else
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<yajl-ruby>, [">= 0"])
     s.add_dependency(%q<rails>, ["~> 3.0.0"])
     s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<riak-client>, ["~> 0.9.0.beta2"])
+    s.add_dependency(%q<riak-client>, ["~> 0.9.0"])
     s.add_dependency(%q<rack>, [">= 1.0"])
   end
 end

data/spec/riak_session_store_spec.rb

@@ -16,7 +16,7 @@ require 'rack/mock'
 
 
 describe Riak::SessionStore do
-  Riak::SessionStore::DEFAULT_OPTIONS[:port] = 9000 if $test_server 
+  Riak::SessionStore::DEFAULT_OPTIONS[:http_port] = 9000 if $test_server
   session_key = Riak::SessionStore::DEFAULT_OPTIONS[:key]
   session_match = /#{session_key}=([0-9a-fA-F]+);/
   incrementor = lambda do |env|

data/spec/ripple_session_store_spec.rb

@@ -21,7 +21,7 @@ describe "Ripple::SessionStore" do
 
   before :each do
     @app = build_app do |middleware|
-      middleware.use Ripple::SessionStore, :key => '_session_id', :port => ($test_server ? 9000 : 8098)
+      middleware.use Ripple::SessionStore, :key => '_session_id', :http_port => ($test_server ? 9000 : 8098)
       middleware.delete "ActionDispatch::ShowExceptions"
     end
     @app.routes.draw do

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: riak-sessions
 version: !ruby/object:Gem::Version 
-  prerelease: 6
-  version: 0.9.0.beta2
+  prerelease: 
+  version: 0.9.0
 platform: ruby
 authors: 
 - Sean Cribbs
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-28 00:00:00 -04:00
+date: 2011-04-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -76,7 +76,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.0.beta2
+        version: 0.9.0
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -131,9 +131,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.3.1
+      version: "0"
 requirements: []
 
 rubyforge_project: