toystore 0.8.3 → 0.9.0

data/lib/toy/caching.rb

@@ -2,19 +2,17 @@ module Toy
   module Caching
     extend ActiveSupport::Concern
 
-    module InstanceMethods
-      def cache_key(*suffixes)
-        cache_key = case
-                      when new_record?
-                        "#{self.class.name}:new"
-                      when timestamp = self[:updated_at]
-                        "#{self.class.name}:#{id}-#{timestamp.utc.to_s(:number)}"
-                      else
-                        "#{self.class.name}:#{id}"
-                    end
-        cache_key += ":#{suffixes.join(':')}" unless suffixes.empty?
-        cache_key
-      end
+    def cache_key(*suffixes)
+      cache_key = case
+                    when new_record?
+                      "#{self.class.name}:new"
+                    when timestamp = self[:updated_at]
+                      "#{self.class.name}:#{id}-#{timestamp.utc.to_s(:number)}"
+                    else
+                      "#{self.class.name}:#{id}"
+                  end
+      cache_key += ":#{suffixes.join(':')}" unless suffixes.empty?
+      cache_key
     end
   end
 end

data/lib/toy/callbacks.rb

@@ -8,41 +8,22 @@ module Toy
       define_model_callbacks :save, :create, :update, :destroy
     end
 
-    module InstanceMethods
-      def save(*)
-        run_callbacks(:save) { super }
-      end
-
-      def destroy
-        run_callbacks(:destroy) { super }
-      end
-
-      def run_callbacks(callback, &block)
-        callback = :create if callback == :update && !persisted?
-
-        embedded_records = self.class.embedded_lists.keys.inject([]) do |records, key|
-          records += send(key).target
-        end
+    def save(*)
+      run_callbacks(:save) { super }
+    end
 
-        block = embedded_records.inject(block) do |chain, record|
-          if record.class.respond_to?("_#{callback}_callbacks")
-            lambda { record.run_callbacks(callback, &chain) }
-          else
-            chain
-          end
-        end
-        super callback, &block
-      end
+    def destroy
+      run_callbacks(:destroy) { super }
+    end
 
-      private
+    private
 
-        def create
-          run_callbacks(:create) { super }
-        end
+    def create
+      run_callbacks(:create) { super }
+    end
 
-        def update
-          run_callbacks(:update) { super }
-        end
+    def update
+      run_callbacks(:update) { super }
     end
   end
 end

data/lib/toy/cloneable.rb

@@ -0,0 +1,20 @@
+module Toy
+  module Cloneable
+    extend ActiveSupport::Concern
+
+    def initialize_copy(other)
+      instance_variables.each do |name|
+        instance_variable_set(name, nil)
+      end
+
+      @attributes  = {}
+
+      other.attributes.except('id').each do |key, value|
+        value = value.duplicable? ? value.clone : value
+        send("#{key}=", value)
+      end
+
+      write_attribute(:id, self.class.next_key(self))
+    end
+  end
+end

data/lib/toy/collection.rb

@@ -42,14 +42,15 @@ module Toy
     alias :== :eql?
 
     private
-      def proxy_class
-        raise('Not Implemented')
-      end
 
-      def modularized_extensions(*extensions)
-        extensions.flatten.compact.map do |extension|
-          Proc === extension ? Module.new(&extension) : extension
-        end
+    def proxy_class
+      raise('Not Implemented')
+    end
+
+    def modularized_extensions(*extensions)
+      extensions.flatten.compact.map do |extension|
+        Proc === extension ? Module.new(&extension) : extension
       end
+    end
   end
 end

data/lib/toy/dirty.rb

@@ -2,46 +2,27 @@ module Toy
   module Dirty
     extend ActiveSupport::Concern
     include ActiveModel::Dirty
+    include Attributes
+    include Cloneable
 
-    module InstanceMethods
-      def initialize(*)
-        super
-        if new_record?
-          # never register initial id assignment as a change
-          @changed_attributes.delete('id')
-        else
-          @previously_changed = {}
-          @changed_attributes.clear if @changed_attributes
-        end
-      end
-
-      def initialize_copy(*)
-        super.tap do
-          @previously_changed = {}
-          @changed_attributes = {}
-        end
-      end
-
-      def reload
-        super.tap do
-          @previously_changed = {}
-          @changed_attributes = {}
-        end
-      end
+    def initialize(*)
+      super
+      # never register initial id assignment as a change
+      @changed_attributes.delete('id') if @changed_attributes
+    end
 
-      def save(*)
-        super.tap do
-          @previously_changed = changes
-          @changed_attributes.clear if @changed_attributes
-        end
+    def initialize_copy(*)
+      super.tap do
+        @previously_changed = {}
+        @changed_attributes = {}
       end
+    end
 
-      def write_attribute(name, value)
-        name    = name.to_s
-        current = read_attribute(name)
-        attribute_will_change!(name) if current != value
-        super
-      end
+    def write_attribute(name, value)
+      name    = name.to_s
+      current = read_attribute(name)
+      attribute_will_change!(name) if current != value
+      super
     end
   end
 end

data/lib/toy/dirty_store.rb

@@ -0,0 +1,32 @@
+module Toy
+  module DirtyStore
+    extend ActiveSupport::Concern
+    include ActiveModel::Dirty
+    include Reloadable
+    include Persistence
+    include Querying
+
+    def initialize_from_database(*)
+      super
+
+      @previously_changed = {}
+      @changed_attributes.clear if @changed_attributes
+
+      self
+    end
+
+    def reload
+      super.tap do
+        @previously_changed = {}
+        @changed_attributes = {}
+      end
+    end
+
+    def save(*)
+      super.tap do
+        @previously_changed = changes
+        @changed_attributes.clear if @changed_attributes
+      end
+    end
+  end
+end

data/lib/toy/equality.rb

@@ -1,5 +1,7 @@
 module Toy
   module Equality
+    extend ActiveSupport::Concern
+
     def eql?(other)
       return true if self.class.eql?(other.class) && id == other.id
       return true if other.respond_to?(:target) &&

data/lib/toy/extensions/boolean.rb

@@ -2,24 +2,28 @@ module Toy
   module Extensions
     module Boolean
       Mapping = {
-        true    => true, 
-        'true'  => true, 
-        'TRUE'  => true, 
-        'True'  => true, 
-        't'     => true, 
-        'T'     => true, 
-        '1'     => true, 
-        1       => true, 
+        true    => true,
+        'true'  => true,
+        'TRUE'  => true,
+        'True'  => true,
+        't'     => true,
+        'T'     => true,
+        '1'     => true,
+        'on'    => true,
+        'ON'    => true,
+        1       => true,
         1.0     => true,
-        false   => false, 
-        'false' => false, 
-        'FALSE' => false, 
-        'False' => false, 
-        'f'     => false, 
-        'F'     => false, 
-        '0'     => false, 
-        0       => false, 
-        0.0     => false, 
+        false   => false,
+        'false' => false,
+        'FALSE' => false,
+        'False' => false,
+        'f'     => false,
+        'F'     => false,
+        '0'     => false,
+        'off'   => false,
+        'OFF'   => false,
+        0       => false,
+        0.0     => false,
         nil     => nil
       }
 
@@ -32,7 +36,7 @@ module Toy
       end
 
       def from_store(value, *)
-        value.nil? ? nil : !!value
+        to_store(value)
       end
     end
   end

data/lib/toy/identity_map.rb

@@ -1,62 +1,62 @@
 module Toy
-  def self.identity_map
-    Thread.current[:toystore_identity_map] ||= {}
-  end
 
   module IdentityMap
     extend ActiveSupport::Concern
 
-    included do
-      identity_map_on
+    def self.enabled=(flag)
+      Thread.current[:toystore_identity_map_enabled] = flag
     end
 
-    module ClassMethods
-      def identity_map
-        Toy.identity_map
-      end
+    def self.enabled
+      Thread.current[:toystore_identity_map_enabled]
+    end
 
-      def identity_map_on?
-        @identity_map_on == true
-      end
+    def self.enabled?
+      enabled == true
+    end
 
-      def identity_map_off?
-        !identity_map_on?
-      end
+    def self.repository
+      Thread.current[:toystore_identity_map] ||= {}
+    end
 
-      def identity_map_on
-        @identity_map_on = true
-      end
+    def self.clear
+      repository.clear
+    end
 
-      def identity_map_off
-        @identity_map_on = false
-      end
+    def self.include?(object)
+      repository.keys.include?(object.id)
+    end
 
-      def without_identity_map(&block)
-        begin
-          original_identity_map_on = @identity_map_on
-          identity_map_off
-          yield
-        ensure
-          @identity_map_on = original_identity_map_on
-        end
-      end
+    def self.use
+      old, self.enabled = enabled, true
 
+      yield if block_given?
+    ensure
+      self.enabled = old
+      clear
+    end
+
+    def self.without
+      old, self.enabled = enabled, false
+
+      yield if block_given?
+    ensure
+      self.enabled = old
+    end
+
+    module ClassMethods
       def get(id)
         get_from_identity_map(id) || super
       end
 
       def get_from_identity_map(id)
-        return nil unless identity_map_on?
-        if record = identity_map[id]
-          log_operation(:img, self.name, store, id)
-          record
-        end
+        IdentityMap.repository[id] if IdentityMap.enabled?
       end
 
       def load(id, attrs)
         return nil if attrs.nil?
 
-        if instance = identity_map[id]
+        if IdentityMap.enabled? && instance = IdentityMap.repository[id]
           instance
         else
           super.tap { |doc| doc.add_to_identity_map }
@@ -64,14 +64,8 @@ module Toy
       end
     end
 
-    def identity_map
-      Toy.identity_map
-    end
-
     def save(*)
-      super.tap do |result|
-        add_to_identity_map if result
-      end
+      super.tap { |result| add_to_identity_map if result }
     end
 
     def delete(*)
@@ -79,28 +73,11 @@ module Toy
     end
 
     def add_to_identity_map
-      return unless self.class.identity_map_on?
-      identity_map[id] = self
-      log_operation(:ims, self.class.name, store, id)
+      IdentityMap.repository[id] = self if IdentityMap.enabled?
     end
 
     def remove_from_identity_map
-      return unless self.class.identity_map_on?
-      identity_map.delete(id)
-      log_operation(:imd, self.class.name, store, id)
+      IdentityMap.repository.delete(id) if IdentityMap.enabled?
     end
-
-    private
-      def has_embedded_objects?
-        self.class.embedded_lists.any?
-      end
-
-      def each_embedded_object(&block)
-        if has_embedded_objects?
-          self.class.embedded_lists.keys.inject([]) do |objects, name|
-            objects.concat(send(name).to_a.compact)
-          end.each { |object| block.call(object) }
-        end
-      end
   end
 end

data/lib/toy/list.rb

@@ -14,33 +14,34 @@ module Toy
     end
 
     private
-      def proxy_class
-        Toy::Proxies::List
-      end
 
-      def list_method
-        :lists
-      end
+    def proxy_class
+      Toy::Proxies::List
+    end
 
-      def create_accessors
-        model.class_eval """
-          def #{name}
-            #{instance_variable} ||= self.class.#{list_method}[:#{name}].new_proxy(self)
-          end
+    def list_method
+      :lists
+    end
 
-          def #{name}=(records)
-            #{name}.replace(records)
-          end
-        """
+    def create_accessors
+      model.class_eval """
+        def #{name}
+          #{instance_variable} ||= self.class.#{list_method}[:#{name}].new_proxy(self)
+        end
 
-        if options[:dependent]
-          model.class_eval """
-            after_destroy :destroy_#{name}
-            def destroy_#{name}
-              #{name}.each { |o| o.destroy }
-            end
-          """
+        def #{name}=(records)
+          #{name}.replace(records)
         end
+      """
+
+      if options[:dependent]
+        model.class_eval """
+          after_destroy :destroy_#{name}
+          def destroy_#{name}
+            #{name}.each { |o| o.destroy }
+          end
+        """
       end
+    end
   end
 end