redis_object 1.4.3 → 1.4.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWI1ZmE4MzE0MjFiNzYyNTNmOTNiMmQxZmRkNmJhMjA3Zjc3ZGU3ZA==
+    ZmEzMTFmMmU3MTcyZDllYzYwYjQ0YzM5ZGE1ZGQ4NjI5MDI2MjVmYw==
   data.tar.gz: !binary |-
-    YmI5NTdlMjY5ODZjNTdjMTU4YTI3NDJhMmQ3MTA3MDg0ZDNhYjUzZg==
+    YTMzYTdjZDg4ZWIzNDE1ODliYTY0N2I5YTYwYTQ5ZGUyNjY5MjFhOQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Njg0ZTllYjQ1NTA1MzU1NWQ5NjdjMTFhN2ZjNDUyYzJhZWIwOTJhMGMyMjY2
-    YWFiYzg2MzYxNmU4NGFmOWUwZDU5OTI5MzVjZmM3NWM5Y2QwNTdhZDc0OWY4
-    MGM2ODdlNjdiZDBjN2RkMThkYTI0MzlkNmQ0MTkzZWRkMjFmZWE=
+    NzdkNzFlNjc4OWM3ZWVhMmI2YzBjMWZiMDhhMmZjNjliOWI2NzhhNDZiOThl
+    NWYzYzhiMzJiYzE4MTdlMjZiZWU3MDBhMzk4NDBiOTdlM2Y4MTgzMmI1Mzk5
+    Njk0YjRhZmJiMWEzYjk3YWNmYjQwYmJhNTUyNzdmOWI1ZDdhYmI=
   data.tar.gz: !binary |-
-    MWRmNTZmNjRlODhkMGJkNmNmNmQxOTVhNjQ2YTY0MDQ4MDUxNWMyNTQ2NjIx
-    NTA1YjQ2ZWVmMTBlNzlkNDEyNTYwNmUyNmIzNmU0Mjk1MTQxNDcyODk3OWNj
-    NzA2MGRkMjNmYTIzZTkyYjQzZDgzMzlmZDZjZGI4MzBiNjEzOTY=
+    MzViYzViZDBjOTFlOTVkZmVkZjg2ZTFmNWJkM2ZmY2I2NjUwMzhmNjI3MzYz
+    M2Q2OTllODgwZGUwZWM1ZTFmYTc3Yjg5ZWRmNTJjYzQ4MjA2ZTJmOTk1ZjI3
+    ZWVkNDk0NmMxYmE4YWYwM2VjY2ZlYjhlOTMxMGJlZmY4NjAzYTI=

data/lib/redis_object/base.rb

@@ -334,17 +334,20 @@ module Seabright
 									good = good
 								else
 									good = false
+									break
 								end
 							else
 								if val ~= matchers[n][2] then
 									good = false
+									break
 								end
 							end
 						else
 							if matchers[n][2] == '#{NilPattern}' then
-								good = true
+								good = good
 							else
 								good = false
+								break
 							end
 						end
 					end

data/lib/redis_object/experimental/dumping.rb

@@ -4,21 +4,32 @@ require 'active_support/core_ext/time/calculations'
 module Seabright
 	class RedisObject
 		
-		def self.dump_everything(file=nil)
+		def self.dump_everything(dump_format=:hash)
 			out = {}
 			ObjectSpace.enum_for(:each_object, class << RedisObject; self; end).each do |cls|
 				unless cls == RedisObject
-					out[cls.name] = {}
-					out[cls.name][:objects] = cls.all.map do |obj|
-						obj.full_hash_dump
-					end
+					out.merge! cls.dump_all(:hash)
 				end
 			end
-			Psych.dump(out)
+			Dumping.format_dump out, dump_format
+		end
+		
+		def self.load_dump(str,dump_format=:hash)
+			case dump_format
+			when :hash
+				load_dump_from_hash str
+			when :yaml, :yml
+				load_dump_from_yaml str
+			# JSON format is not ready yet!
+			# when :json
+			# 	load_dump_from_json str
+			else
+				raise "Unknown dump format."
+			end
 		end
 		
-		def self.load_dump(str)
-			Psych.load(str).each do |(k,v)|
+		def self.load_data(dat)
+			dat.each do |(k,v)|
 				if klass = RedisObject.deep_const_get(k)
 					if v[:objects]
 						v[:objects].each do |o|
@@ -29,6 +40,19 @@ module Seabright
 			end
 		end
 		
+		def self.load_dump_from_yaml(str)
+			load_data Psych.load(str)
+		end
+		
+		def self.load_dump_from_hash(str)
+			load_data str
+		end
+		
+		# JSON format is not ready yet!
+		# def self.load_dump_from_json(str)
+		# 	load_data Yajl::Parser.new(symbolize_keys: true).parse(str)
+		# end
+		
 		def self.load_object(klass,pkt)
 			Log.debug "Loading a #{klass.name}: #{pkt.inspect}"
 			cols = nil
@@ -59,6 +83,20 @@ module Seabright
 		# 	end
 		# end
 		
+		def self.format_dump(dump,format=:hash)
+			case format
+			when :hash
+				return dump
+			when :yaml, :yml
+				return Psych.dump(dump)
+			# JSON format is not ready yet!
+			# when :json
+			# 	return Yajl::Encoder.encode(dump)
+			else
+				return dump
+			end
+		end
+		
 		def full_hash_dump
 			store.hgetall(hkey).inject({}) {|acc,(k,v)| acc[k.to_sym] = enforce_format(k,v); acc }.merge(dump_collections)
 		end
@@ -83,7 +121,14 @@ module Seabright
 		
 		module ClassMethods
 			
-			
+			def dump_all(dump_format=:hash)
+				out = {}
+				out[self.name] = {}
+				out[self.name][:objects] = all.map do |obj|
+					obj.full_hash_dump
+				end
+				Dumping.format_dump out, dump_format
+			end
 			
 		end
 		

data/lib/redis_object/version.rb

@@ -1,5 +1,5 @@
 module Seabright
 	class RedisObject
-		VERSION = "1.4.3"
+		VERSION = "1.4.5"
 	end
 end

data/spec/base_spec.rb

@@ -55,6 +55,13 @@ describe RedisObject do
 		obj.first.should_not be_nil
 	end
 	
+	it "should be found/not-found by nil composite matchers" do
+		obj = ObjectTests::User.find(blah: nil, user_id: "test")
+		obj.first.should_not be_nil
+		obj = ObjectTests::User.find(blah: nil, user_id: "blah")
+		obj.first.should be_nil
+	end
+	
 	it "should be found by regex matchers that do not exist as keys" do
 		obj = ObjectTests::User.find(blah: /test/)
 		obj.first.should be_nil

data/spec/dumping_spec.rb

@@ -41,19 +41,39 @@ module DumpingSpec
 		
 		it "can dump errthing" do
 			
-			r = RedisObject.dump_everything
+			r = RedisObject.dump_everything(:yml)
 			r.size.should > 100
+			# r = RedisObject.dump_everything(:json)
+			# r.size.should > 100
+			
+		end
+		
+		it "can dump a single class" do
+			
+			r = RedisObject.dump_everything(:yml)
+			r.size.should > 100
+			d = DumpableObject.dump_all(:yml)
+			d.size.should > 100
+			d.size.should < r.size
+			# r = RedisObject.dump_everything(:json)
+			# r.size.should > 100
 			
 		end
 		
 		it "can load back in a dump" do
 			
-			r = RedisObject.dump_everything
+			r = RedisObject.dump_everything(:yml)
 			r.size.should > 100
 			RedisObject.store.flushdb
-			RedisObject.load_dump r
+			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
+			# RedisObject.load_dump r, :json
+			# DumpableObject.latest.generic_objects.count.should eq(1)
+			
 		end
 		
 	end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis_object
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.5
 platform: ruby
 authors:
 - John Bragg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-16 00:00:00.000000000 Z
+date: 2013-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: utf8_utils