honkster-bin 0.6.3.3 → 0.6.3.4

data/Rakefile

@@ -9,10 +9,6 @@ namespace :spec do
     t.verbose = true
   end
 
-  task :as2 do
-    sh 'ACTIVE_SUPPORT_VERSION="<= 2.3.8" rake spec:all'
-  end
-
   task :as3 do
     sh 'ACTIVE_SUPPORT_VERSION=">= 3.0.0.beta3" rake spec:all'
   end
@@ -20,7 +16,6 @@ end
 
 desc 'Runs all specs against Active Support 2 and 3'
 task :spec do
-  Rake::Task['spec:as2'].invoke
   Rake::Task['spec:as3'].invoke
 end
 

data/lib/bin/store.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 module Bin
-  class Store < Compatibility
+  class Store < ActiveSupport::Cache::Store
     attr_reader :collection, :options
 
     def initialize(collection, options={})
@@ -11,23 +11,21 @@ module Bin
       @expires_in ||= options[:expires_in] || 1.year
     end
 
-    def write(key, value, options={})
+    def write_entry(key, entry, options={})
       key = key.to_s
-      super do
-        expires = Time.now.utc + ((options && options[:expires_in]) || expires_in)
-        raw     = !!options[:raw]
-        value   = raw ? value : BSON::Binary.new(Marshal.dump(value))
-        doc     = {:_id => key, :value => value, :expires_at => expires, :raw => raw}
-        collection.save(doc)
-      end
+      value = entry.value
+      expires = Time.now.utc + ((options && options[:expires_in]) || expires_in)
+      raw     = !!options[:raw]
+      value   = raw ? value : BSON::Binary.new(Marshal.dump(value))
+      doc     = {:_id => key, :value => value, :expires_at => expires, :raw => raw}
+      collection.save(doc)
     end
     alias_method :write_entry, :write
 
-    def read(key, options=nil)
-      super do
-        if doc = collection.find_one(:_id => key.to_s, :expires_at => {'$gt' => Time.now.utc})
-          doc['raw'] ? doc['value'] : Marshal.load(doc['value'].to_s)
-        end
+    def read_entry(key, options=nil)
+      if doc = collection.find_one(:_id => key.to_s, :expires_at => {'$gt' => Time.now.utc})
+        value = doc['raw'] ? doc['value'] : Marshal.load(doc['value'].to_s)
+        value.is_a?(ActiveSupport::Cache::Entry) ? value : ActiveSupport::Cache::Entry.new(value, options)
       end
     end
     alias_method :read_entry, :read
@@ -39,9 +37,11 @@ module Bin
     end
 
     def delete_matched(matcher, options=nil)
-      super do
-        collection.remove(:_id => matcher)
-      end
+      collection.remove(:_id => matcher)
+    end
+
+    def delete_entry(key, options)
+      collection.remove(:_id => key.to_s)
     end
 
     def exist?(key, options=nil)
@@ -51,15 +51,11 @@ module Bin
     end
 
     def increment(key, amount=1)
-      super do
-        counter_key_upsert(key, amount)
-      end
+      counter_key_upsert(key, amount)
     end
 
     def decrement(key, amount=1)
-      super do
-        counter_key_upsert(key, -amount.abs)
-      end
+      counter_key_upsert(key, -amount.abs)
     end
 
     def clear

data/lib/bin/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module Bin
-  Version = '0.6.3.3'
+  Version = '0.6.3.4'
 end

data/lib/bin.rb

@@ -4,7 +4,6 @@ require 'active_support/version'
 require 'mongo'
 
 module Bin
-  autoload :Compatibility, 'bin/compatibility'
   autoload :Store,         'bin/store'
   autoload :Version,       'bin/version'
 end

data/spec/bin/store_spec.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require File.expand_path("#{File.dirname(__FILE__)}/../helper")
 
 describe Bin::Store do
   before(:each) do

data/spec/bin_spec.rb

@@ -5,10 +5,6 @@ describe Bin do
     lambda { Bin::Store }.should_not raise_error(NameError)
   end
 
-  it "autoloads Compatibility" do
-    lambda { Bin::Compatibility }.should_not raise_error(NameError)
-  end
-
   it "autoloads Version" do
     lambda { Bin::Version }.should_not raise_error(NameError)
   end

data/spec/helper.rb

@@ -1,4 +1,6 @@
-gem 'activesupport', ENV['ACTIVE_SUPPORT_VERSION']
+require "rubygems"
+require "bundler"
+Bundler.setup
 
 $:.unshift(File.expand_path('../../lib', __FILE__))
 
@@ -6,6 +8,6 @@ require 'bin'
 require 'spec'
 
 connection = Mongo::Connection.new
-DB = connection.db('bin-store-test')
+DB = connection.db('test')
 
 puts "\n--- Active Support Version: #{ActiveSupport::VERSION::STRING} ---\n"

metadata

@@ -2,7 +2,7 @@
 name: honkster-bin
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.3.3
+  version: 0.6.3.4
 platform: ruby
 authors: 
 - John Nunemaker
@@ -21,31 +21,75 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.1
+        version: 1.0.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: bson_ext
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "2.3"
+        version: 1.0.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: activesupport
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "3.0"
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: i18n
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.6.0
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
         version: 1.3.0
   type: :development
-  version_requirements: *id003
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: ruby-debug19
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.11.6
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: diff-lcs
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.1.2
+  type: :development
+  version_requirements: *id007
 description: 
 email: 
 - nunemaker@gmail.com
@@ -59,7 +103,6 @@ files:
 - lib/bin.rb
 - lib/bin/version.rb
 - lib/bin/store.rb
-- lib/bin/compatibility.rb
 - spec/bin/store_spec.rb
 - spec/helper.rb
 - spec/bin_spec.rb

data/lib/bin/compatibility.rb

@@ -1,41 +0,0 @@
-# encoding: UTF-8
-module Bin
-  class Compatibility < ActiveSupport::Cache::Store
-    def increment(key, amount=1)
-      yield
-    end
-
-    def decrement(key, amount=1)
-      yield
-    end
-  end
-
-  if ActiveSupport::VERSION::STRING < '3'
-    class Compatibility
-      def write(key, value, options=nil, &block)
-        super(key, value, options)
-        yield
-      end
-
-      def read(key, options=nil, &block)
-        super
-        yield
-      end
-
-      def delete(key, options=nil, &block)
-        super
-        yield
-      end
-
-      def delete_matched(matcher, options=nil, &block)
-        super
-        yield
-      end
-
-      def exist?(key, options=nil, &block)
-        super
-        yield
-      end
-    end
-  end
-end