active_remote-cached 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48a4ddc66707e648e15d6860f1d9c464d6b44ace
-  data.tar.gz: 724bb12c80ccb7dad9e233e6257135d780e872a7
+  metadata.gz: 7bf594804579aa384b0224646afcf8feaca70b57
+  data.tar.gz: 83749d18cc7ffe032696a2dd7e4667401564d8a9
 SHA512:
-  metadata.gz: 7ed6225adc07f144eac3930c81e4ced4efb13c8702d07dce356edd8d4d9cbc6eb4d6fa6992a0eac4086b9a5e98467b14fee2e0f4e4a3c4c5742143685fade71c
-  data.tar.gz: 6bb63d307f480b31cec87087be46cac64eea5448609ff109c0e6cde434ab8d48c2defbbbf35ffb1527cb579e176ec7742619ac4ee4f095f197284878f1a0fa42
+  metadata.gz: 2172bb1d81a714284a9d5211c39dbadbbb4466e588586adad836a9ff3e5848125aa743e8bc062aeac770e73bb904f38108c66ff05741765f80405e49c6b13275
+  data.tar.gz: 4f6708a5191b6b4284e896ac9bdbaa84911b49196dabf6676c4a611dbfde277044af807f03c777173e6c65fa076251edb4caf6f226795a4d7516fe2661ce3980

data/lib/active_remote/cached/version.rb

@@ -1,5 +1,5 @@
 module ActiveRemote
   module Cached
-    VERSION = "0.0.8"
+    VERSION = "0.0.9"
   end
 end

data/lib/active_remote/cached.rb

@@ -134,8 +134,13 @@ module ActiveRemote
           #   ::ActiveRemote::Cached.cache.delete([name, user_guid])
           # end
           def self.#{method_name}(#{expanded_method_args}, options = {})
-            ::ActiveRemote::Cached.cache.delete([name, "#search", #{sorted_method_args}])
-            ::ActiveRemote::Cached.cache.delete([name, "#find", #{sorted_method_args}])
+            options = ::ActiveRemote::Cached.default_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
+
+            ::ActiveRemote::Cached.cache.delete(find_cache_key)
+            ::ActiveRemote::Cached.cache.delete(search_cache_key)
           end
         RUBY
       end
@@ -150,18 +155,15 @@ module ActiveRemote
           #   ::ActiveRemote::Cached.cache.exist?([name, user_guid])
           # end
           def self.#{method_name}(#{expanded_method_args}, options = {})
-            ::ActiveRemote::Cached.cache.exist?([name, "#find", #{sorted_method_args}])
-          end
-        RUBY
+            options = ::ActiveRemote::Cached.default_options.merge(options)
+            namespace = options.delete(:namespace)
+            cache_key = [namespace, name, "#find", #{sorted_method_args}].compact
 
-        self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          # def self.cached_exist_find_by_user_guid?(user_guid, options = {})
-          #   ::ActiveRemote::Cached.cache.exist?([name, user_guid])
-          # end
-          def self.#{method_name}?(#{expanded_method_args}, options = {})
-            ::ActiveRemote::Cached.cache.exist?([name, "#find", #{sorted_method_args}])
+            ::ActiveRemote::Cached.cache.exist?(cache_key)
           end
         RUBY
+
+        singleton_class.send(:alias_method, "#{method_name}?", method_name)
       end
 
       def _define_cached_exist_search_method(method_name, *method_arguments)
@@ -171,21 +173,18 @@ module ActiveRemote
 
         self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
           # def self.cached_exist_search_by_user_guid(user_guid, options = {})
-          #   ::ActiveRemote::Cached.cache.exist?([name, user_guid])
+          #   ::ActiveRemote::Cached.cache.exist?([namespace, name, "#search", user_guid])
           # end
           def self.#{method_name}(#{expanded_method_args}, options = {})
-            ::ActiveRemote::Cached.cache.exist?([name, "#search", #{sorted_method_args}])
-          end
-        RUBY
+            options = ::ActiveRemote::Cached.default_options.merge(options)
+            namespace = options.delete(:namespace)
+            cache_key = [namespace, name, "#search", #{sorted_method_args}].compact
 
-        self.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          # def self.cached_exist_search_by_user_guid?(user_guid, options = {})
-          #   ::ActiveRemote::Cached.cache.exist?([name, user_guid])
-          # end
-          def self.#{method_name}?(#{expanded_method_args}, options = {})
-            ::ActiveRemote::Cached.cache.exist?([name, "#search", #{sorted_method_args}])
+            ::ActiveRemote::Cached.cache.exist?(cache_key)
           end
         RUBY
+
+        singleton_class.send(:alias_method, "#{method_name}?", method_name)
       end
 
       def _define_cached_find_method(method_name, *method_arguments)
@@ -202,7 +201,7 @@ module ActiveRemote
           # def self.cached_find_by_user_guid(user_guid, options = {})
           #   options = ::ActiveRemote::Cached.default_options.merge(options)
           #
-          #   ::ActiveRemote::Cached.cache.fetch([name, "#find", user_guid], options) do
+          #   ::ActiveRemote::Cached.cache.fetch([namespace, name, "#find", user_guid], options) do
           #     self.find(:user_guid => user_guid)
           #   end
           # end
@@ -212,8 +211,10 @@ module ActiveRemote
           #
           def self.#{method_name}(#{expanded_method_args}, options = {})
             options = ::ActiveRemote::Cached.default_options.merge(options)
+            namespace = options.delete(:namespace)
+            cache_key = [namespace, name, "#find", #{sorted_method_args}].compact
 
-            ::ActiveRemote::Cached.cache.fetch([name, "#find", #{sorted_method_args}], options) do
+            ::ActiveRemote::Cached.cache.fetch(cache_key, options) do
               if block_given?
                 yield
               else
@@ -238,7 +239,7 @@ module ActiveRemote
           # def self.cached_search_by_user_guid(user_guid, options = {})
           #   options = ::ActiveRemote::Cached.default_options.merge(options)
           #
-          #   ::ActiveRemote::Cached.cache.fetch([name, "#search", user_guid], options) do
+          #   ::ActiveRemote::Cached.cache.fetch([namespace, name, "#search", user_guid], options) do
           #     self.search(:user_guid => user_guid)
           #   end
           # end
@@ -248,8 +249,10 @@ module ActiveRemote
           #
           def self.#{method_name}(#{expanded_method_args}, options = {})
             options = ::ActiveRemote::Cached.default_options.merge(options)
+            namespace = options.delete(:namespace)
+            cache_key = [namespace, name, "#search", #{sorted_method_args}].compact
 
-            ::ActiveRemote::Cached.cache.fetch([name, "#search", #{sorted_method_args}], options) do
+            ::ActiveRemote::Cached.cache.fetch(cache_key, options) do
               if block_given?
                 yield
               else

data/spec/active_remote/cached_find_methods_spec.rb

@@ -80,5 +80,19 @@ describe FindMethodClass do
         FindMethodClass.cached_find_by_guid(:guid, :expires_in => 200).must_equal(:hello)
       end
     end
+
+    describe "namespaced cache" do
+      before do
+        ::ActiveRemote::Cached.default_options(:expires_in => 100, :namespace => "MyApp")
+      end
+
+      it "uses the namespace as a prefix to the cache key" do
+        ::ActiveRemote::Cached.cache.expects(:fetch).with(["MyApp", FindMethodClass.name, "#find", :guid], :expires_in => 100).returns(:hello)
+
+        FindMethodClass.stub(:find, :hello) do
+          FindMethodClass.cached_find_by_guid(:guid)
+        end
+      end
+    end
   end
 end

data/spec/active_remote/cached_search_methods_spec.rb

@@ -129,5 +129,19 @@ describe SearchMethodClass do
         SearchMethodClass.cached_search_by_guid(:guid, :expires_in => 200).must_equal(:hello)
       end
     end
+
+    describe "namespaced cache" do
+      before do
+        ::ActiveRemote::Cached.default_options(:expires_in => 100, :namespace => "MyApp")
+      end
+
+      it "uses the namespace as a prefix to the cache key" do
+        ::ActiveRemote::Cached.cache.expects(:fetch).with(["MyApp", SearchMethodClass.name, "#search", :guid], :expires_in => 100).returns(:hello)
+
+        SearchMethodClass.stub(:search, :hello) do
+          SearchMethodClass.cached_search_by_guid(:guid)
+        end
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_remote-cached
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Brandon Dewitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-08 00:00:00.000000000 Z
+date: 2014-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_remote