toystore 0.8.3 → 0.9.0

data/lib/toy/serialization.rb

@@ -14,8 +14,7 @@ module Toy
       options[:only]   = Array.wrap(options[:only]).map(&:to_sym)
       options[:except] = Array.wrap(options[:except]).map(&:to_sym)
 
-      serializable_stuff =  serializable_attributes.map(&:to_sym) +
-                            self.class.embedded_lists.keys.map(&:to_sym)
+      serializable_stuff =  serializable_attributes.map(&:to_sym)
 
       if options[:only].any?
         serializable_stuff &= options[:only]
@@ -48,35 +47,36 @@ module Toy
     end
 
     private
-      # Add associations specified via the <tt>:includes</tt> option.
-      # Expects a block that takes as arguments:
-      #   +association+ - name of the association
-      #   +records+     - the association record(s) to be serialized
-      #   +opts+        - options for the association records
-      def serializable_add_includes(options = {})
-        return unless include_associations = options.delete(:include)
 
-        base_only_or_except = { :except => options[:except],
-                                :only => options[:only] }
+    # Add associations specified via the <tt>:includes</tt> option.
+    # Expects a block that takes as arguments:
+    #   +association+ - name of the association
+    #   +records+     - the association record(s) to be serialized
+    #   +opts+        - options for the association records
+    def serializable_add_includes(options = {})
+      return unless include_associations = options.delete(:include)
 
-        include_has_options = include_associations.is_a?(Hash)
-        associations = include_has_options ? include_associations.keys : Array.wrap(include_associations)
+      base_only_or_except = { :except => options[:except],
+                              :only => options[:only] }
 
-        for association in associations
-          records = if self.class.list?(association)
-            send(association).to_a
-          elsif self.class.reference?(association) || self.class.parent_reference?(association)
-            send(association)
-          end
+      include_has_options = include_associations.is_a?(Hash)
+      associations = include_has_options ? include_associations.keys : Array.wrap(include_associations)
 
-          unless records.nil?
-            association_options = include_has_options ? include_associations[association] : base_only_or_except
-            opts = options.merge(association_options)
-            yield(association, records, opts)
-          end
+      for association in associations
+        records = if self.class.list?(association)
+          send(association).to_a
+        elsif self.class.reference?(association) || self.class.parent_reference?(association)
+          send(association)
         end
 
-        options[:include] = include_associations
+        unless records.nil?
+          association_options = include_has_options ? include_associations[association] : base_only_or_except
+          opts = options.merge(association_options)
+          yield(association, records, opts)
+        end
       end
+
+      options[:include] = include_associations
+    end
   end
 end

data/lib/toy/store.rb

@@ -4,17 +4,12 @@ module Toy
     extend Plugins
 
     included do
-      extend  ActiveModel::Naming
-      include ActiveModel::Conversion
-      include Attributes
-      include Identity
+      include Toy::Object
       include Persistence
       include MassAssignmentSecurity
-      include Dolly
-      include Dirty
-      include Equality
-      include Inspect
+      include DirtyStore
       include Querying
+      include Reloadable
 
       include Callbacks
       include Validations
@@ -22,10 +17,7 @@ module Toy
       include Timestamps
 
       include Lists
-      include EmbeddedLists
       include References
-      include Indices
-      include Logger
 
       include IdentityMap
       include Caching

data/lib/toy/validations.rb

@@ -9,41 +9,22 @@ module Toy
     end
 
     module ClassMethods
-      def validates_embedded(*names)
-        validates_each(*names) do |record, name, value|
-          invalid = value.compact.select { |obj| !obj.valid? }
-          if invalid.any?
-            record.errors.add(name, 'is invalid')
-
-            if logger && logger.debug?
-              invalid_messages = []
-              invalid.each do |obj|
-                invalid_messages << [obj.attributes, obj.errors.full_messages]
-              end
-              log_operation(:iem, self.name, store, record.id, invalid_messages)
-            end
-          end
-        end
-      end
-
       def create!(attrs={})
         new(attrs).tap { |doc| doc.save! }
       end
     end
 
-    module InstanceMethods
-      def valid?
-        run_callbacks(:validation) { super }
-      end
+    def valid?
+      run_callbacks(:validation) { super }
+    end
 
-      def save(options={})
-        options.assert_valid_keys(:validate)
-        !options.fetch(:validate, true) || valid? ? super : false
-      end
+    def save(options={})
+      options.assert_valid_keys(:validate)
+      !options.fetch(:validate, true) || valid? ? super : false
+    end
 
-      def save!
-        save || raise(RecordInvalid.new(self))
-      end
+    def save!
+      save || raise(RecordInvalid.new(self))
     end
   end
 end

data/lib/toy/version.rb

@@ -1,3 +1,3 @@
 module Toy
-  VERSION = "0.8.3"
+  VERSION = "0.9.0"
 end

data/perf/reads.rb

@@ -12,8 +12,6 @@ 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
 
@@ -21,20 +19,20 @@ 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)]) }
+adapter_result = Benchmark.realtime {
+  times.times { User.adapter.decode(User.adapter.client[User.adapter.key_for(id)]) }
 }
 
-store_result = Benchmark.realtime {
+toystore_result = Benchmark.realtime {
   times.times { User.get(id) }
 }
 
-puts 'Client', client_result
-puts 'Toystore', store_result
-puts 'Ratio', store_result / client_result
+puts 'Client', adapter_result
+puts 'Toystore', toystore_result
+puts 'Ratio', toystore_result / adapter_result
 
 # PerfTools::CpuProfiler.start('prof_client') do
-#   times.times{ User.store.decode(User.store.client[User.store.key_for(id)]) }
+#   times.times{ User.adapter.decode(User.adapter.client[User.adapter.key_for(id)]) }
 # end
 
 # PerfTools::CpuProfiler.start('prof_reads') do

data/perf/writes.rb

@@ -12,8 +12,6 @@ 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
@@ -21,13 +19,13 @@ user = User.new
 id = user.id
 attrs = user.persisted_attributes
 
-client_result = Benchmark.realtime {
-  times.times { User.store.write(id, attrs) }
+adapter_result = Benchmark.realtime {
+  times.times { User.adapter.write(id, attrs) }
 }
-store_result = Benchmark.realtime {
+toystore_result = Benchmark.realtime {
   times.times { User.create }
 }
 
-puts 'Client', client_result
-puts 'Toystore', store_result
-puts 'Ratio', store_result / client_result
+puts 'Client', adapter_result
+puts 'Toystore', toystore_result
+puts 'Ratio', toystore_result / adapter_result

data/spec/helper.rb

@@ -14,8 +14,8 @@ require 'bundler'
 Bundler.require(:default, :development)
 
 require 'toy'
-require 'adapter/memory'
 require 'support/constants'
+require 'support/objects'
 require 'support/identity_map_matcher'
 require 'support/name_and_number_key_factory'
 
@@ -26,9 +26,11 @@ end
 
 RSpec.configure do |c|
   c.include(Support::Constants)
+  c.include(Support::Objects)
   c.include(IdentityMapMatcher)
 
   c.before(:each) do
+    Toy::IdentityMap.enabled = false
     Toy.clear
     Toy.reset
     Toy.key_factory = nil

data/spec/support/constants.rb

@@ -1,8 +1,6 @@
 module Support
   module Constants
-    def self.included(base)
-      base.extend(ClassMethods)
-    end
+    extend ActiveSupport::Concern
 
     module ClassMethods
       def uses_constants(*constants)
@@ -34,7 +32,6 @@ module Support
           def self.to_s; '#{name}' end
         """ if name
         model.send(:include, Toy::Store)
-        model.store(:memory, {})
       end
     end
   end

data/spec/support/identity_map_matcher.rb

@@ -1,16 +1,16 @@
 module IdentityMapMatcher
   class BeInIdentityMap
-    def matches?(obj)
-      @obj = obj
-      @obj.identity_map[@obj.id] == @obj
+    def matches?(object)
+      @object = object
+      Toy::IdentityMap.include?(@object)
     end
 
     def failure_message
-      "expected #{@obj} to be in identity map, but it was not"
+      "expected #{@object} to be in identity map, but it was not"
     end
 
     def negative_failure_message
-      "expected #{@obj} to not be in identity map, but it was"
+      "expected #{@object} to not be in identity map, but it was"
     end
   end
 

data/spec/support/objects.rb

@@ -0,0 +1,38 @@
+module Support
+  module Objects
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def uses_objects(*objects)
+        before { create_objects(*objects) }
+      end
+    end
+
+    def create_objects(*objects)
+      objects.each { |object| create_object(object) }
+    end
+
+    def remove_objects(*objects)
+      objects.each { |object| remove_object(object) }
+    end
+
+    def create_object(object)
+      remove_object(object)
+      Kernel.const_set(object, Object(object))
+    end
+
+    def remove_object(object)
+      Kernel.send(:remove_const, object) if Kernel.const_defined?(object)
+    end
+
+    def Object(name=nil)
+      Class.new.tap do |object|
+        object.class_eval """
+          def self.name; '#{name}' end
+          def self.to_s; '#{name}' end
+        """ if name
+        object.send(:include, Toy::Object)
+      end
+    end
+  end
+end

data/spec/toy/attribute_spec.rb

@@ -1,7 +1,7 @@
 require 'helper'
 
 describe Toy::Attribute do
-  uses_constants('User')
+  uses_objects('User')
 
   before do
     @attribute = Toy::Attribute.new(User, :age, String)

data/spec/toy/attributes_spec.rb

@@ -1,12 +1,7 @@
 require 'helper'
 
 describe Toy::Attributes do
-  uses_constants('User', 'Game', 'Move', 'Tile')
-
-  before do
-    Game.embedded_list(:moves)
-    Move.embedded_list(:tiles)
-  end
+  uses_objects('User', 'Game')
 
   describe "including" do
     it "adds id attribute" do
@@ -22,7 +17,6 @@ describe Toy::Attributes do
 
   describe "#persisted_attributes" do
     before do
-      Game.embedded_list(:moves)
       @over    = Game.attribute(:over, Boolean)
       @score   = Game.attribute(:creator_score, Integer, :virtual => true)
       @abbr    = Game.attribute(:super_secret_hash, String, :abbr => :ssh)
@@ -32,7 +26,6 @@ describe Toy::Attributes do
         :creator_score => 20,
         :rewards       => %w(twigs berries).to_set,
         :ssh           => 'h4x',
-        :moves         => [Move.new, Move.new],
       })
     end
 
@@ -48,14 +41,6 @@ describe Toy::Attributes do
       @game.persisted_attributes.should_not have_key('super_secret_hash')
     end
 
-    it "includes embedded" do
-      @game.persisted_attributes.should have_key('moves')
-    end
-
-    it "includes ids of embedded" do
-      @game.persisted_attributes['moves'][0].should have_key('id')
-    end
-
     it "does not include virtual attributes" do
       @game.persisted_attributes.should_not have_key(:creator_score)
     end
@@ -130,48 +115,6 @@ describe Toy::Attributes do
     it "does not fail with nil" do
       User.new(nil).should be_instance_of(User)
     end
-
-    it "does guard attributes=" do
-      attrs = {'age' => 21}
-      user = User.allocate
-      user.should_receive(:attributes=).with(attrs, true)
-      user.send(:initialize, attrs)
-    end
-  end
-
-  describe "#initialize_from_database" do
-    before do
-      User.attribute(:age, Integer, :default => 20)
-      @user = User.allocate
-    end
-
-    it "sets new record to false" do
-      @user.initialize_from_database
-      @user.should_not be_new_record
-    end
-
-    it "sets attributes" do
-      @user.initialize_from_database('age' => 21)
-    end
-
-    it "sets defaults" do
-      @user.initialize_from_database
-      @user.age.should == 20
-    end
-
-    it "does not fail with nil" do
-      @user.initialize_from_database(nil).should == @user
-    end
-
-    it "returns self" do
-      @user.initialize_from_database.should == @user
-    end
-
-    it "does not guard attributes=" do
-      attrs = {'age' => 21}
-      @user.should_receive(:attributes=).with(attrs, false)
-      @user.initialize_from_database(attrs)
-    end
   end
 
   describe "#attributes" do
@@ -189,11 +132,6 @@ describe Toy::Attributes do
         'active' => true,
       }
     end
-
-    it "does not include embedded documents" do
-      game = Game.new(:moves => [Move.new(:tiles => [Tile.new])])
-      game.attributes.should_not have_key('moves')
-    end
   end
 
   describe "#attributes=" do
@@ -322,96 +260,6 @@ describe Toy::Attributes do
       user.tat = '1234'
       user.twitter_access_token.should == '1234'
     end
-
-    it "persists to store using abbreviation" do
-      user = User.create(:twitter_access_token => '1234')
-      raw = user.store.read(user.id)
-      raw['tat'].should == '1234'
-      raw.should_not have_key('twitter_access_token')
-    end
-
-    it "loads from store correctly" do
-      user = User.create(:twitter_access_token => '1234')
-      user = User.get(user.id)
-      user.twitter_access_token.should == '1234'
-      user.tat.should == '1234'
-    end
-  end
-
-  describe "#reload" do
-    before do
-      User.attribute(:name, String)
-      @user = User.create(:name => 'John')
-    end
-    let(:user) { @user }
-
-    it "reloads id from database" do
-      id = user.id
-      user.reload
-      user.id.should == id
-    end
-
-    it "reloads record from the database" do
-      user.name = 'Steve'
-      user.reload
-      user.name.should == 'John'
-    end
-
-    it "is still persisted" do
-      user.should be_persisted
-      user.reload
-      user.should be_persisted
-    end
-
-    it "returns the record" do
-      user.name = 'Steve'
-      user.reload.should equal(user)
-    end
-
-    it "resets instance variables" do
-      user.instance_variable_set("@foo", true)
-      user.reload
-      user.instance_variable_get("@foo").should be_nil
-    end
-
-    it "resets lists" do
-      User.list(:games)
-      game = Game.create
-      user.update_attributes(:games => [game])
-      user.games = []
-      user.games.should == []
-      user.reload
-      user.games.should == [game]
-    end
-
-    it "resets references" do
-      Game.reference(:user)
-      game = Game.create(:user => user)
-      game.user = nil
-      game.user.should be_nil
-      game.reload
-      game.user.should == user
-    end
-
-    it "raises NotFound if does not exist" do
-      user.destroy
-      lambda { user.reload }.should raise_error(Toy::NotFound)
-    end
-
-    it "reloads defaults" do
-      User.attribute(:skills, Array)
-      @user.reload
-      @user.skills.should == []
-    end
-
-    it "reloads attributes protected from mass assignment" do
-      User.attribute(:admin, Boolean)
-      User.attr_accessible(:name)
-      user = User.new(:name => 'John')
-      user.admin = true
-      user.save
-      user.reload.admin.should be_true
-    end
   end
 
   describe "Initialization of array attributes" do