mongo_cache_store 0.2.1 → 0.2.2

data/README.rdoc

@@ -50,6 +50,10 @@ configured or used.
             then serialize the entry. 
         [+:never+ - Never serialize]
             Only save the entry if it can be saved natively by MongoDB.
+    [+:collection_opts+]
+        Hash of options passed directly to MongoDB::Collection.
+               
+        Useful for write conditions and read preferences
 
 
 == Backends

data/lib/active_support/cache/mongo_cache_store.rb

@@ -2,6 +2,7 @@
 require "mongo_cache_store/version"
 require "mongo"
 require "active_support/cache"
+require "logger"
 
 module ActiveSupport
   module Cache
@@ -32,6 +33,10 @@ module ActiveSupport
       #             then serialize the entry. 
       #         [+:never+ - Never serialize]
       #             Only save the entry if it can be saved natively by MongoDB.
+      #     [+:collection_opts+ ]
+      #         Hash of options passed directly to MongoDB::Collection.
+      #           
+      #         Useful for write conditions and read preferences
       #
       # === Examples
       #     @store = ActiveSupport::Cache::MongoCacheStore.new(:TTL, :db => Mongo::DB.new('db_name',Mongo::Connection.new))
@@ -45,15 +50,19 @@ module ActiveSupport
           :db => nil,
           :namespace => nil,
           :connection => nil,
-          :serialize => :always
+          :serialize => :always,
+          :collection_opts => {}
         }.merge(options) 
 
         @db = options.delete :db
+        @logger = options.delete :logger
 
         if (@db.nil?)
           @db = Mongo::DB.new(options[:db_name], options[:connection] || Mongo::Connection.new)
         end 
 
+
+
         extend ActiveSupport::Cache::MongoCacheStore::Backend.const_get(backend)
 
         build_backend(options)
@@ -61,6 +70,23 @@ module ActiveSupport
         super(options)
 
       end
+
+      def logger
+        return @logger unless @logger.nil?
+
+        slogger = super
+        case
+        when !slogger.nil?
+          @logger = slogger
+        when defined?(Rails) && Rails.logger
+          @logger = Rails.logger
+        else
+          @logger = Logger.new(STDOUT)
+        end
+      
+        @logger
+      end
+  
     end
   end
 end

data/lib/active_support/cache/mongo_cache_store/backend/base.rb

@@ -61,7 +61,6 @@ module ActiveSupport
                 :serialized => serialize,
                 :value      => serialize ? BSON::Binary.new(entry.raw_value) : entry.value 
               }.merge(options[:xentry] || {})
-              #puts save_doc.inspect
 
               safe_rescue do
                 begin
@@ -88,11 +87,14 @@ module ActiveSupport
               name_parts = ['cache'] 
               name_parts.push(backend_name)
               name_parts.push options[:namespace] unless options[:namespace].nil?
-              return name_parts.join('.')
+              name = name_parts.join('.')
+              return name
             end
 
             def get_collection(options)
               return options[:collection] if options[:collection].is_a? Mongo::Collection
+
+              @db.collection(get_collection_name(options),options[:collection_opts])
             end
 
             def safe_rescue
@@ -100,7 +102,7 @@ module ActiveSupport
                 yield
               rescue => e
                 warn e
-                logger.error("FileStoreError (#{e}): #{e.message}") if logger 
+                logger.error("MongoCacheStoreError (#{e}): #{e.message}") if logger 
                 false
               end
             end

data/lib/active_support/cache/mongo_cache_store/backend/multi_ttl.rb

@@ -48,8 +48,6 @@ module ActiveSupport
         module MultiTTL
           include Base
 
-          alias :get_collection_prefix :get_collection_name
-
           def clear(options = {})
             @db.collection_names.each do |cname|
               prefix = get_collection_prefix
@@ -86,6 +84,7 @@ module ActiveSupport
                 ki.save({
                   :_id => key,
                   :collection => options[:collection].name,
+                  :expires_in => options[:expires_in].nil? ? nil : options[:expires_in].to_i,
                   :expires_at => entry.expires_at
                 })
               end
@@ -101,24 +100,36 @@ module ActiveSupport
 
           private 
 
+          alias :super_get_collection_name :get_collection_name
+
           def backend_name
             "multi_ttl"
           end
 
+
           def get_collection(options)
 
-            col = super 
+            col = @collection_map[get_collection_name(options)]
             return col unless col.nil?
 
+            col = super
+            expires_in = options[:expires_in]
+            col.ensure_index('created_at',{ expireAfterSeconds: expires_in.to_i }) unless expires_in.nil?
+            @collection_map[col.name] = col
+
+            return col
+          end
+
+          def get_collection_name(options)
             name_parts = [get_collection_prefix(options)]
             expires_in = options[:expires_in]
             name_parts.push expires_in.nil? ? 'forever' : expires_in.to_i
             collection_name = name_parts.join('.')
+            return collection_name
+          end
 
-            collection = @collection_map[collection_name]
-
-            collection ||= create_collection(collection_name, expires_in) 
-            return collection
+          def get_collection_prefix(options = {})
+            super_get_collection_name(options)
           end
 
 
@@ -132,6 +143,7 @@ module ActiveSupport
             return col
           end
 
+
           def get_collection_from_index(key,options)
             if (options[:use_index])
               ki  = get_key_index_collection(options)
@@ -142,19 +154,14 @@ module ActiveSupport
                 })
                 return nil if response.nil?
 
-                return @db[response['collection']]
+                options[:expires_in] = response['expires_in']
+                return get_collection(options)
               end
             end
             nil
           end
 
 
-          def create_collection(name, expires_in)
-            collection = @db[name]
-            collection.ensure_index('created_at',{ expireAfterSeconds: expires_in.to_i }) unless expires_in.nil?
-            return collection
-          end
-
           def build_backend(options)
             options.replace({
               :use_index => true

data/lib/active_support/cache/mongo_cache_store/backend/standard.rb

@@ -54,9 +54,6 @@ module ActiveSupport
             "standard"
           end
 
-          def get_collection(options)
-            @db[get_collection_name(options)]
-          end
 
           def write_entry(key, entry, options)
             ret = super

data/lib/active_support/cache/mongo_cache_store/backend/ttl.rb

@@ -58,9 +58,6 @@ module ActiveSupport
           def get_collection(options)
             return @collection if @collection.is_a? Mongo::Collection
             collection = super 
-            return collection unless collection.nil?
-
-            collection = @db[get_collection_name(options)]
             collection.ensure_index('expires_at',{ expireAfterSeconds: 0 })
             @collection = collection
           end

data/lib/mongo_cache_store/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module MongoCacheStore
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/active_support/cache/mongo_cache_store_spec.rb

@@ -154,6 +154,25 @@ module ActiveSupport
             @store = ActiveSupport::Cache::MongoCacheStore.new(:Standard, :db => db, :serialize => :on_fail)
           end
         end
+
+        describe "Pass Collection Options" do
+          before(:all) do
+            db = Mongo::DB.new('mongo_cache_store_test', Mongo::Connection.new)
+            @store = ActiveSupport::Cache::MongoCacheStore.new(
+              :Standard, 
+              :db => db, 
+              :collection_opts => {
+                :read => :nearest
+              }
+            )
+          end
+
+          it "can set collection opts" do
+            col = @store.send(:get_collection,{:collection_opts => {:read => :nearest}})
+            col.instance_eval { @read }.should == :nearest
+          end
+
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo_cache_store
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-14 00:00:00.000000000 Z
+date: 2013-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo