akdubya-cushion 0.6.1 → 0.6.2

data/lib/cushion.rb

@@ -21,7 +21,7 @@ def Cushion!(dbname, opts = {})
 end
 
 module Cushion
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 
   class << self
 

data/lib/cushion/database.rb

@@ -236,7 +236,7 @@ module Cushion
       if opts.empty? && (id == dest_id)
         opts = { :rev => src.headers[:etag] }
       end
-      res = attach(dest_id, new_filename, src, { :headers => headers }.merge(opts))
+      res = attach(dest_id, new_filename, src, headers.merge(opts))
       if id == dest_id
         res.merge("src_rev" => res["rev"])
       else

data/lib/cushion/utils/moneta.rb

@@ -0,0 +1,89 @@
+require 'cushion'
+require 'moneta'
+
+module Moneta
+  class Cushion
+    class Expiration
+      def initialize(db)
+        @db = db
+      end
+
+      def [](key)
+        if obj = get(key)
+          Time.parse(obj[:expires]) if obj[:expires]
+        end
+      end
+
+      def []=(key, value)
+        obj = get(key)
+        obj[:expires] = value
+        obj.save
+      end
+
+      def delete(key)
+        obj = get(key)
+        obj[:expires] = nil
+        obj.save
+      end
+
+      private
+      def get(key)
+        @db.doc(key) rescue nil
+      end
+    end
+
+    def initialize(options = {})
+      @db = Cushion!(options.delete(:dbname), options)
+      @expiration = Expiration.new(@db)
+    end
+
+    module Implementation
+      def key?(key)
+        @db.key?(key)
+      end
+
+      def has_key?(key)
+        @db.has_key?(key)
+      end
+
+      def [](key)
+        obj = @db.doc(key)
+        obj && obj[:value]
+      rescue
+      end
+
+      def []=(key, value)
+        obj = @db.doc(key) rescue nil
+        if obj
+          obj[:value] = value
+          obj.save
+        else
+          @db.store('_id' => key, 'value' => value)
+        end
+      end
+
+      def fetch(key, default)
+        self[key] || default
+      end
+
+      def delete(key)
+        obj = @db.doc(key)
+        obj.destroy
+        obj[:value]
+      rescue
+      end
+
+      def store(key, value, options = {})
+        self[key] = value
+      end
+
+      def clear
+        docs = @db.all['rows'].map { |row| { '_id' => row['id'],
+            '_rev' => row['value']['rev'], '_deleted' => true } }
+        @db.bulk(docs, :use_uuids => false)
+      end
+    end
+    include Implementation
+    include Expires
+  end
+end

data/spec/moneta_spec.rb

@@ -0,0 +1,138 @@
+begin
+  require File.dirname(File.dirname(__FILE__)) + '/lib/cushion/utils/moneta'
+  MONETA_AVAILABLE = true
+rescue LoadError
+  puts "You need the Moneta gem to run the Moneta tests."
+  MONETA_AVAILABLE = false
+end
+
+shared "a read/write Moneta cache" do
+  it "reads from keys like a Hash" do
+    @cache["key"].should == nil
+  end
+
+  it "writes to a key like a Hash" do
+    @cache["key"] = "value"
+    @cache["key"].should == "value"
+  end
+
+  it "specifies that it is writable via frozen?" do
+    @cache.should.not.be.frozen
+  end
+
+  it "if a key is not available, returns false from key?" do
+    @cache.key?("key").should.be.false
+  end
+
+  it "if a key is available, returns true from key?" do
+    @cache["key"] = "value"
+    @cache.key?("key").should.be.true
+  end
+
+  it "if it exists, removes and return an element from the backing store via delete" do
+    @cache["key"] = "value"
+    @cache.delete("key").should == "value"
+    @cache.key?("key").should.be.false
+  end
+
+  it "if it does not exists, returns nil from delete" do
+    @cache.delete("key").should.be.nil
+  end
+
+  it "removes all keys from the store with clear" do
+    @cache["key"] = "value"
+    @cache["key2"] = "value2"
+    @cache.clear
+    @cache.key?("key").should.not.be.true
+    @cache.key?("key2").should.not.be.true
+  end
+
+  it "fetches a key with a default value with fetch, if the key is not available" do
+    @cache.fetch("key", "value").should == "value"
+  end
+
+  it "fetches a key with a default value with fetch, if the key is available" do
+    @cache["key"] = "value2"
+    @cache.fetch("key", "value").should == "value2"
+  end
+
+  it "stores values with #store" do
+    @cache.store("key", "value")
+    @cache["key"].should == "value"
+  end
+
+  describe "when storing values with #store, and providing an expiration" do
+    before do
+      @cache.store("key", "value", :expires_in => 2)
+    end
+
+    shared "not expired" do
+      it "still has the key" do
+        @cache.key?("key").should.be.true
+      end
+
+      it "returns the value when indexed" do
+        @cache["key"].should == "value"
+      end
+
+      it "returns the value when fetched" do
+        @cache.fetch("key", "value2").should == "value"
+      end
+
+      it "returns the value when deleted" do
+        @cache.delete("key").should == "value"
+      end
+    end
+
+    describe "when expired" do
+      before do
+        if @native_expires
+          sleep 2
+        else
+          time = Time.now
+          Time.stub!(:now).and_return { time + 2 }
+        end
+      end
+
+      it "no longer has the key" do
+        @cache.key?("key").should.be.false
+      end
+
+      it "returns nil when indexed" do
+        @cache["key"].should == nil
+      end
+
+      it "returns the default value when fetched" do
+        @cache.fetch("key", "value2").should == "value2"
+      end
+
+      it "returns nil when deleting the expired key" do
+        @cache.delete("key").should == nil
+      end
+    end
+
+    describe "when not expired" do
+      behaves_like "not expired"
+    end
+
+    describe "after updating the expiry with update_key, and waiting for the initial expiry to pass" do
+      before do
+        @cache.update_key("key", :expires_in => 2)
+      end
+
+      behaves_like "not expired"
+    end
+  end
+end
+
+if MONETA_AVAILABLE
+  describe "Moneta::Cushion" do
+    before do
+      @cache = Moneta::Cushion.new(:dbname => :moneta_test)
+      @cache.clear
+      @native_expires = true # => Getting around stubbing issue
+    end
+
+    behaves_like "a read/write Moneta cache"
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: akdubya-cushion
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors: 
 - Aleksander Williams
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-07 00:00:00 -08:00
+date: 2009-03-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,6 +36,8 @@ files:
 - LICENSE
 - lib/cushion
 - lib/cushion/database.rb
+- lib/cushion/utils
+- lib/cushion/utils/moneta.rb
 - lib/cushion/design.rb
 - lib/cushion/server.rb
 - lib/cushion/document.rb
@@ -44,6 +46,7 @@ files:
 - spec/server_spec.rb
 - spec/document_spec.rb
 - spec/database_spec.rb
+- spec/moneta_spec.rb
 - spec/helpers.rb
 - spec/cushion_spec.rb
 has_rdoc: true