toystore 0.13.1 → 0.13.2

data/spec/toy/querying_spec.rb

@@ -8,13 +8,53 @@ describe Toy::Querying do
   end
 
   shared_examples_for "adapter read and load instance" do |method_name|
-    it "returns document if found" do
-      john = User.create(:name => 'John')
-      User.send(method_name, john.id).name.should == 'John'
+    context "when document found" do
+      before do
+        setup_memory_instrumenter
+
+        @user = User.create(:name => 'John')
+        @result = User.send(method_name, @user.id, {some: 'thing'})
+      end
+
+      it "returns document" do
+        @result.should eq(@user)
+      end
+
+      it "is instrumented and sets payload hit to true" do
+        event = instrumenter.events.last
+        event.should_not be_nil
+        event.name.should eq('read.toystore')
+        event.payload.should eq({
+          :id      => @user.id,
+          :options => {some: 'thing'},
+          :model   => User,
+          :hit     => true,
+        })
+      end
     end
 
-    it "returns nil if not found" do
-      User.send(method_name, '1').should be_nil
+    context "when document not found" do
+      before do
+        setup_memory_instrumenter
+
+        @id = 'blah'
+        @result = User.send(method_name, @id, {some: 'thing'})
+      end
+
+      it "returns nil" do
+        @result.should be_nil
+      end
+
+      it "is instrumented and sets payload :hit to false" do
+        event = instrumenter.events.last
+        event.should_not be_nil
+        event.payload.should eq({
+          :id      => @id,
+          :options => {some: 'thing'},
+          :model   => User,
+          :hit     => false,
+        })
+      end
     end
 
     it "passes options to adapter read" do
@@ -54,6 +94,36 @@ describe Toy::Querying do
       }
     end
 
+    it "is instrumented" do
+      setup_memory_instrumenter
+
+      john  = User.create(:name => 'John')
+      steve = User.create(:name => 'Steve')
+
+      ids = [
+        john.id,
+        steve.id,
+        'foo',
+      ]
+
+      User.send(method_name, ids, some: 'thing').should == {
+        john.id  => john,
+        steve.id => steve,
+        'foo'    => nil,
+      }
+
+      event = instrumenter.events.last
+      event.should_not be_nil
+      event.name.should eq('read_multiple.toystore')
+      event.payload.should eq({
+        :ids     => ids,
+        :options => {some: 'thing'},
+        :model   => User,
+        :hits    => 2,
+        :misses  => 1,
+      })
+    end
+
     it "passes options to adapter read_multiple" do
       john = User.create(:name => 'John')
       User.adapter.should_receive(:read_multiple).with([john.id], my: 'options').and_return({john.id => {'name' => 'John'}})
@@ -62,13 +132,54 @@ describe Toy::Querying do
   end
 
   shared_examples_for "adapter key?" do |method_name|
-    it "returns true if key exists" do
-      user = User.create(:name => 'John')
-      User.send(method_name, user.id).should be_true
+    context "when found" do
+      before do
+        setup_memory_instrumenter
+
+        @user = User.create(:name => 'John')
+        @result = User.send(method_name, @user.id, {some: 'thing'})
+      end
+
+      it "returns true" do
+        @result.should be_true
+      end
+
+      it "is instrumented and sets hit to true" do
+        event = instrumenter.events.last
+        event.should_not be_nil
+        event.name.should eq('key.toystore')
+        event.payload.should eq({
+          :id      => @user.id,
+          :options => {some: 'thing'},
+          :model   => User,
+          :hit     => true,
+        })
+      end
     end
 
-    it "returns false if key does not exist" do
-      User.send(method_name, 'taco:bell:tacos').should be_false
+    context "when not found" do
+      before do
+        setup_memory_instrumenter
+
+        @id = 'taco:bell:tacos'
+        @result = User.send(method_name, @id, {some: 'thing'})
+      end
+
+      it "returns false" do
+        @result.should be_false
+      end
+
+      it "is instrumented and sets hit to false" do
+        event = instrumenter.events.last
+        event.should_not be_nil
+        event.name.should eq('key.toystore')
+        event.payload.should eq({
+          :id      => @id,
+          :options => {some: 'thing'},
+          :model   => User,
+          :hit     => false,
+        })
+      end
     end
   end
 
@@ -108,32 +219,6 @@ describe Toy::Querying do
     include_examples "adapter read_multiple and load instances", :find_multiple
   end
 
-  describe ".get_or_new" do
-    it "returns found" do
-      user = User.create
-      User.get_or_new(user.id).should == user
-    end
-
-    it "creates new with id set if not found" do
-      user = User.get_or_new('foo')
-      user.should be_instance_of(User)
-      user.id.should == 'foo'
-    end
-  end
-
-  describe ".get_or_create" do
-    it "returns found" do
-      user = User.create
-      User.get_or_create(user.id).should == user
-    end
-
-    it "creates new with id set if not found" do
-      user = User.get_or_create('foo')
-      user.should be_instance_of(User)
-      user.id.should == 'foo'
-    end
-  end
-
   describe ".key?" do
     include_examples "adapter key?", :key?
   end

data/spec/toy_spec.rb

@@ -3,22 +3,6 @@ require 'helper'
 describe Toy do
   uses_constants('User', 'Game')
 
-  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
@@ -31,4 +15,18 @@ describe Toy do
       Toy.key_factory.should be_instance_of(Toy::Identity::UUIDKeyFactory)
     end
   end
+
+  describe ".instrumenter" do
+    it "defaults to noop" do
+      described_class.instrumenter.should eq(Toy::Instrumenters::Noop)
+    end
+  end
+
+  describe ".instrumenter=" do
+    it "sets instrumenter" do
+      instrumenter = double('Instrumenter')
+      Toy.instrumenter = instrumenter
+      Toy.instrumenter.should be(instrumenter)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toystore
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.13.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-26 00:00:00.000000000 Z
+date: 2013-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adapter
@@ -140,9 +140,17 @@ files:
 - lib/toy/identity_map.rb
 - lib/toy/inheritance.rb
 - lib/toy/inspect.rb
+- lib/toy/instrumentation/active_support_notifications.rb
+- lib/toy/instrumentation/log_subscriber.rb
+- lib/toy/instrumentation/metriks.rb
+- lib/toy/instrumentation/metriks_subscriber.rb
+- lib/toy/instrumentation/statsd.rb
+- lib/toy/instrumentation/statsd_subscriber.rb
+- lib/toy/instrumentation/subscriber.rb
+- lib/toy/instrumenters/memory.rb
+- lib/toy/instrumenters/noop.rb
 - lib/toy/list.rb
 - lib/toy/lists.rb
-- lib/toy/logger.rb
 - lib/toy/mass_assignment_security.rb
 - lib/toy/middleware/identity_map.rb
 - lib/toy/object.rb
@@ -165,7 +173,9 @@ files:
 - spec/helper.rb
 - spec/spec.opts
 - spec/support/constants.rb
+- spec/support/fake_udp_socket.rb
 - spec/support/identity_map_matcher.rb
+- spec/support/instrumenter_helpers.rb
 - spec/support/name_and_number_key_factory.rb
 - spec/support/objects.rb
 - spec/support/shared_active_model_lint.rb
@@ -198,9 +208,13 @@ files:
 - spec/toy/identity_spec.rb
 - spec/toy/inheritance_spec.rb
 - spec/toy/inspect_spec.rb
+- spec/toy/instrumentation/log_subscriber_spec.rb
+- spec/toy/instrumentation/metriks_subscriber_spec.rb
+- spec/toy/instrumentation/statsd_subscriber_spec.rb
+- spec/toy/instrumenters/memory_spec.rb
+- spec/toy/instrumenters/noop_spec.rb
 - spec/toy/list_spec.rb
 - spec/toy/lists_spec.rb
-- spec/toy/logger_spec.rb
 - spec/toy/mass_assignment_security_spec.rb
 - spec/toy/middleware/identity_map_spec.rb
 - spec/toy/object_spec.rb
@@ -230,7 +244,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3156935686083657765
+      hash: 4223268135797679612
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -239,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3156935686083657765
+      hash: 4223268135797679612
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -250,7 +264,9 @@ test_files:
 - spec/helper.rb
 - spec/spec.opts
 - spec/support/constants.rb
+- spec/support/fake_udp_socket.rb
 - spec/support/identity_map_matcher.rb
+- spec/support/instrumenter_helpers.rb
 - spec/support/name_and_number_key_factory.rb
 - spec/support/objects.rb
 - spec/support/shared_active_model_lint.rb
@@ -283,9 +299,13 @@ test_files:
 - spec/toy/identity_spec.rb
 - spec/toy/inheritance_spec.rb
 - spec/toy/inspect_spec.rb
+- spec/toy/instrumentation/log_subscriber_spec.rb
+- spec/toy/instrumentation/metriks_subscriber_spec.rb
+- spec/toy/instrumentation/statsd_subscriber_spec.rb
+- spec/toy/instrumenters/memory_spec.rb
+- spec/toy/instrumenters/noop_spec.rb
 - spec/toy/list_spec.rb
 - spec/toy/lists_spec.rb
-- spec/toy/logger_spec.rb
 - spec/toy/mass_assignment_security_spec.rb
 - spec/toy/middleware/identity_map_spec.rb
 - spec/toy/object_spec.rb

data/lib/toy/logger.rb

@@ -1,15 +0,0 @@
-module Toy
-  module Logger
-    extend ActiveSupport::Concern
-
-    module ClassMethods
-      def logger
-        Toy.logger
-      end
-    end
-
-    def logger
-      Toy.logger
-    end
-  end
-end

data/spec/toy/logger_spec.rb

@@ -1,21 +0,0 @@
-require 'helper'
-
-describe Toy::Logger do
-  uses_objects('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
-
-  it "should use Toy.logger for instance" do
-    User.new.logger.should == Toy.logger
-  end
-end