granite-form 0.6.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62a7935cb1b74f15d4599c3118e4b60728bcf8b27dac232a3893ef84d2b5f127
-  data.tar.gz: 2c6e8d0aeca6ca09aae7a364d2966a26c1ad1a4ab7f9986d348deeaab7688bdb
+  metadata.gz: dda468a489d35aab4f5804326e5f6085402fb2ff75f9fd04ac6cc543d5ef1891
+  data.tar.gz: 0b94a79de0efc3b3658e9c947eb7429ba09d9e07e3ce8febbdbc004100c2a7b0
 SHA512:
-  metadata.gz: 1545d76b21d34005b22708aa3670f7c893d322b388f217f70d21180d0dfa65621f694d87025e1b8c0fd243f97139b5f2e1a0c101a536c01750f3eba741ad0327
-  data.tar.gz: 0dbf480f6d6d8ebc4401ad698d3adfe8b894a2f07f6b32b9fdff0f3bc60605d7a97da1c305877db248f4a6005aebb836fa8000f22fb3c5096231e044d0491144
+  metadata.gz: 3d42d8e453b397943f350d360b3fb17d07176631ba30619d46b2cc9acd5d4f81bf79339ff67538d28d67148b74c5ce50afe25a80d3eb38f3cbd69109f055e9de
+  data.tar.gz: a54b55d887aaddee4813206c7a4b11f6856fe5d1a6ad703deb2ea1d65ade6f109515c8d686c634c42719f5e32277c7de966439c7017b4e1e20a7c3d23ff1808b

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

@@ -22,7 +22,7 @@ module Granite
             unless evar_loaded?
               default = Array.wrap(reflection.default(owner))
               if default.present?
-                collection = if default.all? { |object| object.is_a?(reflection.klass) }
+                collection = if default.all?(reflection.klass)
                                default
                              else
                                default.map do |attributes|
@@ -46,7 +46,7 @@ module Granite
             write_source(target.map { |model| model_data(model) })
           end
 
-          def clear
+          def clear # rubocop:disable Naming/PredicateMethod
             target
             @target = []
             true

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

@@ -44,7 +44,7 @@ module Granite
             write_source(model_data(target))
           end
 
-          def clear
+          def clear # rubocop:disable Naming/PredicateMethod
             target
             @target = nil
             true

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

@@ -29,7 +29,7 @@ module Granite
 
                 super(attrs.merge!(nested_attrs))
               else
-                super(attrs)
+                super
               end
             end
 
@@ -232,6 +232,7 @@ module Granite
               @nested_attributes_methods_module ||= begin
                 mod = const_set(:NestedAttributesMethods, Module.new)
                 include(mod)
+
                 mod
               end
             end

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

@@ -20,9 +20,9 @@ module Granite
 
             return [] unless default
 
-            if default.all? { |object| object.is_a?(reflection.persistence_adapter.data_type) }
+            if default.all?(reflection.persistence_adapter.data_type)
               default
-            elsif default.all? { |object| object.is_a?(Hash) }
+            elsif default.all?(Hash)
               default.map { |attributes| build_object(attributes) }
             else
               reflection.persistence_adapter.find_all(owner, default)
@@ -49,7 +49,7 @@ module Granite
             reader
           end
 
-          def clear
+          def clear # rubocop:disable Naming/PredicateMethod
             attribute.pollute do
               write_source([])
             end

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

@@ -4,7 +4,7 @@ module Granite
       module Associations
         module Reflections
           class EmbedsMany < EmbedsAny
-            def self.build(target, generated_methods, name, options = {}, &block)
+            def self.build(target, generated_methods, name, options = {}, &_block)
               if target < Granite::Form::Model::Attributes
                 target.add_attribute(Granite::Form::Model::Attributes::Reflections::Base, name,
                                      type: Object)

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

@@ -6,7 +6,7 @@ module Granite
           class EmbedsOne < EmbedsAny
             include Singular
 
-            def self.build(target, generated_methods, name, options = {}, &block)
+            def self.build(target, generated_methods, name, options = {}, &_block)
               if target < Granite::Form::Model::Attributes
                 target.add_attribute(Granite::Form::Model::Attributes::Reflections::Base, name,
                                      type: Object)

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

@@ -7,7 +7,7 @@ module Granite
       module Associations
         module Reflections
           class ReferencesMany < ReferencesAny
-            def self.build(target, generated_methods, name, *args, &block)
+            def self.build(target, generated_methods, name, *args, &_block)
               reflection = super
 
               target.add_attribute(

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

@@ -9,7 +9,7 @@ module Granite
           class ReferencesOne < ReferencesAny
             include Singular
 
-            def self.build(target, generated_methods, name, *args, &block)
+            def self.build(target, generated_methods, name, *args, &_block)
               reflection = super
 
               target.add_attribute(

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

@@ -25,9 +25,9 @@ module Granite
             association_names.each do |name|
               association = association(name)
               invalid_block = if association.reflection.klass.method_defined?(:invalid_ansestry?)
-                                ->(object) { object.invalid_ansestry? }
+                                lambda(&:invalid_ansestry?)
                               else
-                                ->(object) { object.invalid? }
+                                lambda(&:invalid?)
                               end
 
               Granite::Form::Model::Validations::NestedValidator

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

@@ -49,7 +49,7 @@ module Granite
             !read.nil? && !(read.respond_to?(:empty?) && read.empty?)
           end
 
-          def query
+          def query # rubocop:disable Naming/PredicateMethod
             !(read.respond_to?(:zero?) ? read.zero? : read.blank?)
           end
 

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

@@ -63,7 +63,7 @@ module Granite
             _attributes[_attribute_aliases[name] || name]
           end
 
-          def has_attribute?(name) # rubocop:disable Naming/PredicateName
+          def has_attribute?(name) # rubocop:disable Naming/PredicatePrefix
             name = name.to_s
             _attributes.key?(_attribute_aliases[name] || name)
           end

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

@@ -3,6 +3,7 @@ module Granite
     module Model
       module Primary
         extend ActiveSupport::Concern
+
         DEFAULT_PRIMARY_ATTRIBUTE_OPTIONS = lambda do
           {
             type: Granite::Form::UUID,
@@ -15,6 +16,7 @@ module Granite
           delegate :has_primary_attribute?, to: 'self.class'
 
           prepend PrependMethods
+
           alias_method :eql?, :==
         end
 
@@ -31,7 +33,7 @@ module Granite
 
           alias primary_attribute primary
 
-          def has_primary_attribute? # rubocop:disable Naming/PredicateName
+          def has_primary_attribute? # rubocop:disable Naming/PredicatePrefix
             has_attribute? _primary_name
           end
 
@@ -49,7 +51,7 @@ module Granite
                 object_id == other.object_id
               end
             else
-              super(other)
+              super
             end
           end
         end

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

@@ -25,7 +25,7 @@ module Granite
 
               super(attrs.merge!(represented_attrs))
             else
-              super(attrs)
+              super
             end
           end
 
@@ -41,9 +41,7 @@ module Granite
           end
 
           def represented_attributes
-            @represented_attributes ||= _attributes.values.select do |attribute|
-              attribute.is_a? Granite::Form::Model::Attributes::Reflections::Represents
-            end
+            @represented_attributes ||= _attributes.values.grep(Granite::Form::Model::Attributes::Reflections::Represents)
           end
 
           def represented_names_and_aliases
@@ -55,7 +53,7 @@ module Granite
 
         private
 
-        def run_validations! # :nodoc:
+        def run_validations! # rubocop:disable Naming/PredicateMethod
           super
           emerge_represented_attributes_errors!
           errors.empty?
@@ -75,26 +73,16 @@ module Granite
           end
         end
 
-        if ActiveModel.version >= Gem::Version.new('6.1.0')
-          def move_errors(from, to)
-            errors.where(from).each do |error|
-              options = error.options
-              # If we generate message for built-in validation, we don't want to later escape it in our monkey-patch
-              options = options.merge(message: error.message.html_safe)
-
-              errors.add(to, error.type, **options)
-            end
+        def move_errors(from, to)
+          errors.where(from).each do |error|
+            options = error.options
+            # If we generate message for built-in validation, we don't want to later escape it in our monkey-patch
+            options = options.merge(message: error.message.html_safe)
 
-            errors.delete(from)
+            errors.add(to, error.type, **options)
           end
-        else
-          # up to 6.0.x
-          def move_errors(from, to)
-            return unless errors.messages.key?(from) && errors.messages[from].present?
 
-            errors[to].concat(errors.messages[from])
-            errors.delete(from)
-          end
+          errors.delete(from)
         end
       end
     end

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

@@ -41,43 +41,18 @@ module Granite
             super || self.class._scope_model.respond_to?(method)
           end
 
-          # 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)
-              with_scope do
-                model = self.class._scope_model
-                if model.respond_to?(method)
-                  result = model.public_send(method, *args, **kwargs, &block)
-                  result.is_a?(Granite::Form::Model::Scopes) ? result : model.scope_class.new(result)
-                else
-                  super
-                end
-              end
-            end
-          elsif Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.7.0')
-            def method_missing(method, *args, **kwargs, &block)
-              with_scope do
-                model = self.class._scope_model
-                if model.respond_to?(method)
-                  model.public_send(method, *args, **kwargs, &block)
-                else
-                  super
-                end
-              end
-            end
-          else
-            # up to 2.6.x
-            def method_missing(method, *args, &block)
-              with_scope do
-                model = self.class._scope_model
-                if model.respond_to?(method)
-                  model.public_send(method, *args, &block)
-                else
-                  super
-                end
+          def method_missing(method, ...)
+            with_scope do
+              model = self.class._scope_model
+              if model.respond_to?(method)
+                result = model.public_send(method, ...)
+                result.is_a?(Granite::Form::Model::Scopes) ? result : model.scope_class.new(result)
+              else
+                super
               end
             end
           end
+
           def with_scope
             previous_scope = self.class._scope_model.current_scope
             self.class._scope_model.current_scope = self

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

@@ -7,7 +7,7 @@ module Granite
             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?
+            record.errors.add(attribute, :invalid, **options, value: value) if invalid_records.present?
           end
         end
 

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

@@ -15,21 +15,10 @@ module Granite
             end
           end
 
-          if ActiveModel.version >= Gem::Version.new('6.1.0')
-            def self.import_errors(from, to, prefix)
-              from.each do |error|
-                key = "#{prefix}.#{error.attribute}"
-                to.import(error, attribute: key) unless to.messages_for(key).include?(error.message)
-              end
-            end
-          else
-            # up to 6.0.x
-            def self.import_errors(from, to, prefix)
-              from.each do |key, message|
-                key = "#{prefix}.#{key}"
-                to[key] << message
-                to[key].uniq!
-              end
+          def self.import_errors(from, to, prefix)
+            from.each do |error|
+              key = "#{prefix}.#{error.attribute}"
+              to.import(error, attribute: key) unless to.messages_for(key).include?(error.message)
             end
           end
 

data/lib/granite/form/version.rb

@@ -1,5 +1,5 @@
 module Granite
   module Form
-    VERSION = '0.6.1'.freeze
+    VERSION = '1.0.0'.freeze
   end
 end