itrigga-cache 0.3.0 → 1.1.0

data/.rvmrc

@@ -0,0 +1 @@
+rvm use ruby-1.9.2-p290@itrigga-cache --create

data/Gemfile

@@ -5,12 +5,28 @@ source "http://rubygems.org"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
-gem "memcached"
+
 gem "itrigga-param_fu"
+gem "itrigga-core_ext"
+
+gem "bundler", ">= 1.0.0"
 
+# Add dependencies to develop your gem here.
+# Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "rspec", "1.3.0"
-  gem "bundler", "~> 1.0.0"
+  gem "rspec-rails", "1.3.2"
+  gem "bundler", ">= 1.0.0"
   gem "jeweler", "~> 1.6.4"
   gem "rcov", ">= 0"
+  gem "fastercsv", ">= 1.5.4"
+end
+
+group :test do
+  gem "rspec", "1.3.0"
+  gem 'test-unit', '1.2.3' # needed by rspec if using ruby 1.9.X
+  gem "rspec-rails", "1.3.2"
+  gem "bundler", ">= 1.0.0"
+  gem "rcov", ">= 0"
+  gem "fastercsv", ">= 1.5.4"
 end

data/Gemfile.lock

@@ -1,24 +1,36 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    fastercsv (1.5.4)
     git (1.2.5)
-    itrigga-param_fu (0.0.1)
+    hoe (2.16.0)
+      rake (~> 0.8)
+    itrigga-core_ext (0.3.0)
+    itrigga-param_fu (0.4.2)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    memcached (1.3.5)
-    rake (0.8.7)
-    rcov (0.9.11)
+    rack (1.4.1)
+    rake (0.9.2.2)
+    rcov (1.0.0)
     rspec (1.3.0)
+    rspec-rails (1.3.2)
+      rack (>= 1.0.0)
+      rspec (>= 1.3.0)
+    test-unit (1.2.3)
+      hoe (>= 1.5.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
+  bundler (>= 1.0.0)
+  fastercsv (>= 1.5.4)
+  itrigga-core_ext
   itrigga-param_fu
   jeweler (~> 1.6.4)
-  memcached
   rcov
   rspec (= 1.3.0)
+  rspec-rails (= 1.3.2)
+  test-unit (= 1.2.3)

data/Rakefile

@@ -27,6 +27,7 @@ Jeweler::Tasks.new do |gem|
 end
 Jeweler::RubygemsDotOrgTasks.new
 
+
 require 'spec/version'
 require 'spec/rake/spectask'
 require 'spec/ruby'

data/VERSION

@@ -1 +1 @@
-0.3.0
+1.1.0

data/itrigga-cache.gemspec

@@ -0,0 +1,72 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "itrigga-cache"
+  s.version = "1.0.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Al Davidson", "Anson Kelly"]
+  s.date = "2011-12-03"
+  s.description = "Wraps memcached with helpful methods"
+  s.email = "support@itrigga.com"
+  s.extra_rdoc_files = [
+    "LICENSE.txt",
+    "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+    ".rspec",
+    "Gemfile",
+    "Gemfile.lock",
+    "LICENSE.txt",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "lib/itrigga/cache.rb",
+    "lib/itrigga/cache/cache.rb",
+    "lib/itrigga/cache/filecache.rb",
+    "lib/itrigga/cache/memcache.rb",
+    "spec/filecache_spec.rb",
+    "spec/itrigga-cache_spec.rb",
+    "spec/memcache_spec.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb",
+    "support/singleton_reset.rb"
+  ]
+  s.homepage = "http://gemcutter.com/gems/itrigga-cache"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.10"
+  s.summary = "Adds caching methods"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<memcached>, [">= 0"])
+      s.add_runtime_dependency(%q<itrigga-param_fu>, [">= 0"])
+      s.add_runtime_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_runtime_dependency(%q<memcached>, [">= 0"])
+      s.add_runtime_dependency(%q<itrigga-param_fu>, [">= 0"])
+    else
+      s.add_dependency(%q<memcached>, [">= 0"])
+      s.add_dependency(%q<itrigga-param_fu>, [">= 0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_dependency(%q<memcached>, [">= 0"])
+      s.add_dependency(%q<itrigga-param_fu>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<memcached>, [">= 0"])
+    s.add_dependency(%q<itrigga-param_fu>, [">= 0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    s.add_dependency(%q<memcached>, [">= 0"])
+    s.add_dependency(%q<itrigga-param_fu>, [">= 0"])
+  end
+end
+

data/lib/itrigga/cache/cache.rb

@@ -1,4 +1,4 @@
-require 'memcached'
+
 require 'trigga/param_fu'
 
 module Itrigga
@@ -15,8 +15,11 @@ module Itrigga
     
     def self.setup!(opts ={})
       @default_cache_type = opts[:backend] if opts[:backend]
-      if opts[:backend] == :memcached
+      case opts[:backend]
+      when :memcached
         Itrigga::Cache::Memcache.setup!(opts)       
+      when :dalli
+        Itrigga::Cache::Dalli.setup!(opts)
       else
         Itrigga::Cache::Filecache.setup!(opts)
       end
@@ -26,6 +29,8 @@ module Itrigga
       case ( opts[:backend] ||= @default_cache_type )
         when :memcached          
           Itrigga::Cache::Memcache.instance
+        when :dalli          
+          Itrigga::Cache::Dalli.instance
         when :filecache
           Itrigga::Cache::Filecache.instance
         else

data/lib/itrigga/cache/dalli.rb

@@ -0,0 +1,55 @@
+# http://stackoverflow.com/questions/4217968/a-problem-about-singleton-in-ruby
+#
+#  To implement a backend it needs to respond to:
+#  - self.setup!
+#  - get
+#  - set
+#  - delete
+#
+
+require 'singleton'
+
+module Itrigga
+  module Cache
+
+    class Dalli
+      include Singleton
+        
+        attr_accessor :cache, :enabled
+        
+        def initialize
+          @cache = nil
+        end
+      
+        def self.setup!(opts = {})
+          servers = opts[:servers] || "localhost:11211"
+          opts.delete(:servers)
+          
+          opts[:default_ttl] ||= opts[:timeout] if opts[:timeout] # rename default_ttl to something easier to use
+          opts.delete(:timeout)
+          instance.enabled = true
+          
+          puts "Dalli client init with: #{servers.inspect} - #{opts.inspect}"
+          instance.cache = ::Dalli::Client.new(servers, opts)   
+        end    
+        
+        def get(key, opts = {})
+          cache.get key
+        end
+        
+        def set(key, value, opts = {})
+          if opts[:timeout]
+            cache.set key, value, opts[:timeout]
+          else
+            cache.set key, value
+          end
+        end
+        
+        def delete(key, opts = {})
+          cache.delete key
+        end
+        
+      end
+
+  end
+end

data/spec/dalli_spec.rb

@@ -0,0 +1,73 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Itrigga::Cache::Memcache do
+  before do
+    Itrigga::Cache::Dalli.reset_instance
+    ::Dalli = Module.new unless defined?(::Dalli)
+    ::Dalli::Client = Module.new unless defined?(::Dalli::Client)
+    ::Dalli::Client.stub!(:new).and_return(@memcached = mock("Memcached"))
+    @instance = Itrigga::Cache::Dalli.instance
+  end
+  
+  it "should include Singleton" do
+    Itrigga::Cache::Dalli.should include Singleton
+  end
+
+  describe "setup!" do
+    it "should call Dalli::Client.new with default server" do
+      Dalli::Client.should_receive(:new).with("localhost:11211",{})
+      Itrigga::Cache::Dalli.setup!
+    end
+
+    it "should call Dalli::Client.new with given server" do
+      Dalli::Client.should_receive(:new).with("funky monkeys",{:abc => 123})
+      Itrigga::Cache::Dalli.setup!(:servers => "funky monkeys", :abc => 123)
+    end
+    
+    it "should call Dalli::Client.new with timeout" do
+      Dalli::Client.should_receive(:new).with("funky monkeys",{:default_ttl => 42})
+      Itrigga::Cache::Dalli.setup!(:servers => "funky monkeys", :timeout => 42)
+    end
+    
+    it "should call Dalli::Client.new with timeout" do
+      Dalli::Client.should_receive(:new).with("funky monkeys",{:default_ttl => 42})
+      Itrigga::Cache::Dalli.setup!(:servers => "funky monkeys", :default_ttl => 42)
+    end
+    
+    it "should assign the memcached instance" do
+      Itrigga::Cache::Dalli.setup!(:servers => "funky monkeys", :default_ttl => 42)
+      Itrigga::Cache::Dalli.instance.cache.should == @memcached
+    end
+  end
+  
+  
+  describe "instance_methods" do
+    before do
+      @instance.stub!(:cache).and_return(@cache = mock("Memcached"))
+    end
+  
+  
+    describe "get" do
+      it "should call cache.get" do
+        @cache.should_receive(:get).with("key")
+        @instance.get("key")
+      end
+    end
+    
+    describe "set" do
+      it "should call cache.set" do
+         @cache.should_receive(:set).with("key","content",42)
+        @instance.set("key","content",{:timeout => 42})
+      end
+    end
+    
+    describe "delete" do
+      it "should call cache.delete" do
+        @cache.should_receive(:delete).with("key")
+        @instance.delete("key")
+      end
+    end
+  
+  end
+  
+end

data/spec/itrigga-cache_spec.rb

@@ -20,6 +20,10 @@ end
 
 describe Itrigga::Cache do
   before do
+    
+    Memcached = Module.new unless defined?(Memcached)
+    Memcached::NotFound = Class.new unless defined?(Memcached::NotFound)
+    
     Itrigga::Cache.setup!(:backend=>:filecache)
     @klass = TriggaCacheTestClass.new
     @klass.stub!(:cache_log) # stub out the logging method in tests

data/spec/memcache_spec.rb

@@ -3,6 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 describe Itrigga::Cache::Memcache do
   before do
     Itrigga::Cache::Memcache.reset_instance
+    ::Memcached = Module.new unless defined?(::Memcached) 
     ::Memcached.stub!(:new).and_return(@memcached = mock("Memcached"))
     @instance = Itrigga::Cache::Memcache.instance
   end

data/spec/spec_helper.rb

@@ -4,12 +4,11 @@ RAILS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 
 $LOAD_PATH.unshift(File.join(RAILS_ROOT, 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'memcached'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
 Dir["#{RAILS_ROOT}/support/**/*.rb"].each {|f| require f }
 
-require 'lib/itrigga/cache'
+require 'itrigga/cache'
 
 

metadata

@@ -4,10 +4,10 @@ version: !ruby/object:Gem::Version
   hash: 19
   prerelease: 
   segments: 
+  - 1
+  - 1
   - 0
-  - 3
-  - 0
-  version: 0.3.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Al Davidson
@@ -16,13 +16,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-20 00:00:00 +01:00
-default_executable: 
+date: 2012-03-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: memcached
-  type: :runtime
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -32,11 +28,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  prerelease: false
   name: itrigga-param_fu
+  prerelease: false
   type: :runtime
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -46,12 +42,28 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  name: itrigga-core_ext
+  prerelease: false
+  type: :runtime
   requirement: *id002
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: rspec
-  type: :development
   version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  name: bundler
+  prerelease: false
+  type: :runtime
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -62,15 +74,31 @@ dependencies:
         - 3
         - 0
         version: 1.3.0
-  requirement: *id003
+  name: rspec
+  prerelease: false
+  type: :development
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 3
+        - 2
+        version: 1.3.2
+  name: rspec-rails
   prerelease: false
-  name: bundler
   type: :development
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
         hash: 23
         segments: 
@@ -78,12 +106,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
+  name: bundler
   prerelease: false
-  name: jeweler
   type: :development
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -94,12 +122,12 @@ dependencies:
         - 6
         - 4
         version: 1.6.4
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
+  name: jeweler
   prerelease: false
-  name: rcov
   type: :development
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -108,12 +136,28 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id006
+  name: rcov
+  prerelease: false
+  type: :development
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 5
+        - 4
+        version: 1.5.4
+  name: fastercsv
   prerelease: false
-  name: memcached
-  type: :runtime
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: *id009
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -122,12 +166,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
+  name: memcached
   prerelease: false
-  name: itrigga-param_fu
   type: :runtime
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: *id010
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -136,7 +180,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id008
+  name: itrigga-param_fu
+  prerelease: false
+  type: :runtime
+  requirement: *id011
 description: Wraps memcached with helpful methods
 email: support@itrigga.com
 executables: []
@@ -149,23 +196,26 @@ extra_rdoc_files:
 files: 
 - .document
 - .rspec
+- .rvmrc
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.rdoc
 - Rakefile
 - VERSION
+- itrigga-cache.gemspec
 - lib/itrigga/cache.rb
 - lib/itrigga/cache/cache.rb
+- lib/itrigga/cache/dalli.rb
 - lib/itrigga/cache/filecache.rb
 - lib/itrigga/cache/memcache.rb
+- spec/dalli_spec.rb
 - spec/filecache_spec.rb
 - spec/itrigga-cache_spec.rb
 - spec/memcache_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - support/singleton_reset.rb
-has_rdoc: true
 homepage: http://gemcutter.com/gems/itrigga-cache
 licenses: 
 - MIT
@@ -195,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.2
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Adds caching methods