redis_object 0.5.0 → 1.0

data/lib/redis_object/types.rb

@@ -22,12 +22,7 @@ module Seabright
 		end
 		
 		def format_date(val)
-			begin
-				val.is_a?(DateTime) || val.is_a?(Date) || val.is_a?(Time) ? val : ( val.is_a?(String) ? DateTime.parse(val) : nil )
-			rescue StandardError => e
-				puts "Could not parse value as date using Date.parse. Returning nil instead. Value: #{val.inspect}\nError: #{e.inspect}" if DEBUG
-				nil
-			end
+			val.instance_of?(DateTime) ? val : DateTime.parse(val)
 		end
 		
 		def score_date(val)
@@ -35,11 +30,7 @@ module Seabright
 		end
 		
 		def format_array(val)
-			Yajl::Parser.new(:symbolize_keys => true).parse(val)
-		end
-		
-		def save_array(val)
-			Yajl::Encoder.encode(val)
+			eval val
 		end
 		
 		def format_number(val)
@@ -67,205 +58,72 @@ module Seabright
 			val=="true"
 		end
 		
-		def save_boolean(val)
-			val === true ? "true" : "false"
-		end
-		
 		def score_boolean(val)
 			val ? 1 : 0
 		end
 		
+		def get(k)
+			enforce_format(k,super(k))
+		end
+		
+		def mset(dat)
+			dat.merge!(dat) {|k,v1,v2| save_format(k,v1) }
+			super(dat)
+		end
+		
+		def set(k,v)
+			super(k,save_format(k,v))
+		end
+		
 		module ClassMethods
 			
 			def date(k)
-				set_field_format(k, :format_date)
-				set_score_format(k, :score_date)
+				field_formats[k] = :format_date
+				score_formats[k] = :score_date
 			end
 			
 			def number(k)
-				set_field_format(k, :format_number)
-				set_score_format(k, :score_number)
+				field_formats[k] = :format_number
+				score_formats[k] = :score_number
 			end
 			alias_method :int, :number
 			
 			def float(k)
-				set_field_format(k, :format_float)
-				set_score_format(k, :score_float)
+				field_formats[k] = :format_float
+				score_formats[k] = :score_float
 			end
 			
 			def bool(k)
-				set_field_format(k, :format_boolean)
-				set_score_format(k, :score_boolean)
-				set_save_format(k, :save_boolean)
+				field_formats[k] = :format_boolean
+				score_formats[k] = :score_boolean
 			end
 			alias_method :boolean, :bool
 			
 			def array(k)
-				set_field_format(k, :format_array)
-				set_save_format(k, :save_array)
+				field_formats[k] = :format_array
 			end
 			
 			def json(k)
-				set_field_format(k, :format_json)
-				set_save_format(k, :save_json)
+				field_formats[k] = :format_json
+				save_formats[k] = :save_json
 			end
 			
 			def field_formats
-				@field_formats_hash ||= (defined?(superclass.field_formats) ? superclass.field_formats.clone : {})
+				@@field_formats ||= {}
 			end
 			
 			def score_formats
-				@score_formats_hash ||= (defined?(superclass.score_formats) ? superclass.score_formats.clone : {})
+				@@score_formats ||= {}
 			end
 			
 			def save_formats
-				@save_formats_hash ||= (defined?(superclass.save_formats) ? superclass.save_formats.clone : {})
-			end
-			
-			def set_field_format(k, v)
-				field_formats_set_locally.add(k)
-				field_formats[k] = v
-				update_child_class_field_formats(k, v)
-				intercept_for_typing!
-			end
-			
-			def field_formats_set_locally
-				@field_formats_set_locally_set ||= Set.new
-			end
-			
-			def inherit_field_format(k, v)
-				unless fields_formats_set_locally.include? k
-					field_formats[k] = v
-					update_child_class_field_formats(k, v)
-				end
-				intercept_for_typing!
-			end
-			
-			def update_child_class_field_formats(k, v)
-				child_classes.each do |child_class|
-					child_class.inherit_field_format(k, v)
-				end
-			end
-			
-			def set_score_format(k, v)
-				score_formats_set_locally.add(k)
-				score_formats[k] = v
-				update_child_class_score_formats(k, v)
-				intercept_for_typing!
-			end
-			
-			def score_formats_set_locally
-				@score_formats_set_locally_set ||= Set.new
-			end
-			
-			def inherit_score_format(k, v)
-				unless scores_formats_set_locally.include? k
-					score_formats[k] = v
-					update_child_class_score_formats(k, v)
-				end
-				intercept_for_typing!
-			end
-			
-			def update_child_class_score_formats(k, v)
-				child_classes.each do |child_class|
-					child_class.inherit_score_format(k, v)
-				end
-			end
-			
-			def set_save_format(k, v)
-				save_formats_set_locally.add(k)
-				save_formats[k] = v
-				update_child_class_save_formats(k, v)
-				intercept_for_typing!
-			end
-			
-			def save_formats_set_locally
-				@save_formats_set_locally_set ||= Set.new
-			end
-			
-			def inherit_save_format(k, v)
-				unless save_formats_set_locally.include? k
-					save_formats[k] = v
-					update_child_class_save_formats(k, v)
-				end
-				intercept_for_typing!
-			end
-			
-			def update_child_class_save_formats(k, v)
-				child_classes.each do |child_class|
-					child_class.inherit_save_format(k, v)
-				end
+				@@save_formats ||= {}
 			end
 			
 			def register_format(k,fmt)
 				send(fmt, k)
 			end
 			
-			def describe
-				all_keys.inject({}) do |acc,(k,v)|
-					if field_formats[k.to_sym]
-						acc[k.to_sym] ||= [field_formats[k.to_sym].to_s.gsub(/^format_/,'').to_sym, 0]
-					else
-						acc[k.to_sym] ||= [:string, 0]
-					end
-					acc[k.to_sym][1] += 1
-					acc
-				end
-			end
-			
-			def dump_schema(file)
-				child_classes_set.sort {|a,b| a.name <=> b.name}.each do |child|
-					file.puts "# #{child.name}"
-					# sort fields by number of instances found
-					child.describe.sort {|a,b| b[1][1] <=> a[1][1]}.each do |field,(type, count)|
-						file.puts "#{field}: #{type} (#{count})"
-					end
-					file.puts
-				end
-			end
-			
-			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
-					
-				end
-				@intercepted_for_typing = true
-			end
-			
-			private
-			
-			def all_keys(limit=100)
-				steps = 0
-				all.inject([]) do |acc,obj|
-					store.hkeys(obj.hkey).each do |k|
-						acc << k.to_sym
-					end
-					steps += 1
-					return acc if steps >= limit
-					acc
-				end
-			end
 		end
 		
 		def self.included(base)
@@ -273,4 +131,4 @@ module Seabright
 		end
 		
 	end
-end
+end

data/lib/redis_object/version.rb

@@ -1,5 +1,5 @@
 module Seabright
 	class RedisObject
-		VERSION = "0.5.0"
+		VERSION = "1.0"
 	end
 end

data/redis_object.gemspec

@@ -19,7 +19,6 @@ 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"

data/spec/base_spec.rb

@@ -1,8 +1,10 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
+DEBUG = false
+
 module ObjectTests
 	class User < RedisObject
-		use_store :global
+		
 	end
 	class Thingy < RedisObject
 		
@@ -13,78 +15,41 @@ module ObjectTests
 end
 
 describe RedisObject do
-	
 	it "can be created" do
 		obj = ObjectTests::User.new
 	end
-	
 	it "can be created with an id" do
 		obj = ObjectTests::User.new("test")
 		obj.save
 	end
-	
-	it "can create an id" do
-		obj = ObjectTests::User.new("test")
-		obj.new_id
-	end
-	
-	it "can reserve an id" do
-		obj = ObjectTests::User.new("test")
-		obj.reserve("test")
-	end
-	
 	it "should be found by id" do
 		obj = ObjectTests::User.find("test")
 		obj.should_not be_nil
 	end
-	
-	it "can recollect objects" do
-		ObjectTests::User.recollect!
-	end
-	
-	it "get get the first object (random)" do
-		obj = ObjectTests::User.first
-		obj.should be_a(ObjectTests::User)
-	end
-	
 	it "should save stuff" do
 		obj = ObjectTests::User.find("test")
 		obj.stuff = "yay!"
-		obj[:stuff].should eq("yay!")
-		obj[:stuff] = "yayyay!"
-		obj.stuff.should eq("yayyay!")
-		obj.stuff = "yay!"
-		obj.stuff.should eq("yay!")
+		obj.stuff.should == "yay!"
 	end
-	
 	it "should retrieve stuff" do
 		obj = ObjectTests::User.find("test")
-		obj.stuff.should eq("yay!")
+		obj.stuff.should == "yay!"
 	end
-	
 	it "can collect other objects" do
 		obj = ObjectTests::User.find("test")
 		obj2 = ObjectTests::Thingy.new("yay")
 		obj << obj2
 		obj.should have_collection(:thingies)
 	end
-	
 	it "can reference other objects" do
 		obj = ObjectTests::User.find("test")
 		obj3 = ObjectTests::Doodad.new("woo")
 		obj.reference obj3
 		obj.should have_collection(:doodads)
 	end
-	
-	it "can convert raw to json" do
-		obj = ObjectTests::User.find("test")
-		obj.to_json.length.should > 0
-	end
-	
 	it "should be deletable" do
 		obj = ObjectTests::User.find("test")
 		obj.delete!
 		ObjectTests::User.find("test").should be_nil
 	end
-	
-end
+end

data/spec/spec_helper.rb

@@ -4,35 +4,4 @@ $LOAD_PATH.unshift File.dirname(__FILE__)
 require 'rubygems'
 require 'test/unit'
 require 'rspec'
-
-require 'simplecov'
-require 'coveralls'
-
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-  SimpleCov::Formatter::HTMLFormatter,
-  Coveralls::SimpleCov::Formatter
-]
-SimpleCov.start do
-	add_filter "_spec.rb"
-	add_filter "/experimental/"
-	add_group "Extensions", "lib/redis_object/ext/"
-end
-
-require 'redis_object'
-
-class DebugMode
-	def initialize(o=nil); @opts = o; end
-	def verbose?; debug? && !!@opts[:verbose]; end
-	def debug?; !!@opts; end
-end
-Debug = if ENV['DEBUG']
-		require 'debugger'
-		DEBUG = true
-		DebugMode.new(verbose:true)
-	else
-		DEBUG = false
-		DebugMode.new
-	end
-
-raise 'must specify TEST_DB' unless ENV['TEST_DB']
-RedisObject.configure_store({adapter:'Redis', db:ENV['TEST_DB']},:global,:alias)
+require 'redis_object'

metadata

@@ -1,109 +1,136 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: redis_object
-version: !ruby/object:Gem::Version
-  version: 0.5.0
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: "1.0"
 platform: ruby
-authors:
+authors: 
 - John Bragg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-17 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: utf8_utils
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+
+date: 2012-12-15 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: redis
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yajl-ruby
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: yajl-ruby
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: activesupport
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: ''
-email:
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
+description: ""
+email: 
 - john@seabrightstudios.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
-- .coveralls.yml
+
+files: 
 - .gitignore
-- .travis.yml
 - Gemfile
 - README.markdown
 - Rakefile
+- doc/Object.html
+- doc/Seabright.html
+- doc/Seabright/Adapter.html
+- doc/Seabright/Collection.html
+- doc/Seabright/Collections.html
+- doc/Seabright/Collections/ClassMethods.html
+- doc/Seabright/ExternalIndex.html
+- doc/Seabright/History.html
+- doc/Seabright/History/ClassMethods.html
+- doc/Seabright/Indices.html
+- doc/Seabright/Indices/ClassMethods.html
+- doc/Seabright/Keys.html
+- doc/Seabright/Keys/ClassMethods.html
+- doc/Seabright/ObjectBase.html
+- doc/Seabright/ObjectBase/ClassMethods.html
+- doc/Seabright/RedisObject.html
+- doc/Seabright/References.html
+- doc/Seabright/Storage.html
+- doc/Seabright/Storage/ClassMethods.html
+- doc/Seabright/Storage/MySQL.html
+- doc/Seabright/Storage/Redis.html
+- doc/Seabright/Template.html
+- doc/Seabright/Template/ClassMethods.html
+- doc/Seabright/Timestamps.html
+- doc/Seabright/Timestamps/ClassMethods.html
+- doc/Seabright/Types.html
+- doc/Seabright/Types/ClassMethods.html
+- doc/created.rid
+- doc/images/add.png
+- doc/images/brick.png
+- doc/images/brick_link.png
+- doc/images/bug.png
+- doc/images/bullet_black.png
+- doc/images/bullet_toggle_minus.png
+- doc/images/bullet_toggle_plus.png
+- doc/images/date.png
+- doc/images/delete.png
+- doc/images/find.png
+- doc/images/loadingAnimation.gif
+- doc/images/macFFBgHack.png
+- doc/images/package.png
+- doc/images/page_green.png
+- doc/images/page_white_text.png
+- doc/images/page_white_width.png
+- doc/images/plugin.png
+- doc/images/ruby.png
+- doc/images/tag_blue.png
+- doc/images/tag_green.png
+- doc/images/transparent.png
+- doc/images/wrench.png
+- doc/images/wrench_orange.png
+- doc/images/zoom.png
+- doc/index.html
+- doc/js/darkfish.js
+- doc/js/jquery.js
+- doc/js/navigation.js
+- doc/js/search.js
+- doc/js/search_index.js
+- doc/js/searcher.js
+- doc/rdoc.css
+- doc/table_of_contents.html
 - 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/ext/benchmark.rb
 - lib/redis_object/ext/cleaner.rb
 - lib/redis_object/ext/filters.rb
-- lib/redis_object/ext/script_cache.rb
-- lib/redis_object/ext/shardable.rb
 - lib/redis_object/ext/triggers.rb
-- lib/redis_object/ext/view_caching.rb
-- lib/redis_object/ext/views.rb
 - lib/redis_object/external_index.rb
+- lib/redis_object/history.rb
 - lib/redis_object/indices.rb
-- lib/redis_object/inheritance_tracking.rb
 - lib/redis_object/keys.rb
 - lib/redis_object/storage.rb
 - lib/redis_object/storage/adapter.rb
@@ -116,57 +143,35 @@ files:
 - lib/redis_object/validation.rb
 - lib/redis_object/version.rb
 - redis_object.gemspec
-- spec/adapter_spec.rb
 - spec/base_spec.rb
-- spec/benchmark_spec.rb
-- spec/collections_spec.rb
-- spec/defaults_spec.rb
-- spec/filters_spec.rb
-- spec/indices_spec.rb
-- spec/rename_class_spec.rb
 - spec/spec_helper.rb
-- spec/timestamp_spec.rb
-- spec/trigger_spec.rb
-- spec/types_spec.rb
-- spec/view_caching_spec.rb
-- spec/views_spec.rb
-homepage: ''
+homepage: ""
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
       version: 1.9.2
-required_rubygems_version: !ruby/object:Gem::Requirement
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: redis_object
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Maps arbitrary objects to a Redis store with indices and smart retrieval
-  and storage mechanisms.
-test_files:
-- spec/adapter_spec.rb
+summary: Maps arbitrary objects to a Redis store with indices and smart retrieval and storage mechanisms.
+test_files: 
 - spec/base_spec.rb
-- spec/benchmark_spec.rb
-- spec/collections_spec.rb
-- spec/defaults_spec.rb
-- spec/filters_spec.rb
-- spec/indices_spec.rb
-- spec/rename_class_spec.rb
 - spec/spec_helper.rb
-- spec/timestamp_spec.rb
-- spec/trigger_spec.rb
-- spec/types_spec.rb
-- spec/view_caching_spec.rb
-- spec/views_spec.rb