active_remote-cached 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 037ff5730170b6fd9bcde427a2551d17eada4242
-  data.tar.gz: d7800b6e88135fac587afc65b3f24cd895c6f510
+  metadata.gz: d0f5c9001aeadeb02257a3a6cbc8206e0209e3e7
+  data.tar.gz: b50ea3df9a27c2cd8f38c47f49687880a67aa8af
 SHA512:
-  metadata.gz: c23a65bb8c5f8c3fb4d52402be4bc2ad233a402a041574fa29a3fce657fb9b53a0b48b76dbc4fb21244c2794843ac5a11aae13851b0f2f5106733aa3a3b9cad9
-  data.tar.gz: 04864770794f7c776af951eab432a4063713b2a2490131a38b13a16d82dece26d4d9547723867045740ff5223233701f42eb855be85d32b51c8b55270b98ba99
+  metadata.gz: 60eaeea21dfc61be402f4ca821e2a2d3f3ce6e5f8f7359e57c5591c62f609d20b1ba2f24389694d9e75f83e9e6011dd7651b358380a19e5446f1da128464967c
+  data.tar.gz: b1056bf3a13952433b28b7ebb13904d8511bc2e88bd90783dd728468c8d6157406677be137129123e42a61ae43b8578509a49de378d868c6331961ea80aff3f4

data/lib/active_remote-cached.rb

@@ -40,13 +40,27 @@ module ActiveRemote
       def cached_find(argument_hash, options = {})
         method_name = _cached_find_method_name(argument_hash.keys)
         arguments = argument_hash.values
-        __send__(method_name, *arguments, options)
+
+        if block_given?
+          __send__(method_name, *arguments, options) do
+            yield
+          end
+        else
+          __send__(method_name, *arguments, options)
+        end
       end
 
       def cached_search(argument_hash, options = {})
         method_name = _cached_search_method_name(argument_hash.keys)
         arguments = argument_hash.values
-        __send__(method_name, *arguments, options)
+
+        if block_given?
+          __send__(method_name, *arguments, options) do
+            yield
+          end
+        else
+          __send__(method_name, *arguments, options)
+        end
       end
 
       ##
@@ -190,11 +204,19 @@ module ActiveRemote
           #     self.find(:user_guid => user_guid)
           #   end
           # end
+          # 
+          # If a block is given, it is incumbent on the caller to make sure the expectation
+          # of the result object is maintained for requests/responses
+          #
           def self.#{method_name}(#{expanded_method_args}, options = {})
             options = ::ActiveRemote::Cached.default_options.merge(options)
 
             ::ActiveRemote::Cached.cache.fetch([name, "#find", #{sorted_method_args}], options) do
-              self.find(#{expanded_search_args})
+              if block_given?
+                yield
+              else
+                self.find(#{expanded_search_args})
+              end
             end
           end
         RUBY
@@ -218,11 +240,19 @@ module ActiveRemote
           #     self.search(:user_guid => user_guid)
           #   end
           # end
+          #
+          # If a block is given, it is incumbent on the caller to make sure the expectation
+          # of the result object is maintained for requests/responses
+          #
           def self.#{method_name}(#{expanded_method_args}, options = {})
             options = ::ActiveRemote::Cached.default_options.merge(options)
 
             ::ActiveRemote::Cached.cache.fetch([name, "#search", #{sorted_method_args}], options) do
-              self.search(#{expanded_search_args})
+              if block_given?
+                yield
+              else
+                self.search(#{expanded_search_args})
+              end
             end
           end
         RUBY

data/lib/active_remote-cached/cache.rb

@@ -15,8 +15,24 @@ module ActiveRemote::Cached
       super(@cache_provider)
     end
 
+    def fetch(name, options = {})
+      fetch_value = super
+
+      unless valid_fetched_value?(fetch_value, options)
+        delete(name)
+      end
+
+      return fetch_value
+    end
+
     private
 
+    def valid_fetched_value?(value, options = {})
+      return false if value.nil?
+      return false if !options.fetch(:allow_empty, false) && value.respond_to?(:empty?) && value.empty?
+      return true
+    end
+
     def validate_provider_method_present(method_name)
       unless self.cache_provider.respond_to?(method_name)
         raise <<-CACHE_METHOD

data/lib/active_remote-cached/version.rb

@@ -1,5 +1,5 @@
 module ActiveRemote
   module Cached
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/spec/cached_search_methods_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 class SearchMethodClass
   include ::ActiveRemote::Cached
 
+  def self.derp; nil; end
   def self.find; nil; end
   def self.search; nil; end
 
@@ -53,6 +54,54 @@ describe SearchMethodClass do
       ::ActiveRemote::Cached.default_options({})
     end
 
+    it "executes the search block when a block is passed" do
+      SearchMethodClass.stub(:derp, :derp) do
+        SearchMethodClass.cached_search(:guid => :guid) do
+          SearchMethodClass.derp
+        end.must_equal(:derp)
+      end
+    end
+
+    it "does not persist empty values by default" do
+      SearchMethodClass.stub(:derp, []) do
+        SearchMethodClass.cached_search(:guid => :guid) do
+          SearchMethodClass.derp
+        end
+
+        SearchMethodClass.cached_exist_search_by_guid?(:guid).must_equal(false)
+      end
+    end
+
+    it "persists empty values when allow_empty sent" do
+      SearchMethodClass.stub(:derp, []) do
+        SearchMethodClass.cached_search({:guid => :guid}, :allow_empty => true) do
+          SearchMethodClass.derp
+        end
+
+        SearchMethodClass.cached_exist_search_by_guid?(:guid).must_equal(true)
+      end
+    end
+
+    it "does not persist nil values" do
+      SearchMethodClass.stub(:derp, nil) do
+        SearchMethodClass.cached_search(:guid => :guid) do
+          SearchMethodClass.derp
+        end
+
+        SearchMethodClass.cached_exist_search_by_guid?(:guid).must_equal(false)
+      end
+    end
+
+    it "does persist non nil values" do
+      SearchMethodClass.stub(:derp, :derp) do
+        SearchMethodClass.cached_search(:guid => :guid) do
+          SearchMethodClass.derp
+        end
+
+        SearchMethodClass.cached_exist_search_by_guid?(:guid).must_equal(true)
+      end
+    end
+
     it "executes search_by_guid when cached_search with guid called" do
       FindMethodClass.stub(:search, :hello) do
         FindMethodClass.cached_search(:guid => :guid).must_equal(:hello)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_remote-cached
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Brandon Dewitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-10 00:00:00.000000000 Z
+date: 2014-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_remote
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Provides a configuration for caching mechanisms and finders on ActiveRemote