on_form 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d7dd5ed97fb50b463cd137f4e37cd54a6b5039f
-  data.tar.gz: cf2be44d209f36980cb248e89498060ae50374a8
+  metadata.gz: 820b56db21bed598a2c4c4fbef8aa5c33cabc693
+  data.tar.gz: 7cd239b39707c8fefa12ba3acec8c2cbe3d733b4
 SHA512:
-  metadata.gz: c967c12d103f110b2932b03e06b4c8e708e1623abc970270c0dc4fdd2f33ccab5936ecccc440e0b8b4922cdac099258eb37b735bd068cef5727c7b62ea2108f1
-  data.tar.gz: b26ae23736314ecfa179e4c380fa4d8e91ea7a09cd18ccd6fae5c9b9c64778225698b040e7bfbe41f67027cfcb90d2176b6f6bc1e0299373c441cc7eb1857756
+  metadata.gz: 897e50e32ef49cf93fea57d5487c750b8c3ed8e65d8610dce0ffb657f6171697b329bfc7125175883223e529bb857442fc5381d34c4ad08f8568721d0194ad5d
+  data.tar.gz: eefe006c8c937acad840b960076233592eed058c4265ca5aaa8e86aa0176a047c4b57d3b962b9aa0d9368431d687a1fbec8a67a322afce90cd273f44787b23e9

data/CHANGES.md

@@ -1,10 +1,15 @@
 Changelog
 =========
 
+2.01
+----
+* Fix regressions in support for Rails 4.2.
+* Support some additional attribute methods such as `*_was` and `*_changed?`.
+
 2.00
 ----
-* New expose syntax to support prefix:, suffix:, and as: options
+* New expose syntax to support prefix:, suffix:, and as: options.
 
 1.00
 ----
-* First public release
+* First public release.

data/lib/on_form/attributes.rb

@@ -54,9 +54,11 @@ module OnForm
       self.class.exposed_attributes.keys.collect { |backing_model_name| backing_model_instance(backing_model_name) }
     end
 
-    def backing_model_for_attribute(exposed_name)
+    def backing_for_attribute(exposed_name)
       self.class.exposed_attributes.each do |backing_model_name, attribute_mappings|
-        return backing_model_instance(backing_model_name) if attribute_mappings[exposed_name.to_sym]
+        if backing_name = attribute_mappings[exposed_name.to_sym]
+          return [backing_model_instance(backing_model_name), backing_name]
+        end
       end
       nil
     end

data/lib/on_form/form.rb

@@ -40,6 +40,8 @@ module OnForm
       define_method(exposed_name)                       { backing_model_instance(backing_model_name).send(backing_name) }
       define_method("#{exposed_name}_before_type_cast") { backing_model_instance(backing_model_name).send("#{backing_name}_before_type_cast") }
       define_method("#{exposed_name}?")                 { backing_model_instance(backing_model_name).send("#{backing_name}?") }
+      define_method("#{exposed_name}_changed?")         { backing_model_instance(backing_model_name).send("#{backing_name}_changed?") }
+      define_method("#{exposed_name}_was")              { backing_model_instance(backing_model_name).send("#{backing_name}_was") }
       define_method("#{exposed_name}=")                 { |arg| backing_model_instance(backing_model_name).send("#{backing_name}=", arg) }
     end
   end

data/lib/on_form/{multiparameter_attributes.rb → rails_compat.rb}

@@ -1,6 +1,7 @@
-# unlike the rest of this library, which is new code, the code in this source file is from ActiveRecord, and
-# is used to provide compatibility wrappers with different versions of ActiveRecord.  please keep it separate
-# so we can see where everything came from and what may need to be kept in sync with ActiveRecord refactors.
+# unlike the rest of this library, which is new code, the code in this source file is from Rails, and is used to
+# provide compatibility wrappers with different versions of ActiveRecord/ActiveModel.  please keep it separate so
+# we can see where everything came from, and what may need to be kept in sync with refactors in those libraries.
+
 module OnForm
   module MultiparameterAttributes
     # Instantiates objects for all attribute classes that needs more than one constructor parameter. This is done
@@ -22,7 +23,8 @@ module OnForm
           if defined?(ActiveRecord::AttributeAssignment::MultiparameterAttribute)
             # ActiveRecord 4.2 and below: you must use MultiparameterAttribute to construct the attribute value.
             # we therefore have to look up which model the attribute actually lives on.
-            send("#{name}=", ActiveRecord::AttributeAssignment::MultiparameterAttribute.new(backing_model_for_attribute(name), name, values_with_empty_parameters).read_value)
+            backing_model, backing_name = backing_for_attribute(name)
+            send("#{name}=", ActiveRecord::AttributeAssignment::MultiparameterAttribute.new(backing_model, backing_name.to_s, values_with_empty_parameters).read_value)
           else
             # ActiveRecord 5.0+: you can assign the indexed hash to the column and it will construct the value for you.
             if values_with_empty_parameters.each_value.all?(&:nil?)
@@ -65,3 +67,20 @@ module OnForm
     end
   end
 end
+
+
+require 'active_model/validations'
+
+unless ActiveModel.const_defined?(:ValidationError)
+  module ActiveModel
+    class ValidationError < StandardError
+      attr_reader :model
+
+      def initialize(model)
+        @model = model
+        errors = @model.errors.full_messages.join(", ")
+        super(I18n.t(:"#{@model.class.i18n_scope}.errors.messages.model_invalid", errors: errors, default: :"errors.messages.model_invalid"))
+      end
+    end
+  end
+end

data/lib/on_form/version.rb

@@ -1,3 +1,3 @@
 module OnForm
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/lib/on_form.rb

@@ -1,8 +1,8 @@
 require "active_model"
 require "active_record"
 require "on_form/version"
+require "on_form/rails_compat"
 require "on_form/attributes"
-require "on_form/multiparameter_attributes"
 require "on_form/errors"
 require "on_form/saving"
 require "on_form/form"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: on_form
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Will Bryant
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-26 00:00:00.000000000 Z
+date: 2016-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -100,7 +100,7 @@ files:
 - lib/on_form/attributes.rb
 - lib/on_form/errors.rb
 - lib/on_form/form.rb
-- lib/on_form/multiparameter_attributes.rb
+- lib/on_form/rails_compat.rb
 - lib/on_form/saving.rb
 - lib/on_form/version.rb
 - on_form.gemspec