granite-form 0.5.0 → 0.6.0

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

@@ -4,6 +4,7 @@ module Granite
       module Attributes
         class Base
           attr_reader :type_definition
+
           delegate :type, :reflection, :owner, :enum, to: :type_definition
           delegate :name, :readonly, to: :reflection
 
@@ -20,6 +21,7 @@ module Granite
 
           def write(value)
             return if readonly?
+
             write_value value
           end
 
@@ -57,12 +59,12 @@ module Granite
 
           def inspect_attribute
             value = case read
-            when Date, Time, DateTime
-              %("#{read.to_formatted_s(:db)}")
-            else
-              inspection = read.inspect
-              inspection.size > 100 ? inspection.truncate(50) : inspection
-            end
+                    when Date, Time, DateTime
+                      %("#{read.to_formatted_s(:db)}")
+                    else
+                      inspection = read.inspect
+                      inspection.size > 100 ? inspection.truncate(50) : inspection
+                    end
             "#{name}: #{value}"
           end
 
@@ -89,7 +91,7 @@ module Granite
             end
           end
 
-        private
+          private
 
           def remove_variable(*names)
             names.flatten.each do |name|

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

@@ -32,7 +32,7 @@ module Granite
             @value_cache
           end
 
-        private
+          private
 
           def association
             @association ||= owner.association(reflection.association)

data/lib/granite/form/model/attributes/reflections/base/build_type_definition.rb

@@ -6,6 +6,7 @@ module Granite
           class Base
             class BuildTypeDefinition
               attr_reader :owner, :reflection
+
               delegate :name, to: :reflection
 
               def initialize(owner, reflection)
@@ -19,7 +20,7 @@ module Granite
                 type_definition_for(type)
               end
 
-            private
+              private
 
               def type
                 reflection.options[:type]

data/lib/granite/form/model/attributes/reflections/represents/build_type_definition.rb

@@ -19,7 +19,7 @@ module Granite
                 end
               end
 
-            private
+              private
 
               def reference
                 owner.__send__(reflection.reference)
@@ -61,7 +61,7 @@ module Granite
 
               def convert_active_model_type_to_definition(attribute_type)
                 type = attribute_type.try(:value_class) ||
-                  Associations::PersistenceAdapters::ActiveRecord::TYPES[attribute_type.type&.to_sym]
+                       Associations::PersistenceAdapters::ActiveRecord::TYPES[attribute_type.type&.to_sym]
                 type_definition_for(type) if type
               end
             end

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

@@ -24,7 +24,7 @@ module Granite
             end
           end
 
-        private
+          private
 
           def reference
             owner.__send__(reflection.reference)

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

@@ -25,7 +25,8 @@ module Granite
 
           %w[attribute collection dictionary].each do |kind|
             define_singleton_method kind do |*args, &block|
-              add_attribute("Granite::Form::Model::Attributes::Reflections::#{kind.camelize}".constantize, *args, &block)
+              add_attribute("Granite::Form::Model::Attributes::Reflections::#{kind.camelize}".constantize, *args,
+                            &block)
             end
           end
         end
@@ -34,7 +35,7 @@ module Granite
           def add_attribute(reflection_class, *args, &block)
             reflection = reflection_class.build(self, generated_attributes_methods, *args, &block)
             self._attributes = _attributes.merge(reflection.name => reflection)
-            should_define_dirty = (dirty? && reflection_class != Granite::Form::Model::Attributes::Reflections::Base)
+            should_define_dirty = dirty? && reflection_class != Granite::Form::Model::Attributes::Reflections::Base
             define_dirty(reflection.name, generated_attributes_methods) if should_define_dirty
             reflection
           end
@@ -42,7 +43,12 @@ module Granite
           def alias_attribute(alias_name, attribute_name)
             reflection = reflect_on_attribute(attribute_name)
             raise ArgumentError, "Unable to alias undefined attribute `#{attribute_name}` on #{self}" unless reflection
-            raise ArgumentError, "Unable to alias base attribute `#{attribute_name}`" if reflection.class == Granite::Form::Model::Attributes::Reflections::Base
+
+            if reflection.class == Granite::Form::Model::Attributes::Reflections::Base
+              raise ArgumentError,
+                    "Unable to alias base attribute `#{attribute_name}`"
+            end
+
             reflection.class.generate_methods alias_name, generated_attributes_methods
             self._attribute_aliases = _attribute_aliases.merge(alias_name.to_s => reflection.name)
             define_dirty alias_name, generated_attributes_methods if dirty?
@@ -85,7 +91,7 @@ module Granite
             self._sanitize = previous_sanitize
           end
 
-        private
+          private
 
           def original_inspect
             Object.method(:inspect).unbind.bind(self).call
@@ -101,7 +107,7 @@ module Granite
           def generated_attributes_methods
             @generated_attributes_methods ||=
               const_set(:GeneratedAttributesMethods, Module.new)
-                .tap { |proxy| include proxy }
+              .tap { |proxy| include proxy }
           end
 
           def inverted_attribute_aliases
@@ -117,14 +123,15 @@ module Granite
         end
 
         def ==(other)
-          super || other.instance_of?(self.class) && other.attributes(false) == attributes(false)
+          super || (other.instance_of?(self.class) && other.attributes(false) == attributes(false))
         end
 
-        alias_method :eql?, :==
+        alias eql? ==
 
         def attribute(name)
           reflection = self.class.reflect_on_attribute(name)
           return unless reflection
+
           initial_value = @initial_attributes.to_h.fetch(reflection.name, Granite::Form::UNDEFINED)
           @_attributes ||= {}
           @_attributes[reflection.name] ||= reflection.build_attribute(self, initial_value)
@@ -134,13 +141,13 @@ module Granite
           attribute(name).write(value)
         end
 
-        alias_method :[]=, :write_attribute
+        alias []= write_attribute
 
         def read_attribute(name)
           attribute(name).read
         end
 
-        alias_method :[], :read_attribute
+        alias [] read_attribute
 
         def read_attribute_before_type_cast(name)
           attribute(name).read_before_type_cast
@@ -162,7 +169,7 @@ module Granite
           assign_attributes(attrs)
         end
 
-        alias_method :update_attributes, :update
+        alias update_attributes update
 
         def assign_attributes(attrs)
           attrs.each do |name, value|
@@ -172,12 +179,13 @@ module Granite
             if respond_to?("#{name}=") && !sanitize_value
               public_send("#{name}=", value)
             else
-              logger.info("Ignoring #{sanitize_value ? 'primary' : 'undefined'} `#{name}` attribute value for #{self} during mass-assignment")
+              attribute_type = sanitize_value ? 'primary' : 'undefined'
+              logger.debug("Ignoring #{attribute_type} `#{name}` attribute value for #{self} during mass-assignment")
             end
           end
         end
 
-        alias_method :attributes=, :assign_attributes
+        alias attributes= assign_attributes
 
         def sync_attributes
           attribute_names.each do |name|
@@ -198,7 +206,7 @@ module Granite
           super
         end
 
-      private
+        private
 
         def attributes_for_inspect
           attribute_names(false).map do |name|

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

@@ -19,7 +19,7 @@ module Granite
           !persisted?
         end
 
-        alias_method :new_object?, :new_record?
+        alias new_object? new_record?
 
         module ClassMethods
           def i18n_scope

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

@@ -30,7 +30,7 @@ module Granite
           false
         end
 
-      private
+        private
 
         def mark_persisted!
           @persisted = true

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

@@ -29,7 +29,7 @@ module Granite
             alias_attribute :primary_attribute, _primary_name
           end
 
-          alias_method :primary_attribute, :primary
+          alias primary_attribute primary
 
           def has_primary_attribute? # rubocop:disable Naming/PredicateName
             has_attribute? _primary_name

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

@@ -19,7 +19,7 @@ module Granite
               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|
+                                      .each_with_object({}) do |name, result|
                 result[name] = attrs.delete(name) if attrs.key?(name)
               end
 
@@ -29,7 +29,7 @@ module Granite
             end
           end
 
-          alias_method :attributes=, :assign_attributes
+          alias attributes= assign_attributes
         end
 
         module ClassMethods
@@ -53,9 +53,9 @@ module Granite
           end
         end
 
-      private
+        private
 
-        def run_validations! #:nodoc:
+        def run_validations! # :nodoc:
           super
           emerge_represented_attributes_errors!
           errors.empty?

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

@@ -26,11 +26,14 @@ module Granite
 
               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)
+                  unless entity.is_a?(self.class._scope_model)
+                    raise AssociationTypeMismatch.new(self.class._scope_model,
+                                                      entity.class)
+                  end
                 end
               end
 
-              super source
+              super(source)
             end
           end
 
@@ -38,7 +41,6 @@ module Granite
             super || self.class._scope_model.respond_to?(method)
           end
 
-          # rubocop:disable Style/MethodMissing
           # rubocop-0.52.1 doesn't understand that `#respond_to_missing?` is defined above
           if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('3.0.0')
             def method_missing(method, *args, **kwargs, &block)
@@ -76,8 +78,6 @@ module Granite
               end
             end
           end
-          # rubocop:enable Style/MethodMissing
-
           def with_scope
             previous_scope = self.class._scope_model.current_scope
             self.class._scope_model.current_scope = self

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

@@ -1,3 +1,6 @@
+require_relative 'validations/nested'
+require_relative 'validations/associated'
+
 module Granite
   module Form
     module Model
@@ -22,7 +25,7 @@ module Granite
           valid?(context) || raise_validation_error
         end
 
-      protected
+        protected
 
         def raise_validation_error
           raise Granite::Form::ValidationError, self
@@ -31,5 +34,3 @@ module Granite
     end
   end
 end
-
-Dir[File.dirname(__FILE__) + '/validations/*.rb'].each { |file| require file }

data/lib/granite/form/types/active_support/time_zone.rb

@@ -5,7 +5,7 @@ module Granite
     module Types
       module ActiveSupport
         class TimeZone < Float
-        private
+          private
 
           def typecast(value)
             case value

data/lib/granite/form/types/array.rb

@@ -4,7 +4,7 @@ module Granite
   module Form
     module Types
       class Array < Object
-      private
+        private
 
         def typecast(value)
           if value.is_a?(::String)

data/lib/granite/form/types/big_decimal.rb

@@ -4,7 +4,7 @@ module Granite
   module Form
     module Types
       class BigDecimal < Object
-      private
+        private
 
         def typecast(value)
           BigDecimal(Float(value).to_s) if value

data/lib/granite/form/types/boolean.rb

@@ -29,7 +29,7 @@ module Granite
           MAPPING[value]
         end
 
-      private
+        private
 
         def typecast(value)
           self.class.typecast(value)

data/lib/granite/form/types/date.rb

@@ -4,7 +4,7 @@ module Granite
   module Form
     module Types
       class Date < Object
-      private
+        private
 
         def typecast(value)
           value.try(:to_date)

data/lib/granite/form/types/date_time.rb

@@ -4,7 +4,7 @@ module Granite
   module Form
     module Types
       class DateTime < Object
-      private
+        private
 
         def typecast(value)
           value.try(:to_datetime)

data/lib/granite/form/types/dictionary.rb

@@ -10,7 +10,7 @@ module Granite
           value.transform_values { |v| subtype_definition.prepare(v) }.with_indifferent_access
         end
 
-      private
+        private
 
         def to_hash(value)
           Hash[value]

data/lib/granite/form/types/float.rb

@@ -4,7 +4,7 @@ module Granite
   module Form
     module Types
       class Float < Object
-      private
+        private
 
         def typecast(value)
           Float(value)

data/lib/granite/form/types/has_subtype.rb

@@ -3,6 +3,7 @@ module Granite
     module Types
       class HasSubtype
         attr_reader :subtype_definition
+
         delegate :reflection, :owner, :type, :name, :enum, to: :subtype_definition
 
         def initialize(subtype_definition)

data/lib/granite/form/types/hash_with_action_controller_parameters.rb

@@ -4,13 +4,13 @@ module Granite
   module Form
     module Types
       class HashWithActionControllerParameters < Object
-      private
+        private
 
         def typecast(value)
           case value
           when ActionController::Parameters
             value.to_h if value.permitted?
-          when ::Hash then
+          when ::Hash
             value
           end
         end

data/lib/granite/form/types/integer.rb

@@ -4,7 +4,7 @@ module Granite
   module Form
     module Types
       class Integer < Float
-      private
+        private
 
         def typecast(value)
           super.try(:to_i)

data/lib/granite/form/types/object.rb

@@ -5,6 +5,7 @@ module Granite
     module Types
       class Object
         attr_reader :reflection, :owner, :type
+
         delegate :name, to: :reflection
 
         def initialize(type, reflection, owner)
@@ -34,7 +35,7 @@ module Granite
           end.to_set
         end
 
-      private
+        private
 
         def ensure_type(value)
           if value.instance_of?(type)

data/lib/granite/form/types/string.rb

@@ -4,7 +4,7 @@ module Granite
   module Form
     module Types
       class String < Object
-      private
+        private
 
         def typecast(value)
           value.to_s

data/lib/granite/form/types/time.rb

@@ -4,7 +4,7 @@ module Granite
   module Form
     module Types
       class Time < Object
-      private
+        private
 
         def typecast(value)
           value.is_a?(::String) && ::Time.zone ? ::Time.zone.parse(value) : value.try(:to_time)

data/lib/granite/form/types/uuid.rb

@@ -4,7 +4,7 @@ module Granite
   module Form
     module Types
       class UUID < Object
-      private
+        private
 
         def typecast(value)
           case value

data/lib/granite/form/util.rb

@@ -41,7 +41,7 @@ module Granite
         end
       end
 
-    private
+      private
 
       def evaluate_proc(value, *args)
         instance_exec(*args, &value)

data/lib/granite/form/version.rb

@@ -1,5 +1,5 @@
 module Granite
   module Form
-    VERSION = '0.5.0'.freeze
+    VERSION = '0.6.0'.freeze
   end
 end

data/spec/granite/form/active_record/associations_spec.rb

@@ -57,16 +57,19 @@ describe Granite::Form::ActiveRecord::Associations do
     describe '#projects' do
       specify do
         expect { user.projects << Project.new }
-          .not_to change { user.read_attribute(:projects) }
+          .not_to(change { user.read_attribute(:projects) })
       end
+
       specify do
         expect { user.projects << Project.new(title: 'First') }
-          .not_to change { user.read_attribute(:projects) }
+          .not_to(change { user.read_attribute(:projects) })
       end
+
       specify do
         expect { user.projects << Project.new(title: 'First') }
-          .not_to change { user.projects.reload.count }
+          .not_to(change { user.projects.reload.count })
       end
+
       specify do
         user.projects << Project.new(title: 'First')
         user.save
@@ -77,12 +80,14 @@ describe Granite::Form::ActiveRecord::Associations do
     describe '#profile' do
       specify do
         expect { user.profile = Profile.new(first_name: 'google.com') }
-          .not_to change { user.read_attribute(:profile) }
+          .not_to(change { user.read_attribute(:profile) })
       end
+
       specify do
         expect { user.profile = Profile.new(first_name: 'google.com') }
           .to change { user.profile }.from(nil).to(an_instance_of(Profile))
       end
+
       specify do
         user.profile = Profile.new(first_name: 'google.com')
         user.save
@@ -110,8 +115,9 @@ describe Granite::Form::ActiveRecord::Associations do
     describe '#projects' do
       specify do
         expect { user.projects << Project.new(title: 'First') }
-          .not_to change { user.read_attribute(:projects) }
+          .not_to(change { user.read_attribute(:projects) })
       end
+
       specify do
         user.projects << Project.new(title: 'First')
         user.save
@@ -120,19 +126,21 @@ describe Granite::Form::ActiveRecord::Associations do
 
       context do
         let(:project) { Project.new(title: 'First') }
+
         before { project.build_author(name: 'Author') }
 
         specify do
           expect { user.projects << project }
-            .not_to change { user.read_attribute(:projects) }
+            .not_to(change { user.read_attribute(:projects) })
         end
+
         specify do
           expect do
             user.projects << project
             user.save
           end
             .to change { user.reload.read_attribute(:projects) }.from([])
-            .to([{'title' => 'First', 'author' => {'name' => 'Author'}}])
+            .to([{ 'title' => 'First', 'author' => { 'name' => 'Author' } }])
         end
       end
     end
@@ -142,22 +150,25 @@ describe Granite::Form::ActiveRecord::Associations do
         expect { user.profile = Profile.new(first_name: 'google.com') }
           .to change { user.profile }.from(nil).to(an_instance_of(Profile))
       end
+
       specify do
         user.profile = Profile.new(first_name: 'google.com')
         user.save
         expect(user.reload.profile.first_name).to eq('google.com')
       end
+
       specify do
         expect { user.profile = Profile.new(first_name: 'google.com') }
-          .not_to change { user.read_attribute(:profile) }
+          .not_to(change { user.read_attribute(:profile) })
       end
+
       specify do
         expect do
           user.profile = Profile.new(first_name: 'google.com')
           user.save
         end
           .to change { user.reload.read_attribute(:profile) }.from(nil)
-          .to({first_name: 'google.com', last_name: nil, admin: nil}.to_json)
+          .to({ first_name: 'google.com', last_name: nil, admin: nil }.to_json)
       end
     end
   end
@@ -167,7 +178,8 @@ describe Granite::Form::ActiveRecord::Associations do
       expect do
         stub_class(:book, ActiveRecord::Base) do
           embeds_one :author, class_name: 'Borogoves'
-        end.reflect_on_association(:author).klass end.to raise_error NameError
+        end.reflect_on_association(:author).klass
+      end.to raise_error NameError
     end
 
     specify do
@@ -176,7 +188,8 @@ describe Granite::Form::ActiveRecord::Associations do
           embeds_many :projects, class_name: 'Borogoves' do
             attribute :title
           end
-        end.reflect_on_association(:projects).klass end.to raise_error NameError
+        end.reflect_on_association(:projects).klass
+      end.to raise_error NameError
     end
   end
 
@@ -194,13 +207,22 @@ describe Granite::Form::ActiveRecord::Associations do
 
     specify { expect(User.reflect_on_association(:projects).klass).to eq(User::Project) }
     specify { expect(User.new.projects).to eq([]) }
-    specify { expect(User.new.tap { |u| u.projects.build(title: 'Project') }.projects).to be_a(Granite::Form::Model::Associations::Collection::Embedded) }
-    specify { expect(User.new.tap { |u| u.projects.build(title: 'Project') }.projects).to match([have_attributes(title: 'Project')]) }
+
+    specify do
+      expect(User.new.tap { |u| u.projects.build(title: 'Project') }.projects)
+        .to be_a(Granite::Form::Model::Associations::Collection::Embedded)
+    end
+
+    specify do
+      expect(User.new.tap { |u| u.projects.build(title: 'Project') }.projects)
+        .to match([have_attributes(title: 'Project')])
+    end
 
     specify { expect(User.reflect_on_association(:profile).klass).to eq(User::Profile) }
     specify { expect(User.reflect_on_association(:profile).klass).to be < Profile }
     specify { expect(User.new.profile).to be_nil }
     specify { expect(User.new.tap { |u| u.build_profile(first_name: 'Profile') }.profile).to be_a(User::Profile) }
+
     specify do
       expect(User.new.tap { |u| u.build_profile(first_name: 'Profile') }.profile)
         .to have_attributes(first_name: 'Profile', last_name: nil, admin: nil, age: nil)