mongo_store 0.2.1 → 0.3.0

data/.rspec

@@ -0,0 +1,2 @@
+--format documentation
+--color

data/History.markdown

@@ -0,0 +1,34 @@
+0.3.0 / 2010-08-30 
+==================
+  * We have a History file now
+  * Converted license to Don't Be a Dick License v0.2
+  * Updated README
+  * Removed 'key' field; using '_id' instead (thanks wpiekutowski)
+  * Added namespace support to Rails 2 methods
+  * Finished Rails 3 fixes, added more specs
+  * Replace Entry with explicit ActiveSupport::Cache::Entry (thanks openhood)
+  * Updating for Rails2/Rails3 compatibility (thanks openhood)
+  * Fix working with Rails 3
+  * Updating specs for RSpec 2
+
+0.2.1 / 2010-04-13
+==================
+* Updated for Mongo gem 0.20.1 compatibility
+
+0.2.0 / 2010-03-06
+==================
+* Provided a proper README.
+* Rewrote initialization and made options more flexible. Added #clean_expired 
+* Moved specs around
+* Fixed error on 'nil' options being passed from Rails
+* Fixing load paths for Rails
+* Fixing path loading for Rails
+* Embedding proper path
+
+0.1.0 / 2010-03-06
+==================
+* All necessary methods implemented now
+* Basic cache operations complete
+* Collections work
+* Docs started and dependencies
+* Initial commit to mongo_store.

data/LICENSE.markdown

@@ -0,0 +1,113 @@
+The Don't Be a Dick License
+===========================
+_version 0.2_
+
+**Project:** [MongoStore](http://github.com/SFEley/mongo_store)   
+**Author:** Stephen Eley (<sfeley@gmail.com>)
+
+This is a proposed draft of the **Don't Be a Dick** license for open source projects.  The purpose of this license is to permit the broadest feasible scope for reuse and modification of creative work, restricted only by the requirement that one is not a dick about it.
+
+1. Legal Parameters
+-------------------
+For legal purposes, the DBAD license is a superset of the [Apache License, Version 2.0][1] and incorporates all terms, conditions, privileges and limitations therein.  The following text is a binding part of this license for this project:
+
+> Copyright 2010 Stephen Eley
+
+> Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+>   <http://www.apache.org/licenses/LICENSE-2.0>
+
+> Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+  
+Nothing in the following text should be construed to inhibit, contradict, or override any part of the Apache License, Version 2.0.  
+
+2. Definitions
+--------------
+The following terms and definitions shall be in effect for the rest of this document.
+
+>  **NOTE:** Singular nouns and pronouns are used throughout this License for 
+  grammatical convenience.  However, any of the terms below _may_ refer to a
+  collective work or group of people.  If this pegs your punctiliousness, you
+  are directed to mentally substitute "Person _or persons_," "Dick _or 
+  dicks,_" etc., throughout this license.  Just don't tell us about it.
+
+### A. Project
+
+A creative work of (software | writing | visual art | music) into which significant time and energy have been invested by people who _are not you,_ and which has been released into the world for the benefit of the general public (_including you._)
+
+The **Project** may include, incorporate, derive from, or be inspired by other works.  The Author, being a Reasonable Person, has made use of such source materials only as permitted by their own licenses or applicable law.  The License you are reading applies only to those portions of the Project which are original and distinct to it.  Source materials may be covered by their own licenses or conditions, and should not be assumed to have coverage under this License.  (However, you are strongly encouraged not to be a dick about them either.)
+
+### B. Author
+
+A person who has invested significant time and energy into the Project licensed herein.  Given the Author's release of the Project to the world under a liberal license, the Author is declared a Reasonable Person (at least within this context) and inherits all attributes, freedoms, and responsibilities thereof.  No other assumptions are made about the Author, nor should you make any.
+
+### C. Reasonable Person
+
+A person who respects the time and energy that have been invested in the Project licensed herein, and acts accordingly.  A Reasonable Person is broadly characterized as one who exercises his or her privilege to use, _not_ use, redistribute, modify, improve, worsen, review, report issues upon, participate in the community of, or ignore the work _without_ placing undue demands upon the Author.  I.e., a Reasonable Person is a constituent of the majority of open source users and the population at large who are not Dicks.
+
+### D. Dick
+
+A person who _does not_ respect the time and energy that have been invested in the Project, and acts to punish such effort by giving others associated with the Project -- including, but not limited to, the Author -- a hard time.  A Dick is nearly always selfish, but not necessarily with deliberate intent; some Dicks are merely thoughtless.  The distinguishing characteristic of a Dick is that he or she places burdens upon Reasonable People, reducing their motivation to engage in open source activities.  This damping effect is a significant detriment to the Project, to open source in general, to the production of new intellectual value in the world -- and, ultimately, to the Dick himself or herself.
+
+>  **NOTE:** Despite its original gender association, the word "Dick" is used herein in a _cultural_ context and not a _genital_ context.  This License has chosen to adopt the term for its linguistic force and psychological impact, and sincerely regrets any inference of sexism.  For purposes of the terms and conditions contained herein, it is understood that both men and women are equally capable of being Dicks.  
+  
+>  (But they shouldn't be.)  
+  
+3. Permissions
+--------------
+
+The following privileges are granted explicitly and exclusively to Reasonable People.  Although the Author acknowledges the practical unfeasibility of barring Dicks from enjoying the same privileges, they are nevertheless asked to refrain from any activity related to the Project _and/or_ to reconsider their behavior and stop being Dicks.
+
+1. You are permitted to use the Project or any component of the Project.
+
+2. You are permitted to redistribute the Project or any component of the Project, by itself or as part of a different work, provided that you give fair and reasonable credit back to the Author.
+
+3. You are permitted to change the Project for your own needs or anyone else's.  You may keep your changes to yourself or submit them back to the Author or the community, as you see fit, provided you are not a Dick about it.
+
+4. You are permitted and encouraged to participate in any community related to the Project, or to create new communities.
+
+5. You are permitted to report issues or problems with the Project, and to request that they be addressed, so long as the request is made in a reasonable fashion.  (This privilege does _not_ oblige the Author to respond.)
+
+6. You are permitted to make money from the Project.  No recompense is owed to the Author unless by separate agreement, although sharing opportunities for mutual benefit is by no means discouraged.
+
+7. You are permitted to discuss the Project in any medium, in any positive or negative spirit, so long as criticism is not libelous nor _ad hominem._  (I.e., don't lie, and keep it about the _work_ and not the _people._)
+
+8. You are permitted to ignore the Project completely and make no use of it whatsoever.  This right is irrevocable and absolute, and extended to Dicks and Reasonable People alike.
+
+4. Limitations
+--------------
+
+The following restrictions are imposed explicitly and exclusively upon Dicks.  These limitations are the inverse of the above privileges and are also tautological, as the prohibited actions are those _definitive_ of Dickhood.
+
+1. You may not impede Reasonable People from exercising their privilege to use, redistribute, change, participate in, profit from, discuss, or ignore the Project.
+
+2. You may not withhold the Author's credit for the Project, nor otherwise present the work of anyone else as your own.
+
+3. You may not hold the Author responsible for any use or abuse of the Project by you or anyone else.
+
+4. You may not troll, flame, nor dumb down any community associated with the Project.
+
+5. Barring separate agreements, you may not _demand_ any time or attention on the part of the Author nor anyone else in the community.  You may not hold the Author personally accountable for any issues you discover nor otherwise spread your own problems to other people.
+
+6. You may not attempt to _compel_ time nor money from the Author nor any other community member by any means, including but not limited to legal action, intimidation, or annoyance.  
+
+7. You may not engage in _ad hominem_ (i.e. personal) attacks or criticism of the Author in the course of criticizing the Project.
+
+8. You may not impede the absolute and irrevocable privilege of the Author and other members of the community to ignore you.  
+
+5. Use of This License
+----------------------
+The Don't Be a Dick License is released under the terms of the Don't Be a Dick License. Projects released under this License should remain under the License, and the terms of the License may not be modified by anyone other than the Project's original Author.
+  
+If you wish to make use of the License for your own open work, you may do so without asking permission, provided said work is truly your own, truly open, and you are truly not a Dick. You may modify the terms of the License to suit your own needs, but are strongly advised to annotate said changes.  Modifications may not reduce the freedoms granted to Reasonable People as described in Section 3.
+
+Reasonable People are _invited,_ but not compelled, to visit the Web site at <http://dbad-license.org> and browse or add their project to the repository of works released under the License.
+ 
+
+[1]: http://apache.org/licenses/LICENSE-2.0

data/README.markdown

@@ -1,6 +1,7 @@
 # MongoStore
 
-It's **ActiveSupport::Cache::MongoStore** -- a [MongoDB](http://mongodb.org)-based provider for the standard Rails cache mechanism.  With an emphasis on fast writes and a memory-mapped architecture, Mongo is well-suited to caching. This gem aims to give you what the ubiquitous **MemCacheStore** does, but with Mongo's persistence.  (And without having to put a second RAM devourer in an environment already running Mongo.)
+It's **ActiveSupport::Cache::MongoStore** -- a [MongoDB](http://mongodb.org)-based provider for the standard Rails 2 or Rails 3 cache mechanism.  With an emphasis on fast writes and a memory-mapped architecture, Mongo is well-suited to caching. This gem aims to give you what the ubiquitous **MemCacheStore** does, but with Mongo's persistence.  (And without having to put a second RAM devourer in an environment already running Mongo.)
+
 
 ## Getting Started
 
@@ -32,15 +33,16 @@ We don't have a separate option for connecting to a different server.  If you do
 The following hash options are recognized on initialization:
 
 * `:db` - A Mongo::DB object or the name of one to create. Defaults to **rails_cache**.
-* `:create_index` - By default, we create an index on the _key_ and _expires_ fields. Set to **false** to override.
+* `:create_index` - By default, we create an index on the *_id* and *expires* fields for fast returns on cache misses. Set to **false** to override.
 * `:expires_in` - The global length of time a cache key remains valid. Defaults to 1 year. Can also be set on individual cache writes.
+* `:namespace` - Set this if you want different applications to share the same Mongo collection without key collisions. (Namespacing is baked into Rails 3, but MongoStore implements it manually for Rails 2 as well.)
 
 ## Other Goodness
 
 MongoStore is a drop-in caching store and doesn't require any special treatment. The only extra behavior on top of what you get from ActiveSupport::Cache::Store is as follows:
 
 ### :expires_in option on the #write method
-This is the same behavior as the option in the MemCacheStore. Specify a number of seconds or an ActiveSupport helper equivalent, e.g.: `:expires_in => 5.minutes`.  Keys past their expiration date are not returned on reads.
+This was built into all stores in Rails 3. In Rails 2, we implement it with same behavior as the option in MemCacheStore. Specify a number of seconds or an ActiveSupport helper equivalent, e.g.: `:expires_in => 5.minutes`.  Keys past their expiration date are not returned on reads.
 
 _**NOTE:** This behavior is fairly dumb and uses `Time.now` on the application side.  If you have a number of app servers hitting one database and their times aren't in sync, expect unwarranted cache misses._
 
@@ -62,8 +64,6 @@ Empties the cache. The moral equivalent of `Rails.cache.delete_matched(/.*/)` bu
 
 * This code and specs were written for Ruby 1.9.1.  I tried to make sure it works fine for you anachronists (Ruby 1.8), but didn't confirm it. Please register an issue if I forgot your quaint historical syntax. I also didn't test it in JRuby, Rubinius, IronRuby, or your roommate's HP-48 calculator. 
 
-* Likewise, this was written for Rails 2.3.5. I have not tried to run it in Rails 3 yet, which is still in beta at the time of this writing. I don't even know if Rails 3 uses the same caching approach. It probably caches using pure energy or something, and removes carbon from the atmosphere at the same time. 
-
 * I am optimistic about performance but have not benchmarked it, apart from  "It's faster than not using a cache."
 
 ## Support
@@ -81,6 +81,9 @@ You can also [check out my podcast](http://escapepod.org) if you like science fi
 
 And Have Fun.
 
-## Copyright
+## License
+
+This project is licensed under the [Don't Be a Dick License](http://dbad-license.org), version 0.2, and is copyright
+2010 by Stephen Eley. See the [LICENSE.markdown](http://github.com/SFEley/mongo_store/blob/master/LICENSE.markdown)
+file for elaboration on not being a dick. (But you probably already know.)
 
-Copyright (c) 2010 Stephen Eley. See LICENSE for details.

data/Rakefile

@@ -10,9 +10,9 @@ begin
     gem.email = "sfeley@gmail.com"
     gem.homepage = "http://github.com/SFEley/mongo_store"
     gem.authors = ["Stephen Eley"]
-    gem.add_dependency "mongo", ">= 0.18.3"
+    gem.add_dependency "mongo", ">= 1.0"
     gem.add_dependency "activesupport", ">= 2.2"
-    gem.add_development_dependency "rspec", ">= 1.2.9"
+    gem.add_development_dependency "rspec", ">= 1.3"
     gem.add_development_dependency "mocha", ">= 0.9"
     
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/lib/active_support/cache/mongo_store.rb

@@ -1,25 +1,134 @@
 require 'active_support'
 require 'mongo'
 
+module MongoStore
+  module Cache
+    module Rails2
+      attr_reader :options
+      
+      # Inserts the value into the cache collection or updates the existing value.  The value must be a valid
+      # MongoDB type.  An *:expires_in* option may be provided, as with MemCacheStore.  If one is _not_ 
+      # provided, a default expiration of 1 day is used.
+      def write(key, value, local_options=nil)
+        super
+        opts = local_options ? options.merge(local_options) : options
+        expires = Time.now + opts[:expires_in]
+        collection.update({'_id' => namespaced_key(key, opts)}, {'$set' => {'value' => value, 'expires' => expires}}, :upsert => true)
+      end
+      
+      # Reads the value from the cache collection.
+      def read(key, local_options=nil)
+        super
+        opts = local_options ? options.merge(local_options) : options
+        if doc = collection.find_one('_id' => namespaced_key(key, opts), 'expires' => {'$gt' => Time.now})
+          doc['value']
+        end
+      end
+        
+      # Takes the specified value out of the collection.
+      def delete(key, local_options=nil)
+        super
+        opts = local_options ? options.merge(local_options) : options
+        collection.remove({'_id' => namespaced_key(key,opts)})
+      end
+      
+
+      # Takes the value matching the pattern out of the collection.
+      def delete_matched(key, local_options=nil)
+        super
+        opts = local_options ? options.merge(local_options) : options
+        collection.remove({'_id' => key_matcher(key,opts)})
+      end
+
+            
+      protected
+
+      # Lifted from Rails 3 ActiveSupport::Cache::Store
+      def namespaced_key(key, options)
+        namespace = options[:namespace] if options
+        prefix = namespace.is_a?(Proc) ? namespace.call : namespace
+        key = "#{prefix}:#{key}" if prefix
+        key
+      end
+      
+      # Lifted from Rails 3 ActiveSupport::Cache::Store
+      def key_matcher(pattern, options)
+        prefix = options[:namespace].is_a?(Proc) ? options[:namespace].call : options[:namespace]
+        if prefix
+          source = pattern.source
+          if source.start_with?('^')
+            source = source[1, source.length]
+          else
+            source = ".*#{source[0, source.length]}"
+          end
+          Regexp.new("^#{Regexp.escape(prefix)}:#{source}", pattern.options)
+        else
+          pattern
+        end
+      end
+      
+    end
+    
+    module Rails3
+      def write_entry(key, entry, options)
+        expires = Time.now + options[:expires_in]
+        value = entry.value
+        value = value.to_mongo if value.respond_to? :to_mongo
+        begin
+          collection.update({'_id' => key}, {'$set' => {'value' => value, 'expires' => expires}}, :upsert => true)
+        rescue BSON::InvalidDocument
+          value = value.to_s and retry unless value.is_a? String
+        end
+      end
+      def read_entry(key, options=nil)
+        doc = collection.find_one('_id' => key, 'expires' => {'$gt' => Time.now})
+        ActiveSupport::Cache::Entry.new(doc['value']) if doc
+      end
+      def delete_entry(key, options=nil)
+        collection.remove({'_id' => key})
+      end
+      def delete_matched(pattern, options=nil)
+        options = merged_options(options)
+        instrument(:delete_matched, pattern.inspect) do
+          matcher = key_matcher(pattern, options)  # Handles namespacing with regexes
+          delete_entry(matcher, options) 
+        end
+      end
+    end
+    
+    module Store
+      rails3 = defined?(::Rails) && ::Rails.version =~ /^3\./
+      include rails3 ? Rails3 : Rails2
+      
+      def expires_in
+        options[:expires_in]
+      end
+      
+      def expires_in=(val)
+        options[:expires_in] = val
+      end
+    end
+  end
+end
+
 module ActiveSupport
   module Cache
     class MongoStore < Store
-      attr_reader :options
-      attr_accessor :expires_in
+      include ::MongoStore::Cache::Store
       
       # Returns a MongoDB cache store.  Can take either a Mongo::Collection object or a collection name.
       # If neither is provided, a collection named "rails_cache" is created.
       #
       # An options hash may also be provided with the following options:
       # 
-      # * :expires_in - The default expiration period for cached objects. If not provided, defaults to 1 year.
+      # * :expires_in - The default expiration period for cached objects. If not provided, defaults to 1 day.
       # * :db - Either a Mongo::DB object or a database name. Not used if a Mongo::Collection object is passed. Otherwise defaults to MongoMapper.database (if MongoMapper is used in the app) or else creates a DB named "rails_cache".
       # * :create_index - Whether to index the key and expiration date on the collection. Defaults to true. Not used if a Mongo::Collection object is passed.
       def initialize(collection = nil, options = nil)
         @options = {
           :collection_name => 'rails_cache',
           :db_name => 'rails_cache',
-          :expires_in => 1.year,
+          :expires_in => 86400,  # That's 1 day in seconds
           :create_index => true
         }
         # @options.merge!(options) if options
@@ -37,10 +146,6 @@ module ActiveSupport
         end
         
         @options.merge!(options) if options.is_a?(Hash)
-        
-        # Set the expiration time
-        self.expires_in = @options[:expires_in]
-        super()
       end
       
       # Returns the MongoDB collection described in the options to .new (or else the default 'rails_cache' one.)
@@ -63,32 +168,6 @@ module ActiveSupport
         collection.remove
       end
       
-      # Inserts the value into the cache collection or updates the existing value.  The value must be a valid
-      # MongoDB type.  An *:expires_in* option may be provided, as with MemCacheStore.  If one is _not_ 
-      # provided, a default expiration of 1 year is used.
-      def write(key, value, options=nil)
-        super
-        expires = Time.now + ((options && options[:expires_in]) || expires_in)
-        collection.update({'key' => key}, {'$set' => {'value' => value, 'expires' => expires}}, :upsert => true)
-      end
-      
-      # Reads the value from the cache collection.
-      def read(key, options=nil)
-        super
-        if doc = collection.find_one('key' => key, 'expires' => {'$gt' => Time.now})
-          doc['value']
-        end
-      end
-        
-      # Takes the specified value out of the collection.
-      def delete(key, options=nil)
-        super
-        collection.remove({'key' => key})
-      end
-      
-      # With MongoDB, there's no difference between querying on an exact value or a regex.  Beautiful, huh?
-      alias_method :delete_matched, :delete
-      
       private
       def mongomapper?
         Kernel.const_defined?(:MongoMapper) && MongoMapper.respond_to?(:database) && MongoMapper.database
@@ -106,7 +185,7 @@ module ActiveSupport
           end
         end
         coll = db.create_collection(options[:collection_name])
-        coll.create_index([['key',Mongo::ASCENDING], ['expires',Mongo::DESCENDING]]) if options[:create_index]
+        coll.create_index([['_id',Mongo::ASCENDING], ['expires',Mongo::DESCENDING]]) if options[:create_index]
         coll
       end
         

data/mongo_store.gemspec

@@ -5,21 +5,23 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongo_store}
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Stephen Eley"]
-  s.date = %q{2010-04-13}
+  s.date = %q{2010-08-30}
   s.description = %q{It's ActiveSupport::Cache::MongoStore -- a MongoDB-based provider for the standard Rails cache mechanism.  With an emphasis on fast writes and a memory-mapped architecture, Mongo is well-suited to caching. This gem aims to give you what the ubiquitous MemCacheStore does, but with Mongo's persistence.  (And without having to put a second RAM devourer in an environment already running Mongo.)}
   s.email = %q{sfeley@gmail.com}
   s.extra_rdoc_files = [
-    "LICENSE",
+    "LICENSE.markdown",
      "README.markdown"
   ]
   s.files = [
     ".document",
      ".gitignore",
-     "LICENSE",
+     ".rspec",
+     "History.markdown",
+     "LICENSE.markdown",
      "README.markdown",
      "Rakefile",
      "VERSION",
@@ -33,7 +35,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/SFEley/mongo_store}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Rails caching for MongoDB}
   s.test_files = [
     "spec/active_support/cache/mongo_store_spec.rb",
@@ -44,21 +46,21 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<mongo>, [">= 0.18.3"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<mongo>, [">= 1.0"])
       s.add_runtime_dependency(%q<activesupport>, [">= 2.2"])
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<rspec>, [">= 1.3"])
       s.add_development_dependency(%q<mocha>, [">= 0.9"])
     else
-      s.add_dependency(%q<mongo>, [">= 0.18.3"])
+      s.add_dependency(%q<mongo>, [">= 1.0"])
       s.add_dependency(%q<activesupport>, [">= 2.2"])
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<rspec>, [">= 1.3"])
       s.add_dependency(%q<mocha>, [">= 0.9"])
     end
   else
-    s.add_dependency(%q<mongo>, [">= 0.18.3"])
+    s.add_dependency(%q<mongo>, [">= 1.0"])
     s.add_dependency(%q<activesupport>, [">= 2.2"])
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<rspec>, [">= 1.3"])
     s.add_dependency(%q<mocha>, [">= 0.9"])
   end
 end

data/spec/active_support/cache/mongo_store_spec.rb

@@ -69,9 +69,9 @@ module ActiveSupport
           store.collection.should_not be_nil
         end
           
-        it "defaults to an expiration of 1 year" do
+        it "defaults to an expiration of 1 day" do
           store = ActiveSupport::Cache.lookup_store(:mongo_store)
-          store.expires_in.should == 1.year
+          store.expires_in.should == 1.day
         end
         
         it "can override expiration time with the :expires_in option" do
@@ -105,11 +105,11 @@ module ActiveSupport
     
         it "can write values" do
           @store.write('fnord', 'I am vaguely disturbed.')
-          @store.collection.find_one(:key => 'fnord')['value'].should == "I am vaguely disturbed."
+          @store.collection.find_one('_id' => 'fnord')['value'].should == "I am vaguely disturbed."
         end
     
         it "can read values" do
-          @store.collection.insert({:key => 'yoo', :value => 'yar', :expires => 1.year.from_now})
+          @store.collection.insert({'_id' => 'yoo', :value => 'yar', :expires => (Time.now + 10)})
           @store.read('yoo').should == 'yar'
         end
     
@@ -172,6 +172,63 @@ module ActiveSupport
           @store.clear
           @store.collection.count.should == 0
         end
+        describe "namespacing" do
+          before(:each) do
+            @store.options[:namespace] = 'ns1'
+            @store.write 'foo', 'bar'
+            @store.write 'too', 'tar'
+            @store.write 'foz', 'baz'
+            @store.write 'foo', 'yar', :namespace => 'ns2'
+            @store.write 'too', 'car', :namespace => 'ns2'
+            @store.write 'foz', 'bat', :namespace => 'ns2'
+          end
+          
+          it "uses the default namespace" do
+            @store.collection.find_one('_id' => /ns1.*foo/)['value'].should == "bar"
+          end
+          
+          it "can override the namespace" do
+            @store.collection.find_one('_id' => /ns2.*foo/)['value'].should == "yar"
+          end
+          
+          it "can have different values in different namespaces" do
+            @store.read('foo').should == 'bar'
+            @store.read('foo', :namespace => 'ns2').should == 'yar'
+          end
+          
+          it "deletes from the default namespace" do
+            @store.delete('foo')
+            @store.read('foo').should be_nil
+            @store.read('foo', :namespace => 'ns2').should == 'yar'
+          end
+          
+          it "deletes from an overridden namespace" do
+            @store.delete('foo', :namespace => 'ns2')
+            @store.read('foo').should == 'bar'
+            @store.read('foo', :namespace => 'ns2').should be_nil
+          end
+          
+          it "deletes matching patterns from the default namespace" do
+            @store.delete_matched(/oo/)
+            @store.read('foo').should be_nil
+            @store.read('too').should be_nil
+            @store.read('foz').should == 'baz'
+            @store.read('foo', :namespace => 'ns2').should == 'yar'
+            @store.read('too', :namespace => 'ns2').should == 'car'
+            @store.read('foz', :namespace => 'ns2').should == 'bat'
+          end
+          
+          it "deletes matching patterns from the overridden namespace" do
+            @store.delete_matched(/oo/, :namespace => "ns2")
+            @store.read('foo').should == 'bar'
+            @store.read('too').should == 'tar'
+            @store.read('foz').should == 'baz'
+            @store.read('foo', :namespace => 'ns2').should be_nil
+            @store.read('too', :namespace => 'ns2').should be_nil
+            @store.read('foz', :namespace => 'ns2').should == 'bat'
+          end
+
+        end
     
         after(:each) do
           @store.collection.remove   # Clear our records

data/spec/spec_helper.rb

@@ -2,10 +2,18 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'mongo'
 require 'mongo_store'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'  # RSpec 2
+require 'rspec/autorun'
 require 'mocha'
 
-Spec::Runner.configure do |config|
+# Fake out Rails 3 -- for Rails 2 testing, run with a gemset with activesupport ~ 2.3
+module Rails
+  def self.version
+    ActiveSupport::Cache.const_defined?(:Entry) ? '3.0.0' : '2.3.8'
+  end
+end
+
+
+RSpec.configure do |config|
   config.mock_with :mocha
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Stephen Eley
@@ -14,27 +14,28 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-13 00:00:00 -04:00
+date: 2010-08-30 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mongo
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
+        - 1
         - 0
-        - 18
-        - 3
-        version: 0.18.3
+        version: "1.0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activesupport
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -48,20 +49,21 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 1
-        - 2
-        - 9
-        version: 1.2.9
+        - 3
+        version: "1.3"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -78,12 +80,14 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE
+- LICENSE.markdown
 - README.markdown
 files: 
 - .document
 - .gitignore
-- LICENSE
+- .rspec
+- History.markdown
+- LICENSE.markdown
 - README.markdown
 - Rakefile
 - VERSION
@@ -103,6 +107,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -110,6 +115,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -119,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Rails caching for MongoDB

data/LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2010 Stephen Eley
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.