toystore 0.9.0 → 0.10.0

data/lib/toy.rb

@@ -72,12 +72,14 @@ module Toy
   autoload 'Cloneable',               'toy/cloneable'
   autoload 'Equality',                'toy/equality'
   autoload 'Inspect',                 'toy/inspect'
+  autoload 'Inheritance',             'toy/inheritance'
   autoload 'Logger',                  'toy/logger'
   autoload 'MassAssignmentSecurity',  'toy/mass_assignment_security'
   autoload 'Persistence',             'toy/persistence'
   autoload 'Querying',                'toy/querying'
   autoload 'Reloadable',              'toy/reloadable'
   autoload 'Serialization',           'toy/serialization'
+  autoload 'AssociationSerialization','toy/association_serialization'
   autoload 'Timestamps',              'toy/timestamps'
   autoload 'Validations',             'toy/validations'
 
@@ -100,4 +102,4 @@ require 'toy/plugins'
 require 'toy/object'
 require 'toy/store'
 
-Toy::IdentityMap.enabled = false
+Toy::IdentityMap.enabled = false

data/lib/toy/association_serialization.rb

@@ -0,0 +1,50 @@
+module Toy
+  module AssociationSerialization
+    extend ActiveSupport::Concern
+    include Serialization
+
+    def serializable_hash(options = nil)
+      options ||= {}
+      super.tap { |hash|
+        serializable_add_includes(options) do |association, records, opts|
+          hash[association] = records.is_a?(Enumerable) ?
+            records.map { |r| r.serializable_hash(opts) } :
+            records.serializable_hash(opts)
+        end
+      }
+    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] }
+
+      include_has_options = include_associations.is_a?(Hash)
+      associations = include_has_options ? include_associations.keys : Array.wrap(include_associations)
+
+      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
+
+        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/attribute.rb

@@ -28,7 +28,12 @@ module Toy
 
     def default
       if options.key?(:default)
-        options[:default].respond_to?(:call) ? options[:default].call : options[:default]
+        default = options[:default]
+        if default.respond_to?(:call)
+          backwards_compatible_call(default)
+        else
+          default
+        end
       else
         type.respond_to?(:store_default) ? type.store_default : nil
       end
@@ -64,5 +69,15 @@ module Toy
         name  == other.name
     end
     alias :== :eql?
+
+    private
+
+    def backwards_compatible_call(block)
+      if block.arity == 1
+        block.call(model)
+      else
+        block.call
+      end
+    end
   end
-end
+end

data/lib/toy/equality.rb

@@ -17,5 +17,9 @@ module Toy
       end
       super other
     end
+
+    def hash
+      id.hash
+    end
   end
-end
+end

data/lib/toy/identity/abstract_key_factory.rb

@@ -8,6 +8,11 @@ module Toy
       def next_key(object)
         raise NotImplementedError, "#{self.class.name}#next_key isn't implemented."
       end
+
+      def eql?(other)
+        self.class == other.class && key_type == other.key_type
+      end
+      alias :== :eql?
     end
   end
 end

data/lib/toy/identity_map.rb

@@ -52,10 +52,9 @@ module Toy
       def get_from_identity_map(id)
         IdentityMap.repository[id] if IdentityMap.enabled?
       end
+      private :get_from_identity_map
 
       def load(id, attrs)
-        return nil if attrs.nil?
-
         if IdentityMap.enabled? && instance = IdentityMap.repository[id]
           instance
         else

data/lib/toy/inheritance.rb

@@ -0,0 +1,29 @@
+module Toy
+  module Inheritance
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      DuplicatedInstanceVariables = [
+        :attributes,
+        :key_factory,
+        :lists,
+        :references,
+        :adapter,
+      ]
+
+      def inherited(subclass)
+        DuplicatedInstanceVariables.each do |name|
+          subclass.instance_variable_set("@#{name}", send(name).dup) if respond_to?(name)
+        end
+
+        subclass.attribute(:type, String, :default => subclass.name)
+
+        super
+      end
+    end
+
+    def type
+      read_attribute(:type)
+    end
+  end
+end

data/lib/toy/inspect.rb

@@ -2,11 +2,24 @@ module Toy
   module Inspect
     extend ActiveSupport::Concern
 
+    module ClassMethods
+      def inspect
+        keys = attributes.keys - ['id']
+        nice_string = keys.sort.map do |name|
+          type = attributes[name].type
+          "#{name}:#{type}"
+        end.join(" ")
+        "#{name}(id:#{attributes['id'].type} #{nice_string})"
+      end
+    end
+
     def inspect
-      attributes_as_nice_string = self.class.attributes.keys.map(&:to_s).sort.map do |name|
+      keys = self.class.attributes.keys - ['id']
+      attributes_as_nice_string = keys.map(&:to_s).sort.map do |name|
         "#{name}: #{read_attribute(name).inspect}"
-      end.join(", ")
-      "#<#{self.class}:#{object_id} #{attributes_as_nice_string}>"
+      end
+      attributes_as_nice_string.unshift("id: #{read_attribute(:id).inspect}")
+      "#<#{self.class}:#{object_id} #{attributes_as_nice_string.join(', ')}>"
     end
   end
-end
+end

data/lib/toy/object.rb

@@ -11,6 +11,12 @@ module Toy
       include Equality
       include Inspect
       include Logger
+      include Inheritance
+      include Serialization
+    end
+
+    def persisted?
+      false
     end
   end
 end

data/lib/toy/querying.rb

@@ -4,7 +4,9 @@ module Toy
 
     module ClassMethods
       def get(id)
-        load(id, adapter.read(id))
+        if (attrs = adapter.read(id))
+          load(id, attrs)
+        end
       end
 
       def get!(id)
@@ -29,8 +31,23 @@ module Toy
       alias :has_key? :key?
 
       def load(id, attrs)
-        attrs && allocate.initialize_from_database(attrs.update('id' => id))
+        attrs ||= {}
+        instance = constant_from_attrs(attrs).allocate
+        instance.initialize_from_database(attrs.update('id' => id))
       end
+
+      def constant_from_attrs(attrs)
+        return self if attrs.nil?
+
+        type = attrs[:type] || attrs['type']
+
+        return self if type.nil?
+
+        type.constantize
+      rescue NameError
+        self
+      end
+      private :constant_from_attrs
     end
   end
-end
+end

data/lib/toy/reference.rb

@@ -120,17 +120,31 @@ module Toy
     def create_accessors
       model.class_eval """
         def #{name}
-          #{instance_variable} ||= self.class.references[:#{name}].new_proxy(self)
+          #{instance_variable} ||= self.class.references[:#{name}].new_proxy(self).target
         end
 
         def #{name}=(record)
-          #{name}.replace(record)
+          self.class.references[:#{name}].new_proxy(self).replace(record)
+          #{instance_variable} = record
         end
 
         def #{name}?
-          #{name}.present?
+          !!#{name}
+        end
+
+        def build_#{name}(attrs={})
+          self.class.references[:#{name}].new_proxy(self).build(attrs)
+        end
+
+        def create_#{name}(attrs={})
+          self.class.references[:#{name}].new_proxy(self).create(attrs)
+        end
+
+        def reset_#{name}
+          #{instance_variable} = nil
+          self.class.references[:#{name}].new_proxy(self).reset
         end
       """
     end
   end
-end
+end

data/lib/toy/reloadable.rb

@@ -7,11 +7,11 @@ module Toy
         initialize_attributes_with_defaults
         send(:attributes=, attrs, new_record?)
         self.class.lists.each_key      { |name| send(name).reset }
-        self.class.references.each_key { |name| send(name).reset }
+        self.class.references.each_key { |name| send("reset_#{name}") }
       else
         raise NotFound.new(id)
       end
       self
     end
   end
-end
+end

data/lib/toy/serialization.rb

@@ -37,46 +37,7 @@ module Toy
                           end
       end
 
-      serializable_add_includes(options) do |association, records, opts|
-        hash[association] = records.is_a?(Enumerable) ?
-          records.map { |r| r.serializable_hash(opts) } :
-          records.serializable_hash(opts)
-      end
-
       hash
     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] }
-
-      include_has_options = include_associations.is_a?(Hash)
-      associations = include_has_options ? include_associations.keys : Array.wrap(include_associations)
-
-      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
-
-        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
+end

data/lib/toy/store.rb

@@ -13,14 +13,14 @@ module Toy
 
       include Callbacks
       include Validations
-      include Serialization
       include Timestamps
 
       include Lists
       include References
+      include AssociationSerialization
 
       include IdentityMap
       include Caching
     end
   end
-end
+end

data/lib/toy/timestamps.rb

@@ -1,6 +1,8 @@
 module Toy
   module Timestamps
     extend ActiveSupport::Concern
+    include Attributes
+    include Callbacks
 
     module ClassMethods
       def timestamps
@@ -19,4 +21,4 @@ module Toy
       end
     end
   end
-end
+end

data/lib/toy/version.rb

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

data/spec/helper.rb

@@ -11,7 +11,7 @@ log_path.mkpath
 require 'rubygems'
 require 'bundler'
 
-Bundler.require(:default, :development)
+Bundler.require(:default, :test)
 
 require 'toy'
 require 'support/constants'
@@ -20,7 +20,6 @@ require 'support/identity_map_matcher'
 require 'support/name_and_number_key_factory'
 
 Logger.new(log_path.join('test.log')).tap do |log|
-  LogBuddy.init(:logger => log)
   Toy.logger = log
 end
 
@@ -35,4 +34,4 @@ RSpec.configure do |c|
     Toy.reset
     Toy.key_factory = nil
   end
-end
+end

data/spec/support/constants.rb

@@ -4,35 +4,35 @@ module Support
 
     module ClassMethods
       def uses_constants(*constants)
-        before { create_constants(*constants) }
+        before { create_constants *constants }
+        after  { remove_constants *constants }
       end
     end
 
     def create_constants(*constants)
-      constants.each { |constant| create_constant(constant) }
+      constants.each { |constant| create_constant constant }
     end
 
     def remove_constants(*constants)
-      constants.each { |constant| remove_constant(constant) }
+      constants.each { |constant| remove_constant constant }
     end
 
-    def create_constant(constant)
-      remove_constant(constant)
-      Kernel.const_set(constant, Model(constant))
+    def create_constant(constant, superclass=nil)
+      Object.const_set constant, Model(superclass)
     end
 
     def remove_constant(constant)
-      Kernel.send(:remove_const, constant) if Kernel.const_defined?(constant)
+      if Object.const_defined?(constant)
+        Object.send :remove_const, constant
+      end
     end
 
-    def Model(name=nil)
-      Class.new.tap do |model|
-        model.class_eval """
-          def self.name; '#{name}' end
-          def self.to_s; '#{name}' end
-        """ if name
-        model.send(:include, Toy::Store)
+    def Model(superclass=nil)
+      if superclass.nil?
+        Class.new { include Toy::Store }
+      else
+        Class.new(superclass) { include Toy::Store }
       end
     end
   end
-end
+end