redis_object 1.3.2 → 1.3.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzZmMGZlNjJjNDM2NDUzZDc1NWY1YjdjMzNlMDRlZmI2OTljMmMwMg==
+    MzM4MzMyNzVhNTUxNWY4NDlhZDQ4ZGYxOTIxMDEwZGMxMjY2MjM4Yg==
   data.tar.gz: !binary |-
-    NWM0MDhkYzAzODdiZDI3NDliMjViOGQ1Njg0ZDNmZmQ2YmFlODI2OQ==
+    MzU2MWQxMDA1MDUyMGUwYjc1Mzk0MzQxMjBkNTE0NDFmNzhmOTU1MA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    OTlkMTQ2ZmZkY2ZlZmRkNjgyNTA1NDJiZjI5ZDk4Yjc5MTc2YTEzNjdlZThh
-    ODM0YWIzMTdkNGE0NzgzNDM0OGViMzAwYTljYTg5YmY0NzkzMWQ0ZDQwNGIz
-    NWE3YmRjYzJkZjcxMTFhOGNmOTJkM2RmNjg3NGMzZjA0NjdkZWU=
+    ZmVlMWJiMTBjNzg4ZDBlNzEzOGQ2ZTJmNzAzNWFhM2QwOGY3NDhiMWI3NmMw
+    ZTcyZGRmM2Y3ZGExZjgzNzI0ZTY1Yzk0MmFkMjJiN2Q0ODM0MzI5ODkyZTBm
+    YjdhMDY2NTkyOTM2N2RiNDIwZGY0YzNjMTk5NzQ5ODk2MTM0MDA=
   data.tar.gz: !binary |-
-    YjBjM2IxNDkwNTRjYTVlYjU5ZGM0NzM1MTJlZjk4MGQ0YmQ2YjZlNzJjMDZh
-    ZjY3MDk3YTVkMDM5NmM5YzFmZmViNGQ4Mjc2ODQ3ZTUyNDBkOTI2OTc0ZmM2
-    M2FhY2I1ZmQzMjI3YTdkYzFiZjc5YjY5MWRmOTU2OWNmMDM2NWU=
+    YTllMGUzYzk3OTlhOTUwNDQzYmVhYmYzZDk4ZjQ1MjBhYjlhOWZjOTI4OTZi
+    N2E0N2ExODY1NDQ1N2NmYzM3NmY5NWM5NjFjZjYyZGRhY2NmZTY0Y2Y0NzA1
+    YThmNDgxOGQzMTc2MTZkMmYyZTEzZTVjOTJhYzYxODBkMTFiYzI=

data/lib/redis_object.rb

@@ -45,4 +45,6 @@ module Seabright
 	end
 end
 
+require "redis_object/logger"
+
 ::RedisObject = Seabright::RedisObject

data/lib/redis_object/base.rb

@@ -219,10 +219,10 @@ module Seabright
 			def generate_id
 				v = new_id
 				while exists?(v) do
-					puts "[RedisObject] Collision at id: #{v}" if Debug.verbose?
+					Log.verbose "[RedisObject] Collision at id: #{v}"
 					v = new_id
 				end
-				puts "[RedisObject] Reserving key: #{v}" if Debug.verbose?
+				Log.verbose "[RedisObject] Reserving key: #{v}"
 				reserve(v)
 				v
 			end
@@ -250,7 +250,7 @@ module Seabright
 						if a = find_by_key(hkey(member))
 							y << a
 						else
-							puts "[#{name}] Object listed but not found: #{member}" if DEBUG
+							Log.debug "[#{name}] Object listed but not found: #{member}"
 							store.srem(plname,member)
 						end
 					end

data/lib/redis_object/collection.rb

@@ -319,12 +319,12 @@ module Seabright
 		def cleanup!
 			each_index do |key|
 				unless a = class_const.find_by_key(at(key))
-					puts "Deleting #{key} because not #{a.inspect}" if DEBUG
+					Log.debug "Deleting #{key} because not #{a.inspect}"
 					delete at(key)
 				end
 			end
 			if size < 1
-				puts "Deleting collection #{@name} because empty" if DEBUG
+				Log.debug "Deleting collection #{@name} because empty"
 				remove!
 			end
 		end

data/lib/redis_object/experimental/dumping.rb

@@ -30,7 +30,7 @@ module Seabright
 		end
 		
 		def self.load_object(klass,pkt)
-			puts "Loading a #{klass.name}: #{pkt.inspect}" if DEBUG
+			Log.debug "Loading a #{klass.name}: #{pkt.inspect}"
 			cols = nil
 			pkt.delete(:collections).each do |col_name|
 				if objs = pkt.delete(col_name.to_sym)
@@ -41,7 +41,7 @@ module Seabright
 			obj = klass.create(pkt)
 			if cols
 				cols.each do |name,objs|
-					puts "  Loading in collected #{name}: #{objs.inspect}" if DEBUG
+					Log.debug "  Loading in collected #{name}: #{objs.inspect}"
 					obj.collect_type_by_key name, *objs
 				end
 			end

data/lib/redis_object/ext/benchmark.rb

@@ -16,7 +16,7 @@ module Seabright
 			end
 			
 			def benchmark_out(method,args,time)
-				puts "[RedisObject::Benchmark] #{method}(#{args.join(",")}): #{time}"
+				Log.debug "[RedisObject::Benchmark] #{method}(#{args.join(",")}): #{time}"
 			end
 			
 			def benchmark!

data/lib/redis_object/ext/cleaner.rb

@@ -4,7 +4,7 @@ module Seabright
 			RedisObject.store.keys("*:collections").each do |key|
 				if obj = RedisObject.find_by_key(key.gsub(/:collections$/,''))
 					obj.collections.each do |nm,col|
-						puts "Cleaning: #{nm} #{col.class} #{col.inspect}" if DEBUG
+						Log.debug "Cleaning: #{nm} #{col.class} #{col.inspect}"
 						col.cleanup!
 					end
 				end

data/lib/redis_object/ext/script_cache.rb

@@ -23,7 +23,7 @@ module Seabright
 					out = (@tmp_store || store).evalsha(get_script_sha(name,source),keys,args)
 				rescue Redis::CommandError => e
 					if e.message == NoScriptError && @rescue_recurse < 3
-						puts "Rescuing NOSCRIPT error for #{name} - running again..." if DEBUG
+						Log.debug "Rescuing NOSCRIPT error for #{name} - running again..."
 						untrack_script name
 						@rescue_recurse += 1
 						out = (@tmp_store || store).evalsha(get_script_sha(name,source),keys,args)

data/lib/redis_object/ext/view_caching.rb

@@ -45,10 +45,10 @@ module Seabright
 					def view_as_hash(name)
 						return uncached_view_as_hash(name) unless self.class.view_should_be_cached?(name)
 						if v = view_from_cache(name)
-							puts "  Got view from cache: #{name}" if DEBUG
+							Log.debug "  Got view from cache: #{name}"
 							Yajl::Parser.parse(v)
 						else
-							puts "  View cache miss: #{name}" if DEBUG
+							Log.debug "  View cache miss: #{name}"
 							cache_view_content(name)[0]
 						end
 					end
@@ -57,10 +57,10 @@ module Seabright
 					def view_as_json(name)
 						return uncached_view_as_json(name) unless self.class.view_should_be_cached?(name)
 						if v = view_from_cache(name)
-							puts "  Got view from cache: #{name}" if DEBUG
+							Log.debug "  Got view from cache: #{name}"
 							v
 						else
-							puts "  View cache miss: #{name}" if DEBUG
+							Log.debug "  View cache miss: #{name}"
 							cache_view_content(name)[1]
 						end
 					end
@@ -107,7 +107,7 @@ module Seabright
 				self.class_eval do
 					
 					def invalidate_cached_views(*names)
-						puts "Invalidating cached views: #{names.join(", ")}" if Debug.verbose?
+						Log.verbose "Invalidating cached views: #{names.join(", ")}"
 						run_script(:CachedViewInvalidator, [cached_view_key], names, CachedViewInvalidator)
 						self.class.cache_invalidation_hooks do |hook|
 							hook.call(names)
@@ -125,7 +125,7 @@ module Seabright
 					
 					def invalidate_downstream!
 						return unless invalidations(:down).size > 0
-						puts "Invalidating downstream: #{invalidations(:down).inspect}" if Debug.verbose?
+						Log.verbose "Invalidating downstream: #{invalidations(:down).inspect}"
 						invalidations(:down).each do |col|
 							if has_collection?(col) and (colctn = get_collection(col))
 								colctn.each do |obj|
@@ -137,7 +137,7 @@ module Seabright
 					
 					def invalidate_upstream!
 						return unless invalidations(:up).size > 0
-						puts "Invalidating upstream: #{invalidations(:up).inspect}" if Debug.verbose?
+						Log.verbose "Invalidating upstream: #{invalidations(:up).inspect}"
 						backreferences.each do |obj|
 							obj = Object.const_get(obj) if obj.is_a?(String) or obj.is_a?(Symbol)
 							if invalidations(:up).include?(obj.class) and obj.respond_to?(:invalidated_by_other)
@@ -170,7 +170,7 @@ module Seabright
 					
 					def invalidated_by_other(obj,chain)
 						return if chain.include?(self.hkey)
-						puts "#{self.class.name}:#{self.id}'s view caches were invalidated by upstream object: #{obj.class.name}:#{obj.id} (chain:#{chain.inspect})" if Debug.verbose?
+						Log.verbose "#{self.class.name}:#{self.id}'s view caches were invalidated by upstream object: #{obj.class.name}:#{obj.id} (chain:#{chain.inspect})"
 						@invalidation_chain = chain
 						[:invalidated_by,"invalidated_by_#{obj.class.name.underscore}".to_sym].each do |meth_sym|
 							if respond_to?(meth_sym)

data/lib/redis_object/logger.rb

@@ -0,0 +1,47 @@
+require 'logger'
+
+module Seabright
+	class Log
+		
+		class << self
+			
+			def verbose(*args)
+				logger.verbose(*args) if logger.respond_to?(:verbose)
+			end
+			
+			def debug(*args)
+				logger.debug(*args)
+			end
+			
+			def info(*args)
+				logger.info(*args)
+			end
+			
+			def warn(*args)
+				logger.warn(*args)
+			end
+			
+			def error(*args)
+				logger.error(*args)
+			end
+			
+			def fatal(*args)
+				logger.fatal(*args)
+			end
+			
+			def logger
+				@@logger ||= Proc.new do
+					lg = Logger.new(STDOUT)
+					lg.level = Logger::WARN
+					lg
+				end.call
+			end
+			
+			def logger=(new_logger)
+				@@logger = new_logger
+			end
+			
+		end
+		
+	end
+end

data/lib/redis_object/storage.rb

@@ -66,7 +66,7 @@ module Seabright
 				raise "Directory does not exist!" unless Dir.exists?(File.dirname(path))
 				adapters.each do |name,adptr|
 					if adptr.respond_to? :dump_to_file
-						puts "Dumping #{name} into #{path}/#{name.to_s}.dump"
+						Log.info "Dumping #{name} into #{path}/#{name.to_s}.dump"
 						adptr.dump_to_file("#{path}/#{name.to_s}.dump")
 					end
 				end
@@ -77,7 +77,7 @@ module Seabright
 				Dir.glob(path + "/*.dump").each do |file|
 					name = file.gsub(/\.[^\.]+$/,'').gsub(/.*\//,'').to_sym
 					if (stor = store(name)) && stor.respond_to?(:restore_from_file)
-						puts "Restoring #{name} from #{file}"
+						Log.info "Restoring #{name} from #{file}"
 						stor.restore_from_file(file)
 					end
 				end

data/lib/redis_object/storage/aws.rb

@@ -4,7 +4,7 @@ module Seabright
 		class AWS
 			
 			def initialize(config={})
-				puts "Got config: '#{config.inspect}'"
+				Log.debug "Got config: '#{config.inspect}'"
 				@config = config
 			end
 			

data/lib/redis_object/storage/redis.rb

@@ -4,11 +4,11 @@ module Seabright
 			
 			def method_missing(sym, *args, &block)
 				return super unless connection.respond_to?(sym)
-				puts "[Storage::Redis] #{sym}(#{args.inspect.gsub(/\[|\]/m,'')})" if Debug.verbose?
+				Log.verbose "[Storage::Redis] #{sym}(#{args.inspect.gsub(/\[|\]/m,'')})"
 				begin
 					connection.send(sym,*args, &block)
 				rescue ::Redis::InheritedError, ::Redis::TimeoutError => err
-					puts "Rescued: #{err.inspect}" if DEBUG
+					Log.debug "Rescued: #{err.inspect}"
 					reset
 					connection.send(sym,*args, &block)
 				end
@@ -16,7 +16,7 @@ module Seabright
 			
 			def new_connection
 				require 'redis'
-				puts "Connecting to Redis with: #{config_opts(:path, :db, :password, :host, :port, :timeout, :tcp_keepalive).inspect}" if DEBUG
+				Log.debug "Connecting to Redis with: #{config_opts(:path, :db, :password, :host, :port, :timeout, :tcp_keepalive).inspect}"
 				::Redis.new(config_opts(:path, :db, :password, :host, :port, :timeout, :tcp_keepalive))
 			end
 			

data/lib/redis_object/types/date.rb

@@ -6,7 +6,7 @@ module Seabright
 				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
+					Log.debug "Could not parse value as date using Date.parse. Returning nil instead. Value: #{val.inspect}\nError: #{e.inspect}"
 					nil
 				end
 			end

data/lib/redis_object/version.rb

@@ -1,5 +1,5 @@
 module Seabright
 	class RedisObject
-		VERSION = "1.3.2"
+		VERSION = "1.3.3"
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis_object
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - John Bragg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-13 00:00:00.000000000 Z
+date: 2013-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: utf8_utils
@@ -114,6 +114,7 @@ files:
 - lib/redis_object/indices.rb
 - lib/redis_object/inheritance_tracking.rb
 - lib/redis_object/keys.rb
+- lib/redis_object/logger.rb
 - lib/redis_object/storage.rb
 - lib/redis_object/storage/adapter.rb
 - lib/redis_object/storage/aws.rb