redis_object 1.5.1 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9e5ca5eeb648940280fd12e10eadde8060bf9bd
-  data.tar.gz: aa70d17724344acd63d808113f31449fe0da257b
+  metadata.gz: e29fac9ff513bd3d3f7aa116e630fe7c73f5cec7
+  data.tar.gz: 14d062362d8cad4c0ee0ea30de05fcf7ae21f4a2
 SHA512:
-  metadata.gz: e24ee1ccdaa8cc5171a0d58ba3ebebad051cf361dbd719f954837427d1b9d5d69a5c7cfcc9b23103c25fe5aa57a2779035a1b2e6d78d5f956e9ce42351a2d7ce
-  data.tar.gz: 57b3a7698aa66d95faa01f88e83dd65d75a5160b8c722160215de280ddc8ca44cf0e839afb20e2f6249ad77be48f2384cac3d7b8fa56d6da57816cfa13e92635
+  metadata.gz: 7ea0b819bb2181d844fbbf493d3e5cbd66a2b9511282ed200a8cc2ed2032df0fd67b1c9cbb1f43867a2d3bd349be8a369355d380ad39661855ebc734fad50786
+  data.tar.gz: cc1dbf34cddda5e4fadad91871d443ba038c0657f8b9566f70b3526d6bbf01e45dd94b460a7b86aa380edd08b4a03c7081104c7636080d19bb656560e46cbdff

data/lib/redis_object.rb

@@ -34,11 +34,11 @@ module Seabright
 		include Seabright::CachedScripts
 		include Seabright::Storage
 		include Seabright::Keys
-		include Seabright::Types
 		include Seabright::DefaultValues
+		include Seabright::Indices
 		include Seabright::Collections
+		include Seabright::Types
 		include Seabright::Triggers
-		include Seabright::Indices
 		include Seabright::Views
 		include Seabright::ViewCaching
 		include Seabright::Timestamps

data/lib/redis_object/base.rb

@@ -71,7 +71,13 @@ module Seabright
 		alias_method :actual, :raw
 		
 		def get(k)
-			cached_hash_values[k.to_s] ||= _get(k)
+			filter_gotten_value(k, (cached_hash_values[k.to_s] || _get(k)))
+		end
+		
+		def filter_gotten_value(k,v)
+			self.class.get_filters.inject(v) do |acc, filter|
+				filter.call(self, k, acc)
+			end
 		end
 		
 		def _get(k)
@@ -92,6 +98,9 @@ module Seabright
 		end
 		
 		def mset(dat)
+			dat = self.class.mset_filters.inject(dat) do |acc,filter|
+				filter.call(self, acc)
+			end
 			store.hmset(hkey, *(dat.inject([]){|acc,(k,v)| acc << [k,v] }.flatten))
 			cached_hash_values.merge!(dat)
 			dat.each do |k,v|
@@ -115,6 +124,9 @@ module Seabright
 		end
 		
 		def set(k,v)
+			(k,v) = self.class.set_filters.inject([k,v]) do |acc,filter|
+				filter.call(self,*acc) unless acc.nil? or acc[0].nil?
+			end
 			return nil if k.nil?
 			return set_ref(k,v) if v.is_a?(RedisObject)
 			store.hset(hkey, k.to_s, v.to_s)
@@ -151,6 +163,9 @@ module Seabright
 		end
 		
 		def setnx(k,v)
+			(k,v) = self.class.set_filters.inject([k,v]) do |acc,filter|
+				filter.call(self,*acc)
+			end
 			if success = store.hsetnx(hkey, k.to_s, v.to_s)
 				cached_hash_values[k.to_s] = v
 				define_setter_getter(k)
@@ -216,6 +231,34 @@ module Seabright
 		
 		module ClassMethods
 			
+			def action_filters
+				@@action_filters ||= {}
+			end
+			
+			def set_filters
+				action_filters[:set] ||= []
+			end
+			
+			def filter_sets(&block)
+				set_filters << block
+			end
+			
+			def mset_filters
+				action_filters[:mset] ||= []
+			end
+			
+			def filter_msets(&block)
+				mset_filters << block
+			end
+			
+			def get_filters
+				action_filters[:get] ||= []
+			end
+			
+			def filter_gets(&block)
+				get_filters << block
+			end
+			
 			def clean_id(i)
 				i.to_s.gsub(/.*:/,'').gsub(/_h$/,'')
 			end

data/lib/redis_object/collection.rb

@@ -6,20 +6,6 @@ module Seabright
 			"#{hkey}:collections"
 		end
 		
-		def load(o_id)
-			super(o_id)
-			store.smembers(hkey_col).each do |name|
-				collections[name] = Seabright::Collection.load(name,self)
-				define_access(name) do
-					get_collection(name)
-				end
-				define_access(name.to_s.singularize) do
-					get_collection(name).latest
-				end
-			end
-			true
-		end
-		
 		def delete_child(obj)
 			if col = get_collection(obj.collection_name)
 				col.delete obj
@@ -78,14 +64,18 @@ module Seabright
 			end
 		end
 		
-		def get(k)
-			if has_collection?(k)
-				get_collection(k)
-			elsif has_collection?(pk = k.to_s.pluralize)
-				get_collection(pk).first
-			else
-				super(k)
+		def load(o_id)
+			super(o_id)
+			store.smembers(hkey_col).each do |name|
+				collections[name] = Seabright::Collection.load(name,self)
+				define_access(name) do
+					get_collection(name)
+				end
+				define_access(name.to_s.singularize) do
+					get_collection(name).latest
+				end
 			end
+			true
 		end
 		
 		def has_collection?(name)
@@ -97,13 +87,13 @@ module Seabright
 				collections[name.to_s] ||= Collection.load(name,self)
 			else
 				store.sadd hkey_col, name
-				@collection_names << name.to_s
+				collection_names << name.to_s
 				collections[name.to_s] ||= Collection.load(name,self)
 				define_access(name.to_s.pluralize) do
 					get_collection(name)
 				end
 				define_access(name.to_s.singularize) do
-					get_collection(name).latest
+					get_collection(name).first
 				end
 			end
 			collections[name.to_s]
@@ -117,16 +107,6 @@ module Seabright
 			@collection_names ||= store.smembers(hkey_col)
 		end
 		
-		def mset(dat)
-			dat.select! {|k,v| !collections[k.to_s] }
-			super(dat)
-		end
-		
-		def set(k,v)
-			@data ? super(k,v) : has_collection?(k) ? get_collection(k.to_s).replace(v) : super(k,v)
-			v
-		end
-		
 		def collect_type_by_key(col,*keys)
 			collect = get_collection(col)
 			keys.each do |k|
@@ -136,6 +116,37 @@ module Seabright
 		
 		module ClassMethods
 			
+			def intercept_sets_for_collecting!
+				return if @intercepted_sets_for_collecting
+				self.class_eval do
+					
+					filter_gets do |obj, k, v|
+						if obj.has_collection?(k)
+							obj.get_collection(k)
+						elsif obj.has_collection?(pk = k.to_s.pluralize)
+							obj.get_collection(pk).first
+						else
+							v
+						end
+					end
+					
+					filter_sets do |obj, k, v|
+						if obj.has_collection?(k)
+							obj.get_collection(k.to_s).replace(v)
+							return [nil,nil]
+						else
+							[k,v]
+						end
+					end
+					
+					filter_msets do |obj, dat|
+						dat.select {|k,v| !obj.collections[k.to_s] }
+					end
+					
+				end
+				@intercepted_sets_for_collecting = true
+			end
+			
 			def hkey_col(ident = nil)
 				"#{hkey(ident)}:collections"
 			end
@@ -170,12 +181,11 @@ module Seabright
 			
 			def get(k)
 				if has_collection?(k)
-					get_collection(k)
+					return get_collection(k)
 				elsif has_collection?(pk = k.to_s.pluralize)
-					get_collection(pk).first
-				else
-					super(k)
+					return get_collection(pk).first
 				end
+				nil
 			end
 			
 			def has_collection?(name)
@@ -195,6 +205,7 @@ module Seabright
 		
 		def self.included(base)
 			base.extend(ClassMethods)
+			base.intercept_sets_for_collecting!
 		end
 		
 	end
@@ -238,12 +249,18 @@ module Seabright
 			"#{key}::zintersect_temp::#{RedisObject.new_id(4)}"
 		end
 		
-		RedisObject::ScriptSources::FwdScript = "redis.call('ZINTERSTORE', KEYS[1], 2, KEYS[2], KEYS[3], 'WEIGHTS', 1, 0)\nlocal keys = redis.call('ZRANGE', KEYS[1], 0, KEYS[4])\nredis.call('DEL', KEYS[1])\nreturn keys".freeze
-		RedisObject::ScriptSources::RevScript = "redis.call('ZINTERSTORE', KEYS[1], 2, KEYS[2], KEYS[3], 'WEIGHTS', 1, 0)\nlocal keys = redis.call('ZREVRANGE', KEYS[1], 0, KEYS[4])\nredis.call('DEL', KEYS[1])\nreturn keys".freeze
+		RedisObject::ScriptSources::FwdScript = "redis.call('ZINTERSTORE', KEYS[1], 2, KEYS[2], KEYS[3], 'WEIGHTS', 1, 0)
+			local keys = redis.call('ZRANGE', KEYS[1], 0, KEYS[4])
+			redis.call('DEL', KEYS[1])
+			return keys".freeze
+		RedisObject::ScriptSources::RevScript = "redis.call('ZINTERSTORE', KEYS[1], 2, KEYS[2], KEYS[3], 'WEIGHTS', 1, 0)
+			local keys = redis.call('ZREVRANGE', KEYS[1], 0, KEYS[4])
+			redis.call('DEL', KEYS[1])
+			return keys".freeze
 		
 		def keys_by_index(idx,num=-1,reverse=false)
-			keys = run_script(reverse ? :RevScript : :FwdScript, [temp_key, sort_index_key(idx), key, num])
-			ListEnumerator.new(keys) do |y|
+			keys = run_script(reverse ? :RevScript : :FwdScript, [temp_key, sort_index_key(idx), key, num>0 ? num - 1 : -1])
+			ListEnumerator.new(keys.uniq) do |y|
 				keys.each do |member|
 					y << member
 				end
@@ -584,6 +601,9 @@ module Seabright
 			end
 			
 			def class_const_for(name)
+				if cls = RedisObject.constant_lookups[name.to_s.classify.to_sym]
+					return cls
+				end
 				Object.const_get(name.to_s.classify.to_sym) rescue RedisObject
 			end
 

data/lib/redis_object/defaults.rb

@@ -11,12 +11,12 @@ module Seabright
 				return if @intercepted_for_defaults
 				self.class_eval do
 					
-					alias_method :undefaulted_get, :get unless method_defined?(:undefaulted_get)
-					def get(k)
-						if !is_set?(k) && (d = self.class.default_vals[k.to_sym]) && !d.nil?
-							return d
+					filter_gets do |obj, k, v|
+						if !obj.is_set?(k) && (d = obj.class.default_vals[k.to_sym]) && !d.nil?
+							d
+						else
+							v
 						end
-						undefaulted_get(k)
 					end
 					
 				end

data/lib/redis_object/ext/filters.rb

@@ -7,41 +7,45 @@ module Seabright
 				return if @intercept_for_filters
 				self.class_eval do
 					
-					def filtered_method_call(method,*args)
-						if filters = self.class.filters_for(method)
-							filters.each do |f|
-								next unless args.is_a?(Array) and !args[0].nil?
-								args = send(f,*args)
+					filter_gets do |obj, k, v|
+						if filters = obj.class.filters_for(:get)
+							return filters.inject(v) do |acc,f|
+								obj.send(f,acc)
 							end
+						else
+							v
 						end
-						unless args.is_a?(Array)
-							args = [nil,nil]
-						end
-						send("unfiltered_#{method.to_s}".to_sym,*args)
-					end
-					
-					alias_method :unfiltered_get, :get unless method_defined?(:unfiltered_get)
-					def get(k)
-						filtered_method_call(:get,k)
 					end
 					
-					alias_method :unfiltered_set, :set unless method_defined?(:unfiltered_set)
-					def set(k,v)
-						filtered_method_call(:set,k,v)
-					end
-					
-					alias_method :unfiltered_setnx, :setnx unless method_defined?(:unfiltered_setnx)
-					def setnx(k,v)
-						filtered_method_call(:setnx,k,v)
+					filter_sets do |obj, k, v|
+						if filters = obj.class.filters_for(:set)
+							filters.inject([k,v]) do |acc,f|
+								obj.send(f,*acc)
+							end
+						else
+							[k,v]
+						end
 					end
 					
+					# filter_msets do |dat|
+					# 	if filters = self.class.filters_for(method)
+					# 		filters.each do |f|
+					# 			next unless args.is_a?(Array) and !args[0].nil?
+					# 			args = send(f,*args)
+					# 		end
+					# 	end
+					# 	unless args.is_a?(Array)
+					# 		args = [nil,nil]
+					# 	end
+					# 	args
+					# end
+					# 
 				end
 				@intercept_for_filters = true
 			end
 			
 			def set_filter(filter)
 				filter_method(:set,filter)
-				filter_method(:setnx,filter)
 			end
 			
 			def get_filter(filter)

data/lib/redis_object/indices.rb

@@ -22,17 +22,6 @@ module Seabright
 				return if @intercepted_sets_for_indices
 				self.class_eval do
 					
-					def indexed_set_method(meth,k,v)
-						ret = send("unindexed_#{meth}".to_sym,k,v)
-						if self.class.has_index?(k)
-							set_index k, v, hkey
-						end
-						if self.class.has_sort_index?(k)
-							set_sort_index k, v, hkey
-						end
-						ret
-					end
-					
 					def set_index(k,v,hkey)
 						if cur = get(k)
 							store.srem(self.class.index_key(k,cur), hkey)
@@ -45,25 +34,24 @@ module Seabright
 						store.zadd(self.class.sort_index_key(k), score_format(k,v), hkey)
 					end
 					
-					alias_method :unindexed_set, :set unless method_defined?(:unindexed_set)
-					def set(k,v)
-						indexed_set_method(:set,k,v)
-					end
-					
-					alias_method :unindexed_setnx, :setnx unless method_defined?(:unindexed_setnx)
-					def setnx(k,v)
-						indexed_set_method(:setnx,k,v)
+					filter_sets do |obj, k, v|
+						if obj.class.has_index?(k)
+							obj.set_index k, v, obj.hkey
+						end
+						if obj.class.has_sort_index?(k)
+							obj.set_sort_index k, v, obj.hkey
+						end
+						[k, v]
 					end
 					
-					alias_method :unindexed_mset, :mset unless method_defined?(:unindexed_mset)
-					def mset(dat)
-						dat.select {|k,v| self.class.has_index?(k) }.each do |k,v|
-							set_index k, v, hkey
+					filter_msets do |obj, dat|
+						dat.each do |k,v|
+							obj.set_index(k, v, obj.hkey) if obj.class.has_index?(k)
 						end
-						dat.select {|k,v| self.class.has_sort_index?(k) }.each do |k,v|
-							set_sort_index k, v, hkey
+						dat.each do |k,v|
+							obj.set_sort_index(k, v, obj.hkey) if obj.class.has_sort_index?(k)
 						end
-						unindexed_mset(dat)
+						dat
 					end
 					
 				end
@@ -147,6 +135,7 @@ module Seabright
 		
 		def self.included(base)
 			base.extend(ClassMethods)
+			base.intercept_sets_for_indices!
 		end
 		
 	end

data/lib/redis_object/inheritance_tracking.rb

@@ -1,8 +1,15 @@
 module Seabright
+	
+	def RedisObject.constant_lookups
+		@constant_lookups ||= {}
+	end
+	
 	module InheritanceTracking
 		
 		module ClassMethods
+			
 			def inherited(child_class)
+				RedisObject.constant_lookups[child_class.name.to_s.split("::").last.to_sym] ||= child_class
 				child_classes_set.add(child_class)
 			end
 

data/lib/redis_object/timestamps.rb

@@ -3,7 +3,9 @@ module Seabright
 		
 		def update_timestamps
 			# return unless self.class.time_matters?
-			set(:created_at, Time.now) if !is_set?(:created_at)
+			if !is_set?(:created_at)
+				set(:created_at, Time.now)
+			end
 			set(:updated_at, Time.now)
 		end
 		

data/lib/redis_object/types.rb

@@ -136,30 +136,19 @@ module Seabright
 			
 			def intercept_for_typing!
 				return if @intercepted_for_typing
-				self.class_eval do
-					
-					alias_method :untyped_get, :get unless method_defined?(:untyped_get)
-					def get(k)
-						enforce_format(k,untyped_get(k))
-					end
-					
-					alias_method :untyped_mset, :mset unless method_defined?(:untyped_mset)
-					def mset(dat)
-						dat.merge!(dat) {|k,v1,v2| save_format(k,v1) }
-						untyped_mset(dat)
-					end
-					
-					alias_method :untyped_set, :set unless method_defined?(:untyped_set)
-					def set(k,v)
-						untyped_set(k,save_format(k,v))
-					end
-					
-					alias_method :untyped_setnx, :setnx unless method_defined?(:untyped_setnx)
-					def setnx(k,v)
-						untyped_setnx(k,save_format(k,v))
-					end
-					
+				
+				filter_gets do |obj, k, v|
+					obj.enforce_format(k, v)
+				end
+				
+				filter_sets do |obj, k, v|
+					[k, obj.save_format(k,v)]
+				end
+				
+				filter_msets do |obj, dat|
+					dat.merge!(dat) {|k,v1,v2| obj.save_format(k, v1) }
 				end
+				
 				@intercepted_for_typing = true
 			end
 			

data/lib/redis_object/types/array.rb

@@ -3,10 +3,12 @@ module Seabright
 		module ArrayType
 			
 			def format_array(val)
+				return val if val.is_a?(Array)
 				val ? Yajl::Parser.new(:symbolize_keys => true).parse(val) : []
 			end
 			
 			def save_array(val)
+				return val if val.is_a?(String)
 				Yajl::Encoder.encode(val)
 			end
 			

data/lib/redis_object/types/boolean.rb

@@ -3,11 +3,11 @@ module Seabright
 		module BooleanType
 			
 			def format_boolean(val)
-				val=="true"
+				(val === true or val === "true") ? true : false
 			end
 			
 			def save_boolean(val)
-				val === true ? "true" : "false"
+				(val === true or val === "true") ? "true" : "false"
 			end
 			
 			def score_boolean(val)

data/lib/redis_object/types/json.rb

@@ -3,10 +3,12 @@ module Seabright
 		module JsonType
 			
 			def format_json(val)
+				return val unless val.is_a?(String)
 				val ? Yajl::Parser.new(:symbolize_keys => true).parse(val) : nil
 			end
 			
 			def save_json(val)
+				return val if val.is_a?(String)
 				Yajl::Encoder.encode(val)
 			end
 			

data/lib/redis_object/version.rb

@@ -1,5 +1,5 @@
 module Seabright
 	class RedisObject
-		VERSION = "1.5.1"
+		VERSION = "1.5.3"
 	end
 end

data/spec/adapter_spec.rb

@@ -22,7 +22,7 @@ describe RedisObject do
 	it "can dump to a file" do
 		obj = ObjectTests::User.create("test")
 		RedisObject.dump_stores_to_files("/tmp")
-		RedisObject.store.flushdb
+		SpecHelper.flushdb
 	end
 	
 	it "can restore from a file" do

data/spec/benchmark_spec.rb

@@ -30,7 +30,7 @@ module BenchmarkSpec
 	
 	describe Seabright::Benchmark do
 		before do
-			RedisObject.store.flushdb
+			SpecHelper.flushdb
 		end
 		
 		it "benchmarks a call" do

data/spec/collections_spec.rb

@@ -10,7 +10,7 @@ module CollectionSpec
 	describe Seabright::Collections do
 		before do
 			
-			RedisObject.store.flushdb
+			SpecHelper.flushdb
 			@granddad = GrandDad.create("gramps")
 			@dad = Daddy.create("dad")
 			@son = Son.create("sun")
@@ -140,7 +140,7 @@ module CollectionSpec
 				@dad << Son.create
 			end
 			
-			# @dad.sons.indexed(:created_at,3,true).count.should eq(3)
+			@dad.sons.indexed(:created_at,3,true).count.should eq(3)
 			
 			Son.indexed(:created_at,3,true).count.should eq(3)
 			

data/spec/defaults_spec.rb

@@ -28,7 +28,7 @@ module DefaultSpec
 	
 	describe Seabright::DefaultValues do
 		before do
-			RedisObject.store.flushdb
+			SpecHelper.flushdb
 		end
 		
 		it "returns default value" do

data/spec/dumping_spec.rb

@@ -16,9 +16,9 @@ module DumpingSpec
 		
 	end
 	
-	describe Seabright::Triggers do
+	describe Seabright::Dumping do
 		before do
-			RedisObject.store.flushdb
+			SpecHelper.flushdb
 			5.times do
 				d = DumpableObject.create(phone: Random.rand(100)*555, mailed: true, canceled_at: Time.now)
 				d << GenericObject.create(complex: {woot: true, ohnoes: false})
@@ -64,13 +64,13 @@ module DumpingSpec
 			
 			r = RedisObject.dump_everything(:yml)
 			r.size.should > 100
-			RedisObject.store.flushdb
+			SpecHelper.flushdb
 			RedisObject.load_dump r, :yml
 			DumpableObject.latest.generic_objects.count.should eq(1)
 			
 			# r = RedisObject.dump_everything(:json)
 			# r.size.should > 100
-			# RedisObject.store.flushdb
+			# SpecHelper.flushdb
 			# RedisObject.load_dump r, :json
 			# DumpableObject.latest.generic_objects.count.should eq(1)
 			

data/spec/field_ref_spec.rb

@@ -8,7 +8,7 @@ module FieldRefSpec
 	describe RedisObject do
 		
 		before do
-			RedisObject.store.flushdb
+			SpecHelper.flushdb
 			@dad = Dad.create("daddy")
 			@son = Son.create("sonny")
 			@dad.stepson = @son

data/spec/filters_spec.rb

@@ -13,7 +13,7 @@ module FilterSpec
 	
 	describe Seabright::Filters do
 		before do
-			RedisObject.store.flushdb
+			SpecHelper.flushdb
 		end
 		
 		it "modifies set and gets correctly" do

data/spec/indices_spec.rb

@@ -35,7 +35,7 @@ module IndexSpec
 	describe Seabright::Indices do
 		
 		before do
-			RedisObject.store.flushdb
+			SpecHelper.flushdb
 		end
 		
 		it "sorts on integer field" do

data/spec/rename_class_spec.rb

@@ -10,7 +10,7 @@ module RenameClassSpec
 
 	describe Seabright::Storage::Redis, "#rename_class" do
 		before do
-			RedisObject.store.flushdb
+			SpecHelper.flushdb
 
 			mozzarella = Topping.create(:mozzarella)
 			basil      = Topping.create(:basil)

data/spec/sanitization_spec.rb

@@ -16,26 +16,29 @@ module TriggerSpec
 	end
 	
 	describe Seabright::Triggers do
-		before do
-			RedisObject.store.flushdb
-			@secret = SensitiveObject.create(test: Time.now, yay: true, stuff: {test: "1"}, worthless: "yup", sup: "dawg")
+		before(:each) do
+			SpecHelper.flushdb
+		end
+		
+		let(:secret) do
+			SensitiveObject.create(test: Time.now, yay: true, stuff: {test: "1"}, worthless: "yup", sup: "dawg")
 		end
 		
 		it "can sanitize a field or two willy nilly" do
 			
-			@secret.stuff.should be_a(Hash)
-			@secret.sanitize! :stuff, :sup
-			@secret.stuff.should eq(nil)
+			secret.stuff.should be_a(Hash)
+			secret.sanitize! :stuff, :sup
+			secret.stuff.should eq(nil)
 			
 		end
 		
 		it "can sanitize by name" do
 			
-			@secret.test.should_not eq(nil)
-			@secret.yay.should eq(true)
-			@secret.sanitize_by_name! :burn
-			@secret.test.should eq(nil)
-			@secret.yay.should eq(false)
+			secret.test.should_not eq(nil)
+			secret.yay.should eq(true)
+			secret.sanitize_by_name! :burn
+			secret.test.should eq(nil)
+			secret.yay.should eq(false)
 			
 		end
 		

data/spec/script_cache_spec.rb

@@ -7,7 +7,7 @@ module ScriptCacheSpec
 	describe Seabright::CachedScripts do
 		before do
 			
-			RedisObject.store.flushdb
+			SpecHelper.flushdb
 			
 			(1..5).each do |n|
 				GenericObject.create(n.to_s)

data/spec/spec_helper.rb

@@ -35,5 +35,13 @@ Debug = if ENV['DEBUG']
 		DebugMode.new
 	end
 
+module SpecHelper
+	
+	def self.flushdb
+		RedisObject.store.flushdb
+	end
+	
+end
+
 raise 'must specify TEST_DB' unless ENV['TEST_DB']
 RedisObject.configure_store({adapter:'Redis', db:ENV['TEST_DB']},:global,:alias)

data/spec/timestamp_spec.rb

@@ -6,7 +6,7 @@ module TriggerSpec
 	
 	describe Seabright::Triggers do
 		before do
-			RedisObject.store.flushdb
+			SpecHelper.flushdb
 		end
 		
 		it "should get recently created object" do

data/spec/trigger_spec.rb

@@ -30,7 +30,7 @@ module TriggerSpec
 	
 	describe Seabright::Triggers do
 		before do
-			RedisObject.store.flushdb
+			SpecHelper.flushdb
 		end
 		
 		it "triggers on a call" do

data/spec/types_spec.rb

@@ -26,7 +26,7 @@ module TypeSpec
 	
 	describe Seabright::Types do
 		before do
-			RedisObject.store.flushdb
+			SpecHelper.flushdb
 		end
 	
 		it "can be created via data packet" do

data/spec/view_caching_spec_disabled.rb

@@ -53,7 +53,7 @@ module ViewCachingSpec
 	describe Seabright::ViewCaching do
 		
 		before do
-			RedisObject.store.flushdb
+			SpecHelper.flushdb
 			@obj = TypedObject.create(TestData)
 			@dad = Container.create("daddy")
 			@dad << @obj

data/spec/views_spec.rb

@@ -33,7 +33,7 @@ module ViewSpec
 	describe Seabright::Views do
 		
 		before do
-			RedisObject.store.flushdb
+			SpecHelper.flushdb
 			@obj = ViewedObject.create(TestData)
 		end
 		

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis_object
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.3
 platform: ruby
 authors:
 - John Bragg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-25 00:00:00.000000000 Z
+date: 2013-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: utf8_utils