redis_object 1.2.2 → 1.2.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGRkODFlNTE1NmI1NDI0Njc0MjQxMzlmNTFiOTA0MGViZWMzYWNjMQ==
+    YzUwMjBmYTE3ZDljZGMxMmE4MzBlNmQ5ZDQxNmUxNTAyMDU0ZGEzZA==
   data.tar.gz: !binary |-
-    MDdhZDJiZmZkYWZjNzg2ZmIxOGY0NDFjNjRkY2RkOTIzMDZhYTQwOA==
+    ZjRkOTMzMzI0ZGMwOWY1NDY0ZWUzMjg4ODhjZjc5NjVlYWRjNjY5Mw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YzE0YWQxNjYxNjM4YjExNTAwNjZiMzM5OTliNzkyYTljYTRjYjAzMTMyOTg3
-    M2JkOTBlMThhZGVjNDM5ZjA5NjFmMWY1NTkzMDAyNTkxMzFhYzJmNjhhNGJk
-    YTk3Yjk1YzY0MzRiMWRmOTQ5ZDdjMGVmMThkNmMwMmI1Nzk5NzE=
+    Yjk2NWJhOGNlZTQ3ZWVkYzAzMTJkNDZmMTA0NDA1ZDNmN2Y3MmJkMGNjMWIw
+    MzMzZmU1NTc1MmZkMTkzYTdlMDgzZjNkMGVlOGNhMzZiOWY4YjQ2YTVlNjVj
+    YjAxOTNkMGY0NTgwZWE2MWZkNDk5Yzk4NTcxMzA1ZjUzM2Y2NWM=
   data.tar.gz: !binary |-
-    YzRhNjY2MjEzYzQ3MjY5OTAxYzcxYjU1MzA5ZmQ4ZGVkNTRlMGU0ZTgxOWIy
-    ZGY5NWNlZTQxNGJhYzFlZTkwYmE2ZTU0MGExYWU4ZDFjODdmYjI1ZGVjYzYx
-    YzU1NzdhYTI2NzA1MDNkNTZkYTIzMDFiMGU5YTQ2ODc0ZDRhZTE=
+    NWYyMmYxNzk2ZGJiYTQxOTYxYTM3NmNkOTg2MzY2NDJhNDFlOTUxNzQwZWMy
+    YmU3MTMyZDA4M2Y2N2QxMmI3OGQ3OWRhYjIyNDA2OTIzYTMxMjhlMWFhNWFm
+    MzNhOGRhMWRjN2MxMzQ4YWE1ODRlZTVkNTRhOGE2YmQ1ZDA4YWE=

data/Gemfile

@@ -1,8 +1,10 @@
 source "http://rubygems.org"
 
-gem 'rake'
-gem 'rspec'
-gem 'coveralls', require: false
+group :test do
+	gem 'rake'
+	gem 'rspec'
+	gem 'coveralls', require: false
+end
 
 # Specify your gem's dependencies in redis_object.gemspec
 gemspec

data/lib/redis_object.rb

@@ -33,12 +33,12 @@ module Seabright
 		include Seabright::Types
 		include Seabright::DefaultValues
 		include Seabright::Collections
+		include Seabright::Triggers
 		include Seabright::Indices
 		include Seabright::Views
 		include Seabright::ViewCaching
 		include Seabright::Timestamps
 		include Seabright::History
-		include Seabright::Triggers
 		include Seabright::Benchmark
 		
 	end

data/lib/redis_object/base.rb

@@ -177,10 +177,10 @@ module Seabright
 			super if sym == :class
 			if sym.to_s =~ SetPattern
 				return super if args.size > 1
-				set(sym.to_s.gsub(SetPattern,'').to_sym,*args)
+				send(:set,sym.to_s.gsub(SetPattern,'').to_sym,*args)
 			else
 				return super if !args.empty?
-				get(sym)
+				send(:get,sym)
 			end
 		end
 		

data/lib/redis_object/ext/view_caching.rb

@@ -34,8 +34,6 @@ module Seabright
 			
 			def cache_view(name,opts=true)
 				cached_views[name.to_sym] = opts
-				intercept_views_for_caching!
-				set_up_invalidation!
 			end
 			alias_method :cache_named_view, :cache_view
 			
@@ -175,7 +173,27 @@ module Seabright
 						end
 					end
 					
-					trigger_on_update :invalidated_by_update!
+					def invalidated_by(obj,chain)
+						invalidate_cached_views!
+					end
+					
+					def invalidated_set(cmd,k,v)
+						ret = send("uninvalidated_#{cmd}".to_sym,k,v)
+						invalidated_by_update!
+						ret
+					end
+					
+					alias_method :uninvalidated_set, :set unless method_defined?(:uninvalidated_set)
+					def set(k,v)
+						invalidated_set(:set,k,v)
+					end
+					
+					alias_method :uninvalidated_setnx, :setnx unless method_defined?(:uninvalidated_setnx)
+					def setnx(k,v)
+						invalidated_set(:setnx,k,v)
+					end
+					
+					# trigger_on_update :invalidated_by_update!
 					trigger_on_reference :invalidated_by_reference!
 					
 				end
@@ -202,7 +220,6 @@ module Seabright
 			
 			def invalidate_upstream(*args)
 				@upstream_invalidations = (@upstream_invalidations || []) + args
-				set_up_invalidation!
 			end
 			
 			def upstream_invalidations
@@ -219,7 +236,6 @@ module Seabright
 			
 			def invalidate_downstream(*args)
 				@downstream_invalidations = (@downstream_invalidations || []) + args
-				set_up_invalidation!
 			end
 			
 			def downstream_invalidations
@@ -252,6 +268,8 @@ module Seabright
 		
 		def self.included(base)
 			base.extend(ClassMethods)
+			base.intercept_views_for_caching!
+			base.set_up_invalidation!
 		end
 		
 	end

data/lib/redis_object/version.rb

@@ -1,5 +1,5 @@
 module Seabright
 	class RedisObject
-		VERSION = "1.2.2"
+		VERSION = "1.2.3"
 	end
 end

data/spec/script_cache_spec.rb

@@ -26,9 +26,9 @@ module ScriptCacheSpec
 			GenericObject.recently_created.first.id.should eq("5")
 			GenericObject.indexed(:created_at,-1,false).to_a.last.id.should eq("4")
 			
-			$ScriptSHAMap.keys.count.should eq(1)
+			cnt = $ScriptSHAMap.keys.count
 			RedisObject.untrack_script :RevScript
-			$ScriptSHAMap.keys.count.should eq(0)
+			$ScriptSHAMap.keys.count.should eq(cnt-1)
 			
 		end
 		

data/spec/view_caching_spec.rb

@@ -34,7 +34,7 @@ module ViewCachingSpec
 	
 	class Container < RedisObject
 		
-		invalidate_downstream :TypedObject
+		invalidate_downstream :typed_objects
 		
 	end
 	
@@ -96,9 +96,9 @@ module ViewCachingSpec
 			@obj.view_is_cached?(:aggregated).should eq(true)
 			
 			@obj.set(:demolisher, "smash")
-			# 
-			# @obj.view_is_cached?(:aggregated).should eq(false)
+			sleep 1
 			
+			@obj.view_is_cached?(:aggregated).should eq(false)
 			
 		end
 				
@@ -109,20 +109,18 @@ module ViewCachingSpec
 			@obj.view_is_cached?(:aggregated).should eq(true)
 			
 			@baby.set(:demolisher, "smash")
+			sleep 1
 			
-			# sleep 1
-			# 
-			# TypedObject.find(@obj.id).view_is_cached?(:aggregated).should eq(false)
+			TypedObject.find(@obj.id).view_is_cached?(:aggregated).should eq(false)
 			
 			@obj.view_as_hash(:aggregated).should be_a(Hash)
 			
 			@obj.view_is_cached?(:aggregated).should eq(true)
 			
 			@dad.set(:demolisher, "smash")
+			sleep 1
 			
-			# sleep 1
-			# 
-			# TypedObject.find(@obj.id).view_is_cached?(:aggregated).should eq(false)
+			TypedObject.find(@obj.id).view_is_cached?(:aggregated).should eq(false)
 			
 		end
 				

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis_object
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - John Bragg