redis_object 1.2 → 1.2.1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    N2RlY2YxYmY1ZWY0ZWFlODA1ZTg0MWM3ZDhmYWFjNmU0MWY1ZWM5Yw==
+  data.tar.gz: !binary |-
+    NTBjOTBmYTgyNTc2NTc3NzU5MTRlOWQ3NWQ3NTI4MTM1YTViZWUxYg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    OTdiN2Q1NjRjNDUzMjgxMjA0ZGIwYjQwMDUxYmJkYWZlODlhNWQyZWQyODk4
+    ODhhZDA2Y2I3MzQ4ZjVhZWIxMGUyYTY1YWMzNzViZjZmZDcxMmUyNGZhZjkw
+    NWRkYjJiMmFkNWZhZWFhN2FmNDRhNTNiNGYyOTFmZTQ4ZjNjZDk=
+  data.tar.gz: !binary |-
+    MzY5ODIzOGJkMWFiMTVhOGVlNGMzY2MxYWRkMDUzYzJhZTI1NmQxNTM2YTQz
+    ODRlNjg5Yjg4NGI0MTlkMDRhYTUzNGI3ODg5MGE3Yzc3MDM5YWMyNDYyYWVm
+    ZDY2YzQzOTI1NjdmODE1YmU4YjBhNjc1MjY0MWVlYzgyMDU3NmQ=

data/lib/redis_object/base.rb

@@ -71,14 +71,16 @@ module Seabright
 		alias_method :actual, :raw
 		
 		def get(k)
-			cached_hash_values[k.to_s] ||= Proc.new {|key|
-				if is_ref_key?(k) && (v = get_reference(store.hget(hkey, key.to_s)))
-					define_setter_getter(key)
-				elsif v = store.hget(hkey, key.to_s)
-					define_setter_getter(key)
-				end
-				v
-			}.call(k)
+			cached_hash_values[k.to_s] ||= _get(k)
+		end
+		
+		def _get(k)
+			if is_ref_key?(k) && (v = get_reference(store.hget(hkey, k.to_s)))
+				define_setter_getter(k)
+			elsif v = store.hget(hkey, k.to_s)
+				define_setter_getter(k)
+			end
+			v
 		end
 		
 		def [](k)

data/lib/redis_object/indices.rb

@@ -10,15 +10,26 @@ module Seabright
 			def intercept_sets_for_indices!
 				return if @intercepted_sets_for_indices
 				self.class_eval do
-					alias_method :unindexed_set, :set unless method_defined?(:unindexed_set)
-					def set(k,v)
-						ret = unindexed_set(k,v)
+					
+					def indexed_set_method(meth,k,v)
+						ret = send("unindexed_#{meth}".to_sym,k,v)
 						if self.class.has_sort_index?(k)
 							store.zrem(index_key(k), hkey)
 							store.zadd(index_key(k), score_format(k,v), hkey)
 						end
 						ret
 					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)
+					end
+					
 					alias_method :unindexed_mset, :mset unless method_defined?(:unindexed_mset)
 					def mset(dat)
 						ret = unindexed_mset(dat)
@@ -28,15 +39,6 @@ module Seabright
 						end
 						ret
 					end
-					alias_method :unindexed_setnx, :setnx unless method_defined?(:unindexed_setnx)
-					def setnx(k,v)
-						ret = unindexed_setnx(k,v)
-						if self.class.has_sort_index?(k)
-							store.zrem(index_key(k), hkey)
-							store.zadd(index_key(k), score_format(k,v), hkey)
-						end
-						ret
-					end
 					
 				end
 				@intercepted_sets_for_indices = true

data/lib/redis_object/storage/redis.rb

@@ -7,14 +7,10 @@ module Seabright
 				puts "[Storage::Redis] #{sym}(#{args.inspect.gsub(/\[|\]/m,'')})" if Debug.verbose?
 				begin
 					connection.send(sym,*args, &block)
-				rescue ::Redis::InheritedError => err
+				rescue ::Redis::InheritedError, ::Redis::TimeoutError => err
 					puts "Rescued: #{err.inspect}" if DEBUG
 					reset
 					connection.send(sym,*args, &block)
-				rescue ::Redis::TimeoutError => err
-					puts "Rescued connection timeout: #{err.inspect}" if DEBUG
-					reset
-					connection.send(sym,*args, &block)
 				end
 			end
 			

data/lib/redis_object/types/json.rb

@@ -3,7 +3,7 @@ module Seabright
 		module JsonType
 			
 			def format_json(val)
-				Yajl::Parser.new(:symbolize_keys => true).parse(val)
+				Yajl::Parser.new(:symbolize_keys => true).parse(val || "")
 			end
 			
 			def save_json(val)

data/lib/redis_object/version.rb

@@ -1,5 +1,5 @@
 module Seabright
 	class RedisObject
-		VERSION = "1.2"
+		VERSION = "1.2.1"
 	end
 end

data/spec/types_spec.rb

@@ -16,6 +16,7 @@ module TypeSpec
 	TestData = TestValues.inject({}){|acc,(k,v)| acc["a_#{k}".to_sym] = v; acc }
 	
 	class TypedObject < RedisObject
+		json :another_json
 		TestValues.keys.each do |type|
 			send(type.to_sym,"a_#{type}".to_sym)
 		end
@@ -89,6 +90,14 @@ module TypeSpec
 			
 		end
 		
+		it "can get unset json field" do
+			
+			obj = TypedObject.new
+			
+			obj.another_json.should eq(nil)
+			
+		end
+		
 		it "describes itself" do
 			
 			obj = TypedObject.create(TestData)

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: redis_object
 version: !ruby/object:Gem::Version
-  version: '1.2'
-  prerelease: 
+  version: 1.2.1
 platform: ruby
 authors:
 - John Bragg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-17 00:00:00.000000000 Z
+date: 2013-06-19 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
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -140,27 +131,26 @@ files:
 - spec/views_spec.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: redis_object
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Maps arbitrary objects to a Redis store with indices and smart retrieval
   and storage mechanisms.
 test_files: