granite-form 0.5.0 → 0.6.1

data/lib/granite/form/model/associations/base.rb

@@ -4,6 +4,7 @@ module Granite
       module Associations
         class Base
           attr_accessor :owner, :reflection
+
           delegate :macro, :collection?, to: :reflection
 
           def initialize(owner, reflection)
@@ -33,6 +34,7 @@ module Granite
 
           def target
             return @target if loaded?
+
             self.target = load_target
           end
 
@@ -66,10 +68,12 @@ module Granite
           end
 
           def inspect
-            "#<#{reflection.macro.to_s.camelize} #{target.inspect.truncate(50, omission: collection? ? '...]' : '...')}>"
+            macro = reflection.macro.to_s.camelize
+            target_for_inspect = target.inspect.truncate(50, omission: collection? ? '...]' : '...')
+            "#<#{macro} #{target_for_inspect}>"
           end
 
-        private
+          private
 
           def read_source
             reflection.read_source owner

data/lib/granite/form/model/associations/collection/embedded.rb

@@ -6,7 +6,7 @@ module Granite
           class Embedded < Proxy
             delegate :build, to: :@association
             delegate :delete, to: :target
-            alias_method :new, :build
+            alias new build
           end
         end
       end

data/lib/granite/form/model/associations/collection/proxy.rb

@@ -8,8 +8,8 @@ module Granite
 
             delegate :target, :loaded?, :reload, :clear, :concat, to: :@association
             delegate :each, :size, :length, :first, :last, :empty?, :many?, :==, :dup, to: :target
-            alias_method :<<, :concat
-            alias_method :push, :concat
+            alias << concat
+            alias push concat
 
             def initialize(association)
               @association = association
@@ -19,7 +19,7 @@ module Granite
               dup
             end
 
-            alias_method :to_a, :to_ary
+            alias to_a to_ary
 
             def inspect
               entries = target.take(10).map!(&:inspect)

data/lib/granite/form/model/associations/embeds_any.rb

@@ -3,7 +3,7 @@ module Granite
     module Model
       module Associations
         class EmbedsAny < Base
-        private
+          private
 
           def build_object(attributes)
             reflection.klass.new(attributes)

data/lib/granite/form/model/associations/embeds_many.rb

@@ -23,14 +23,14 @@ module Granite
               default = Array.wrap(reflection.default(owner))
               if default.present?
                 collection = if default.all? { |object| object.is_a?(reflection.klass) }
-                  default
-                else
-                  default.map do |attributes|
-                    reflection.klass.with_sanitize(false) do
-                      build_object(attributes)
-                    end
-                  end
-                end
+                               default
+                             else
+                               default.map do |attributes|
+                                 reflection.klass.with_sanitize(false) do
+                                   build_object(attributes)
+                                 end
+                               end
+                             end
                 collection.map { |object| object.send(:clear_changes_information) } if reflection.klass.dirty?
                 collection
               end
@@ -64,13 +64,13 @@ module Granite
             end
           end
 
-          alias_method :writer, :replace
+          alias writer replace
 
           def concat(*objects)
             append objects.flatten
           end
 
-        private
+          private
 
           def read_source
             super || []
@@ -78,7 +78,11 @@ module Granite
 
           def append(objects)
             objects.each do |object|
-              raise AssociationTypeMismatch.new(reflection.klass, object.class) unless object && object.is_a?(reflection.klass)
+              unless object.is_a?(reflection.klass)
+                raise AssociationTypeMismatch.new(reflection.klass,
+                                                  object.class)
+              end
+
               push_object object
             end
             target

data/lib/granite/form/model/associations/embeds_one.rb

@@ -30,12 +30,12 @@ module Granite
             return unless default
 
             object = if default.is_a?(reflection.klass)
-              default
-            else
-              reflection.klass.with_sanitize(false) do
-                build_object(default)
-              end
-            end
+                       default
+                     else
+                       reflection.klass.with_sanitize(false) do
+                         build_object(default)
+                       end
+                     end
             object.send(:clear_changes_information) if reflection.klass.dirty?
             object
           end
@@ -58,6 +58,7 @@ module Granite
           def replace(object)
             if object
               raise AssociationTypeMismatch.new(reflection.klass, object.class) unless object.is_a?(reflection.klass)
+
               transaction do
                 clear
                 self.target = object
@@ -69,9 +70,9 @@ module Granite
             target
           end
 
-          alias_method :writer, :replace
+          alias writer replace
 
-        private
+          private
 
           def setup_performers!(object)
             embed_object(object)

data/lib/granite/form/model/associations/nested_attributes.rb

@@ -22,7 +22,7 @@ module Granite
                 attrs = attrs.stringify_keys
 
                 nested_attrs = self.class.nested_attributes_options.keys
-                  .each_with_object({}) do |association_name, result|
+                                   .each_with_object({}) do |association_name, result|
                   name = "#{association_name}_attributes"
                   result[name] = attrs.delete(name) if attrs.key?(name)
                 end
@@ -33,14 +33,18 @@ module Granite
               end
             end
 
-            alias_method :attributes=, :assign_attributes
+            alias attributes= assign_attributes
           end
 
-          class NestedAttributesMethods
-            REJECT_ALL_BLANK_PROC = proc { |attributes| attributes.all? { |key, value| key == DESTROY_ATTRIBUTE || value.blank? } }
+          class NestedAttributesMethods # rubocop:disable Metrics/ClassLength
+            REJECT_ALL_BLANK_PROC = proc { |attributes|
+              attributes.all? do |key, value|
+                key == DESTROY_ATTRIBUTE || value.blank?
+              end
+            }
 
             def self.accepts_nested_attributes_for(klass, *attr_names)
-              options = {allow_destroy: false, update_only: false}
+              options = { allow_destroy: false, update_only: false }
               options.update(attr_names.extract_options!)
               options.assert_valid_keys(:allow_destroy, :reject_if, :limit, :update_only)
               options[:reject_if] = REJECT_ALL_BLANK_PROC if options[:reject_if] == :all_blank
@@ -49,10 +53,18 @@ module Granite
 
               attr_names.each do |association_name|
                 reflection = klass.reflect_on_association(association_name)
-                raise ArgumentError, "No association found for name `#{association_name}'. Has it been defined yet?" unless reflection
-                klass.nested_attributes_options = klass.nested_attributes_options.merge(association_name.to_sym => options)
+                unless reflection
+                  raise ArgumentError,
+                        "No association found for name `#{association_name}'. Has it been defined yet?"
+                end
+
+                klass.nested_attributes_options =
+                  klass
+                  .nested_attributes_options
+                  .merge(association_name.to_sym => options)
 
-                should_validate_nested = klass.respond_to?(:validates_nested) && !klass.validates_nested?(association_name)
+                should_validate_nested = klass.respond_to?(:validates_nested) &&
+                                         !klass.validates_nested?(association_name)
                 klass.validates_nested(association_name) if should_validate_nested
 
                 type = (reflection.collection? ? :collection : :one_to_one)
@@ -74,10 +86,17 @@ module Granite
               primary_attribute_name = primary_name_for(association.reflection.klass)
               if existing_record
                 primary_attribute = existing_record.attribute(primary_attribute_name)
-                primary_attribute_value = primary_attribute.type_definition.prepare(attributes[primary_attribute_name]) if primary_attribute
+                if primary_attribute
+                  primary_attribute_value = primary_attribute.type_definition
+                                                             .prepare(attributes[primary_attribute_name])
+                end
               end
 
-              if existing_record && (!primary_attribute || options[:update_only] || existing_record.primary_attribute == primary_attribute_value)
+              should_assign = !primary_attribute ||
+                              options[:update_only] ||
+                              existing_record.primary_attribute == primary_attribute_value
+
+              if existing_record && should_assign
                 assign_to(existing_record, attributes) unless call_reject_if(object, association_name, attributes)
                 association.clear if destroy_flag?(attributes) && options[:allow_destroy]
               elsif attributes[primary_attribute_name].present?
@@ -93,11 +112,12 @@ module Granite
               end
             end
 
-            def self.assign_nested_attributes_for_collection_association(object, association_name, attributes_collection)
+            def self.assign_nested_attributes_for_collection_association(object, association_name, attributes_collection) # rubocop:disable Layout/LineLength,Metrics/MethodLength
               options = object.nested_attributes_options[association_name]
 
               unless attributes_collection.is_a?(Hash) || attributes_collection.is_a?(Array)
-                raise ArgumentError, "Hash or Array expected, got #{attributes_collection.class.name} (#{attributes_collection.inspect})"
+                raise ArgumentError,
+                      "Hash or Array expected, got #{attributes_collection.class.name} (#{attributes_collection.inspect})" # rubocop:disable Layout/LineLength
               end
 
               check_record_limit!(options[:limit], attributes_collection)
@@ -105,26 +125,32 @@ module Granite
               association = object.association(association_name)
               primary_attribute_name = primary_name_for(association.reflection.klass)
 
-              raise Granite::Form::UndefinedPrimaryAttribute.new(object.class, association_name) unless primary_attribute_name
+              unless primary_attribute_name
+                raise Granite::Form::UndefinedPrimaryAttribute.new(object.class,
+                                                                   association_name)
+              end
 
               if attributes_collection.is_a? Hash
                 keys = attributes_collection.keys
-                attributes_collection = if keys.include?(primary_attribute_name) || keys.include?(primary_attribute_name.to_sym)
-                  [attributes_collection]
-                else
-                  attributes_collection.values
-                end
+                attributes_collection =
+                  if keys.include?(primary_attribute_name) || keys.include?(primary_attribute_name.to_sym)
+                    [attributes_collection]
+                  else
+                    attributes_collection.values
+                  end
               end
 
               attributes_collection.each do |attributes|
                 attributes = attributes.with_indifferent_access
 
                 if attributes[primary_attribute_name].blank?
-                  association.build(attributes.except(*unassignable_keys(object))) unless reject_new_object?(object, association_name, attributes, options)
+                  association.build(attributes.except(*unassignable_keys(object))) unless reject_new_object?(
+                    object, association_name, attributes, options
+                  )
                 else
                   existing_record = association.target.detect do |record|
                     primary_attribute_value = record.attribute(primary_attribute_name)
-                      .type_definition.prepare(attributes[primary_attribute_name])
+                                                    .type_definition.prepare(attributes[primary_attribute_name])
                     record.primary_attribute == primary_attribute_value
                   end
                   if existing_record
@@ -137,7 +163,8 @@ module Granite
                       end
                     end
                   else
-                    raise Granite::Form::ObjectNotFound.new(object, association_name, attributes[primary_attribute_name])
+                    raise Granite::Form::ObjectNotFound.new(object, association_name,
+                                                            attributes[primary_attribute_name])
                   end
                 end
               end
@@ -145,13 +172,13 @@ module Granite
 
             def self.check_record_limit!(limit, attributes_collection)
               limit = case limit
-              when Symbol
-                send(limit)
-              when Proc
-                limit.call
-              else
-                limit
-              end
+                      when Symbol
+                        send(limit)
+                      when Proc
+                        limit.call
+                      else
+                        limit
+                      end
 
               return unless limit && attributes_collection.size > limit
 
@@ -197,15 +224,16 @@ module Granite
           module NestedAttributesMethodsExtension
             def self.ensure_extended!(klass)
               return if klass.singleton_class.ancestors.include?(self)
+
               klass.extend(self)
             end
 
             def nested_attributes_methods_module
               @nested_attributes_methods_module ||= begin
-                                                      mod = const_set(:NestedAttributesMethods, Module.new)
-                                                      include(mod)
-                                                      mod
-                                                    end
+                mod = const_set(:NestedAttributesMethods, Module.new)
+                include(mod)
+                mod
+              end
             end
           end
         end

data/lib/granite/form/model/associations/persistence_adapters/active_record/referenced_proxy.rb

@@ -9,6 +9,7 @@ module Granite
               METHODS_EXCLUDED_FROM_DELEGATION = %w[build create create!].map(&:to_sym).freeze
 
               attr_reader :association
+
               delegate :scope, to: :@association
 
               def method_missing(method, *args, &block)
@@ -19,7 +20,7 @@ module Granite
                 delegate_to_scope?(method) || super
               end
 
-            private
+              private
 
               def delegate_to_scope?(method)
                 METHODS_EXCLUDED_FROM_DELEGATION.exclude?(method) && scope.respond_to?(method)

data/lib/granite/form/model/associations/persistence_adapters/active_record.rb

@@ -17,10 +17,11 @@ module Granite
               text: String,
               string: String,
               binary: String,
-              boolean: Boolean
+              boolean: Boolean,
+              enum: String
             }.freeze
 
-            alias_method :data_type, :data_source
+            alias data_type data_source
 
             def build(attributes)
               data_source.new(attributes)
@@ -31,10 +32,10 @@ module Granite
 
               if scope_proc
                 scope = if scope_proc.arity.zero?
-                  scope.instance_exec(&scope_proc)
-                else
-                  scope.instance_exec(owner, &scope_proc)
-                end
+                          scope.instance_exec(&scope_proc)
+                        else
+                          scope.instance_exec(owner, &scope_proc)
+                        end
               end
 
               scope.where(primary_key => source)

data/lib/granite/form/model/associations/persistence_adapters/base.rb

@@ -13,7 +13,8 @@ module Granite
             end
 
             def build(_attributes)
-              raise NotImplementedError, 'Should be implemented in inhereted adapter. Build new instance of data object by attributes'
+              raise NotImplementedError,
+                    'Should be implemented in inhereted adapter. Build new instance of data object by attributes'
             end
 
             def scope(_owner, _source)
@@ -29,11 +30,13 @@ module Granite
             end
 
             def identify(_object)
-              raise NotImplementedError, 'Should be implemented in inhereted adapter. Field to be used as primary_key for object'
+              raise NotImplementedError,
+                    'Should be implemented in inhereted adapter. Field to be used as primary_key for object'
             end
 
             def data_type
-              raise NotImplementedError, 'Should be implemented in inhereted adapter. Type of data object for type_check'
+              raise NotImplementedError,
+                    'Should be implemented in inhereted adapter. Type of data object for type_check'
             end
 
             def primary_key_type
@@ -41,7 +44,8 @@ module Granite
             end
 
             def referenced_proxy
-              raise NotImplementedError, 'Should be implemented in inhereted adapter. Object to manage proxying of methods to scope.'
+              raise NotImplementedError,
+                    'Should be implemented in inhereted adapter. Object to manage proxying of methods to scope.'
             end
           end
         end

data/lib/granite/form/model/associations/references_any.rb

@@ -7,7 +7,7 @@ module Granite
             reflection.persistence_adapter.scope(owner, source)
           end
 
-        private
+          private
 
           def read_source
             attribute.read_before_type_cast

data/lib/granite/form/model/associations/references_many.rb

@@ -42,7 +42,7 @@ module Granite
             end
           end
 
-          alias_method :writer, :replace
+          alias writer replace
 
           def concat(*objects)
             append objects.flatten
@@ -60,12 +60,13 @@ module Granite
             target.map { |obj| reflection.persistence_adapter.identify(obj) }
           end
 
-        private
+          private
 
           def append(objects)
             attribute.pollute do
               objects.each do |object|
                 next if target.include?(object)
+
                 raise_type_mismatch(object) unless matches_type?(object)
 
                 target.push(object)

data/lib/granite/form/model/associations/references_one.rb

@@ -48,7 +48,7 @@ module Granite
             target
           end
 
-          alias_method :writer, :replace
+          alias writer replace
 
           def identify
             reflection.persistence_adapter.identify(target)

data/lib/granite/form/model/associations/reflections/base.rb

@@ -10,13 +10,14 @@ module Granite
             attr_reader :name, :options
             # AR compatibility
             attr_accessor :parent_reflection
+
             delegate :association_class, to: 'self.class'
 
             def self.build(target, generated_methods, name, options = {}, &_block)
               generate_methods name, generated_methods
               if options.delete(:validate) &&
-                  target.respond_to?(:validates_nested) &&
-                  !target.validates_nested?(name)
+                 target.respond_to?(:validates_nested) &&
+                 !target.validates_nested?(name)
                 target.validates_nested name
               end
               new(name, options)

data/lib/granite/form/model/associations/reflections/embeds_any.rb

@@ -31,10 +31,10 @@ module Granite
 
             def klass
               @klass ||= if options[:class]
-                options[:class].call(self)
-              else
-                super
-              end
+                           options[:class].call(self)
+                         else
+                           super
+                         end
             end
 
             def inspect

data/lib/granite/form/model/associations/reflections/embeds_many.rb

@@ -5,7 +5,10 @@ module Granite
         module Reflections
           class EmbedsMany < EmbedsAny
             def self.build(target, generated_methods, name, options = {}, &block)
-              target.add_attribute(Granite::Form::Model::Attributes::Reflections::Base, name, type: Object) if target < Granite::Form::Model::Attributes
+              if target < Granite::Form::Model::Attributes
+                target.add_attribute(Granite::Form::Model::Attributes::Reflections::Base, name,
+                                     type: Object)
+              end
               options[:validate] = true unless options.key?(:validate)
               super
             end

data/lib/granite/form/model/associations/reflections/embeds_one.rb

@@ -7,7 +7,10 @@ module Granite
             include Singular
 
             def self.build(target, generated_methods, name, options = {}, &block)
-              target.add_attribute(Granite::Form::Model::Attributes::Reflections::Base, name, type: Object) if target < Granite::Form::Model::Attributes
+              if target < Granite::Form::Model::Attributes
+                target.add_attribute(Granite::Form::Model::Attributes::Reflections::Base, name,
+                                     type: Object)
+              end
               options[:validate] = true unless options.key?(:validate)
               super
             end

data/lib/granite/form/model/associations/reflections/references_any.rb

@@ -25,17 +25,17 @@ module Granite
 
             def klass
               @klass ||= if options[:data_source].present?
-                options[:data_source].to_s.constantize
-              else
-                super
-              end
+                           options[:data_source].to_s.constantize
+                         else
+                           super
+                         end
             end
 
-            alias_method :data_source, :klass
+            alias data_source klass
 
             def persistence_adapter
               @persistence_adapter ||= self.class.persistence_adapter(klass)
-                .new(data_source, options[:primary_key], @scope_proc)
+                                           .new(data_source, options[:primary_key], @scope_proc)
             end
 
             def read_source(object)

data/lib/granite/form/model/associations/reflections/references_many.rb

@@ -22,7 +22,7 @@ module Granite
 
             def reference_key
               @reference_key ||= options[:reference_key].presence.try(:to_sym) ||
-                :"#{name.to_s.singularize}_#{primary_key.to_s.pluralize}"
+                                 :"#{name.to_s.singularize}_#{primary_key.to_s.pluralize}"
             end
           end
         end

data/lib/granite/form/model/associations/reflections/references_one.rb

@@ -24,7 +24,7 @@ module Granite
 
             def reference_key
               @reference_key ||= options[:reference_key].presence.try(:to_sym) ||
-                :"#{name}_#{primary_key}"
+                                 :"#{name}_#{primary_key}"
             end
           end
         end

data/lib/granite/form/model/associations/validations.rb

@@ -9,7 +9,7 @@ module Granite
             run_validations!
           end
 
-          alias_method :validate_ancestry, :valid_ancestry?
+          alias validate_ancestry valid_ancestry?
 
           def invalid_ancestry?
             !valid_ancestry?
@@ -19,16 +19,16 @@ module Granite
             valid_ancestry? || raise_validation_error
           end
 
-        private
+          private
 
           def validate_nested!
             association_names.each do |name|
               association = association(name)
               invalid_block = if association.reflection.klass.method_defined?(:invalid_ansestry?)
-                ->(object) { object.invalid_ansestry? }
-              else
-                ->(object) { object.invalid? }
-              end
+                                ->(object) { object.invalid_ansestry? }
+                              else
+                                ->(object) { object.invalid? }
+                              end
 
               Granite::Form::Model::Validations::NestedValidator
                 .validate_nested(self, name, association.target, &invalid_block)

data/lib/granite/form/model/associations.rb

@@ -58,6 +58,7 @@ module Granite
           def alias_association(alias_name, association_name)
             reflection = reflect_on_association(association_name)
             raise ArgumentError, "Can't alias undefined association `#{attribute_name}` on #{self}" unless reflection
+
             reflection.class.generate_methods alias_name, generated_associations_methods
             self._association_aliases = _association_aliases.merge(alias_name.to_sym => reflection.name)
             reflection
@@ -72,7 +73,7 @@ module Granite
             _associations.keys
           end
 
-        private
+          private
 
           def attributes_for_inspect
             (_associations.map do |name, reflection|
@@ -82,7 +83,7 @@ module Granite
 
           def generated_associations_methods
             @generated_associations_methods ||= const_set(:GeneratedAssociationsMethods, Module.new)
-              .tap { |proxy| include proxy }
+                                                .tap { |proxy| include proxy }
           end
         end
 
@@ -92,15 +93,16 @@ module Granite
           end
         end
 
-        alias_method :eql?, :==
+        alias eql? ==
 
         def association(name)
           reflection = self.class.reflect_on_association(name)
           return unless reflection
+
           (@_associations ||= {})[reflection.name] ||= reflection.build_association(self)
         end
 
-      private
+        private
 
         def attributes_for_inspect
           (association_names.map do |name|

data/lib/granite/form/model/attributes/attribute.rb

@@ -7,6 +7,7 @@ module Granite
 
           def write(value)
             return if readonly?
+
             pollute do
               write_value value
             end