reform 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 247ffc53838f5e69a71f4ab5d066572b05308003
-  data.tar.gz: f6162c6a018e02ad2f9c487441dcea08623b960a
+  metadata.gz: 037b79d11746474c6c396824536f8bd567e59879
+  data.tar.gz: 4d448833f2cde88977600d0e9cc85686550eeda8
 SHA512:
-  metadata.gz: 31ee6b2d4656b94ced0c7790832e8b6be84ea2b8218866c5cb9e75c6b3099710e9e2a52a24cd54b9c40ba0ead9a9712e7e961ac4b463f48bb34131b305c22246
-  data.tar.gz: d8954f5806cdbbd701b4e8352d930f2b1bd3aef5a36d5621ef154a0132e6e46481137b5f1d9208932a0377805f81cac75ee066885cf73b2ea4778957e8c1192b
+  metadata.gz: a40d0cde85b16d5b4f4fbfa06cde1549e961044986abda2a95cb0abc2a22224a8b0b7dd88a7e80706b9b78b1932056d0091d4c858f7d3e67b523ced40bdd1285
+  data.tar.gz: bc964b5838dabcaac8b47db139a6a6b86c624b133297af97489d6dd1f465bb375cb47c9186c52832ad4ebea03227095f0947629edfc3678090fd471e2e06ff66

data/CHANGES.md

@@ -1,3 +1,7 @@
+## 2.0.1
+
+* Fix `ActiveModel::Validations` where translations in custom validations would error. This is now handled by delegating back to the `Valiator` object in Reform.
+
 ## 2.0.0
 
 * The `::reform_2_0!` is no longer there. Guess why.

data/README.md

@@ -113,8 +113,12 @@ It's then up to you what to do with the updated models - they're still unsaved.
 The easiest way to save the data is to call `#save` on the form.
 
 ```ruby
-    @form.save  #=> populates album with incoming data
-                #   by calling @form.album.title=.
+if @form.validate(params[:song])
+  @form.save  #=> populates album with incoming data
+              #   by calling @form.album.title=.
+else
+  # handle validation errors.
+end
 ```
 
 This will sync the data to the model and then call `album.save`.

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

@@ -5,13 +5,16 @@ require "uber/delegates"
 module Reform::Form::ActiveModel
   # AM::Validations for your form.
   #
-  # Note: The preferred way for validations should be Lotus::Validations, as ActiveModel::Validation's implementation is
-  # old, very complex given that it needs to do a simple thing, and it's using globals like @errors.
+  # Note: The preferred way for validations should be Lotus::Validations, as ActiveModel::Validation's
+  # implementation is old, very complex given that it needs to do a simple thing, is using
+  # globals like @errors, and relies and more than 100 methods to be mixed into your form.
   #
   # Implements ::validates and friends, and #valid?.
+  #
   module Validations
     def self.included(includer)
       includer.instance_eval do
+        include Reform::Form::ActiveModel
         extend Uber::InheritableAttr
         inheritable_attr :validator
         self.validator = Class.new(Validator)
@@ -19,6 +22,9 @@ module Reform::Form::ActiveModel
         class << self
           extend Uber::Delegates
           delegates :validator, :validates, :validate, :validates_with, :validate_with
+
+          # Hooray! Delegate translation back to Reform's Validator class which contains AM::Validations.
+          delegates :validator, :human_attribute_name, :lookup_ancestors, :i18n_scope # Rails 3.1.
         end
       end
     end
@@ -27,6 +33,12 @@ module Reform::Form::ActiveModel
       Reform::Contract::Errors.new(self)
     end
 
+    # The concept of "composition" has still not arrived in Rails core and they rely on 400 methods being
+    # available in one object. This is why we need to provide parts of the I18N API in the form.
+    def read_attribute_for_validation(name)
+      send(name)
+    end
+
 
     # Validators is the validatable object. On the class level, we define validations,
     # on instance, it exposes #valid?.
@@ -44,9 +56,6 @@ module Reform::Form::ActiveModel
         @form.send(method_name, *args, &block)
       end
 
-      # def self.model_name # FIXME: this is only needed for i18n, it seems.
-      #   "Reform::Form"
-      # end
       def self.model_name
         ActiveModel::Name.new(Reform::Form)
       end
@@ -57,7 +66,8 @@ module Reform::Form::ActiveModel
       end
     end
 
-
+    # 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)
       validator.valid? # run the Validations object's validator with the form as context. this won't pollute anything in the form.

data/lib/reform/mongoid.rb

@@ -1,4 +1,4 @@
 require 'reform/form/active_model'
 require 'reform/form/orm'
 require 'reform/form/mongoid'
-require 'reform/form/model_reflections' # only load this in AR context as simple_form currently is bound to AR.
+require 'reform/form/active_model/model_reflections' # only load this in AR context as simple_form currently is bound to AR.

data/lib/reform/version.rb

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

data/test/active_model_custom_validation_translations_test.rb

@@ -0,0 +1,47 @@
+require 'test_helper'
+
+class ActiveModelCustomValidationTranslationsTest < MiniTest::Spec
+  module SongForm
+    class WithBlock < Reform::Form
+      property :title
+
+      validate do
+        errors.add :title, :blank
+      end
+    end
+
+    class WithLambda < Reform::Form
+      property :title
+
+      validate ->{ errors.add :title, :blank }
+    end
+
+    class WithMethod < Reform::Form
+      property :title
+
+      validate :custom_validation_method
+      def custom_validation_method
+        errors.add :title, :blank
+      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
+
+  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

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

@@ -1,5 +1,205 @@
-# Sample localization file for English. Add more files in this directory for other locales.
-# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
-
+---
 en:
-  hello: "Hello world"
+  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

data/test/mongoid_test.rb

@@ -1,311 +1,313 @@
-# require 'test_helper'
-# def mongoid_present?
-#   require 'mongoid'
-#   Mongoid.configure do |config|
-#     config.connect_to("reform-mongoid-test")
-#   end
-#   true
-# rescue
-#   false
-# end
-
-# if mongoid_present?
-#   require 'reform/mongoid'
-
-#   class Disc
-#     include Mongoid::Document
-#     field :title, type: String
-#     has_many :tunes
-#     has_and_belongs_to_many :musicians
-#   end
-
-#   class Musician
-#     include Mongoid::Document
-#     field :name, type: String
-#   end
-
-#   class Tune
-#     include Mongoid::Document
-#     include Mongoid::Timestamps
-#     field :title, type: String
-#     belongs_to :disc
-#     belongs_to :musician
-#   end
-
-#   class MongoidTest < MiniTest::Spec
-#     class TuneForm < Reform::Form
-#       include Reform::Form::Mongoid
-#       model :tune
-
-#       property :title
-#       property :created_at
-
-#       validates_uniqueness_of :title, scope: [:disc_id, :musician_id]
-#       validates :created_at, :presence => true # have another property to test if we mix up.
-
-#       property :musician do
-#         property :name
-#         validates_uniqueness_of :name # this currently also tests if Form::AR is included as a feature.
-#       end
-#     end
-
-#     let(:disc)   { Disc.create(:title => "Damnation") }
-#     let(:musician)  { Musician.create(:name => "Opeth") }
-#     let(:form)    { TuneForm.new(Tune.new(:musician => Musician.new)) }
-
-#     it { form.class.i18n_scope.must_equal :mongoid }
-
-#     it "allows accessing the database" do
-#     end
-
-#     # uniqueness
-#     it "has no errors on title when title is unique for the same musician and disc" do
-#       form.validate("title" => "The Gargoyle", "musician_id" => musician.id, "disc" => disc.id, "created_at" => "November 6, 1966")
-#       assert_empty form.errors[:title]
-#     end
-
-#     it "has errors on title when title is taken for the same musician and disc" do
-#       skip "replace ActiveModel::Validations with our own, working and reusable gem."
-#       Tune.create(title: "Windowpane", musician_id: musician.id, disc_id: disc.id)
-#       form.validate("title" => "Windowpane", "musician_id" => musician.id, "disc" => disc)
-#       refute_empty form.errors[:title]
-#     end
-
-#     # nested object taken.
-#     it "is valid when musician name is unique" do
-#       form.validate("musician" => {"name" => "Paul Gilbert"}, "title" => "The Gargoyle", "created_at" => "November 6, 1966").must_equal true
-#     end
-
-#     it "is invalid and shows error when taken" do
-#       Tune.delete_all
-#       Musician.create(:name => "Racer X")
-
-#       form.validate("musician" => {"name" => "Racer X"}, "title" => "Ghost Inside My Skin").must_equal false
-#       form.errors.messages.must_equal({:"musician.name"=>["is already taken"], :created_at => ["can't be blank"]})
-#     end
-
-#     it "works with Composition" do
-#       form = Class.new(Reform::Form) do
-#         include Reform::Form::Mongoid
-#         include Reform::Form::Composition
-
-#         property :name, :on => :musician
-#         validates_uniqueness_of :name
-#       end.new(:musician => Musician.new)
-
-#       Musician.create(:name => "Bad Religion")
-#       form.validate("name" => "Bad Religion").must_equal false
-#     end
-
-#     describe "#save" do
-#       # TODO: test 1-n?
-#       it "calls model.save" do
-#         Musician.delete_all
-#         form.validate("musician" => {"name" => "Bad Religion"}, "title" => "Ghost Inside My Skin")
-#         form.save
-#         Musician.where(:name => "Bad Religion").size.must_equal 1
-#       end
-
-#       it "doesn't call model.save when block is given" do
-#         Musician.delete_all
-#         form.validate("name" => "Bad Religion")
-#         form.save {}
-#         Musician.where(:name => "Bad Religion").size.must_equal 0
-#       end
-#     end
-#   end
+require 'test_helper'
+def mongoid_present?
+  require 'mongoid'
+  Mongoid.configure do |config|
+    config.connect_to("reform-mongoid-test")
+  end
+  true
+rescue
+  false
+end
+
+if mongoid_present?
+  require 'reform/mongoid'
+
+  class Disc
+    include Mongoid::Document
+    field :title, type: String
+    has_many :tunes
+    has_and_belongs_to_many :musicians
+  end
+
+  class Musician
+    include Mongoid::Document
+    field :name, type: String
+  end
+
+  class Tune
+    include Mongoid::Document
+    include Mongoid::Timestamps
+    field :title, type: String
+    belongs_to :disc
+    belongs_to :musician
+  end
+
+  class MongoidTest < MiniTest::Spec
+    class TuneForm < Reform::Form
+      include Reform::Form::Mongoid
+      model :tune
+
+      property :title
+      property :created_at
+
+      validates_uniqueness_of :title, scope: [:disc_id, :musician_id]
+      validates :created_at, :presence => true # have another property to test if we mix up.
+
+      property :musician do
+        property :name
+        validates_uniqueness_of :name # this currently also tests if Form::AR is included as a feature.
+      end
+    end
+
+    let(:disc)   { Disc.create(:title => "Damnation") }
+    let(:musician)  { Musician.create(:name => "Opeth") }
+    let(:form)    { TuneForm.new(Tune.new(:musician => Musician.new)) }
+
+    it { form.class.i18n_scope.must_equal :mongoid }
+
+    it "allows accessing the database" do
+    end
+
+    # uniqueness
+    it "has no errors on title when title is unique for the same musician and disc" do
+      form.validate("title" => "The Gargoyle", "musician_id" => musician.id, "disc" => disc.id, "created_at" => "November 6, 1966")
+      assert_empty form.errors[:title]
+    end
+
+    it "has errors on title when title is taken for the same musician and disc" do
+      skip "replace ActiveModel::Validations with our own, working and reusable gem."
+      Tune.create(title: "Windowpane", musician_id: musician.id, disc_id: disc.id)
+      form.validate("title" => "Windowpane", "musician_id" => musician.id, "disc" => disc)
+      refute_empty form.errors[:title]
+    end
+
+    # nested object taken.
+    it "is valid when musician name is unique" do
+      form.validate("musician" => {"name" => "Paul Gilbert"}, "title" => "The Gargoyle", "created_at" => "November 6, 1966").must_equal true
+    end
+
+    it "is invalid and shows error when taken" do
+      Tune.delete_all
+      Musician.create(:name => "Racer X")
+
+      form.validate("musician" => {"name" => "Racer X"}, "title" => "Ghost Inside My Skin").must_equal false
+      form.errors.messages.must_equal({:"musician.name"=>["is already taken"], :created_at => ["can't be blank"]})
+    end
+
+    it "works with Composition" do
+      form = Class.new(Reform::Form) do
+        include Reform::Form::Mongoid
+        include Reform::Form::Composition
+
+        property :name, :on => :musician
+        validates_uniqueness_of :name
+      end.new(:musician => Musician.new)
+
+      Musician.create(:name => "Bad Religion")
+      form.validate("name" => "Bad Religion").must_equal false
+    end
+
+    describe "#save" do
+      # TODO: test 1-n?
+      it "calls model.save" do
+        Musician.delete_all
+        form.validate("musician" => {"name" => "Bad Religion"}, "title" => "Ghost Inside My Skin")
+        form.save
+        Musician.where(:name => "Bad Religion").size.must_equal 1
+      end
+
+      it "doesn't call model.save when block is given" do
+        Musician.delete_all
+        form.validate("name" => "Bad Religion")
+        form.save {}
+        Musician.where(:name => "Bad Religion").size.must_equal 0
+      end
+    end
+  end
+
 
+  class PopulateWithActiveRecordTest < MiniTest::Spec
+    class DiscForm < Reform::Form
 
-#   class PopulateWithActiveRecordTest < MiniTest::Spec
-#     class DiscForm < Reform::Form
+      property :title
 
-#       property :title
+      collection :tunes, :populate_if_empty => Tune do
+        property :title
+      end
+    end
 
-#       collection :tunes, :populate_if_empty => Tune do
-#         property :title
-#       end
-#     end
+    let (:disc) { Disc.new(:tunes => []) }
+    it do
+      form = DiscForm.new(disc)
 
-#     let (:disc) { Disc.new(:tunes => []) }
-#     it do
-#       form = DiscForm.new(disc)
+      form.validate("tunes" => [{"title" => "Straight From The Jacket"}])
 
-#       form.validate("tunes" => [{"title" => "Straight From The Jacket"}])
+      # form populated.
+      form.tunes.size.must_equal 1
+      form.tunes[0].model.must_be_kind_of Tune
 
-#       # form populated.
-#       form.tunes.size.must_equal 1
-#       form.tunes[0].model.must_be_kind_of Tune
+      # model NOT populated.
+      disc.tunes.must_equal []
 
-#       # model NOT populated.
-#       disc.tunes.must_equal []
 
+      form.sync
 
-#       form.sync
+      # form populated.
+      form.tunes.size.must_equal 1
+      form.tunes[0].model.must_be_kind_of Tune
 
-#       # form populated.
-#       form.tunes.size.must_equal 1
-#       form.tunes[0].model.must_be_kind_of Tune
+      # model also populated.
+      tune = disc.tunes[0]
+      disc.tunes.must_equal [tune]
+      tune.title.must_equal "Straight From The Jacket"
 
-#       # model also populated.
-#       tune = disc.tunes[0]
-#       disc.tunes.must_equal [tune]
-#       tune.title.must_equal "Straight From The Jacket"
 
+      # if ActiveRecord::VERSION::STRING !~ /^3.0/
+      #   # saving saves association.
+      #   form.save
+      #
+      #   disc.reload
+      #   tune = disc.tunes[0]
+      #   disc.tunes.must_equal [tune]
+      #   tune.title.must_equal "Straight From The Jacket"
+      # end
+    end
 
-#       # if ActiveRecord::VERSION::STRING !~ /^3.0/
-#       #   # saving saves association.
-#       #   form.save
-#       #
-#       #   disc.reload
-#       #   tune = disc.tunes[0]
-#       #   disc.tunes.must_equal [tune]
-#       #   tune.title.must_equal "Straight From The Jacket"
-#       # end
-#     end
 
+    describe "modifying 1., adding 2." do
+      let (:tune) { Tune.new(:title => "Part 2") }
+      let (:disc) { Disc.create.tap { |a| a.tunes << tune } }
 
-#     describe "modifying 1., adding 2." do
-#       let (:tune) { Tune.new(:title => "Part 2") }
-#       let (:disc) { Disc.create.tap { |a| a.tunes << tune } }
+      it do
+        form = DiscForm.new(disc)
 
-#       it do
-#         form = DiscForm.new(disc)
+        id = disc.tunes[0].id
+        disc.tunes[0].persisted?.must_equal true
+        assert id.to_s.size > 0
 
-#         id = disc.tunes[0].id
-#         assert id > 0
+        form.validate("tunes" => [{"title" => "Part Two"}, {"title" => "Check For A Pulse"}])
 
-#         form.validate("tunes" => [{"title" => "Part Two"}, {"title" => "Check For A Pulse"}])
+        # form populated.
+        form.tunes.size.must_equal 2
+        form.tunes[0].model.must_be_kind_of Tune
+        form.tunes[1].model.must_be_kind_of Tune
 
-#         # form populated.
-#         form.tunes.size.must_equal 2
-#         form.tunes[0].model.must_be_kind_of Tune
-#         form.tunes[1].model.must_be_kind_of Tune
+        # model NOT populated.
+        disc.tunes.must_equal [tune]
 
-#         # model NOT populated.
-#         disc.tunes.must_equal [tune]
 
+        form.sync
 
-#         form.sync
+        # form populated.
+        form.tunes.size.must_equal 2
 
-#         # form populated.
-#         form.tunes.size.must_equal 2
+        # model also populated.
+        disc.tunes.size.must_equal 2
 
-#         # model also populated.
-#         disc.tunes.size.must_equal 2
+        # corrected title
+        disc.tunes[0].title.must_equal "Part Two"
+        # ..but same tune.
+        disc.tunes[0].id.must_equal id
 
-#         # corrected title
-#         disc.tunes[0].title.must_equal "Part Two"
-#         # ..but same tune.
-#         disc.tunes[0].id.must_equal id
+        # and a new tune.
+        disc.tunes[1].title.must_equal "Check For A Pulse"
+        disc.tunes[1].persisted?.must_equal true # TODO: with << strategy, this shouldn't be saved.
+      end
 
-#         # and a new tune.
-#         disc.tunes[1].title.must_equal "Check For A Pulse"
-#         disc.tunes[1].persisted?.must_equal true # TODO: with << strategy, this shouldn't be saved.
-#       end
+      describe 'using nested_models_attributes to modify nested collection' do
+        class ActiveModelDiscForm < Reform::Form
+          include Reform::Form::ActiveModel
+          include Reform::Form::ActiveModel::FormBuilderMethods
 
-#       describe 'using nested_models_attributes to modify nested collection' do
-#         class ActiveModelDiscForm < Reform::Form
-#           include Reform::Form::ActiveModel
-#           include Reform::Form::ActiveModel::FormBuilderMethods
+          property :title
 
-#           property :title
+          collection :tunes, :populate_if_empty => Tune do
+            property :title
+          end
+        end
 
-#           collection :tunes, :populate_if_empty => Tune do
-#             property :title
-#           end
-#         end
+        let (:disc) { Disc.create(:title => 'Greatest Hits') }
+        let (:form) { ActiveModelDiscForm.new(disc) }
 
-#         let (:disc) { Disc.create(:title => 'Greatest Hits') }
-#         let (:form) { ActiveModelDiscForm.new(disc) }
+        it do
+          form.validate('tunes_attributes' => {'0' => {'title' => 'Tango'}})
 
-#         it do
-#           form.validate('tunes_attributes' => {'0' => {'title' => 'Tango'}})
+          # form populated.
+          form.tunes.size.must_equal 1
+          form.tunes[0].model.must_be_kind_of Tune
+          form.tunes[0].title.must_equal 'Tango'
 
-#           # form populated.
-#           form.tunes.size.must_equal 1
-#           form.tunes[0].model.must_be_kind_of Tune
-#           form.tunes[0].title.must_equal 'Tango'
+          # model NOT populated.
+          disc.tunes.must_equal []
 
-#           # model NOT populated.
-#           disc.tunes.must_equal []
+          form.save
 
-#           form.save
+          # nested model persisted.
+          first_tune = disc.tunes[0]
+          first_tune.persisted?.must_equal true
+          assert first_tune.id.to_s.size > 0
 
-#           # nested model persisted.
-#           first_tune = disc.tunes[0]
-#           assert first_tune.id > 0
+          # form populated.
+          form.tunes.size.must_equal 1
 
-#           # form populated.
-#           form.tunes.size.must_equal 1
+          # model also populated.
+          disc.tunes.size.must_equal 1
+          disc.tunes[0].title.must_equal 'Tango'
 
-#           # model also populated.
-#           disc.tunes.size.must_equal 1
-#           disc.tunes[0].title.must_equal 'Tango'
+          form = ActiveModelDiscForm.new(disc)
+          form.validate('tunes_attributes' => {'0' => {'id' => first_tune.id, 'title' => 'Tango nuevo'}, '1' => {'title' => 'Waltz'}})
 
-#           form = ActiveModelDiscForm.new(disc)
-#           form.validate('tunes_attributes' => {'0' => {'id' => first_tune.id, 'title' => 'Tango nuevo'}, '1' => {'title' => 'Waltz'}})
+          # form populated.
+          form.tunes.size.must_equal 2
+          form.tunes[0].model.must_be_kind_of Tune
+          form.tunes[1].model.must_be_kind_of Tune
+          form.tunes[0].title.must_equal 'Tango nuevo'
+          form.tunes[1].title.must_equal 'Waltz'
 
-#           # form populated.
-#           form.tunes.size.must_equal 2
-#           form.tunes[0].model.must_be_kind_of Tune
-#           form.tunes[1].model.must_be_kind_of Tune
-#           form.tunes[0].title.must_equal 'Tango nuevo'
-#           form.tunes[1].title.must_equal 'Waltz'
+          # model NOT populated.
+          disc.tunes.size.must_equal 1
+          disc.tunes[0].title.must_equal 'Tango'
 
-#           # model NOT populated.
-#           disc.tunes.size.must_equal 1
-#           disc.tunes[0].title.must_equal 'Tango'
+          form.save
 
-#           form.save
+          # form populated.
+          form.tunes.size.must_equal 2
 
-#           # form populated.
-#           form.tunes.size.must_equal 2
+          # model also populated.
+          disc.tunes.size.must_equal 2
+          disc.tunes[0].id.must_equal first_tune.id
+          disc.tunes[0].persisted?.must_equal true
+          disc.tunes[1].persisted?.must_equal true
+          disc.tunes[0].title.must_equal 'Tango nuevo'
+          disc.tunes[1].title.must_equal 'Waltz'
+        end
+      end
+    end
 
-#           # model also populated.
-#           disc.tunes.size.must_equal 2
-#           disc.tunes[0].id.must_equal first_tune.id
-#           disc.tunes[0].persisted?.must_equal true
-#           disc.tunes[1].persisted?.must_equal true
-#           disc.tunes[0].title.must_equal 'Tango nuevo'
-#           disc.tunes[1].title.must_equal 'Waltz'
-#         end
-#       end
-#     end
+    # it do
+    #   a=Disc.new
+    #   a.tunes << Tune.new(title: "Old What's His Name") # Tune does not get persisted.
 
-#     # it do
-#     #   a=Disc.new
-#     #   a.tunes << Tune.new(title: "Old What's His Name") # Tune does not get persisted.
+    #   a.tunes[1] = Tune.new(title: "Permanent Rust")
 
-#     #   a.tunes[1] = Tune.new(title: "Permanent Rust")
+    #   puts "@@@"
+    #   puts a.tunes.inspect
 
-#     #   puts "@@@"
-#     #   puts a.tunes.inspect
+    #   puts "---"
+    #   a.save
+    #   puts a.tunes.inspect
 
-#     #   puts "---"
-#     #   a.save
-#     #   puts a.tunes.inspect
+    #   b = a.tunes.first
 
-#     #   b = a.tunes.first
+    #   a.tunes = [Tune.new(title:"Biomag")]
+    #   puts "\\\\"
+    #   a.save
+    #   a.reload
+    #   puts a.tunes.inspect
+
+    #   b.reload
+    #   puts "#{b.inspect}, #{b.persisted?}"
 
-#     #   a.tunes = [Tune.new(title:"Biomag")]
-#     #   puts "\\\\"
-#     #   a.save
-#     #   a.reload
-#     #   puts a.tunes.inspect
 
-#     #   b.reload
-#     #   puts "#{b.inspect}, #{b.persisted?}"
+    #   a.tunes = [a.tunes.first, Tune.new(title: "Count Down")]
+    #   b = a.tunes.first
+    #   puts ":::::"
+    #   a.save
+    #   a.reload
+    #   puts a.tunes.inspect
 
-
-#     #   a.tunes = [a.tunes.first, Tune.new(title: "Count Down")]
-#     #   b = a.tunes.first
-#     #   puts ":::::"
-#     #   a.save
-#     #   a.reload
-#     #   puts a.tunes.inspect
-
-#     #   b.reload
-#     #   puts "#{b.inspect}, #{b.persisted?}"
-#     # end
-#   end
-# end
+    #   b.reload
+    #   puts "#{b.inspect}, #{b.persisted?}"
+    # end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reform
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Nick Sutterer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-10 00:00:00.000000000 Z
+date: 2015-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: disposable
@@ -196,7 +196,6 @@ files:
 - Rakefile
 - TODO.md
 - database.sqlite3
-- gemfiles/Gemfile.rails-3.0
 - gemfiles/Gemfile.rails-3.1
 - gemfiles/Gemfile.rails-3.2
 - gemfiles/Gemfile.rails-4.0
@@ -230,6 +229,7 @@ files:
 - lib/reform/schema.rb
 - lib/reform/version.rb
 - reform.gemspec
+- test/active_model_custom_validation_translations_test.rb
 - test/active_model_test.rb
 - test/active_record_test.rb
 - test/benchmarking.rb
@@ -319,6 +319,7 @@ signing_key:
 specification_version: 4
 summary: Form object decoupled from models with validation, population and presentation.
 test_files:
+- test/active_model_custom_validation_translations_test.rb
 - test/active_model_test.rb
 - test/active_record_test.rb
 - test/benchmarking.rb

data/gemfiles/Gemfile.rails-3.0

@@ -1,7 +0,0 @@
-source "http://rubygems.org"
-
-# Specify your gem's dependencies in reform.gemspec
-gemspec :path => '../'
-
-gem 'railties', '~> 3.0.11'
-gem 'activerecord', '~> 3.0.11'