reform 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23a355251cb556bceba19de085db87c09ad464b1
-  data.tar.gz: 6bb5c660b9a1192d869003d4f5cbfa60f30b5cb5
+  metadata.gz: 27711bf7172cfebfc6c1d62d3fd0d0c2cf30ca9b
+  data.tar.gz: 32a1f9984118720c0f5672fa05234399ce5de3a5
 SHA512:
-  metadata.gz: 4c9e1b8d28f8b696f78fb076e2897ba00a0a2becc2f2be97abe60d508bc7cf7dfcb2989230699e5b8af7d1112e0851536e3ffc3e2424323b9a5f41ab62d8d0c7
-  data.tar.gz: efa2c7b4482fa007dbc9a7a18b8d1c905c650afcd6b9b4bc03e1569c291aa345e28e6843868ea0bdd74b6e023555d973f34c653247ff4a0e540a5005e8a011bc
+  metadata.gz: f5919186056ee49ad7ed00f00257e2c6e3dcaa18f7f0e4df7c2218b42f7365fd958dcd541b32987e6423cfc275d2a62fcd983dab98236c81643154e3f27c5bd5
+  data.tar.gz: a874aa0a645f17c46ba95aa0f379af4a00f9857bba184a88a5f82c57b3a2343ff6c07c69137ed75553452cf0038b726b858dd9ff72513ba109722ee4f4e07d69

data/CHANGES.md

@@ -1,7 +1,14 @@
+## 2.0.3
+
+* `Form#valid?` is private now. Sorry for the inconvenience, but this has never been documented as public. Reason is that the only entry point for validation is `#validate` to give the form as less public API as possible and minimize misunderstandings.
+
+    The idea is that you set up the object graph before/while `#validate` and then invoke the validators once.
+* Fixed AM to find proper i18n for error messages. This happens by injecting the form's `model_name` into the `Validator` object in ActiveModel.
+
 ## 2.0.2
 
 * Fix `unique: true` validation in combination with `Composition`.
-* Use newest Disposable 0.1.8 which does not set `:pass_options` anymore.
+* Use newest Disposable 0.1.9 which does not set `:pass_options` anymore.
 
 ## 2.0.1
 

data/README.md

@@ -16,6 +16,13 @@ Temporary note: This is the README and API for Reform 2. On the public API, only
 
 Every form in Reform is a _twin_. Twins are non-persistent domain objects from the [Disposable gem](https://github.com/apotonick/disposable). All features of Disposable, like renaming fields, change tracking, etc. are available in Reform, too.
 
+<!--
+## ActiveModel
+
+**WARNING: Reform will soon drop support for ActiveModel validations.**
+
+This is mostly to save my mental integrity. The amount of problems we have in Reform with ActiveModel's poor object design, its lack of interfaces and encapsulation do outweigh the benefits. Please consider using Lotus::Validations instead, which will soon be mature enough to replace this dinosaur.
+-->
 
 ## Defining Forms
 

data/lib/reform/form/active_model.rb

@@ -61,8 +61,13 @@ module Reform::Form::ActiveModel
         form_name = model_options.first.to_s.camelize
         namespace = model_options.last[:namespace].present? ? model_options.last[:namespace].to_s.camelize.constantize : nil
       else
-        form_name = name.sub(/(::)?Form$/, "") # Song::Form => "Song"
-        namespace = nil
+        if name
+          form_name = name.sub(/(::)?Form$/, "") # Song::Form => "Song"
+          namespace = nil
+        else # anonymous forms. let's drop AM and forget about all this.
+          form_name = "reform"
+          namespace = nil
+        end
       end
 
       active_model_name_for(form_name, namespace)

data/lib/reform/form/active_model/validations.rb

@@ -44,32 +44,41 @@ module Reform::Form::ActiveModel
     # on instance, it exposes #valid?.
     class Validator
       # current i18n scope: :activemodel.
-
       include ActiveModel::Validations
-      # extend ActiveModel::Naming
 
-      def initialize(form)
-        @form = form
-      end
+      class << self
+        def model_name
+          @_active_model_sucks || ActiveModel::Name.new(Reform::Form, nil, "Reform::Form")
+        end
 
-      def method_missing(method_name, *args, &block)
-        @form.send(method_name, *args, &block)
+        def model_name=(name)
+          @_active_model_sucks = name
+        end
+
+        def clone
+          Class.new(self)
+        end
       end
 
-      def self.model_name
-        ActiveModel::Name.new(Reform::Form)
+      def initialize(form, name)
+        @form = form
+        self.class.model_name = name # one of the many reasons why i will drop support for AM::V in 2.1.
       end
-      # we can also do self.name and return "reform/form" but then run into "wrong constant name reform/form" from the autoloader. wtf?
 
-      def self.clone
-        Class.new(self)
+      def method_missing(method_name, *args, &block)
+        @form.send(method_name, *args, &block)
       end
     end
 
+    private
+
     # Needs to be implemented by every validation backend and implements the
     # actual validation. See Reform::Form::Lotus, too!
     def valid?
-      validator = self.class.validator.new(self)
+      # we always pass the model_name into the validator now, so AM:V can do its magic. problem is that
+      # AM does validator.class.model_name so we have to hack the dynamic model name into the
+      # Validator class.
+      validator = self.class.validator.new(self, model_name)
       validator.valid? # run the Validations object's validator with the form as context. this won't pollute anything in the form.
 
 
@@ -81,4 +90,4 @@ module Reform::Form::ActiveModel
       errors.empty?
     end
   end
-end
+end

data/lib/reform/form/lotus.rb

@@ -42,14 +42,15 @@ module Reform::Form::Lotus
     end
   end
 
+  def build_errors
+    Errors.new
+  end
+
+  private
 
   def valid?
     # DISCUSS: by using @fields here, we avoid setters being called. win!
     validator = Lotus::Validations::Validator.new(self.class.validations, @fields, errors)
     validator.validate
   end
-
-  def build_errors
-    Errors.new
-  end
-end
+end

data/lib/reform/version.rb

@@ -1,3 +1,3 @@
 module Reform
-  VERSION = "2.0.2"
+  VERSION = "2.0.3"
 end

data/test/active_model_custom_validation_translations_test.rb

@@ -3,45 +3,73 @@ require 'test_helper'
 class ActiveModelCustomValidationTranslationsTest < MiniTest::Spec
   module SongForm
     class WithBlock < Reform::Form
+      model :song
       property :title
 
       validate do
         errors.add :title, :blank
+        errors.add :title, :custom_error_message
       end
     end
 
     class WithLambda < Reform::Form
+      model :song
       property :title
 
-      validate ->{ errors.add :title, :blank }
+      validate ->{ errors.add :title, :blank
+                   errors.add :title, :custom_error_message }
     end
 
     class WithMethod < Reform::Form
+      model :song
       property :title
 
       validate :custom_validation_method
       def custom_validation_method
         errors.add :title, :blank
+        errors.add :title, :custom_error_message
       end
     end
   end
 
 
-  it 'translates the error message when custom validation is used with block' do
-    form = SongForm::WithBlock.new(Song.new)
-    form.validate({})
-    form.errors[:title].must_include "can't be blank"
-  end
+  describe 'when using a default translation' do
+    it 'translates the error message when custom validation is used with block' do
+      form = SongForm::WithBlock.new(Song.new)
+      form.validate({})
+      form.errors[:title].must_include "can't be blank"
+    end
 
-  it 'translates the error message when custom validation is used with lambda' do
-    form = SongForm::WithLambda.new(Song.new)
-    form.validate({})
-    form.errors[:title].must_include "can't be blank"
+    it 'translates the error message when custom validation is used with lambda' do
+      form = SongForm::WithLambda.new(Song.new)
+      form.validate({})
+      form.errors[:title].must_include "can't be blank"
+    end
+
+    it 'translates the error message when custom validation is used with method' do
+      form = SongForm::WithMethod.new(Song.new)
+      form.validate({})
+      form.errors[:title].must_include "can't be blank"
+    end
   end
 
-  it 'translates the error message when custom validation is used with method' do
-    form = SongForm::WithMethod.new(Song.new)
-    form.validate({})
-    form.errors[:title].must_include "can't be blank"
+  describe 'when using a custom translation' do
+    it 'translates the error message when custom validation is used with block' do
+      form = SongForm::WithBlock.new(Song.new)
+      form.validate({})
+      form.errors[:title].must_include "Custom Error Message"
+    end
+
+    it 'translates the error message when custom validation is used with lambda' do
+      form = SongForm::WithLambda.new(Song.new)
+      form.validate({})
+      form.errors[:title].must_include "Custom Error Message"
+    end
+
+    it 'translates the error message when custom validation is used with method' do
+      form = SongForm::WithMethod.new(Song.new)
+      form.validate({})
+      form.errors[:title].must_include "Custom Error Message"
+    end
   end
 end

data/test/dummy/config/locales/en.yml

@@ -1,205 +1,11 @@
 ---
 en:
-  date:
-    abbr_day_names:
-    - Sun
-    - Mon
-    - Tue
-    - Wed
-    - Thu
-    - Fri
-    - Sat
-    abbr_month_names:
-    - 
-    - Jan
-    - Feb
-    - Mar
-    - Apr
-    - May
-    - Jun
-    - Jul
-    - Aug
-    - Sep
-    - Oct
-    - Nov
-    - Dec
-    day_names:
-    - Sunday
-    - Monday
-    - Tuesday
-    - Wednesday
-    - Thursday
-    - Friday
-    - Saturday
-    formats:
-      default: "%Y-%m-%d"
-      long: "%B %d, %Y"
-      short: "%b %d"
-    month_names:
-    - 
-    - January
-    - February
-    - March
-    - April
-    - May
-    - June
-    - July
-    - August
-    - September
-    - October
-    - November
-    - December
-    order:
-    - :year
-    - :month
-    - :day
-  datetime:
-    distance_in_words:
-      about_x_hours:
-        one: about 1 hour
-        other: about %{count} hours
-      about_x_months:
-        one: about 1 month
-        other: about %{count} months
-      about_x_years:
-        one: about 1 year
-        other: about %{count} years
-      almost_x_years:
-        one: almost 1 year
-        other: almost %{count} years
-      half_a_minute: half a minute
-      less_than_x_minutes:
-        one: less than a minute
-        other: less than %{count} minutes
-      less_than_x_seconds:
-        one: less than 1 second
-        other: less than %{count} seconds
-      over_x_years:
-        one: over 1 year
-        other: over %{count} years
-      x_days:
-        one: 1 day
-        other: "%{count} days"
-      x_minutes:
-        one: 1 minute
-        other: "%{count} minutes"
-      x_months:
-        one: 1 month
-        other: "%{count} months"
-      x_seconds:
-        one: 1 second
-        other: "%{count} seconds"
-    prompts:
-      day: Day
-      hour: Hour
-      minute: Minute
-      month: Month
-      second: Seconds
-      year: Year
-  errors:
-    format: "%{attribute} %{message}"
-    messages:
-      accepted: must be accepted
-      blank: can't be blank
-      present: must be blank
-      confirmation: doesn't match %{attribute}
-      empty: can't be empty
-      equal_to: must be equal to %{count}
-      even: must be even
-      exclusion: is reserved
-      greater_than: must be greater than %{count}
-      greater_than_or_equal_to: must be greater than or equal to %{count}
-      inclusion: is not included in the list
-      invalid: is invalid
-      less_than: must be less than %{count}
-      less_than_or_equal_to: must be less than or equal to %{count}
-      not_a_number: is not a number
-      not_an_integer: must be an integer
-      odd: must be odd
-      record_invalid: 'Validation failed: %{errors}'
-      restrict_dependent_destroy:
-        one: Cannot delete record because a dependent %{record} exists
-        many: Cannot delete record because dependent %{record} exist
-      taken: has already been taken
-      too_long:
-        one: is too long (maximum is 1 character)
-        other: is too long (maximum is %{count} characters)
-      too_short:
-        one: is too short (minimum is 1 character)
-        other: is too short (minimum is %{count} characters)
-      wrong_length:
-        one: is the wrong length (should be 1 character)
-        other: is the wrong length (should be %{count} characters)
-      other_than: must be other than %{count}
-    template:
-      body: 'There were problems with the following fields:'
-      header:
-        one: 1 error prohibited this %{model} from being saved
-        other: "%{count} errors prohibited this %{model} from being saved"
-  helpers:
-    select:
-      prompt: Please select
-    submit:
-      create: Create %{model}
-      submit: Save %{model}
-      update: Update %{model}
-  number:
-    currency:
-      format:
-        delimiter: ","
-        format: "%u%n"
-        precision: 2
-        separator: "."
-        significant: false
-        strip_insignificant_zeros: false
-        unit: "$"
-    format:
-      delimiter: ","
-      precision: 3
-      separator: "."
-      significant: false
-      strip_insignificant_zeros: false
-    human:
-      decimal_units:
-        format: "%n %u"
-        units:
-          billion: Billion
-          million: Million
-          quadrillion: Quadrillion
-          thousand: Thousand
-          trillion: Trillion
-          unit: ''
-      format:
-        delimiter: ''
-        precision: 3
-        significant: true
-        strip_insignificant_zeros: true
-      storage_units:
-        format: "%n %u"
-        units:
-          byte:
-            one: Byte
-            other: Bytes
-          gb: GB
-          kb: KB
-          mb: MB
-          tb: TB
-    percentage:
-      format:
-        delimiter: ''
-        format: "%n%"
-    precision:
-      format:
-        delimiter: ''
-  support:
-    array:
-      last_word_connector: ", and "
-      two_words_connector: " and "
-      words_connector: ", "
-  time:
-    am: am
-    formats:
-      default: "%a, %d %b %Y %H:%M:%S %z"
-      long: "%B %d, %Y %H:%M"
-      short: "%d %b %H:%M"
-    pm: pm
+  # custom validation error messages
+
+  activemodel:
+    errors:
+      models:
+        song:
+          attributes:
+            title:
+              custom_error_message: Custom Error Message

data/test/test_helper.rb

@@ -75,3 +75,6 @@ require "reform/form/active_model/validations"
 Reform::Contract.class_eval do
   include Reform::Form::ActiveModel::Validations
 end
+
+I18n.load_path << Dir['test/dummy/config/locales/*.yml']
+I18n.backend.load_translations

data/test/validate_test.rb

@@ -132,6 +132,15 @@ class ValidateWithoutConfigurationTest < MiniTest::Spec
     form.songs[1].composer.name.must_equal "SNFU"
     form.artist.name.must_equal "The Police"
   end
+
+  # throws exception when no populators.
+  it do
+    album = Album.new("The Dissent Of Man", [])
+
+    assert_raises RuntimeError do
+      AlbumForm.new(album).validate(songs: {title: "Resist-Stance"})
+    end
+  end
 end
 
 class ValidateWithDeserializerOptionTest < MiniTest::Spec

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reform
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Nick Sutterer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-21 00:00:00.000000000 Z
+date: 2015-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: disposable