active_remote-cached 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30ab76a72a43662a016c241f8ea069559fbffd2f
-  data.tar.gz: f5efe169305a48fbc569be896091f64fd265b2d6
+  metadata.gz: d0c37d8fe5adf8a1227c97dddf83db2eb5d59fc7
+  data.tar.gz: 49690fa347012f5dd569dd1ce175f864adf83b6d
 SHA512:
-  metadata.gz: 532fda905ee748ca161c6c04f6bdf6f904697a078eaa724a3557b4f22bbe5c45bd083555fcf32cfcafdc4f6963e09b9c37aa2559532748921897916aa2d7d24e
-  data.tar.gz: 53767240c5f8dfd8389adc4b9e62c4203fd68ffcdde73072311dc97cd157317e1a4cb6f5ebb7e54168f300ca4e5140a57a87085897039671b1f35efcb0d07da7
+  metadata.gz: 553ee8882228bb293410908ef21f4c40b7decc3fa2d0a4f40adfe42d83191c2c0649266b3e7db69782f42943cdeb42dead439ebeeed9461fac2f7da02da1ebfd
+  data.tar.gz: 42ca67feb1eddc71a2f679e4ab04453811c12d63810486adb0290d78245b4c2ad0e88ef31fa81ebab5dd7ff4afc7456e4754a9e4aee53cd2131c52a05de06c8f

data/lib/active_remote/cached.rb

@@ -83,23 +83,23 @@ module ActiveRemote
           search_method_name = _cached_search_method_name(arguments)
 
           unless self.respond_to?(delete_method_name)
-            _define_cached_delete_method(delete_method_name, arguments)
+            _define_cached_delete_method(delete_method_name, arguments, options)
           end
 
           unless self.respond_to?(exist_find_method_name)
-            _define_cached_exist_find_method(exist_find_method_name, arguments)
+            _define_cached_exist_find_method(exist_find_method_name, arguments, options)
           end
 
           unless self.respond_to?(exist_search_method_name)
-            _define_cached_exist_search_method(exist_search_method_name, arguments)
+            _define_cached_exist_search_method(exist_search_method_name, arguments, options)
           end
 
           unless self.respond_to?(find_method_name)
-            _define_cached_find_method(find_method_name, arguments)
+            _define_cached_find_method(find_method_name, arguments, options)
           end
 
           unless self.respond_to?(search_method_name)
-            _define_cached_search_method(search_method_name, arguments)
+            _define_cached_search_method(search_method_name, arguments, options)
           end
         end
       end
@@ -124,7 +124,7 @@ module ActiveRemote
         "cached_search_by_#{arguments.join('_and_')}"
       end
 
-      def _define_cached_delete_method(method_name, *method_arguments)
+      def _define_cached_delete_method(method_name, *method_arguments, cached_finder_options)
         method_arguments.flatten!
         expanded_method_args = method_arguments.join(",")
         sorted_method_args = method_arguments.sort.join(",")
@@ -134,7 +134,7 @@ module ActiveRemote
           #   ::ActiveRemote::Cached.cache.delete([name, user_guid])
           # end
           def self.#{method_name}(#{expanded_method_args}, options = {})
-            options = ::ActiveRemote::Cached.default_options.merge(options)
+            options = ::ActiveRemote::Cached.default_options.merge(#{cached_finder_options}).merge(options)
             namespace = options.delete(:namespace)
             find_cache_key = [namespace, name, "#find", #{sorted_method_args}].compact
             search_cache_key = [namespace, name, "#search", #{sorted_method_args}].compact
@@ -145,7 +145,7 @@ module ActiveRemote
         RUBY
       end
 
-      def _define_cached_exist_find_method(method_name, *method_arguments)
+      def _define_cached_exist_find_method(method_name, *method_arguments, cached_finder_options)
         method_arguments.flatten!
         expanded_method_args = method_arguments.join(",")
         sorted_method_args = method_arguments.sort.join(",")
@@ -155,7 +155,7 @@ module ActiveRemote
           #   ::ActiveRemote::Cached.cache.exist?([name, user_guid])
           # end
           def self.#{method_name}(#{expanded_method_args}, options = {})
-            options = ::ActiveRemote::Cached.default_options.merge(options)
+            options = ::ActiveRemote::Cached.default_options.merge(#{cached_finder_options}).merge(options)
             namespace = options.delete(:namespace)
             cache_key = [namespace, name, "#find", #{sorted_method_args}].compact
 
@@ -166,7 +166,7 @@ module ActiveRemote
         singleton_class.send(:alias_method, "#{method_name}?", method_name)
       end
 
-      def _define_cached_exist_search_method(method_name, *method_arguments)
+      def _define_cached_exist_search_method(method_name, *method_arguments, cached_finder_options)
         method_arguments.flatten!
         expanded_method_args = method_arguments.join(",")
         sorted_method_args = method_arguments.sort.join(",")
@@ -176,7 +176,7 @@ module ActiveRemote
           #   ::ActiveRemote::Cached.cache.exist?([namespace, name, "#search", user_guid])
           # end
           def self.#{method_name}(#{expanded_method_args}, options = {})
-            options = ::ActiveRemote::Cached.default_options.merge(options)
+            options = ::ActiveRemote::Cached.default_options.merge(#{cached_finder_options}).merge(options)
             namespace = options.delete(:namespace)
             cache_key = [namespace, name, "#search", #{sorted_method_args}].compact
 
@@ -187,7 +187,7 @@ module ActiveRemote
         singleton_class.send(:alias_method, "#{method_name}?", method_name)
       end
 
-      def _define_cached_find_method(method_name, *method_arguments)
+      def _define_cached_find_method(method_name, *method_arguments, cached_finder_options)
         method_arguments.flatten!
         expanded_method_args = method_arguments.join(",")
         sorted_method_args = method_arguments.sort.join(",")
@@ -199,7 +199,7 @@ module ActiveRemote
 
         self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
           # def self.cached_find_by_user_guid(user_guid, options = {})
-          #   options = ::ActiveRemote::Cached.default_options.merge(options)
+          #   options = ::ActiveRemote::Cached.default_options.merge({}).merge(options)
           #
           #   ::ActiveRemote::Cached.cache.fetch([namespace, name, "#find", user_guid], options) do
           #     self.find(:user_guid => user_guid)
@@ -210,7 +210,7 @@ module ActiveRemote
           # of the result object is maintained for requests/responses
           #
           def self.#{method_name}(#{expanded_method_args}, options = {})
-            options = ::ActiveRemote::Cached.default_options.merge(options)
+            options = ::ActiveRemote::Cached.default_options.merge(#{cached_finder_options}).merge(options)
             namespace = options.delete(:namespace)
             cache_key = [namespace, name, "#find", #{sorted_method_args}].compact
 
@@ -225,7 +225,7 @@ module ActiveRemote
         RUBY
       end
 
-      def _define_cached_search_method(method_name, *method_arguments)
+      def _define_cached_search_method(method_name, *method_arguments, cached_finder_options)
         method_arguments.flatten!
         expanded_method_args = method_arguments.join(",")
         sorted_method_args = method_arguments.sort.join(",")
@@ -237,7 +237,7 @@ module ActiveRemote
 
         self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
           # def self.cached_search_by_user_guid(user_guid, options = {})
-          #   options = ::ActiveRemote::Cached.default_options.merge(options)
+          #   options = ::ActiveRemote::Cached.default_options.merge({}).merge(options)
           #
           #   ::ActiveRemote::Cached.cache.fetch([namespace, name, "#search", user_guid], options) do
           #     self.search(:user_guid => user_guid)
@@ -248,7 +248,7 @@ module ActiveRemote
           # of the result object is maintained for requests/responses
           #
           def self.#{method_name}(#{expanded_method_args}, options = {})
-            options = ::ActiveRemote::Cached.default_options.merge(options)
+            options = ::ActiveRemote::Cached.default_options.merge(#{cached_finder_options}).merge(options)
             namespace = options.delete(:namespace)
             cache_key = [namespace, name, "#search", #{sorted_method_args}].compact
 

data/lib/active_remote/cached/version.rb

@@ -1,5 +1,5 @@
 module ActiveRemote
   module Cached
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/spec/active_remote/cached_find_methods_spec.rb

@@ -6,6 +6,7 @@ class FindMethodClass
   def self.find; nil; end
   def self.search; nil; end
 
+  cached_finders_for :foo, :expires_in => 500
   cached_finders_for :guid
   cached_finders_for :guid, :user_guid
   cached_finders_for [:user_guid, :client_guid]
@@ -14,6 +15,10 @@ end
 
 describe FindMethodClass do
   describe "API" do
+    it "creates 'cached_find_by_foo'" do
+      FindMethodClass.must_respond_to("cached_find_by_foo")
+    end
+
     it "creates 'cached_find_by_guid'" do
       FindMethodClass.must_respond_to("cached_find_by_guid")
     end
@@ -95,4 +100,31 @@ describe FindMethodClass do
       end
     end
   end
+
+  describe "#cached_find_by_foo" do
+    before do
+      ::ActiveRemote::Cached.cache(HashCache.new)
+      ::ActiveRemote::Cached.default_options(:expires_in => 100)
+    end
+
+    after do
+      ::ActiveRemote::Cached.default_options({})
+    end
+
+    it "overrides the default options with cached_finder options for the fetch call" do
+      ::ActiveRemote::Cached.cache.expects(:fetch).with([FindMethodClass.name, "#find", :foo], :expires_in => 500).returns(:hello)
+
+      FindMethodClass.stub(:find, :hello) do
+        FindMethodClass.cached_find_by_foo(:foo).must_equal(:hello)
+      end
+    end
+
+    it "overrides the cached_finder options with local options for the fetch call" do
+      ::ActiveRemote::Cached.cache.expects(:fetch).with([FindMethodClass.name, "#find", :foo], :expires_in => 200).returns(:hello)
+
+      FindMethodClass.stub(:find, :hello) do
+        FindMethodClass.cached_find_by_foo(:foo, :expires_in => 200).must_equal(:hello)
+      end
+    end
+  end
 end

data/spec/active_remote/cached_search_methods_spec.rb

@@ -7,6 +7,7 @@ class SearchMethodClass
   def self.find; nil; end
   def self.search; nil; end
 
+  cached_finders_for :foo, :expires_in => 500
   cached_finders_for :guid
   cached_finders_for :guid, :user_guid
   cached_finders_for [:user_guid, :client_guid]
@@ -15,6 +16,10 @@ end
 
 describe SearchMethodClass do
   describe "API" do
+    it "creates 'cached_search_by_foo'" do
+      SearchMethodClass.must_respond_to("cached_search_by_foo")
+    end
+
     it "creates 'cached_search_by_guid'" do
       SearchMethodClass.must_respond_to("cached_search_by_guid")
     end
@@ -144,4 +149,31 @@ describe SearchMethodClass do
       end
     end
   end
+
+  describe "#cached_search_by_foo" do
+    before do
+      ::ActiveRemote::Cached.cache(HashCache.new)
+      ::ActiveRemote::Cached.default_options(:expires_in => 100)
+    end
+
+    after do
+      ::ActiveRemote::Cached.default_options({})
+    end
+
+    it "overrides the default options with cached_finder options for the fetch call" do
+      ::ActiveRemote::Cached.cache.expects(:fetch).with([SearchMethodClass.name, "#search", :foo], :expires_in => 500).returns(:hello)
+
+      SearchMethodClass.stub(:find, :hello) do
+        SearchMethodClass.cached_search_by_foo(:foo).must_equal(:hello)
+      end
+    end
+
+    it "overrides the cached_finder options with local options for the fetch call" do
+      ::ActiveRemote::Cached.cache.expects(:fetch).with([SearchMethodClass.name, "#search", :foo], :expires_in => 200).returns(:hello)
+
+      SearchMethodClass.stub(:find, :hello) do
+        SearchMethodClass.cached_search_by_foo(:foo, :expires_in => 200).must_equal(:hello)
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_remote-cached
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Brandon Dewitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-05 00:00:00.000000000 Z
+date: 2016-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_remote