factory_girl-cache 0.1.1 → 0.2.0

data/README.md

@@ -45,12 +45,6 @@ Then:
 
 ### Usage
 
-#### Require
-
-You may need to add this to the top of the test or factories.rb or wherever you are going to use it:
-
-    require 'factory_girl-cache'
-
 #### Be Sure to Clear Cache After Every Use
 
 In your tests, be sure that the cache is cleared after anything that uses it is done, otherwise it probably will eventually pollute other tests if you are not careful!
@@ -103,25 +97,25 @@ More examples:
 
 #### Store Results From Same Factory for Two Different Associations Separately
 
-Because it will use the method name and all arguments (after dup-ing) for the cache key, but will remove the second argument if ones exists after using it as the cache key, you can differentiate results from the same factory/store them in different caches.
-
-Examples:
-
-    FactoryGirlCache.create(:post, :great_post) # will create
-    FactoryGirlCache.create(:post, :great_post) # will return post from cache
-    FactoryGirlCache.create(:post, :bad_post) # will create
-    FactoryGirlCache.create_list(:post, :great_posts, 2) # will create list of 2
-    FactoryGirlCache.create_list(:post, :bad_posts, 2) # will create list of 2
-    FactoryGirlCache.create_list(:post, :bad_posts, 2) # will return list of 2 from cache
-    FactoryGirlCache.build(:post, :great_post) # will build
-    FactoryGirlCache.build(:post, :great_post) # will return post from cache
-    FactoryGirlCache.build(:post, :bad_post) # will build
-    FactoryGirlCache.build_list(:post, :great_posts, 2) # will build list of 2
-    FactoryGirlCache.build_list(:post, :bad_posts, 2) # will build list of 2
-    FactoryGirlCache.build_list(:post, :bad_posts, 2) # will return list of 2 from cache
-    FactoryGirlCache.build_stubbed(:post, :great_post) # will build stubbed
-    FactoryGirlCache.build_stubbed(:post, :great_post) # will return post from cache
-    FactoryGirlCache.build_stubbed(:post, :bad_post) # will build stubbed
+Because it will use the method name and all arguments for the cache key, but will look for and remove the option `:cached_as` and used that instead of the factory name in the cache key.
+
+For example:
+
+    FactoryGirlCache.create(:post, cached_as: :great_post) # will create
+    FactoryGirlCache.create(:post, cached_as: :great_post) # will return post from cache
+    FactoryGirlCache.create(:post, cached_as: :bad_post) # will create
+    FactoryGirlCache.create_list(:post, 2, cached_as: :great_posts) # will create list of 2
+    FactoryGirlCache.create_list(:post, 2, cached_as: :bad_posts) # will create list of 2
+    FactoryGirlCache.create_list(:post, 2, cached_as: :bad_posts) # will return list of 2 from cache
+    FactoryGirlCache.build(:post, cached_as: :great_post) # will build
+    FactoryGirlCache.build(:post, cached_as: :great_post) # will return post from cache
+    FactoryGirlCache.build(:post, cached_as: :bad_post) # will build
+    FactoryGirlCache.build_list(:post, 2, cached_as: :great_posts) # will build list of 2
+    FactoryGirlCache.build_list(:post, 2, cached_as: :bad_posts) # will build list of 2
+    FactoryGirlCache.build_list(:post, 2, cached_as: :bad_posts) # will return list of 2 from cache
+    FactoryGirlCache.build_stubbed(:post, cached_as: :great_post) # will build stubbed
+    FactoryGirlCache.build_stubbed(:post, cached_as: :great_post) # will return post from cache
+    FactoryGirlCache.build_stubbed(:post, cached_as: :bad_post) # will build stubbed
 
 ### License
 

data/lib/factory_girl-cache/cache.rb

@@ -1,9 +1,8 @@
 require 'factory_girl'
 
 # A wrapper for FactoryGirl that caches the build, build_list, build_stubbed, create, and create_list methods using
-# the method (as symbol) and arguments as the key for the cache, with the only wierdness being that if the second
-# argument is a symbol, it removes that from the arguments before calling FactoryGirl with the arguments and block,
-# such that it can use different caches for different associations.
+# the method (as symbol) and arguments as the key for the cache. You can send in a :cached_as option and it will
+# use that in place of the factory name/1st argument in the key of the cache.
 module FactoryGirlCache
   class << self
     attr_accessor :factory_girl_cache
@@ -11,7 +10,9 @@ module FactoryGirlCache
     def method_missing(m, *args, &block)
       if [:build, :build_list, :build_stubbed, :create, :create_list].include?(m)
         keys = args.dup
-        args.delete_at(1) if args.size > 1 && args[1].is_a?(Symbol)
+        options = args.last
+        cached_as = options.is_a?(Hash) ? options.remove(:cached_as) : nil
+        keys[0] = cached_as if !(cached_as.nil?) && keys.size > 0
         @factory_girl_cache ||= {}
         @factory_girl_cache[[m, *keys]] ||= FactoryGirl.__send__(m, *args, &block)
       else

data/lib/factory_girl-cache/version.rb

@@ -1,3 +1,3 @@
 module FactoryGirlCache
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factory_girl-cache
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors: