simple_cache_rs 0.11.1 → 0.12.1

data/lib/simple_cache/memcached_store.rb

@@ -0,0 +1,27 @@
+class SimpleCache::MemcachedStore
+  Marshal = ::SimpleCache::Marshal
+  
+  def initialize(url)
+    require "dalli"
+
+    uri = URI.parse(url)
+
+    @dc = Dalli::Client.new("#{uri.host}:#{uri.port}", :namespace => uri.path || "simple_cache", :compress => true)
+  end
+  
+  def fetch(key, &block)
+    value = @dc.get(key)
+    return Marshal.unmarshal(value) if value
+    return yield(self, key) if block
+    nil
+  end
+
+  def store(key, value, ttl = nil)
+    @dc.set(key, Marshal.marshal(value), ttl)
+    value
+  end
+
+  def clear
+    @dc.flush_all
+  end
+end

data/lib/simple_cache/null_store.rb

@@ -0,0 +1,12 @@
+class SimpleCache::NullStore
+  def clear
+  end
+  
+  def fetch(key, &block)
+    yield self, key if block_given?
+  end
+
+  def store(key, value, max_age = nil)
+    value
+  end
+end

data/lib/simple_cache/pg_store.rb

@@ -3,7 +3,7 @@ require "micro_sql"
 class SimpleCache::PgStore
   Marshal = ::SimpleCache::Marshal
   
-  TABLE_NAME = "simple_cache"
+  TABLE_NAME = "simple_cache2"
 
   attr :path
 
@@ -18,18 +18,18 @@ class SimpleCache::PgStore
 
   def fetch(key, &block)
     value = table[key]
-    return value if value
+    return Marshal.unmarshal(value) if value
     return yield(self, key) if block
     nil
   end
 
   def store(key, value, ttl = nil)
-    table.update(key, value, ttl)
+    table.update(key, Marshal.marshal(value), ttl)
     value
   end
 
   def clear
-    return unless @db.tables.include?(TABLE_NAME)
-    @db.ask "DELETE FROM #{TABLE_NAME}"
+    return unless @db.tables.include?(table.table_name)
+    @db.ask "DELETE FROM #{table.table_name}"
   end
 end

data/lib/simple_cache/sqlite_store.rb

@@ -1,9 +1,10 @@
 # A simplistic Sqlite database interface
 class SimpleCache::SqliteDatabase
-  def initialize(path)
+  def initialize(url)
     require "sqlite3"
 
-    FileUtils.mkdir_p File.dirname(@path)
+    path = URI.parse(url).path
+    FileUtils.mkdir_p File.dirname(path)
 
     @impl = SQLite3::Database.new(path)
     @prepared_queries = {}
@@ -27,9 +28,9 @@ class SimpleCache::SqliteStore < SimpleCache::SqliteDatabase
 
   def self.base_dir
     if RUBY_PLATFORM.downcase.include?("darwin")
-      "#{Dir.home}/Library/Cache"
+      "#{Dir.home}/Library/Caches/org.radiospiel.simple_cache"
     else
-      "#{Dir.home}/cache"
+      "#{Dir.home}/.org.radiospiel.simple_cache"
     end
   end
 

data/lib/simple_cache.rb

@@ -6,30 +6,32 @@ end
 
 require_relative "simple_cache/marshal"
 
+require_relative "simple_cache/memcached_store"
+require_relative "simple_cache/pg_store"
 require_relative "simple_cache/sqlite_store"
 require_relative "simple_cache/redis_store"
+require_relative "simple_cache/null_store"
 
 module SimpleCache
   def self.create_store(url)
-    expect! url => [ String, Redis, Redis::Namespace ]
-    case url 
-    when Redis, Redis::Namespace then
-      return SimpleCache::RedisStore.new(url)
-    when String
+    expect! url => [ "null:", nil, String, Redis, Redis::Namespace ]
+    
+    klass = case url 
+    when Redis, Redis::Namespace  then SimpleCache::RedisStore
+    when "null:", nil             then SimpleCache::NullStore
+    else
       uri = URI.parse(url)
+      expect! uri.scheme => [ nil, "redis", "sqlite", "pg", "memcached" ]
 
       case uri.scheme
-      when "redis"        then 
-        return SimpleCache::RedisStore.new(url)
-      when nil, "sqlite"  then 
-        return SimpleCache::SqliteStore.new(uri.path)
-      when "pg"
-        require_relative "simple_cache/pg_store"
-        return SimpleCache::PgStore.new(url)
-      else                
-        raise uri.scheme.inspect
+      when "redis"        then SimpleCache::RedisStore
+      when nil, "sqlite"  then SimpleCache::SqliteStore
+      when "pg"           then SimpleCache::PgStore
+      when "memcached"    then SimpleCache::MemcachedStore
       end
     end
+
+    klass.new url
   end
   
   def self.new(url)

data/test/memcache_store_test.rb

@@ -0,0 +1,31 @@
+require_relative 'test_helper'
+
+class SimpleCache::MemcachedStoreTest < Test::Unit::TestCase
+  include SimpleCache::TestCase
+
+  def simple_cache
+    @simple_cache ||= begin
+      simple_cache = SimpleCache.new("memcached://localhost:11211/simple_cache_test")
+      simple_cache.clear
+      simple_cache
+    end
+  end
+  
+  def test_expiration
+    assert_equal("1", simple_cache.store("forever", "1"))
+    assert_equal("2", simple_cache.store("young", "2", 3))
+
+    # Timecop tests don't work here :(
+    #
+    # Timecop.freeze(Time.now + 10) do
+    #   assert_equal("1", simple_cache.fetch("forever"))
+    #   assert_equal(nil, simple_cache.fetch("young"))
+    # end
+  end
+  
+  def test_array
+    ary = %w(foo bar)
+    assert_equal(ary, simple_cache.store("ary", ary))
+    assert_equal(ary, simple_cache.fetch("ary"))
+  end
+end

data/test/null_store_test.rb

@@ -0,0 +1,15 @@
+require_relative 'test_helper'
+
+class SimpleCache::NullStoreTest < Test::Unit::TestCase
+  include SimpleCache::TestCase
+
+  URL = "null:"
+  
+  def simple_cache
+    @simple_cache ||= SimpleCache.new(URL).tap(&:clear)
+  end
+  
+  def teardown
+    @simple_cache.clear if @simple_cache
+  end
+end

data/test/pg_store_test.rb

@@ -4,7 +4,11 @@ class SimpleCache::PgStoreTest < Test::Unit::TestCase
   include SimpleCache::TestCase
 
   def simple_cache
-    @simple_cache ||= SimpleCache.new("pg://simple_cache:simple_cache@localhost/simple_cache_test").tap(&:clear)
+    @simple_cache ||= begin
+      simple_cache = SimpleCache.new("pg://simple_cache:simple_cache@localhost:5432/simple_cache_test")
+      simple_cache.clear
+      simple_cache
+    end
   end
   
   def test_expiration
@@ -15,4 +19,10 @@ class SimpleCache::PgStoreTest < Test::Unit::TestCase
       assert_equal(nil, simple_cache.fetch("young"))
     end
   end
+  
+  def test_array
+    ary = %w(foo bar)
+    assert_equal(ary, simple_cache.store("ary", ary))
+    assert_equal(ary, simple_cache.fetch("ary"))
+  end
 end

data/test/test_helper.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'bundler'
 begin
-  Bundler.setup(:default, :development)
+  Bundler.setup(:default, :development, :test)
 rescue Bundler::BundlerError => e
   $stderr.puts e.message
   $stderr.puts "Run `bundle install` to install missing gems"
@@ -27,7 +27,12 @@ module SimpleCache::TestCase
     assert_equal(nil, simple_cache.fetch("bar"))
 
     assert_equal("foo", simple_cache.store("bar", "foo"))
-    assert_equal("foo", simple_cache.fetch("bar"))
+
+    if simple_cache.is_a?(SimpleCache::NullStore)
+      assert_equal(nil, simple_cache.fetch("bar"))
+    else
+      assert_equal("foo", simple_cache.fetch("bar"))
+    end
   end
   
   def test_simple_cache_expiration
@@ -35,7 +40,21 @@ module SimpleCache::TestCase
     assert_equal "baz", simple_cache.cached("key2") { done += 1; "baz" }
     assert_equal 1, done
     assert_equal "baz", simple_cache.cached("key2") { done += 1; "baz" }
+
+    if simple_cache.is_a?(SimpleCache::NullStore)
+      assert_equal 2, done
+    else
+      assert_equal 1, done
+    end
+  end
+
+  def test_simple_cache_clear
+    done = 0
+    assert_equal "baz", simple_cache.cached("test_simple_cache_expiration") { done += 1; "baz" }
     assert_equal 1, done
+    simple_cache.clear
+    assert_equal "baz", simple_cache.cached("test_simple_cache_expiration") { done += 1; "baz" }
+    assert_equal 2, done
   end
   
   def test_simple_cache_store_and_fetch

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_cache_rs
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.12.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-01 00:00:00.000000000 Z
+date: 2013-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: expectation
-  requirement: &70272344276440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70272344276440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70272344248420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70272344248420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70272344243080 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70272344243080
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: micro_sql
-  requirement: &70272344242040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +69,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70272344242040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A sensibly fast, yet simplistic sqlite- or redis-based cache.
 email: eno@radiospiel.org
 executables: []
@@ -62,6 +82,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/simple_cache/marshal.rb
+- lib/simple_cache/memcached_store.rb
+- lib/simple_cache/null_store.rb
 - lib/simple_cache/pg_store.rb
 - lib/simple_cache/redis_store.rb
 - lib/simple_cache/sqlite_store.rb
@@ -117,7 +139,9 @@ files:
 - test/coverage/assets/0.5.3/smoothness/jquery-ui-1.8.4.custom.css
 - test/coverage/assets/0.5.3/stylesheet.css
 - test/coverage/index.html
+- test/memcache_store_test.rb
 - test/memoize_test.rb
+- test/null_store_test.rb
 - test/pg_store_test.rb
 - test/redis_store_test.rb
 - test/simple_cache_test.rb
@@ -137,7 +161,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3223836389259576757
+      hash: -4118416796349753026
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -146,10 +170,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3223836389259576757
+      hash: -4118416796349753026
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A sensibly fast, yet simplistic sqlite- or redis-based cache.