redis_object 1.2.3 → 1.2.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzUwMjBmYTE3ZDljZGMxMmE4MzBlNmQ5ZDQxNmUxNTAyMDU0ZGEzZA==
+    ZWZkNGY4Y2M4ZjI3YzEwY2NlMzgyNDlkNTBmMjc0ODY1NjUwZDhhMw==
   data.tar.gz: !binary |-
-    ZjRkOTMzMzI0ZGMwOWY1NDY0ZWUzMjg4ODhjZjc5NjVlYWRjNjY5Mw==
+    ZmExZDRhNDYwNWU3NjI2N2U4OTgyMGE4MTE2Yzg4NjNhNWQ5MDhmOQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Yjk2NWJhOGNlZTQ3ZWVkYzAzMTJkNDZmMTA0NDA1ZDNmN2Y3MmJkMGNjMWIw
-    MzMzZmU1NTc1MmZkMTkzYTdlMDgzZjNkMGVlOGNhMzZiOWY4YjQ2YTVlNjVj
-    YjAxOTNkMGY0NTgwZWE2MWZkNDk5Yzk4NTcxMzA1ZjUzM2Y2NWM=
+    NjI1ZjUyNGEyNzY0NTUxODljNmJhNTBiODcyNzIzNjllYjM5NjdmNmM4MGM5
+    MjRjNjQ1NDVmMTBmZGE4NGE1NGMyMDBkZmY1ZTlhY2ZlYWY1MDg2NmNjNGJi
+    ZGE0NDM5ODc5MWFhZWZlYzg2ZmRiNGRmMjVkZWI4ODZhMDM2YjM=
   data.tar.gz: !binary |-
-    NWYyMmYxNzk2ZGJiYTQxOTYxYTM3NmNkOTg2MzY2NDJhNDFlOTUxNzQwZWMy
-    YmU3MTMyZDA4M2Y2N2QxMmI3OGQ3OWRhYjIyNDA2OTIzYTMxMjhlMWFhNWFm
-    MzNhOGRhMWRjN2MxMzQ4YWE1ODRlZTVkNTRhOGE2YmQ1ZDA4YWE=
+    ZDEwYzc3NWRkYWVlYjk2NzFkMjI4MDcxMjVmZGViYTJhZDk5MDdmODkwMjQ5
+    NWVjNjg4MjE1MDRmMjE5ZmUzMjRkNTM5NDlkMDE0YmE5MTY3YjMxNjIwNTc2
+    OTJhZDI2YWZiYmM0M2JmNDU0YWQ1ODQyYThhNTRjODhjMmY2Yzc=

data/.rspec

@@ -0,0 +1,2 @@
+--format Fuubar
+--color

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 rvm:
   - 1.9.3
+  - 2.0.0
 env:
   - "TEST_DB=14"

data/Gemfile

@@ -4,6 +4,11 @@ group :test do
 	gem 'rake'
 	gem 'rspec'
 	gem 'coveralls', require: false
+	gem 'fuubar'
+end
+
+group :development, :test do
+  gem 'guard-rspec'
 end
 
 # Specify your gem's dependencies in redis_object.gemspec

data/Guardfile

@@ -0,0 +1,5 @@
+guard 'rspec', cli: "--format Fuubar --color" do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end

data/README.markdown

@@ -4,6 +4,7 @@ RedisObject is a fast and simple-to-use object persistence layer for Ruby.
 [![Build Status](https://travis-ci.org/remotezygote/RedisObject.png?branch=master)](https://travis-ci.org/remotezygote/RedisObject)
 [![Coverage Status](https://coveralls.io/repos/remotezygote/RedisObject/badge.png?branch=master)](https://coveralls.io/r/remotezygote/RedisObject?branch=master)
 [![Code Climate](https://codeclimate.com/github/remotezygote/RedisObject.png)](https://codeclimate.com/github/remotezygote/RedisObject)
+[![Dependency Status](https://gemnasium.com/remotezygote/RedisObject.png)](https://gemnasium.com/remotezygote/RedisObject)
 
 ## Prerequisites
 You'll need [Redis](http://redis.io). Other storage adapters are in the works. Maybe.

data/lib/redis_object.rb

@@ -14,7 +14,7 @@ require "redis_object/defaults"
 require "redis_object/collection"
 require "redis_object/indices"
 require "redis_object/timestamps"
-require "redis_object/experimental/history"
+require "redis_object/experimental/dumping"
 require "redis_object/ext/views"
 require "redis_object/ext/view_caching"
 require "redis_object/ext/triggers"
@@ -38,8 +38,8 @@ module Seabright
 		include Seabright::Views
 		include Seabright::ViewCaching
 		include Seabright::Timestamps
-		include Seabright::History
 		include Seabright::Benchmark
+		include Seabright::Dumping
 		
 	end
 end

data/lib/redis_object/base.rb

@@ -25,9 +25,10 @@ module Seabright
 			self.class.reserve(k)
 		end
 		
-		def to_json
-			Yajl::Encoder.encode(actual)
-		end
+		# oved this to the dumper module in experimental - remove when it gets to base
+		# def to_json
+		# 	Yajl::Encoder.encode(actual)
+		# end
 		
 		def id
 			@id || get(id_sym) || set(id_sym, generate_id)
@@ -188,14 +189,15 @@ module Seabright
 			"#{cls.split('::').last.downcase}_id".to_sym
 		end
 		
-		def load_all_hash_values
-			@cached_hash_values = store.hgetall(hkey)
-			cached_hash_values.keys.dup.each do |key|
-				next if key == "class"
-				define_setter_getter(key)
-			end
-		end
-		
+		# Not used yet...
+		# def load_all_hash_values
+		# 	@cached_hash_values = store.hgetall(hkey)
+		# 	cached_hash_values.keys.dup.each do |key|
+		# 		next if key == "class"
+		# 		define_setter_getter(key)
+		# 	end
+		# end
+		# 
 		def cached_hash_values
 			@cached_hash_values ||= {}
 		end

data/lib/redis_object/collection.rb

@@ -127,6 +127,13 @@ module Seabright
 			v
 		end
 		
+		def collect_type_by_key(col,*keys)
+			collect = get_collection(col)
+			keys.each do |k|
+				collect << k
+			end
+		end
+		
 		module ClassMethods
 			
 			def hkey_col(ident = nil)

data/lib/redis_object/experimental/dumping.rb

@@ -0,0 +1,95 @@
+require 'psych'
+require 'active_support/core_ext/time/calculations'
+
+module Seabright
+	class RedisObject
+		
+		def self.dump_everything(file=nil)
+			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
+				end
+			end
+			Psych.dump(out)
+		end
+		
+		def self.load_dump(str)
+			Psych.load(str).each do |(k,v)|
+				if klass = RedisObject.deep_const_get(k)
+					if v[:objects]
+						v[:objects].each do |o|
+							load_object klass, o
+						end
+					end
+				end
+			end
+		end
+		
+		def self.load_object(klass,pkt)
+			puts "Loading a #{klass.name}: #{pkt.inspect}" if DEBUG
+			cols = nil
+			pkt.delete(:collections).each do |col_name|
+				if objs = pkt.delete(col_name.to_sym)
+					cols ||= {}
+					cols[col_name.to_sym] = objs
+				end
+			end
+			obj = klass.create(pkt)
+			if cols
+				cols.each do |name,objs|
+					puts "  Loading in collected #{name}: #{objs.inspect}" if DEBUG
+					obj.collect_type_by_key name, *objs
+				end
+			end
+		end
+		
+	end
+	
+	module Dumping
+		
+		# def dump(file=nil)
+		# 	if file && File.exists?(file)
+		# 		# 
+		# 	else
+		# 		self.to_yaml
+		# 	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
+		
+		def dump_collections
+			cols = []
+			collections.inject({}) do |acc,(k,v)|
+				acc[k.to_sym] = v.map {|o| o.hkey }
+				cols << k
+				acc
+			end.merge(collections: cols)
+		end
+		
+		def to_json
+			Yajl::Encoder.encode(full_hash_dump)
+		end
+		
+		def to_yaml
+			Psych.dump(full_hash_dump)
+		end
+		alias_method :to_yml, :to_yaml
+		
+		module ClassMethods
+			
+			
+			
+		end
+		
+		def self.included(base)
+			base.extend(ClassMethods)
+		end
+		
+	end
+end

data/lib/redis_object/storage/adapter.rb

@@ -3,7 +3,7 @@ module Seabright
 		class Adapter
 			
 			def initialize(config={})
-				@config = config
+				configure config
 			end
 			
 			def configure(conf)
@@ -38,7 +38,6 @@ module Seabright
 			end
 			
 			def new_connection
-				true
 			end
 			
 		end

data/lib/redis_object/storage/redis.rb

@@ -27,9 +27,12 @@ module Seabright
 				File.open(file,'wb') do |f|
 					keys = connection.send(:keys,"*")
 					f.write keys.map {|k|
-						v = connection.dump(k)
-						v.force_encoding(Encoding::BINARY)
-						[k,v].join(DUMP_SEPARATOR)
+						if v = connection.dump(k)
+							v.force_encoding(Encoding::BINARY)
+							[k,v].join(DUMP_SEPARATOR)
+						else
+							""
+						end
 					}.join(REC_SEPARATOR)
 				end
 			end

data/lib/redis_object/version.rb

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

data/redis_object.gemspec

@@ -19,8 +19,9 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   s.required_ruby_version = '>= 1.9.2'
-  s.add_dependency "utf8_utils"
-  s.add_dependency "redis"
-  s.add_dependency "yajl-ruby"
-  s.add_dependency "activesupport"
+  s.add_dependency "utf8_utils", ">= 2.0.1"
+  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"
 end

data/spec/base_spec.rb

@@ -87,4 +87,16 @@ describe RedisObject do
 		ObjectTests::User.find("test").should be_nil
 	end
 	
+	it "can dump itself raw-ly" do
+		obj = ObjectTests::User.create("testy")
+		obj.test = true
+		obj.raw.should be_a(Hash)
+	end
+	
+	it "can iterate through instances with each" do
+		ObjectTests::User.each do |obj|
+			obj.should be_a(ObjectTests::User)
+		end
+	end
+	
 end

data/spec/collections_spec.rb

@@ -19,7 +19,7 @@ module CollectionSpec
 			GrandDad << @dad
 			@granddad << @dad
 			@granddad << @son
-			@dad << @son
+			@dad.push @son
 			@dad.push @sonny
 			@son.reference @grandson
 			
@@ -30,6 +30,7 @@ module CollectionSpec
 			@granddad.daddies.count.should eq(1)
 			@granddad.sons.count.should eq(1)
 			@dad.sons.count.should eq(2)
+			@dad.sons.push Son.create
 			
 		end
 		
@@ -61,6 +62,10 @@ module CollectionSpec
 			
 			@dad = Daddy.find("dad")
 			@dad.sons.find(son_id: "sonny").first.should be_a(Son)
+			@dad.sons[0].should be_a(Son)
+			@dad.sons.first.should be_a(Son)
+			@dad.sons.last.should be_a(Son)
+			@dad.sons.objects.first.should be_a(Son)
 			
 		end
 		
@@ -113,6 +118,22 @@ module CollectionSpec
 			
 		end
 		
+		it "can delete a collection another way" do
+			
+			@dad.remove_collection! :sons
+			@dad.collections.keys.should_not include(:sons)
+			@son.remove_collection!(:grand_sons)
+			@son.collections.keys.should_not include(:grand_sons)
+			
+		end
+		
+		it "can select a block of objects" do
+			
+			i = @dad.sons.last.id
+			@dad.sons.select {|o| o.id == i }.count.should > 0
+			
+		end
+		
 		it "retrieves via index" do
 			
 			5.times do
@@ -140,5 +161,16 @@ module CollectionSpec
 			
 		end
 		
+		it "can remove a collection from a class itself" do
+			
+			5.times do
+				Daddy.push Son.create
+			end
+			
+			Daddy.remove_collection! :sons
+			# Daddy.get(:sons).indexed(:created_at,3,true).count.should eq(3)
+			
+		end
+		
 	end
 end

data/spec/dumping_spec.rb

@@ -0,0 +1,60 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+module DumpingSpec
+	
+	class DumpableObject < RedisObject
+		
+		int :phone
+		bool :mailed
+		date :canceled_at
+				
+	end
+	
+	class GenericObject < RedisObject
+		
+		json :complex
+		
+	end
+	
+	describe Seabright::Triggers do
+		before do
+			RedisObject.store.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})
+			end
+		end
+		
+		it "can dump an object" do
+			
+			r = DumpableObject.latest.to_yaml
+			r.size.should > 100
+			
+		end
+		
+		it "can dump to json" do
+			
+			r = DumpableObject.latest.to_json
+			r.size.should > 100
+			
+		end
+		
+		it "can dump errthing" do
+			
+			r = RedisObject.dump_everything
+			r.size.should > 100
+			
+		end
+		
+		it "can load back in a dump" do
+			
+			r = RedisObject.dump_everything
+			r.size.should > 100
+			RedisObject.store.flushdb
+			RedisObject.load_dump r
+			DumpableObject.latest.generic_objects.count.should eq(1)
+			
+		end
+		
+	end
+end

data/spec/indices_spec.rb

@@ -38,6 +38,9 @@ module IndexSpec
 			end
 			
 			IndexedObject.indexed(:a_number,3,true).count.should eq(3)
+			IndexedObject.indexed(:a_number,3,true) do |o|
+				o.should be_a(IndexedObject)
+			end
 			
 		end
 				

data/spec/spec_helper.rb

@@ -14,8 +14,12 @@ SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
 ]
 SimpleCov.start do
 	add_filter "_spec.rb"
-	add_filter "/experimental/"
+	# add_filter "/experimental/"
 	add_group "Extensions", "lib/redis_object/ext/"
+	add_group "Experimental", "lib/redis_object/experimental/" do |fl|
+		!/_untested/.match(fl)
+	end
+	maximum_coverage_drop 5
 end
 
 require 'redis_object'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis_object
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - John Bragg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-19 00:00:00.000000000 Z
+date: 2013-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: utf8_utils
@@ -16,56 +16,70 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.0.1
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.4
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.13
+- !ruby/object:Gem::Dependency
+  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: ''
 email:
 - john@seabrightstudios.com
@@ -75,15 +89,18 @@ extra_rdoc_files: []
 files:
 - .coveralls.yml
 - .gitignore
+- .rspec
 - .travis.yml
 - Gemfile
+- Guardfile
 - README.markdown
 - Rakefile
 - lib/redis_object.rb
 - lib/redis_object/base.rb
 - lib/redis_object/collection.rb
 - lib/redis_object/defaults.rb
-- lib/redis_object/experimental/history.rb
+- lib/redis_object/experimental/dumping.rb
+- lib/redis_object/experimental/history_untested.rb
 - lib/redis_object/ext/benchmark.rb
 - lib/redis_object/ext/cleaner.rb
 - lib/redis_object/ext/filters.rb
@@ -118,6 +135,7 @@ files:
 - spec/benchmark_spec.rb
 - spec/collections_spec.rb
 - spec/defaults_spec.rb
+- spec/dumping_spec.rb
 - spec/field_ref_spec.rb
 - spec/filters_spec.rb
 - spec/indices_spec.rb
@@ -159,6 +177,7 @@ test_files:
 - spec/benchmark_spec.rb
 - spec/collections_spec.rb
 - spec/defaults_spec.rb
+- spec/dumping_spec.rb
 - spec/field_ref_spec.rb
 - spec/filters_spec.rb
 - spec/indices_spec.rb