activemodel 6.0.0.rc2 → 6.0.1.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b62a3079c9aa82727030259ac3f47b1f1e8a4292f9b02d7dff3351c59bd7504c
-  data.tar.gz: a85c9b29228edce13de7f632a0275af7343869c3b77df89645fbd78554bd43cb
+  metadata.gz: 730f70f2562e4ec51447fabe473bb6e47a34c51224db9b987559d5684943560f
+  data.tar.gz: 2f480664d22d4c09bb1c0d1247b1cc94b2ae69d3c876507c6b3e0e4d39adb1ed
 SHA512:
-  metadata.gz: 3889c892dd0584c45062c6c802ad41b473076afe732f8958bf1014d3802a555acb80bb7cceb8209c1bf628a798b36d3ffbec2226adc39349b75174ede9115e3a
-  data.tar.gz: 5084f8019c592585e9ac1d739d100ae6c65f3cb6a003982cd9916d322f586a876bd2c1c9fe14c727b170dae8dc2df78a71547bf3695e7cdbe8753a07ebdffeb6
+  metadata.gz: 610908012ccc1e598efea402bee3d63edbe0a558324673c1670b8d310928a298fdad1e206442ab6d018c0057565d8a93051013b7037e7fffbfbbf1bf95bfcbef
+  data.tar.gz: 2e2fd041d8054a208bcddfd0b5731874f1f80bdaf69e7885960fef5f992432a9b5c1741605450152602c31c8002a87850e7e4c8b069de34f0e565231dd4921c7

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## Rails 6.0.1.rc1 (October 31, 2019) ##
+
+*   No changes.
+
+
+## Rails 6.0.0 (August 16, 2019) ##
+
+*   No changes.
+
+
 ## Rails 6.0.0.rc2 (July 22, 2019) ##
 
 *   No changes.
@@ -89,6 +99,16 @@
 
 ## Rails 6.0.0.beta1 (January 18, 2019) ##
 
+*   Internal calls to `human_attribute_name` on an `Active Model` now pass attributes as strings instead of symbols
+    in some cases.
+
+    This is in line with examples in Rails docs and puts the code in line with the intention -
+    the potential use of strings or symbols.
+
+    It is recommended to cast the attribute input to your desired type as if you you are overriding that methid.
+
+    *Martin Larochelle*
+
 *   Add `ActiveModel::Errors#of_kind?`.
 
     *bogdanvlviv*, *Rafael Mendonça França*

data/lib/active_model/gem_version.rb

@@ -9,8 +9,8 @@ module ActiveModel
   module VERSION
     MAJOR = 6
     MINOR = 0
-    TINY  = 0
-    PRE   = "rc2"
+    TINY  = 1
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/active_model/validations/acceptance.rb

@@ -17,7 +17,8 @@ module ActiveModel
       private
 
         def setup!(klass)
-          klass.include(LazilyDefineAttributes.new(AttributeDefinition.new(attributes)))
+          define_attributes = LazilyDefineAttributes.new(attributes)
+          klass.include(define_attributes) unless klass.included_modules.include?(define_attributes)
         end
 
         def acceptable_option?(value)
@@ -25,46 +26,50 @@ module ActiveModel
         end
 
         class LazilyDefineAttributes < Module
-          def initialize(attribute_definition)
+          def initialize(attributes)
+            @attributes = attributes.map(&:to_s)
+          end
+
+          def included(klass)
+            mod = self
+
             define_method(:respond_to_missing?) do |method_name, include_private = false|
-              super(method_name, include_private) || attribute_definition.matches?(method_name)
+              mod.define_on(klass)
+              super(method_name, include_private) || mod.matches?(method_name)
             end
 
             define_method(:method_missing) do |method_name, *args, &block|
-              if attribute_definition.matches?(method_name)
-                attribute_definition.define_on(self.class)
+              mod.define_on(klass)
+              if mod.matches?(method_name)
                 send(method_name, *args, &block)
               else
                 super(method_name, *args, &block)
               end
             end
           end
-        end
-
-        class AttributeDefinition
-          def initialize(attributes)
-            @attributes = attributes.map(&:to_s)
-          end
 
           def matches?(method_name)
-            attr_name = convert_to_reader_name(method_name)
-            attributes.include?(attr_name)
+            attr_name = method_name.to_s.chomp("=")
+            attributes.any? { |name| name == attr_name }
           end
 
           def define_on(klass)
+            remove_method :respond_to_missing?
+            remove_method :method_missing
+
             attr_readers = attributes.reject { |name| klass.attribute_method?(name) }
             attr_writers = attributes.reject { |name| klass.attribute_method?("#{name}=") }
-            klass.define_attribute_methods
-            klass.attr_reader(*attr_readers)
-            klass.attr_writer(*attr_writers)
+
+            attr_reader(*attr_readers)
+            attr_writer(*attr_writers)
           end
 
-          private
-            attr_reader :attributes
+          def ==(other)
+            self.class == other.class && attributes == other.attributes
+          end
 
-            def convert_to_reader_name(method_name)
-              method_name.to_s.chomp("=")
-            end
+          protected
+            attr_reader :attributes
         end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activemodel
 version: !ruby/object:Gem::Version
-  version: 6.0.0.rc2
+  version: 6.0.1.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-22 00:00:00.000000000 Z
+date: 2019-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc2
+        version: 6.0.1.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc2
+        version: 6.0.1.rc1
 description: A toolkit for building modeling frameworks like Active Record. Rich support
   for attributes, callbacks, validations, serialization, internationalization, and
   testing.
@@ -101,8 +101,11 @@ homepage: https://rubyonrails.org
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/rails/rails/tree/v6.0.0.rc2/activemodel
-  changelog_uri: https://github.com/rails/rails/blob/v6.0.0.rc2/activemodel/CHANGELOG.md
+  bug_tracker_uri: https://github.com/rails/rails/issues
+  changelog_uri: https://github.com/rails/rails/blob/v6.0.1.rc1/activemodel/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v6.0.1.rc1/
+  mailing_list_uri: https://groups.google.com/forum/#!forum/rubyonrails-talk
+  source_code_uri: https://github.com/rails/rails/tree/v6.0.1.rc1/activemodel
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -118,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A toolkit for building modeling frameworks (part of Rails).