toystore 0.8.1 → 0.8.2

data/lib/toy.rb

@@ -42,13 +42,32 @@ module Toy
     end
   end
 
+  def logger
+    @logger
+  end
+
+  def logger?
+    @logger.present?
+  end
+
+  def logger=(logger)
+    @logger = logger
+  end
+
+  def key_factory=(key_factory)
+    @key_factory = key_factory
+  end
+
+  def key_factory
+    @key_factory ||= Toy::Identity::UUIDKeyFactory.new
+  end
+
   module Middleware
     autoload 'IdentityMap', 'toy/middleware/identity_map'
   end
 end
 
 require 'toy/exceptions'
-require 'toy/connection'
 require 'toy/attribute'
 require 'toy/attributes'
 require 'toy/callbacks'

data/lib/toy/logger.rb

@@ -3,13 +3,16 @@ module Toy
     extend ActiveSupport::Concern
 
     module ClassMethods
+      OperationsToLogValueFor = [:get, :set, :del]
+
       def logger
         Toy.logger
       end
 
       def log_operation(operation, model, adapter, key, value=nil)
-        if logger.debug?
-          logger.debug("ToyStore #{operation.to_s.upcase} #{model} :#{adapter.name} #{key.inspect}")
+        if logger && logger.debug?
+          logger.debug("TOYSTORE #{operation.to_s.upcase} #{model} :#{adapter.name} #{key.inspect}")
+          logger.debug("  #{value.inspect}") if !value.nil? && OperationsToLogValueFor.include?(operation)
         end
       end
     end

data/lib/toy/store.rb

@@ -31,6 +31,4 @@ module Toy
       include Caching
     end
   end
-
-  extend Connection
 end

data/lib/toy/validations.rb

@@ -15,7 +15,7 @@ module Toy
           if invalid.any?
             record.errors.add(name, 'is invalid')
 
-            if logger.debug?
+            if logger && logger.debug?
               invalid_messages = []
               invalid.each do |obj|
                 invalid_messages << [obj.attributes, obj.errors.full_messages]

data/lib/toy/version.rb

@@ -1,3 +1,3 @@
 module Toy
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

data/spec/toy/dolly_spec.rb

@@ -1,6 +1,6 @@
 require 'helper'
 
-describe Toy::Connection do
+describe Toy::Dolly do
   uses_constants('User', 'Game', 'Move')
 
   before do

data/spec/toy/logger_spec.rb

@@ -3,6 +3,14 @@ require 'helper'
 describe Toy::Logger do
   uses_constants('User')
 
+  before do
+    @logger = Toy.logger
+  end
+
+  after do
+    Toy.logger = @logger
+  end
+
   it "should use Toy.logger for class" do
     User.logger.should == Toy.logger
   end
@@ -15,16 +23,26 @@ describe Toy::Logger do
     let(:adapter) { Adapter[:memory].new({}) }
 
     it "logs operation" do
-      User.logger.should_receive(:debug).with('ToyStore GET User :memory "foo"')
+      Toy.logger = stub(:debug? => true)
+      User.logger.should_receive(:debug).with('TOYSTORE GET User :memory "foo"')
+      User.logger.should_receive(:debug).with('  "bar"')
       User.log_operation(:get, User, adapter, 'foo', 'bar')
     end
+
+    it "ignores operations that should not be logged" do
+      Toy.logger = stub(:debug? => true)
+      User.logger.should_receive(:debug).with('TOYSTORE IMG User :memory "foo"')
+      User.log_operation(:img, User, adapter, 'foo', 'bar')
+    end
   end
 
   describe "#log_operation" do
     let(:adapter) { Adapter[:memory].new({}) }
 
     it "logs operation" do
-      User.logger.should_receive(:debug).with('ToyStore GET User :memory "foo"')
+      Toy.logger = stub(:debug? => true)
+      User.logger.should_receive(:debug).with('TOYSTORE GET User :memory "foo"')
+      User.logger.should_receive(:debug).with('  "bar"')
       User.log_operation(:get, User, adapter, 'foo', 'bar')
     end
   end

data/spec/toy_spec.rb

@@ -18,4 +18,33 @@ describe Toy do
       lambda { Toy.clear }.should_not raise_error
     end
   end
+
+  describe ".logger" do
+    before do
+      @logger = Toy.logger
+    end
+
+    after do
+      Toy.logger = @logger
+    end
+
+    it "should set the default logger" do
+      logger = stub
+      Toy.logger = logger
+      Toy.logger.should == logger
+    end
+  end
+
+  describe ".key_factory" do
+    it "should set the default key_factory" do
+      key_factory = stub
+      Toy.key_factory = key_factory
+      Toy.key_factory.should == key_factory
+    end
+
+    it "should default to the UUIDKeyFactory" do
+      Toy.key_factory = nil
+      Toy.key_factory.should be_instance_of(Toy::Identity::UUIDKeyFactory)
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: toystore
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 59
   prerelease: 
   segments: 
   - 0
   - 8
-  - 1
-  version: 0.8.1
+  - 2
+  version: 0.8.2
 platform: ruby
 authors: 
 - Geoffrey Dagley
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-04 00:00:00 Z
+date: 2011-07-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: adapter
@@ -114,7 +114,6 @@ files:
 - lib/toy/caching.rb
 - lib/toy/callbacks.rb
 - lib/toy/collection.rb
-- lib/toy/connection.rb
 - lib/toy/dirty.rb
 - lib/toy/dolly.rb
 - lib/toy/embedded_list.rb
@@ -169,7 +168,6 @@ files:
 - spec/toy/attributes_spec.rb
 - spec/toy/caching_spec.rb
 - spec/toy/callbacks_spec.rb
-- spec/toy/connection_spec.rb
 - spec/toy/dirty_spec.rb
 - spec/toy/dolly_spec.rb
 - spec/toy/embedded_list_spec.rb
@@ -254,7 +252,6 @@ test_files:
 - spec/toy/attributes_spec.rb
 - spec/toy/caching_spec.rb
 - spec/toy/callbacks_spec.rb
-- spec/toy/connection_spec.rb
 - spec/toy/dirty_spec.rb
 - spec/toy/dolly_spec.rb
 - spec/toy/embedded_list_spec.rb

data/lib/toy/connection.rb

@@ -1,28 +0,0 @@
-module Toy
-  module Connection
-    def logger
-      @@logger ||= init_default_logger
-    end
-
-    def logger=(logger)
-      @@logger = logger
-    end
-
-    def key_factory=(key_factory)
-      @@key_factory = key_factory
-    end
-
-    def key_factory
-      @@key_factory ||= Toy::Identity::UUIDKeyFactory.new
-    end
-
-    def init_default_logger
-      if Object.const_defined?("RAILS_DEFAULT_LOGGER")
-        @@logger = Object.const_get("RAILS_DEFAULT_LOGGER")
-      else
-        require 'logger'
-        @@logger = ::Logger.new(STDOUT)
-      end
-    end
-  end
-end

data/spec/toy/connection_spec.rb

@@ -1,47 +0,0 @@
-require 'helper'
-
-describe Toy::Connection do
-  uses_constants('User')
-
-  before do
-    @logger = Toy.logger
-  end
-
-  after do
-    Toy.logger = @logger
-  end
-
-  describe ".logger" do
-    it "should set the default logger" do
-      logger = stub
-      Toy.logger = logger
-      Toy.logger.should == logger
-    end
-
-    it "should be an instance of Logger if not set" do
-      Toy.logger = nil
-      Toy.logger.should be_instance_of(Logger)
-    end
-
-    it "should use RAILS_DEFAULT_LOGGER if defined" do
-      remove_constants("RAILS_DEFAULT_LOGGER")
-      RAILS_DEFAULT_LOGGER = stub
-
-      Toy.logger = nil
-      Toy.logger.should == RAILS_DEFAULT_LOGGER
-    end
-  end
-
-  describe ".key_factory" do
-    it "should set the default key_factory" do
-      key_factory = stub
-      Toy.key_factory = key_factory
-      Toy.key_factory.should == key_factory
-    end
-
-    it "should default to the UUIDKeyFactory" do
-      Toy.key_factory = nil
-      Toy.key_factory.should be_instance_of(Toy::Identity::UUIDKeyFactory)
-    end
-  end
-end