toystore 0.7.0 → 0.8.0

data/README.rdoc

@@ -10,7 +10,7 @@ https://groups.google.com/forum/#!forum/toystoreadapter
 
 == Identity Map
 
-By default, Toystore has identity map turned on. It assumes that any Toystore model has a unique id across all models. This means you either need to use the default uuid id's, object_id's (included), some other unique id, or create your own key factory that namespaces to model (see examples).
+By default, Toystore has identity map turned on. It assumes that any Toystore model has a unique id across all models. This means you either need to use the default uuid id's or create your own key factory that namespaces to model (see examples).
 
 You also need to clear the map before each request. For this, there is a provided piece of middleware that you can use.
 

data/examples/mongo.rb

@@ -11,7 +11,6 @@ require 'toystore'
 class User
   include Toy::Store
   store :mongo, Mongo::Connection.new.db('adapter')['testing']
-  key(:object_id)
 
   attribute :name, String
 end

data/lib/toy/attributes.rb

@@ -99,6 +99,7 @@ module Toy
 
       private
         def read_attribute(key)
+          @attributes ||= {}
           @attributes[key.to_s]
         end
 
@@ -127,7 +128,7 @@ module Toy
         end
 
         def initialize_attributes_with_defaults
-          @attributes = {}
+          @attributes ||= {}
           self.class.defaulted_attributes.each do |attribute|
             @attributes[attribute.name.to_s] = attribute.default
           end

data/lib/toy/identity.rb

@@ -8,20 +8,16 @@ module Toy
 
     module ClassMethods
       def key(name_or_factory = :uuid)
-        @key_factory = case name_or_factory
-          when :uuid
-            UUIDKeyFactory.new
-          when :object_id
-            require 'toy/identity/object_id_key_factory'
-            ObjectIdKeyFactory.new
+        @key_factory = if name_or_factory == :uuid
+          UUIDKeyFactory.new
+        else
+          if name_or_factory.respond_to?(:next_key) && name_or_factory.respond_to?(:key_type)
+            name_or_factory
           else
-            if name_or_factory.respond_to?(:next_key) &&
-               name_or_factory.respond_to?(:key_type)
-              name_or_factory
-            else
-              raise InvalidKeyFactory.new(name_or_factory)
-            end
+            raise InvalidKeyFactory.new(name_or_factory)
           end
+        end
+
         attribute :id, @key_factory.key_type
         @key_factory
       end

data/lib/toy/version.rb

@@ -1,3 +1,3 @@
 module Toy
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

data/perf/reads.rb

@@ -0,0 +1,45 @@
+# require 'perftools'
+require 'pp'
+require 'logger'
+require 'benchmark'
+require 'rubygems'
+
+$:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+require 'toystore'
+require 'adapter/memory'
+
+Toy.logger = ::Logger.new(STDOUT).tap { |log| log.level = ::Logger::INFO }
+
+class User
+  include Toy::Store
+  identity_map_off
+  store(:memory, {})
+  attribute :name, String
+end
+
+user  = User.create(:name => 'John')
+id    = user.id
+times = 10_000
+
+client_result = Benchmark.realtime {
+  times.times { User.store.decode(User.store.client[User.store.key_for(id)]) }
+}
+
+store_result = Benchmark.realtime {
+  times.times { User.get(id) }
+}
+
+puts 'Client', client_result
+puts 'Toystore', store_result
+puts 'Ratio', store_result / client_result
+
+# PerfTools::CpuProfiler.start('prof_client') do
+#   times.times{ User.store.decode(User.store.client[User.store.key_for(id)]) }
+# end
+
+# PerfTools::CpuProfiler.start('prof_reads') do
+#   times.times{ User.get(id) }
+# end
+
+# system('pprof.rb --gif --ignore=Collection#find_one prof_reads > prof_reads.gif')
+# system('open prof_reads.gif')

data/perf/writes.rb

@@ -0,0 +1,33 @@
+# require 'perftools'
+require 'pp'
+require 'logger'
+require 'benchmark'
+require 'rubygems'
+
+$:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+require 'toystore'
+require 'adapter/memory'
+
+Toy.logger = ::Logger.new(STDOUT).tap { |log| log.level = ::Logger::INFO }
+
+class User
+  include Toy::Store
+  identity_map_off
+  store(:memory, {})
+end
+
+times = 10_000
+user = User.new
+id = user.id
+attrs = user.persisted_attributes
+
+client_result = Benchmark.realtime {
+  times.times { User.store.write(id, attrs) }
+}
+store_result = Benchmark.realtime {
+  times.times { User.create }
+}
+
+puts 'Client', client_result
+puts 'Toystore', store_result
+puts 'Ratio', store_result / client_result

data/spec/toy/attributes_spec.rb

@@ -423,4 +423,25 @@ describe Toy::Attributes do
       User.new.skills.should == []
     end
   end
+
+  # https://github.com/newtoy/toystore/issues/13
+  describe "Overriding initialize and setting an attribute before calling super" do
+    before do
+      User.attribute(:name, String)
+      User.class_eval do
+        def initialize(*)
+          self.name = 'John'
+          super
+        end
+      end
+    end
+
+    it "does not throw error" do
+      lambda { User.new }.should_not raise_error
+    end
+
+    it "sets value" do
+      User.new.name.should == 'John'
+    end
+  end
 end

data/spec/toy/identity/uuid_key_factory_spec.rb

@@ -11,7 +11,7 @@ describe Toy::Identity::UUIDKeyFactory do
     Toy::Identity::UUIDKeyFactory.new.next_key(nil).length.should == 36
   end
 
-  describe "Declaring key to be object_id" do
+  describe "Declaring key to be uuid" do
     before(:each) do
       User.key(:uuid)
     end

data/spec/toy/identity_spec.rb

@@ -8,21 +8,17 @@ describe Toy::Identity do
       User.key(:uuid).should be_instance_of(Toy::Identity::UUIDKeyFactory)
     end
 
-    it "should use ObjectIdKeyFactory if :object_id" do
-      User.key(:object_id).should be_instance_of(Toy::Identity::ObjectIdKeyFactory)
-    end
-
     it "should set key factory passed in factory" do
       factory = Toy::Identity::UUIDKeyFactory.new
       User.key(factory).should == factory
     end
 
     it "should use Toy.key_factory by default" do
-      key_factory     = Toy::Identity::ObjectIdKeyFactory.new
+      key_factory     = Toy::Identity::UUIDKeyFactory.new
       Toy.key_factory = key_factory
       Class.new do
         include Toy::Store
-      end.key_factory.should be_instance_of(Toy::Identity::ObjectIdKeyFactory)
+      end.key_factory.should be_instance_of(Toy::Identity::UUIDKeyFactory)
     end
   end
 

data/spec/toy/reference_spec.rb

@@ -49,17 +49,6 @@ describe Toy::Reference do
     Game.new.should respond_to(:user=)
   end
 
-  describe "with object_id key" do
-    before(:each) do
-      User.key(:object_id)
-      @reference = Game.reference(:user)
-    end
-
-    it "sets type to BSON::ObjectId" do
-      Game.attributes['user_id'].type.should be(BSON::ObjectId)
-    end
-  end
-
   describe "#eql?" do
     it "returns true if same class, model, and name" do
       reference.should eql(reference)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: toystore
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 63
   prerelease: 
   segments: 
   - 0
-  - 7
+  - 8
   - 0
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Geoffrey Dagley
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-08 00:00:00 Z
+date: 2011-05-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: adapter
@@ -102,7 +102,6 @@ files:
 - Rakefile
 - examples/attributes_abbreviation.rb
 - examples/attributes_virtual.rb
-- examples/changing_key_factory.rb
 - examples/identity_map.rb
 - examples/memcached.rb
 - examples/memory.rb
@@ -137,7 +136,6 @@ files:
 - lib/toy/extensions/time.rb
 - lib/toy/identity.rb
 - lib/toy/identity/abstract_key_factory.rb
-- lib/toy/identity/object_id_key_factory.rb
 - lib/toy/identity/uuid_key_factory.rb
 - lib/toy/identity_map.rb
 - lib/toy/index.rb
@@ -162,6 +160,8 @@ files:
 - lib/toy/validations.rb
 - lib/toy/version.rb
 - lib/toystore.rb
+- perf/reads.rb
+- perf/writes.rb
 - spec/helper.rb
 - spec/spec.opts
 - spec/support/constants.rb
@@ -189,7 +189,6 @@ files:
 - spec/toy/extensions/string_spec.rb
 - spec/toy/extensions/time_spec.rb
 - spec/toy/identity/abstract_key_factory_spec.rb
-- spec/toy/identity/object_id_key_factory_spec.rb
 - spec/toy/identity/uuid_key_factory_spec.rb
 - spec/toy/identity_map_spec.rb
 - spec/toy/identity_spec.rb
@@ -275,7 +274,6 @@ test_files:
 - spec/toy/extensions/string_spec.rb
 - spec/toy/extensions/time_spec.rb
 - spec/toy/identity/abstract_key_factory_spec.rb
-- spec/toy/identity/object_id_key_factory_spec.rb
 - spec/toy/identity/uuid_key_factory_spec.rb
 - spec/toy/identity_map_spec.rb
 - spec/toy/identity_spec.rb

data/examples/changing_key_factory.rb

@@ -1,16 +0,0 @@
-require 'pp'
-require 'rubygems'
-require 'pathname'
-
-root_path = Pathname(__FILE__).dirname.join('..').expand_path
-lib_path  = root_path.join('lib')
-$:.unshift(lib_path)
-
-require 'toystore'
-
-class User
-  include Toy::Store
-  key :object_id
-end
-
-puts User.new.id # BSON::ObjectId ...

data/lib/toy/identity/object_id_key_factory.rb

@@ -1,26 +0,0 @@
-require 'bson'
-
-module Toy
-  module Identity
-    class ObjectIdKeyFactory < AbstractKeyFactory
-      def key_type
-        BSON::ObjectId
-      end
-
-      def next_key(object)
-        BSON::ObjectId.new
-      end
-    end
-  end
-end
-
-class BSON::ObjectId
-  def self.to_store(value, *)
-    return value if value.is_a?(BSON::ObjectId)
-    BSON::ObjectId.from_string(value.to_s)
-  end
-
-  def self.from_store(value, *args)
-    to_store(value, *args)
-  end
-end

data/spec/toy/identity/object_id_key_factory_spec.rb

@@ -1,40 +0,0 @@
-require 'helper'
-require 'toy/identity/object_id_key_factory'
-
-describe Toy::Identity::ObjectIdKeyFactory do
-  uses_constants('User')
-
-  it "should use BSON::ObjectId as key_type" do
-    Toy::Identity::ObjectIdKeyFactory.new.key_type.should be(BSON::ObjectId)
-  end
-
-  it "should use object id for next key" do
-    key = Toy::Identity::ObjectIdKeyFactory.new.next_key(nil)
-    key.should be_instance_of(BSON::ObjectId)
-  end
-
-  describe "Declaring key to be object_id" do
-    before(:each) do
-      User.key(:object_id)
-      User.attribute(:name, String)
-    end
-
-    it "returns BSON::ObjectId as .key_type" do
-      User.key_type.should be(BSON::ObjectId)
-    end
-
-    it "sets id attribute to BSON::ObjectId type" do
-      User.attributes['id'].type.should be(BSON::ObjectId)
-    end
-
-    it "correctly stores id in database" do
-      user = User.create(:name => 'John')
-      user.id.should be_instance_of(BSON::ObjectId)
-      # key_for in memory adapter marshals non symbol/string keys
-      # so we have to unmarshal to get the key type
-      key =  Marshal.load(user.store.client.keys.first)
-      key.should be_instance_of(BSON::ObjectId)
-      user.id.should == key
-    end
-  end
-end