dim-tokyo-cache-store 0.1.1 → 0.2.0

data/README

@@ -13,14 +13,14 @@ Overview
 
 Requirements
 
-  Tokyo Cabinet:   
+  Tokyo Cabinet:
   http://1978th.net/tokyocabinet/
 
   Tokyo Tyrant:   
   http://1978th.net/tokyotyrant/
 
-  (Fast) Ruby Bindings:  
-  sudo gem install actsasflinn-ruby-tokyotyrant --source=http://gems.github.com
+  Ruby Bindings:  
+  sudo gem install rufus-tokyo
 
 Installation
 

data/Rakefile

@@ -19,7 +19,7 @@ begin
     spec.authors = ["Dimitrij Denissenko"]
     spec.test_files = Dir.glob('spec/**')
     spec.add_dependency('activesupport', '>= 2.3.0')
-    spec.add_dependency('actsasflinn-ruby-tokyotyrant', '>= 0.2.0')
+    spec.add_dependency('rufus-tokyo', '>= 1.0.1')
   end
 rescue LoadError
   puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/lib/active_support/cache/tokyo_store.rb

@@ -1,26 +1,40 @@
-gem 'actsasflinn-ruby-tokyotyrant', '>= 0.2.0'
-require 'tokyo_tyrant'
+begin
+  gem 'actsasflinn-ruby-tokyotyrant', '>= 0.2.0'
+  require 'tokyo_tyrant'
+rescue LoadError
+  begin
+    require 'rufus/tokyo/tyrant'
+  rescue LoadError
+    warn "\n  WARNING: Unable to find required tokyo tyrant libraries."
+    warn "  Please install the rufus-tokyo GEM - sudo gem install rufus-tokyo\n"
+    raise
+  end
+end
 
 module ActiveSupport
   module Cache
     class TokyoStore < Store
     
-      def initialize(host = 'localhost', port = 1978)
+      def initialize(host = '127.0.0.1', port = 1978)
         super()
-        @data = ::TokyoTyrant::DB.new(host, port)
+        @data = if Object.const_defined?(:TokyoTyrant)
+          TokyoTyrant::DB.new(host, port)
+        else        
+          Rufus::Tokyo::Tyrant.new(host, port)
+        end
       end
       
       def read(key, options = nil)
         super
         @data[key]
-      rescue TokyoTyrantError 
+      rescue 
         nil
       end
   
       def write(key, value, options = nil)
         super
         @data[key] = value
-      rescue TokyoTyrantError 
+      rescue 
         nil
       end
   
@@ -31,12 +45,12 @@ module ActiveSupport
   
       def delete_matched(matcher, options = nil)
         super
-        @data.each_key { |k| @data.delete(k) if k =~ matcher }
+        @data.keys.each { |k| @data.delete(k) if k =~ matcher }
       end
   
       def exist?(key, options = nil)
         super
-        @data.key?(key)
+        not @data[key].nil?
       end
       
       def clear

data/spec/tokyo_cache_store_spec.rb

@@ -11,7 +11,7 @@ describe ActiveSupport::Cache::TokyoStore do
   
   before :all do
     `tchmgr create #{DB_FILE.to_str}`
-    `ttserver -dmn -le -pid #{PID_FILE.to_str} #{DB_FILE.to_str}`
+    `ttserver -dmn -le -port 45000 -pid #{PID_FILE.to_str} #{DB_FILE.to_str}`
   end
   
   after :all do
@@ -26,7 +26,7 @@ describe ActiveSupport::Cache::TokyoStore do
   end
   
   before do
-    @store = ActiveSupport::Cache::TokyoStore.new
+    @store = ActiveSupport::Cache::TokyoStore.new('127.0.0.1', 45000)
     @store.clear
     write 'A', 'B'
   end
@@ -41,8 +41,8 @@ describe ActiveSupport::Cache::TokyoStore do
     @store.write 'C', 'Plan C'
     @store.read('C').should == 'Plan C'
     
-    @store.delete('A').should be(true)
-    @store.delete('D').should be(false)    
+    @store.delete('A').should == 'Plan A'
+    @store.delete('D').should be_nil    
     @store.read('A').should be_nil
   end
 

data/tokyo-cache-store.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tokyo-cache-store}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dimitrij Denissenko"]
-  s.date = %q{2009-09-19}
+  s.date = %q{2009-09-20}
   s.description = %q{Tokyo Tyrant cache store for ActiveSupport/Rails.}
   s.email = %q{contact@dvisionfactory.com}
   s.extra_rdoc_files = [
@@ -42,13 +42,13 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, [">= 2.3.0"])
-      s.add_runtime_dependency(%q<actsasflinn-ruby-tokyotyrant>, [">= 0.2.0"])
+      s.add_runtime_dependency(%q<rufus-tokyo>, [">= 1.0.1"])
     else
       s.add_dependency(%q<activesupport>, [">= 2.3.0"])
-      s.add_dependency(%q<actsasflinn-ruby-tokyotyrant>, [">= 0.2.0"])
+      s.add_dependency(%q<rufus-tokyo>, [">= 1.0.1"])
     end
   else
     s.add_dependency(%q<activesupport>, [">= 2.3.0"])
-    s.add_dependency(%q<actsasflinn-ruby-tokyotyrant>, [">= 0.2.0"])
+    s.add_dependency(%q<rufus-tokyo>, [">= 1.0.1"])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dim-tokyo-cache-store
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors: 
 - Dimitrij Denissenko
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-19 00:00:00 -07:00
+date: 2009-09-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -23,14 +23,14 @@ dependencies:
         version: 2.3.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: actsasflinn-ruby-tokyotyrant
+  name: rufus-tokyo
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.2.0
+        version: 1.0.1
     version: 
 description: Tokyo Tyrant cache store for ActiveSupport/Rails.
 email: contact@dvisionfactory.com