active_data 1.0.0 → 1.1.0

data/lib/active_data/active_record/nested_attributes.rb

@@ -3,21 +3,15 @@ module ActiveData
     module NestedAttributes
       extend ActiveSupport::Concern
 
-      included do
-        singleton_class.alias_method_chain :accepts_nested_attributes_for, :active_data
-      end
-
-      module ClassMethods
-        def accepts_nested_attributes_for_with_active_data *attr_names
-          options = attr_names.extract_options!
-          active_data_associations, active_record_association = attr_names.partition do |association_name|
-            reflect_on_association(association_name).is_a?(ActiveData::Model::Associations::Reflections::Base)
-          end
-
-          ActiveData::Model::Associations::NestedAttributes::NestedAttributesMethods
-            .accepts_nested_attributes_for self, *active_data_associations, options.dup
-          accepts_nested_attributes_for_without_active_data *active_record_association, options.dup
+      def accepts_nested_attributes_for(*attr_names)
+        options = attr_names.extract_options!
+        active_data_associations, active_record_association = attr_names.partition do |association_name|
+          reflect_on_association(association_name).is_a?(ActiveData::Model::Associations::Reflections::Base)
         end
+
+        ActiveData::Model::Associations::NestedAttributes::NestedAttributesMethods
+          .accepts_nested_attributes_for(self, *active_data_associations, options.dup)
+        super(*active_record_association, options.dup)
       end
     end
   end

data/lib/active_data/base.rb

@@ -0,0 +1,13 @@
+require 'active_data/model'
+require 'active_data/model/primary'
+require 'active_data/model/lifecycle'
+require 'active_data/model/associations'
+
+module ActiveData
+  class Base
+    include ActiveData::Model
+    include ActiveData::Model::Primary
+    include ActiveData::Model::Lifecycle
+    include ActiveData::Model::Associations
+  end
+end

data/lib/active_data/config.rb

@@ -18,22 +18,22 @@ module ActiveData
       @_typecasters = {}
     end
 
-    def normalizer name, &block
+    def normalizer(name, &block)
       if block
         _normalizers[name.to_sym] = block
       else
-        _normalizers[name.to_sym] or raise NormalizerMissing.new(name)
+        _normalizers[name.to_sym] or raise NormalizerMissing, name
       end
     end
 
-    def typecaster *classes, &block
+    def typecaster(*classes, &block)
       classes = classes.flatten
       if block
         _typecasters[classes.first.to_s.camelize] = block
       else
         _typecasters[classes.detect do |klass|
           _typecasters[klass.to_s.camelize]
-        end.to_s.camelize] or raise TypecasterMissing.new(*classes)
+        end.to_s.camelize] or raise TypecasterMissing, classes
       end
     end
   end

data/lib/active_data/errors.rb

@@ -11,7 +11,7 @@ module ActiveData
 
     def initialize(model)
       @model = model
-      errors = @model.errors.full_messages.join(", ")
+      errors = @model.errors.full_messages.join(', ')
       super(I18n.t(:"#{@model.class.i18n_scope}.errors.messages.model_invalid", errors: errors, default: :'errors.messages.model_invalid'))
     end
   end
@@ -32,13 +32,13 @@ module ActiveData
   end
 
   class AssociationTypeMismatch < ActiveDataError
-    def initialize expected, got
+    def initialize(expected, got)
       super "Expected `#{expected}` (##{expected.object_id}), but got `#{got}` (##{got.object_id})"
     end
   end
 
   class ObjectNotFound < ActiveDataError
-    def initialize object, association_name, record_id
+    def initialize(object, association_name, record_id)
       message = "Couldn't find #{object.class.reflect_on_association(association_name).klass.name}" \
         "with #{object.respond_to?(:_primary_name) ? object._primary_name : 'id'} = #{record_id} for #{object.inspect}"
       super message
@@ -46,14 +46,14 @@ module ActiveData
   end
 
   class TooManyObjects < ActiveDataError
-    def initialize limit, actual_size
+    def initialize(limit, actual_size)
       super "Maximum #{limit} objects are allowed. Got #{actual_size} objects instead."
     end
   end
 
   class UndefinedPrimaryAttribute < ActiveDataError
-    def initialize klass, association_name
-      super <<-EOS
+    def initialize(klass, association_name)
+      super <<-MESSAGE
 Undefined primary attribute for `#{association_name}` in #{klass}.
 It is required for embeds_many nested attributes proper operation.
 You can define this association as:
@@ -61,33 +61,49 @@ You can define this association as:
   embeds_many :#{association_name} do
     primary :attribute_name
   end
-      EOS
+      MESSAGE
     end
   end
 
   class NormalizerMissing < NoMethodError
-    def initialize name
-      super <<-EOS
+    def initialize(name)
+      super <<-MESSAGE
 Could not find normalizer `:#{name}`
 You can define it with:
 
   ActiveData.normalizer(:#{name}) do |value, options|
     # do some staff with value and options
   end
-      EOS
+      MESSAGE
     end
   end
 
   class TypecasterMissing < NoMethodError
-    def initialize *classes
-      super <<-EOS
+    def initialize(*classes)
+      classes = classes.flatten
+      super <<-MESSAGE
 Could not find typecaster for #{classes}
 You can define it with:
 
   ActiveData.typecaster('#{classes.first}') do |value|
     # do some staff with value and options
   end
-      EOS
+      MESSAGE
+    end
+  end
+
+  class PersistenceAdapterMissing < NoMethodError
+    def initialize(data_source)
+      super <<-MESSAGE
+Could not find persistence adapter for #{data_source}
+You can define it with:
+
+  class #{data_source}
+    def self.active_data_persistence_adapter
+      #{data_source}ActiveDataPersistenceAdapter
+    end
+  end
+      MESSAGE
     end
   end
 end

data/lib/active_data/extensions.rb

@@ -1,33 +1,34 @@
-unless defined?(Boolean)
-  class Boolean; end
-end
+class Boolean; end unless defined?(Boolean)
 
 begin
   require 'uuidtools'
 rescue LoadError
+  nil
 else
-  class ActiveData::UUID < UUIDTools::UUID
-    def as_json *_
-      to_s
-    end
+  module ActiveData
+    class UUID < UUIDTools::UUID
+      def as_json(*_)
+        to_s
+      end
 
-    def to_param
-      to_s
-    end
+      def to_param
+        to_s
+      end
 
-    def self.parse_string value
-      return nil if value.length == 0
-      if value.length == 36
-        parse value
-      elsif value.length == 32
-        parse_hexdigest value
-      else
-        parse_raw value
+      def self.parse_string(value)
+        return nil if value.length.zero?
+        if value.length == 36
+          parse value
+        elsif value.length == 32
+          parse_hexdigest value
+        else
+          parse_raw value
+        end
       end
-    end
 
-    def inspect
-      "#<ActiveData::UUID:#{to_s}>"
+      def inspect
+        "#<ActiveData::UUID:#{self}>"
+      end
     end
   end
 end

data/lib/active_data/model/associations/base.rb

@@ -5,8 +5,9 @@ module ActiveData
         attr_accessor :owner, :reflection
         delegate :macro, :collection?, to: :reflection
 
-        def initialize owner, reflection
-          @owner, @reflection = owner, reflection
+        def initialize(owner, reflection)
+          @owner = owner
+          @reflection = reflection
           @evar_loaded = owner.persisted?
           reset
         end
@@ -43,9 +44,24 @@ module ActiveData
           apply_changes or raise ActiveData::AssociationChangesNotApplied
         end
 
-        def transaction &block
-          data = Marshal.load(Marshal.dump(read_source))
-          block.call
+        def callback(name, object)
+          evaluator = reflection.options[name]
+          return true unless evaluator
+
+          if evaluator.is_a?(Proc)
+            if evaluator.arity == 1
+              owner.instance_exec(object, &evaluator)
+            else
+              evaluator.call(owner, object)
+            end
+          else
+            owner.send(evaluator, object)
+          end
+        end
+
+        def transaction
+          data = read_source.deep_dup
+          yield
         rescue StandardError => e
           write_source data
           reload
@@ -62,7 +78,7 @@ module ActiveData
           reflection.read_source owner
         end
 
-        def write_source value
+        def write_source(value)
           reflection.write_source owner, value
         end
 

data/lib/active_data/model/associations/embeds_any.rb

@@ -0,0 +1,17 @@
+module ActiveData
+  module Model
+    module Associations
+      class EmbedsAny < Base
+      private
+
+        def build_object(attributes)
+          reflection.klass.new(attributes)
+        end
+
+        def embed_object(object)
+          object.instance_variable_set(:@embedder, owner)
+        end
+      end
+    end
+  end
+end

data/lib/active_data/model/associations/embeds_many.rb

@@ -1,16 +1,16 @@
 module ActiveData
   module Model
     module Associations
-      class EmbedsMany < Base
-        def build attributes = {}
-          push_object(reflection.klass.new(attributes))
+      class EmbedsMany < EmbedsAny
+        def build(attributes = {})
+          push_object(build_object(attributes))
         end
 
-        def create attributes = {}
+        def create(attributes = {})
           build(attributes).tap(&:save)
         end
 
-        def create! attributes = {}
+        def create!(attributes = {})
           build(attributes).tap(&:save!)
         end
 
@@ -27,7 +27,7 @@ module ActiveData
           result
         end
 
-        def target= objects
+        def target=(objects)
           objects.each { |object| setup_performers! object }
           loaded!
           @target = objects
@@ -47,7 +47,7 @@ module ActiveData
               else
                 default.map do |attributes|
                   reflection.klass.with_sanitize(false) do
-                    reflection.klass.new(attributes)
+                    build_object(attributes)
                   end
                 end
               end
@@ -63,16 +63,20 @@ module ActiveData
         end
 
         def clear
-          transaction { target.all?(&:destroy!) } rescue ActiveData::ObjectNotDestroyed
+          begin
+            transaction { target.all?(&:destroy!) }
+          rescue ActiveData::ObjectNotDestroyed
+            nil
+          end
           reload.empty?
         end
 
-        def reader force_reload = false
+        def reader(force_reload = false)
           reload if force_reload
           @proxy ||= Collection::Embedded.new self
         end
 
-        def replace objects
+        def replace(objects)
           transaction do
             clear
             append(objects) or raise ActiveData::AssociationChangesNotApplied
@@ -80,7 +84,7 @@ module ActiveData
         end
         alias_method :writer, :replace
 
-        def concat *objects
+        def concat(*objects)
           append objects.flatten
         end
 
@@ -90,7 +94,7 @@ module ActiveData
           super || []
         end
 
-        def append objects
+        def append(objects)
           objects.each do |object|
             raise AssociationTypeMismatch.new(reflection.klass, object.class) unless object && object.is_a?(reflection.klass)
             push_object object
@@ -99,19 +103,23 @@ module ActiveData
           result && target
         end
 
-        def push_object object
+        def push_object(object)
           setup_performers! object
           target[target.size] = object
+          object
         end
 
-        def setup_performers! object
+        def setup_performers!(object)
+          embed_object(object)
+          callback(:before_add, object)
+
           association = self
 
           object.define_create do
             source = association.send(:read_source)
-            index = association.target.select do |one|
-              one.persisted? || one === self
-            end.index { |one| one === self }
+            index = association.target
+              .select { |one| one.persisted? || one.equal?(self) }
+              .index { |one| one.equal?(self) }
 
             source.insert(index, attributes)
             association.send(:write_source, source)
@@ -119,7 +127,7 @@ module ActiveData
 
           object.define_update do
             source = association.send(:read_source)
-            index = association.target.select(&:persisted?).index { |one| one === self }
+            index = association.target.select(&:persisted?).index { |one| one.equal?(self) }
 
             source[index] = attributes
             association.send(:write_source, source)
@@ -127,11 +135,13 @@ module ActiveData
 
           object.define_destroy do
             source = association.send(:read_source)
-            index = association.target.select(&:persisted?).index { |one| one === self }
+            index = association.target.select(&:persisted?).index { |one| one.equal?(self) }
 
             source.delete_at(index) if index
             association.send(:write_source, source)
           end
+
+          callback(:after_add, object)
         end
       end
     end

data/lib/active_data/model/associations/embeds_one.rb

@@ -1,23 +1,21 @@
 module ActiveData
   module Model
     module Associations
-      class EmbedsOne < Base
-        def build attributes = {}
-          self.target = reflection.klass.new(attributes)
+      class EmbedsOne < EmbedsAny
+        attr_reader :destroyed
+
+        def build(attributes = {})
+          self.target = build_object(attributes)
         end
 
-        def create attributes = {}
+        def create(attributes = {})
           build(attributes).tap(&:save)
         end
 
-        def create! attributes = {}
+        def create!(attributes = {})
           build(attributes).tap(&:save!)
         end
 
-        def destroyed
-          @destroyed
-        end
-
         def apply_changes
           if target
             if target.destroyed? || target.marked_for_destruction?
@@ -31,10 +29,14 @@ module ActiveData
           end
         end
 
-        def target= object
-          setup_performers! object if object
+        def target=(object)
+          if object
+            callback(:before_add, object)
+            setup_performers! object
+          end
           loaded!
           @target = object
+          callback(:after_add, object) if object
         end
 
         def load_target
@@ -43,20 +45,21 @@ module ActiveData
         end
 
         def default
-          unless evar_loaded?
-            default = reflection.default(owner)
-            if default
-              object = if default.is_a?(reflection.klass)
-                default
-              else
-                reflection.klass.with_sanitize(false) do
-                  reflection.klass.new(default)
-                end
-              end
-              object.send(:clear_changes_information) if reflection.klass.dirty?
-              object
+          return if evar_loaded?
+
+          default = reflection.default(owner)
+
+          return unless default
+
+          object = if default.is_a?(reflection.klass)
+            default
+          else
+            reflection.klass.with_sanitize(false) do
+              build_object(default)
             end
           end
+          object.send(:clear_changes_information) if reflection.klass.dirty?
+          object
         end
 
         def clear
@@ -64,12 +67,12 @@ module ActiveData
           reload.nil?
         end
 
-        def reader force_reload = false
+        def reader(force_reload = false)
           reload if force_reload
           target
         end
 
-        def replace object
+        def replace(object)
           if object
             raise AssociationTypeMismatch.new(reflection.klass, object.class) unless object.is_a?(reflection.klass)
             transaction do
@@ -87,7 +90,8 @@ module ActiveData
 
       private
 
-        def setup_performers! object
+        def setup_performers!(object)
+          embed_object(object)
           association = self
 
           object.define_save do