redis_object 1.2.4 → 1.2.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWZkNGY4Y2M4ZjI3YzEwY2NlMzgyNDlkNTBmMjc0ODY1NjUwZDhhMw==
+    ZDA3ZWZiYjJkZWZjMWRmMTRkN2YwOGI1YzU3ZmRhNjc1MGRhZjcyZQ==
   data.tar.gz: !binary |-
-    ZmExZDRhNDYwNWU3NjI2N2U4OTgyMGE4MTE2Yzg4NjNhNWQ5MDhmOQ==
+    ZDc3ZmExMjMxYjNkYjMxZTAwYWY0ODA2YTYxMTE3NDA5ZWJkNDUyZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NjI1ZjUyNGEyNzY0NTUxODljNmJhNTBiODcyNzIzNjllYjM5NjdmNmM4MGM5
-    MjRjNjQ1NDVmMTBmZGE4NGE1NGMyMDBkZmY1ZTlhY2ZlYWY1MDg2NmNjNGJi
-    ZGE0NDM5ODc5MWFhZWZlYzg2ZmRiNGRmMjVkZWI4ODZhMDM2YjM=
+    NWY3ZjBkY2UxNGNlMTllMWVhNzYxNmMzNTI0MWJkZDRjMzQwZGY0ZDc3MmEx
+    Mzk3YWMyY2M3ZDM4ZDg2Yjk5M2JlNjMwNWEwMWUwYTI0ZTBmMTY0NGIxMWMz
+    NGEyYWMxODI5ZWFiYmJmOGMwNzJlMzkzZTQ0MzVlMTI3YzViZjc=
   data.tar.gz: !binary |-
-    ZDEwYzc3NWRkYWVlYjk2NzFkMjI4MDcxMjVmZGViYTJhZDk5MDdmODkwMjQ5
-    NWVjNjg4MjE1MDRmMjE5ZmUzMjRkNTM5NDlkMDE0YmE5MTY3YjMxNjIwNTc2
-    OTJhZDI2YWZiYmM0M2JmNDU0YWQ1ODQyYThhNTRjODhjMmY2Yzc=
+    YzRmMmI4MzQ2NGFkMGQyOGZhOThhMTJlZGU0ZTEyMjM0MjFmNzE5OGY0NDYz
+    OGY1MzJmYjI4NzM4NmZjZmQzYjk2NjQ2ODAwMWM0MmI2NWQ3NzU3NjEyNmYw
+    ZWYwOTFjYTAzMDA2N2U5MmZiYWQzOWMyZjQ1OWEzMzY0NDIxODg=

data/lib/redis_object/ext/view_caching.rb

@@ -119,11 +119,15 @@ module Seabright
 						invalidate_cached_views(*self.class.cached_views.map {|name,opts| name })
 					end
 					
+					def invalidations(stream)
+						self.class.send("#{stream}stream_invalidations".to_sym)
+					end
+					
 					def invalidate_downstream!
-						return unless self.class.downstream_invalidations && (self.class.downstream_invalidations.size > 0)
-						puts "Invalidating downstream: #{self.class.downstream_invalidations.inspect}" if Debug.verbose?
-						self.class.downstream_invalidations.each do |col|
-							if has_collection?(col) && (colctn = get_collection(col))
+						return unless invalidations(:down).size > 0
+						puts "Invalidating downstream: #{invalidations(:down).inspect}" if Debug.verbose?
+						invalidations(:down).each do |col|
+							if has_collection?(col) and (colctn = get_collection(col))
 								colctn.each do |obj|
 									obj.invalidated_by_other(self,invalidation_chain + [self.hkey])
 								end
@@ -132,11 +136,12 @@ module Seabright
 					end
 					
 					def invalidate_upstream!
-						return unless self.class.upstream_invalidations && (self.class.upstream_invalidations.size > 0)
-						puts "Invalidating upstream: #{self.class.upstream_invalidations.inspect}" if Debug.verbose?
+						return unless invalidations(:up).size > 0
+						puts "Invalidating upstream: #{invalidations(:up).inspect}" if Debug.verbose?
 						backreferences.each do |obj|
-							next unless self.class.upstream_invalidations.include?(obj.class.name.split("::").last.to_sym) #|| self.class.invalidate_everything_upstream?
-							obj.invalidated_by_other(self,invalidation_chain + [self.hkey]) if obj.respond_to?(:invalidated_by_other)
+							if invalidations(:up).include?(obj.class) and obj.respond_to?(:invalidated_by_other)
+								obj.invalidated_by_other(self,invalidation_chain + [self.hkey])
+							end
 						end
 					end
 					
@@ -163,14 +168,15 @@ module Seabright
 					end
 					
 					def invalidated_by_other(obj,chain)
-						unless chain.include?(self.hkey)
-							puts "#{self.class.name}:#{self.id}'s view caches were invalidated by upstream object: #{obj.class.name}:#{obj.id} (chain:#{chain.inspect})" if Debug.verbose?
-							@invalidation_chain = chain
-							[:invalidated_by,"invalidated_by_#{obj.class.name.underscore}".to_sym].each do |meth_sym|
-								send(meth_sym,obj,chain) if respond_to?(meth_sym)
+						return if chain.include?(self.hkey)
+						puts "#{self.class.name}:#{self.id}'s view caches were invalidated by upstream object: #{obj.class.name}:#{obj.id} (chain:#{chain.inspect})" if Debug.verbose?
+						@invalidation_chain = chain
+						[:invalidated_by,"invalidated_by_#{obj.class.name.underscore}".to_sym].each do |meth_sym|
+							if respond_to?(meth_sym)
+								send(meth_sym,obj,chain)
 							end
-							invalidate_up_and_down!
 						end
+						invalidate_up_and_down!
 					end
 					
 					def invalidated_by(obj,chain)

data/lib/redis_object/version.rb

@@ -1,5 +1,5 @@
 module Seabright
 	class RedisObject
-		VERSION = "1.2.4"
+		VERSION = "1.2.5"
 	end
 end

data/redis_object.gemspec

@@ -23,5 +23,5 @@ Gem::Specification.new do |s|
   s.add_dependency "redis", ">= 3.0.4"
   s.add_dependency "yajl-ruby", ">= 1.1.0"
   s.add_dependency "activesupport", ">= 3.2.13"
-  s.add_dependency "psych", "= 1.3.4"
+  s.add_dependency "psych", ">= 1.3.4"
 end

data/spec/view_caching_spec.rb

@@ -40,7 +40,7 @@ module ViewCachingSpec
 	
 	class Baby < RedisObject
 		
-		invalidate_upstream :TypedObject
+		invalidate_upstream TypedObject
 		
 	end
 	

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis_object
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - John Bragg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-25 00:00:00.000000000 Z
+date: 2013-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: utf8_utils
@@ -70,14 +70,14 @@ dependencies:
   name: psych
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.3.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.3.4
 description: ''