active_data 1.0.0 → 1.1.0

data/lib/active_data/model/lifecycle.rb

@@ -1,6 +1,5 @@
 module ActiveData
   module Model
-
     # == Lifecycle methods for ActiveData::Model
     #
     # Provides methods +save+ and +destroy+ and its bang variants.
@@ -64,12 +63,11 @@ module ActiveData
       included do
         include Persistence
 
-        class_attribute *[:save, :create, :update, :destroy].map { |action| "_#{action}_performer" }
-        private *[:save, :create, :update, :destroy].map { |action| "_#{action}_performer=" }
+        class_attribute(*%i[save create update destroy].map { |action| "_#{action}_performer" })
+        private(*%i[save create update destroy].map { |action| "_#{action}_performer=" })
       end
 
       module ClassMethods
-
         # <tt>define_<action></tt> methods define performers for lifecycle
         # actions. Every action block must return boolean result, which
         # would mean the action success. If action performed unsuccessfully
@@ -108,7 +106,7 @@ module ActiveData
         #   author = Author.create # using define_save performer
         #   author.update_attributes(...) # using define_update performer
         #
-        [:save, :create, :update, :destroy].each do |action|
+        %i[save create update destroy].each do |action|
           define_method "define_#{action}" do |&block|
             send("_#{action}_performer=", block)
           end
@@ -117,7 +115,7 @@ module ActiveData
         # Initializes new instance with attributes passed and calls +save+
         # on it. Returns instance in any case.
         #
-        def create *args
+        def create(*args)
           new(*args).tap(&:save)
         end
 
@@ -125,7 +123,7 @@ module ActiveData
         # on it. Returns instance in case of success and raises ActiveData::ValidationError
         # or ActiveData::ObjectNotSaved in case of validation or saving fail respectively.
         #
-        def create! *args
+        def create!(*args)
           new(*args).tap(&:save!)
         end
       end
@@ -139,7 +137,7 @@ module ActiveData
       #   end
       #   user.save! # => will use instance-level performer
       #
-      [:save, :create, :update, :destroy].each do |action|
+      %i[save create update destroy].each do |action|
         define_method "define_#{action}" do |&block|
           send("_#{action}_performer=", block)
         end
@@ -158,7 +156,7 @@ module ActiveData
       #
       #   author.update(name: 'Donald') { REDIS.set(id, attributes.to_json) }
       #
-      def update attributes, &block
+      def update(attributes, &block)
         assign_attributes(attributes) && save(&block)
       end
       alias_method :update_attributes, :update
@@ -177,7 +175,7 @@ module ActiveData
       #
       #   author.update!(name: 'Donald') { REDIS.set(id, attributes.to_json) }
       #
-      def update! attributes, &block
+      def update!(attributes, &block)
         assign_attributes(attributes) && save!(&block)
       end
       alias_method :update_attributes!, :update!
@@ -196,7 +194,7 @@ module ActiveData
       #
       #   author.save { REDIS.set(id, attributes.to_json) }
       #
-      def save options = {}, &block
+      def save(_options = {}, &block)
         raise ActiveData::UnsavableObject unless block || savable?
         valid? && save_object(&block)
       end
@@ -216,7 +214,7 @@ module ActiveData
       #
       #   author.save! { REDIS.set(id, attributes.to_json) }
       #
-      def save! options = {}, &block
+      def save!(_options = {}, &block)
         raise ActiveData::UnsavableObject unless block || savable?
         validate!
         save_object(&block) or raise ActiveData::ObjectNotSaved
@@ -235,7 +233,7 @@ module ActiveData
       #
       #   author.destroy { REDIS.del(id) }
       #
-      def destroy &block
+      def destroy(&block)
         raise ActiveData::UndestroyableObject unless block || destroyable?
         destroy_object(&block)
         self
@@ -255,7 +253,7 @@ module ActiveData
       #
       #   author.destroy! { REDIS.del(id) }
       #
-      def destroy! &block
+      def destroy!(&block)
         raise ActiveData::UndestroyableObject unless block || destroyable?
         destroy_object(&block) or raise ActiveData::ObjectNotDestroyed
         self
@@ -267,19 +265,19 @@ module ActiveData
         !!((persisted? ? _update_performer : _create_performer) || _save_performer)
       end
 
-      def save_object &block
+      def save_object(&block)
         apply_association_changes! if respond_to?(:apply_association_changes!)
         result = persisted? ? update_object(&block) : create_object(&block)
         mark_persisted! if result
         result
       end
 
-      def create_object &block
+      def create_object(&block)
         performer = block || _create_performer || _save_performer
         !!performer_exec(&performer)
       end
 
-      def update_object &block
+      def update_object(&block)
         performer = block || _update_performer || _save_performer
         !!performer_exec(&performer)
       end
@@ -288,16 +286,16 @@ module ActiveData
         !!_destroy_performer
       end
 
-      def destroy_object &block
+      def destroy_object(&block)
         performer = block || _destroy_performer
         result = !!performer_exec(&performer)
         mark_destroyed! if result
         result
       end
 
-      def performer_exec &block
+      def performer_exec(&block)
         if block.arity == 1
-          block.call(self)
+          yield(self)
         else
           instance_exec(&block)
         end

data/lib/active_data/model/localization.rb

@@ -1,14 +1,17 @@
+require 'active_data/model/attributes/reflections/localized'
+require 'active_data/model/attributes/localized'
+
 module ActiveData
   module Model
     module Localization
       extend ActiveSupport::Concern
 
       module ClassMethods
-        def localized *args, &block
+        def localized(*args, &block)
           add_attribute(ActiveData::Model::Attributes::Reflections::Localized, *args, &block)
         end
 
-        def fallbacks locale
+        def fallbacks(locale)
           ::I18n.respond_to?(:fallbacks) ? ::I18n.fallbacks[locale] : [locale]
         end
 

data/lib/active_data/model/persistence.rb

@@ -4,7 +4,7 @@ module ActiveData
       extend ActiveSupport::Concern
 
       module ClassMethods
-        def instantiate data
+        def instantiate(data)
           data = data.stringify_keys
           instance = allocate
 
@@ -14,7 +14,7 @@ module ActiveData
           instance
         end
 
-        def instantiate_collection data
+        def instantiate_collection(data)
           collection = Array.wrap(data).map { |attrs| instantiate attrs }
           collection = scope(collection, true) if respond_to?(:scope)
           collection

data/lib/active_data/model/primary.rb

@@ -2,10 +2,12 @@ module ActiveData
   module Model
     module Primary
       extend ActiveSupport::Concern
-      DEFAULT_PRIMARY_ATTRIBUTE_OPTIONS = -> { {
-        type: ActiveData::UUID,
-        default: -> { ActiveData::UUID.random_create }
-      } }
+      DEFAULT_PRIMARY_ATTRIBUTE_OPTIONS = lambda do
+        {
+          type: ActiveData::UUID,
+          default: -> { ActiveData::UUID.random_create }
+        }
+      end
 
       included do
         class_attribute :_primary_name, instance_writer: false
@@ -16,18 +18,18 @@ module ActiveData
       end
 
       module ClassMethods
-        def primary *args
+        def primary(*args)
           options = args.extract_options!
           self._primary_name = (args.first.presence || ActiveData.primary_attribute).to_s
           unless has_attribute?(_primary_name)
-            options.merge!(type: args.second) if args.second
+            options[:type] = args.second if args.second
             attribute _primary_name, options.presence || DEFAULT_PRIMARY_ATTRIBUTE_OPTIONS.call
           end
           alias_attribute :primary_attribute, _primary_name
         end
         alias_method :primary_attribute, :primary
 
-        def has_primary_attribute?
+        def has_primary_attribute? # rubocop:disable Naming/PredicateName
           has_attribute? _primary_name
         end
 
@@ -37,13 +39,16 @@ module ActiveData
       end
 
       module PrependMethods
-        def == other
-          other.instance_of?(self.class) &&
-            has_primary_attribute? ?
-              primary_attribute ?
-                primary_attribute == other.primary_attribute :
-                object_id == other.object_id :
-              super(other)
+        def ==(other)
+          if other.instance_of?(self.class) && has_primary_attribute?
+            if primary_attribute
+              primary_attribute == other.primary_attribute
+            else
+              object_id == other.object_id
+            end
+          else
+            super(other)
+          end
         end
       end
     end

data/lib/active_data/model/representation.rb

@@ -0,0 +1,81 @@
+require 'active_data/model/attributes/reflections/represents'
+require 'active_data/model/attributes/represents'
+
+module ActiveData
+  module Model
+    module Representation
+      extend ActiveSupport::Concern
+
+      included do
+        prepend PrependMethods
+      end
+
+      module PrependMethods
+        def assign_attributes(attrs)
+          if self.class.represented_attributes.present?
+            attrs = attrs.to_unsafe_hash if attrs.respond_to?(:to_unsafe_hash)
+            attrs = attrs.stringify_keys
+            represented_attrs = self.class.represented_names_and_aliases
+              .each_with_object({}) do |name, result|
+                result[name] = attrs.delete(name) if attrs.key?(name)
+              end
+
+            super(attrs.merge!(represented_attrs))
+          else
+            super(attrs)
+          end
+        end
+        alias_method :attributes=, :assign_attributes
+      end
+
+      module ClassMethods
+        def represents(*names, &block)
+          options = names.extract_options!
+          names.each do |name|
+            add_attribute(ActiveData::Model::Attributes::Reflections::Represents, name, options, &block)
+          end
+        end
+
+        def represented_attributes
+          @represented_attributes ||= _attributes.values.select do |attribute|
+            attribute.is_a? ActiveData::Model::Attributes::Reflections::Represents
+          end
+        end
+
+        def represented_names_and_aliases
+          @represented_names_and_aliases ||= represented_attributes.flat_map do |attribute|
+            [attribute.name, *inverted_attribute_aliases[attribute.name]]
+          end
+        end
+      end
+
+    private
+
+      def run_validations! #:nodoc:
+        super
+        emerge_represented_attributes_errors!
+        errors.empty?
+      end
+
+      # Move represent attribute errors to the top level:
+      #
+      #   {:'role.email' => ['Some error']}
+      #
+      # to:
+      #
+      #   {email: ['Some error']}
+      #
+      def emerge_represented_attributes_errors!
+        self.class.represented_attributes.each do |attribute|
+          key = :"#{attribute.reference}.#{attribute.column}"
+          # Rails 5 pollutes messages with an empty array on key data fetch attempt
+          messages = errors.messages[key] if errors.messages.key?(key)
+          if messages.present?
+            errors[attribute.column].concat(messages)
+            errors.delete(key)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/active_data/model/scopes.rb

@@ -20,27 +20,37 @@ module ActiveData
         end
 
         included do
-          def initialize source = nil, trust = false
+          def initialize(source = nil, trust = false)
             source ||= self.class.superclass.new
 
-            source.each do |entity|
-              raise AssociationTypeMismatch.new(self.class._scope_model, entity.class) unless entity.is_a?(self.class._scope_model)
-            end unless trust && source.is_a?(self.class)
+            unless trust && source.is_a?(self.class)
+              source.each do |entity|
+                raise AssociationTypeMismatch.new(self.class._scope_model, entity.class) unless entity.is_a?(self.class._scope_model)
+              end
+            end
 
             super source
           end
         end
 
-        def respond_to_missing? method, _
+        def respond_to_missing?(method, _)
           super || self.class._scope_model.respond_to?(method)
         end
 
-        def method_missing method, *args, &block
-          with_scope { self.class._scope_model.public_send(method, *args, &block) }
+        def method_missing(method, *args, &block)
+          with_scope do
+            model = self.class._scope_model
+            if model.respond_to?(method)
+              self.class._scope_model.public_send(method, *args, &block)
+            else
+              super
+            end
+          end
         end
 
         def with_scope
-          previous_scope, self.class._scope_model.current_scope = self.class._scope_model.current_scope, self
+          previous_scope = self.class._scope_model.current_scope
+          self.class._scope_model.current_scope = self
           result = yield
           self.class._scope_model.current_scope = previous_scope
           result
@@ -48,7 +58,7 @@ module ActiveData
       end
 
       module ClassMethods
-        def scopify scope_base = Array
+        def scopify(scope_base = Array)
           self._scope_base = scope_base
         end
 
@@ -56,15 +66,15 @@ module ActiveData
           @scope_class ||= ActiveData::Model::Scopes::ScopeProxy.for(self)
         end
 
-        def scope *args
+        def scope(*args)
           if args.empty?
             current_scope
           else
-            scope_class.new *args
+            scope_class.new(*args)
           end
         end
 
-        def current_scope= value
+        def current_scope=(value)
           @current_scope = value
         end
 

data/lib/active_data/model/validations/associated.rb

@@ -3,9 +3,10 @@ module ActiveData
     module Validations
       class AssociatedValidator < ActiveModel::EachValidator
         def validate_each(record, attribute, value)
-          if Array.wrap(value).reject { |r| r.respond_to?(:valid?) && r.valid?(record.validation_context) }.any?
-            record.errors.add(attribute, :invalid, options.merge(value: value))
+          invalid_records = Array.wrap(value).reject do |r|
+            r.respond_to?(:valid?) && r.valid?(record.validation_context)
           end
+          record.errors.add(attribute, :invalid, options.merge(value: value)) if invalid_records.present?
         end
       end
 

data/lib/active_data/model/validations/nested.rb

@@ -24,7 +24,7 @@ module ActiveData
 
         def validate_each(record, attribute, value)
           self.class.validate_nested(record, attribute, value) do |object|
-            object.invalid?
+            object.invalid? && !(object.respond_to?(:marked_for_destruction?) && object.marked_for_destruction?)
           end
         end
       end
@@ -33,6 +33,11 @@ module ActiveData
         def validates_nested(*attr_names)
           validates_with NestedValidator, _merge_attributes(attr_names)
         end
+
+        def validates_nested?(attr)
+          _validators[attr.to_sym]
+            .grep(ActiveData::Model::Validations::NestedValidator).present?
+        end
       end
     end
   end

data/lib/active_data/model/validations.rb

@@ -11,17 +11,17 @@ module ActiveData
         alias_method :validate, :valid?
       end
 
-      def validate! context = nil
+      def validate!(context = nil)
         valid?(context) || raise_validation_error
       end
 
     protected
 
       def raise_validation_error
-        raise ActiveData::ValidationError.new(self)
+        raise ActiveData::ValidationError, self
       end
     end
   end
 end
 
-Dir[File.dirname(__FILE__) + "/validations/*.rb"].each { |file| require file }
+Dir[File.dirname(__FILE__) + '/validations/*.rb'].each { |file| require file }

data/lib/active_data/model.rb

@@ -1,13 +1,14 @@
 require 'active_data/model/conventions'
 require 'active_data/model/attributes'
+require 'active_data/model/validations'
 require 'active_data/model/scopes'
 require 'active_data/model/primary'
 require 'active_data/model/lifecycle'
 require 'active_data/model/persistence'
 require 'active_data/model/callbacks'
 require 'active_data/model/associations'
-require 'active_data/model/validations'
 require 'active_data/model/localization'
+require 'active_data/model/representation'
 require 'active_data/model/dirty'
 
 module ActiveData

data/lib/active_data/undefined_class.rb

@@ -0,0 +1,9 @@
+require 'singleton'
+
+module ActiveData
+  class UndefinedClass
+    include Singleton
+  end
+
+  UNDEFINED = UndefinedClass.instance.freeze
+end

data/lib/active_data/version.rb

@@ -1,3 +1,3 @@
 module ActiveData
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'.freeze
 end

data/lib/active_data.rb

@@ -10,8 +10,12 @@ require 'active_model'
 require 'active_data/version'
 require 'active_data/errors'
 require 'active_data/extensions'
+require 'active_data/undefined_class'
 require 'active_data/config'
 require 'active_data/railtie' if defined? Rails
+require 'active_data/model'
+require 'active_data/model/associations/persistence_adapters/base'
+require 'active_data/model/associations/persistence_adapters/active_record'
 
 module ActiveData
   BOOLEAN_MAPPING = {
@@ -32,33 +36,29 @@ module ActiveData
     'y' => true,
     'n' => false,
     'yes' => true,
-    'no' => false,
-  }
+    'no' => false
+  }.freeze
 
   def self.config
     ActiveData::Config.instance
   end
 
-  singleton_class.delegate *ActiveData::Config.delegated, to: :config
+  singleton_class.delegate(*ActiveData::Config.delegated, to: :config)
 
   typecaster('Object') { |value, attribute| value if value.class < attribute.type }
-  typecaster('String') { |value| value.to_s }
+  typecaster('String') { |value, _| value.to_s }
   typecaster('Array') do |value|
     case value
     when ::Array then
       value
     when ::String then
       value.split(',').map(&:strip)
-    else
-      nil
     end
   end
   typecaster('Hash') do |value|
     case value
     when ::Hash then
       value
-    else
-      nil
     end
   end
   typecaster('Date') do |value|
@@ -89,15 +89,36 @@ module ActiveData
     when ::TZInfo::Timezone
       ActiveSupport::TimeZone[value.name]
     when String, Numeric, ActiveSupport::Duration
-      value = Float(value) rescue value
+      value = begin
+        Float(value)
+      rescue ArgumentError, TypeError
+        value
+      end
       ActiveSupport::TimeZone[value]
-    else
+    end
+  end
+  typecaster('BigDecimal') do |value|
+    next unless value
+    begin
+      ::BigDecimal.new Float(value).to_s
+    rescue ArgumentError, TypeError
+      nil
+    end
+  end
+  typecaster('Float') do |value|
+    begin
+      Float(value)
+    rescue ArgumentError, TypeError
+      nil
+    end
+  end
+  typecaster('Integer') do |value|
+    begin
+      Float(value).to_i
+    rescue ArgumentError, TypeError
       nil
     end
   end
-  typecaster('BigDecimal') { |value| ::BigDecimal.new Float(value).to_s rescue nil if value }
-  typecaster('Float') { |value| Float(value) rescue nil }
-  typecaster('Integer') { |value| Float(value).to_i rescue nil }
   typecaster('Boolean') { |value| BOOLEAN_MAPPING[value] }
   typecaster('ActiveData::UUID') do |value|
     case value
@@ -109,18 +130,20 @@ module ActiveData
       ActiveData::UUID.parse_string value
     when Integer
       ActiveData::UUID.parse_int value
-    else
-      nil
     end
   end
 end
 
-require 'active_data/model'
+require 'active_data/base'
 
 ActiveSupport.on_load :active_record do
   require 'active_data/active_record/associations'
   require 'active_data/active_record/nested_attributes'
 
   include ActiveData::ActiveRecord::Associations
-  include ActiveData::ActiveRecord::NestedAttributes
+  singleton_class.prepend ActiveData::ActiveRecord::NestedAttributes
+
+  def self.active_data_persistence_adapter
+    ActiveData::Model::Associations::PersistenceAdapters::ActiveRecord
+  end
 end