redis-store 1.0.0.beta2 → 1.0.0.beta3

data/tasks/redis.tasks.rb

@@ -9,7 +9,7 @@ class RedisRunner
   end
 
   def self.redisdir
-    "/tmp/redis/"
+    @@redisdir ||= File.expand_path File.join(File.dirname(__FILE__), '..', 'vendor', 'redis')
   end
 
   def self.redisconfdir
@@ -124,17 +124,19 @@ namespace :redis do
   end
 
   desc 'Install the lastest verison of Redis from Github (requires git, duh)'
-  task :install => [:about, :download, :make] do
+  task :install => [ :about, :download, :make ] do
     %w(redis-benchmark redis-cli redis-server).each do |bin|
-      sh "sudo cp /tmp/redis/#{bin} /usr/bin/"
+      if File.exist?(path = "#{RedisRunner.redisdir}/src/#{bin}")
+        sh "sudo cp #{path} /usr/bin/"
+      else
+        sh "sudo cp #{RedisRunner.redisdir}/#{bin} /usr/bin/"
+      end
     end
 
     puts "Installed redis-benchmark, redis-cli and redis-server to /usr/bin/"
 
-    unless File.exists?('/etc/redis.conf')
-      sh 'sudo cp /tmp/redis/redis.conf /etc/'
-      puts "Installed redis.conf to /etc/ \n You should look at this file!"
-    end
+    sh "sudo cp #{RedisRunner.redisdir}/redis.conf /etc/"
+    puts "Installed redis.conf to /etc/ \n You should look at this file!"
   end
 
   task :make do
@@ -144,13 +146,18 @@ namespace :redis do
 
   desc "Download package"
   task :download do
-    sh 'rm -rf /tmp/redis/' if File.exists?("#{RedisRunner.redisdir}/.svn")
-    sh 'git clone git://github.com/antirez/redis.git /tmp/redis' unless File.exists?(RedisRunner.redisdir)
+    require 'git'
+
+    sh "rm -rf #{RedisRunner.redisdir} && mkdir -p vendor && rm -rf redis"
+    Git.clone("git://github.com/antirez/redis.git", "redis")
+    sh "mv redis vendor"
 
-    if File.exists?("#{RedisRunner.redisdir}/.git")
-      arguments = ENV['COMMIT'].nil? ? "pull" : "reset --hard #{ENV['COMMIT']}"
-      sh "cd #{RedisRunner.redisdir} && git #{arguments}"
+    commit = case ENV['VERSION']
+      when "1.2.6" then "570e43c8285a4e5e3f31"
     end
+
+    arguments = commit.nil? ? "pull origin master" : "reset --hard #{commit}"
+    sh "cd #{RedisRunner.redisdir} && git #{arguments}"
   end
 
   desc "Open an IRb session"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: redis-store
 version: !ruby/object:Gem::Version 
-  hash: -1848230054
+  hash: -1848230053
   prerelease: true
   segments: 
   - 1
   - 0
   - 0
-  - beta2
-  version: 1.0.0.beta2
+  - beta3
+  version: 1.0.0.beta3
 platform: ruby
 authors: 
 - Luca Guidi
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-12 00:00:00 +02:00
+date: 2010-09-10 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -35,7 +35,7 @@ dependencies:
         version: 2.0.0
   type: :runtime
   version_requirements: *id001
-description: Rack::Session, Rack::Cache and cache Redis stores for Ruby web frameworks.
+description: Namespaced Rack::Session, Rack::Cache, I18n and cache Redis stores for Ruby web frameworks.
 email: guidi.luca@gmail.com
 executables: []
 
@@ -47,39 +47,48 @@ files:
 - .gitignore
 - CHANGELOG
 - Gemfile
+- Gemfile.lock
 - MIT-LICENSE
 - README.md
 - Rakefile
 - VERSION
+- lib/action_controller/session/redis_session_store.rb
+- lib/active_support/cache/redis_store.rb
 - lib/cache/merb/redis_store.rb
-- lib/cache/rails/redis_store.rb
 - lib/cache/sinatra/redis_store.rb
+- lib/i18n/backend/redis.rb
 - lib/rack/cache/redis_entitystore.rb
 - lib/rack/cache/redis_metastore.rb
 - lib/rack/session/merb.rb
-- lib/rack/session/rails.rb
 - lib/rack/session/redis.rb
 - lib/redis-store.rb
-- lib/redis/distributed_marshaled.rb
+- lib/redis/distributed_store.rb
 - lib/redis/factory.rb
-- lib/redis/marshaled_client.rb
-- lib/redis_store/version.rb
+- lib/redis/store.rb
+- lib/redis/store/interface.rb
+- lib/redis/store/marshalling.rb
+- lib/redis/store/namespace.rb
+- lib/redis/store/ttl.rb
+- lib/redis/store/version.rb
 - redis-store.gemspec
+- spec/action_controller/session/redis_session_store_spec.rb
+- spec/active_support/cache/redis_store_spec.rb
 - spec/cache/merb/redis_store_spec.rb
-- spec/cache/rails/redis_store_spec.rb
 - spec/cache/sinatra/redis_store_spec.rb
 - spec/config/master.conf
 - spec/config/single.conf
 - spec/config/slave.conf
+- spec/i18n/backend/redis_spec.rb
 - spec/rack/cache/entitystore/pony.jpg
 - spec/rack/cache/entitystore/redis_spec.rb
 - spec/rack/cache/metastore/redis_spec.rb
-- spec/rack/session/redis_session_store_spec.rb
 - spec/rack/session/redis_spec.rb
-- spec/redis/distributed_marshaled_redis_spec.rb
+- spec/redis/distributed_store_spec.rb
 - spec/redis/factory_spec.rb
-- spec/redis/marshaled_client_spec.rb
-- spec/redis_store/version_spec.rb
+- spec/redis/store/interface_spec.rb
+- spec/redis/store/marshalling_spec.rb
+- spec/redis/store/namespace_spec.rb
+- spec/redis/store/version_spec.rb
 - spec/spec_helper.rb
 - tasks/redis.tasks.rb
 has_rdoc: true
@@ -117,17 +126,20 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Rack::Session, Rack::Cache and cache Redis stores for Ruby web frameworks.
+summary: Namespaced Rack::Session, Rack::Cache, I18n and cache Redis stores for Ruby web frameworks.
 test_files: 
+- spec/action_controller/session/redis_session_store_spec.rb
+- spec/active_support/cache/redis_store_spec.rb
 - spec/cache/merb/redis_store_spec.rb
-- spec/cache/rails/redis_store_spec.rb
 - spec/cache/sinatra/redis_store_spec.rb
+- spec/i18n/backend/redis_spec.rb
 - spec/rack/cache/entitystore/redis_spec.rb
 - spec/rack/cache/metastore/redis_spec.rb
-- spec/rack/session/redis_session_store_spec.rb
 - spec/rack/session/redis_spec.rb
-- spec/redis/distributed_marshaled_redis_spec.rb
+- spec/redis/distributed_store_spec.rb
 - spec/redis/factory_spec.rb
-- spec/redis/marshaled_client_spec.rb
-- spec/redis_store/version_spec.rb
+- spec/redis/store/interface_spec.rb
+- spec/redis/store/marshalling_spec.rb
+- spec/redis/store/namespace_spec.rb
+- spec/redis/store/version_spec.rb
 - spec/spec_helper.rb

data/lib/redis/distributed_marshaled.rb

@@ -1,28 +0,0 @@
-class Redis
-  class DistributedMarshaled < Distributed
-    attr_reader :ring
-
-    def initialize(addresses)
-      nodes = addresses.map do |address|
-        MarshaledClient.new address
-      end
-      @ring = Redis::HashRing.new nodes
-    end
-
-    def nodes
-      ring.nodes
-    end
-
-    def marshalled_set(key, val, options = nil)
-      node_for(key).marshalled_set(key, val, options)
-    end
-
-    def marshalled_get(key, options = nil)
-      node_for(key).marshalled_get(key, options)
-    end
-
-    def marshalled_setnx(key, value, options = nil)
-      node_for(key).marshalled_setnx(key, value, options)
-    end
-  end
-end

data/lib/redis/marshaled_client.rb

@@ -1,65 +0,0 @@
-class Redis
-  class MarshaledClient < self
-    def marshalled_set(key, val, options = nil)
-      val = marshal_value(val, options)
-      if ttl = expires_in(options)
-        setex key, ttl, val
-      else
-        set key, val
-      end
-    end
-
-    def marshalled_setnx(key, val, options = nil)
-      val = marshal_value(val, options)
-      if expires_in = expires_in(options)
-        setnx_with_expire key, val, expires_in
-      else
-        setnx key, val
-      end
-    end
-
-    def setnx_with_expire(key, value, ttl)
-      multi do
-        setnx(key, val)
-        expire(key, expires_in)
-      end
-    end
-
-    def marshalled_get(key, options = nil)
-      result = @client.call(:get, key)
-      result = Marshal.load result if unmarshal?(result, options)
-      result
-    end
-
-    def marshalled_mget(*keys)
-      options = keys.flatten.pop if keys.flatten.last.is_a?(Hash)
-      mget(*keys).map do |result|
-        unmarshal?(result, options) ? Marshal.load(result) : result
-      end
-    end
-
-    def to_s
-      "Redis Client connected to #{@client.host}:#{@client.port} against DB #{@client.db}"
-    end
-
-    private
-      def marshal_value(val, options)
-        raw?(options) ? val : Marshal.dump(val)
-      end
-
-      def unmarshal?(result, options)
-        result && result.size > 0 && !raw?(options)
-      end
-
-      def raw?(options)
-        options && options[:raw]
-      end
-
-      def expires_in(options)
-        if options
-          # Rack::Session           Merb                    Rails/Sinatra
-          options[:expire_after] || options[:expires_in] || options[:expire_in]
-        end
-      end
-  end
-end

data/lib/redis_store/version.rb

@@ -1,10 +0,0 @@
-module ::RedisStore
-  module VERSION #:nodoc:
-    MAJOR = 1
-    MINOR = 0
-    TINY  = 0
-    BUILD = "beta2"
-
-    STRING = [MAJOR, MINOR, TINY, BUILD].join('.')
-  end
-end

data/spec/rack/session/redis_session_store_spec.rb

@@ -1,75 +0,0 @@
-require File.join(File.dirname(__FILE__), "/../../spec_helper")
-RAILS_SESSION_STORE_CLASS = ::RedisStore.rails3? ? ActionDispatch::Session::RedisSessionStore : ActionController::Session::RedisSessionStore
-
-describe RAILS_SESSION_STORE_CLASS do
-  attr_reader :app
-
-  before :each do
-    @app = Object.new
-    @store  = RAILS_SESSION_STORE_CLASS.new(app)
-    @dstore = RAILS_SESSION_STORE_CLASS.new app, :servers => ["localhost:6380/1", "localhost:6381/1"]
-    @rabbit = OpenStruct.new :name => "bunny"
-    @white_rabbit = OpenStruct.new :color => "white"
-    with_store_management do |store|
-      class << store
-        attr_reader :pool
-        public :get_session, :set_session
-      end
-      store.set_session({'rack.session.options' => {}}, "rabbit", @rabbit)
-      store.pool.del "counter"
-      store.pool.del "rub-a-dub"
-    end
-  end
-
-  it "should accept connection params" do
-    redis = instantiate_store
-    redis.to_s.should == "Redis Client connected to 127.0.0.1:6379 against DB 0"
-
-    redis = instantiate_store :servers => "localhost"
-    redis.to_s.should == "Redis Client connected to localhost:6379 against DB 0"
-
-    redis = instantiate_store :servers => "localhost:6380"
-    redis.to_s.should == "Redis Client connected to localhost:6380 against DB 0"
-
-    redis = instantiate_store :servers => "localhost:6380/13"
-    redis.to_s.should == "Redis Client connected to localhost:6380 against DB 13"
-  end
-
-  it "should instantiate a ring" do
-    store = instantiate_store
-    store.should be_kind_of(Redis::MarshaledClient)
-    store = instantiate_store :servers => ["localhost:6379/0", "localhost:6379/1"]
-    store.should be_kind_of(Redis::DistributedMarshaled)
-  end
-
-  it "should read the data" do
-    with_store_management do |store|
-      store.get_session({}, "rabbit").should === ["rabbit", @rabbit]
-    end
-  end
-
-  it "should write the data" do
-    with_store_management do |store|
-      store.set_session({"rack.session.options" => {}}, "rabbit", @white_rabbit)
-      store.get_session({}, "rabbit").should === ["rabbit", @white_rabbit]
-    end
-  end
-
-  it "should write the data with expiration time" do
-    with_store_management do |store|
-      store.set_session({"rack.session.options" => {:expires_in => 1.second}}, "rabbit", @white_rabbit)
-      store.get_session({}, "rabbit").should === ["rabbit", @white_rabbit]; sleep 2
-      store.get_session({}, "rabbit").should === ["rabbit", {}]
-    end
-  end
-
-  private
-    def instantiate_store(params={})
-      RAILS_SESSION_STORE_CLASS.new(app, params).instance_variable_get(:@pool)
-    end
-
-    def with_store_management
-      yield @store
-      yield @dstore
-    end
-end

data/spec/redis/distributed_marshaled_redis_spec.rb

@@ -1,33 +0,0 @@
-require File.join(File.dirname(__FILE__), "/../spec_helper")
-
-describe "Redis::DistributedMarshaled" do
-  before(:each) do
-    @dmr = Redis::DistributedMarshaled.new [
-      {:host => "localhost", :port => "6380", :db => 0},
-      {:host => "localhost", :port => "6381", :db => 0}
-    ]
-    @rabbit = OpenStruct.new :name => "bunny"
-    @white_rabbit = OpenStruct.new :color => "white"
-    @dmr.marshalled_set "rabbit", @rabbit
-  end
-
-  after(:all) do
-    @dmr.ring.nodes.each { |server| server.flushdb }
-  end
-
-  it "should accept connection params" do
-    dmr = Redis::DistributedMarshaled.new [ :host => "localhost", :port => "6380", :db => "1" ]
-    dmr.ring.nodes.size == 1
-    mr = dmr.ring.nodes.first
-    mr.to_s.should == "Redis Client connected to localhost:6380 against DB 1"
-  end
-
-  it "should set an object" do
-    @dmr.marshalled_set "rabbit", @white_rabbit
-    @dmr.marshalled_get("rabbit").should == @white_rabbit
-  end
-
-  it "should get an object" do
-    @dmr.marshalled_get("rabbit").should == @rabbit
-  end
-end

data/spec/redis/marshaled_client_spec.rb

@@ -1,83 +0,0 @@
-require File.join(File.dirname(__FILE__), "/../spec_helper")
-
-describe "Redis::MarshaledClient" do
-  before(:each) do
-    @store = Redis::MarshaledClient.new
-    @rabbit = OpenStruct.new :name => "bunny"
-    @white_rabbit = OpenStruct.new :color => "white"
-    @store.marshalled_set "rabbit", @rabbit
-    @store.del "rabbit2"
-  end
-
-  after :each do
-    @store.quit
-  end
-
-  it "should unmarshal an object on get" do
-    @store.marshalled_get("rabbit").should === @rabbit
-  end
-
-  it "should marshal object on set" do
-    @store.marshalled_set "rabbit", @white_rabbit
-    @store.marshalled_get("rabbit").should === @white_rabbit
-  end
-
-  if RUBY_VERSION.match /1\.9/
-    it "should not unmarshal object on get if raw option is true" do
-      @store.marshalled_get("rabbit", :raw => true).should == "\x04\bU:\x0FOpenStruct{\x06:\tnameI\"\nbunny\x06:\rencoding\"\rUS-ASCII"
-    end
-  else
-    it "should not unmarshal object on get if raw option is true" do
-      @store.marshalled_get("rabbit", :raw => true).should == "\004\bU:\017OpenStruct{\006:\tname\"\nbunny"
-    end
-  end
-
-  it "should not marshal object on set if raw option is true" do
-    @store.marshalled_set "rabbit", @white_rabbit, :raw => true
-    @store.marshalled_get("rabbit", :raw => true).should == %(#<OpenStruct color="white">)
-  end
-
-  it "should not unmarshal object if getting an empty string" do
-    @store.marshalled_set "empty_string", ""
-    lambda { @store.marshalled_get("empty_string").should == "" }.should_not raise_error
-  end
-
-  it "should not set an object if already exist" do
-    @store.marshalled_setnx "rabbit", @white_rabbit
-    @store.marshalled_get("rabbit").should === @rabbit
-  end
-
-  it "should marshal object on set_unless_exists" do
-    @store.marshalled_setnx "rabbit2", @white_rabbit
-    @store.marshalled_get("rabbit2").should === @white_rabbit
-  end
-
-  it "should not marshal object on set_unless_exists if raw option is true" do
-    @store.marshalled_setnx "rabbit2", @white_rabbit, :raw => true
-    @store.marshalled_get("rabbit2", :raw => true).should == %(#<OpenStruct color="white">)
-  end
-
-  it "should unmarshal object(s) on multi get" do
-    @store.marshalled_set "rabbit2", @white_rabbit
-    rabbit, rabbit2 = @store.marshalled_mget "rabbit", "rabbit2"
-    rabbit.should  == @rabbit
-    rabbit2.should == @white_rabbit
-  end
-
-  if RUBY_VERSION.match /1\.9/
-    it "should not unmarshal object(s) on multi get if raw option is true" do
-      @store.marshalled_set "rabbit2", @white_rabbit
-      rabbit, rabbit2 = @store.marshalled_mget "rabbit", "rabbit2", :raw => true
-      rabbit.should  == "\x04\bU:\x0FOpenStruct{\x06:\tnameI\"\nbunny\x06:\rencoding\"\rUS-ASCII"
-      rabbit2.should == "\x04\bU:\x0FOpenStruct{\x06:\ncolorI\"\nwhite\x06:\rencoding\"\rUS-ASCII"
-    end
-  else
-    it "should not unmarshal object(s) on multi get if raw option is true" do
-      @store.marshalled_set "rabbit2", @white_rabbit
-      rabbit, rabbit2 = @store.marshalled_mget "rabbit", "rabbit2", :raw => true
-      rabbit.should  == "\004\bU:\017OpenStruct{\006:\tname\"\nbunny"
-      rabbit2.should == "\004\bU:\017OpenStruct{\006:\ncolor\"\nwhite"
-    end
-  end
-end
-