reform 2.0.0.rc1 → 2.0.0.rc2

data/test/reform_test.rb

@@ -132,18 +132,21 @@ class ReformTest < ReformSpec
   end
 
 
-  describe "inheritance" do
-    class HitForm < SongForm
-      property :position
-      validates :position, :presence => true
-    end
+  unless (rails4_0? or rails3_2?)
+    describe "inheritance" do
+      class HitForm < SongForm
+        property :position
+        validates :position, :presence => true
 
-    let (:form) { HitForm.new(OpenStruct.new()) }
-    it do
-      form.validate({"title" => "The Body"})
-      form.title.must_equal "The Body"
-      form.position.must_equal nil
-      form.errors.messages.must_equal({:name=>["can't be blank"], :position=>["can't be blank"]})
+      end
+
+      let (:form) { HitForm.new(OpenStruct.new()) }
+      it do
+        form.validate({"title" => "The Body"})
+        form.title.must_equal "The Body"
+        form.position.must_equal nil
+        form.errors.messages.must_equal({:name=>["can't be blank"], :position=>["can't be blank"]})
+      end
     end
   end
 end

data/test/test_helper.rb

@@ -61,4 +61,17 @@ MiniTest::Spec.class_eval do
       @saved
     end
   end
+
+  def self.rails4_0?
+    ::ActiveModel::VERSION::MAJOR == 4 and ::ActiveModel::VERSION::MINOR == 0
+  end
+
+  def self.rails3_2?
+    ::ActiveModel::VERSION::MAJOR == 3 and ::ActiveModel::VERSION::MINOR == 2
+  end
+end
+
+require "reform/form/active_model/validations"
+Reform::Contract.class_eval do
+  include Reform::Form::ActiveModel::Validations
 end

data/test/validate_test.rb

@@ -1,14 +1,5 @@
 require 'test_helper'
 
-# tests: -------
-# Contract
-#   validate
-#   errors
-
-# Form
-#   validate
-#   errors
-
 class ContractValidateTest < MiniTest::Spec
   Song  = Struct.new(:title, :album, :composer)
   Album = Struct.new(:name, :songs, :artist)
@@ -53,7 +44,7 @@ class ContractValidateTest < MiniTest::Spec
     album.name = nil
 
     form.validate.must_equal false
-    form.errors.messages.inspect.must_equal "{:\"songs.composer.name\"=>[\"can't be blank\"], :name=>[\"can't be blank\"]}"
+    form.errors.messages.inspect.must_equal "{:name=>[\"can't be blank\"], :\"songs.composer.name\"=>[\"can't be blank\"]}"
   end
 end
 
@@ -215,7 +206,7 @@ class ValidateWithDeserializerOptionTest < MiniTest::Spec
       "artist" => {"name" => ""},
     ).must_equal false
 
-    form.errors.messages.inspect.must_equal "{:\"songs.composer.name\"=>[\"can't be blank\"], :\"artist.name\"=>[\"can't be blank\"], :name=>[\"can't be blank\"]}"
+    form.errors.messages.inspect.must_equal "{:name=>[\"can't be blank\"], :\"songs.composer.name\"=>[\"can't be blank\"], :\"artist.name\"=>[\"can't be blank\"]}"
   end
 
   # adding to collection via :instance.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reform
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc1
+  version: 2.0.0.rc2
 platform: ruby
 authors:
 - Nick Sutterer
@@ -9,22 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-01 00:00:00.000000000 Z
+date: 2015-07-07 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: representable
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: disposable
   requirement: !ruby/object:Gem::Requirement
@@ -54,13 +40,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.0.11
 - !ruby/object:Gem::Dependency
-  name: activemodel
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -68,7 +54,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -82,7 +68,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -96,7 +82,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -110,7 +96,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -124,7 +110,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: virtus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -138,7 +124,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: virtus
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -152,7 +138,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: mongoid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: lotus-validations
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -200,6 +200,8 @@ files:
 - gemfiles/Gemfile.rails-3.1
 - gemfiles/Gemfile.rails-3.2
 - gemfiles/Gemfile.rails-4.0
+- gemfiles/Gemfile.rails-4.1
+- gemfiles/Gemfile.rails-4.2
 - lib/reform.rb
 - lib/reform/active_record.rb
 - lib/reform/contract.rb
@@ -208,19 +210,24 @@ files:
 - lib/reform/form.rb
 - lib/reform/form/active_model.rb
 - lib/reform/form/active_model/model_validations.rb
+- lib/reform/form/active_model/validations.rb
 - lib/reform/form/active_record.rb
 - lib/reform/form/coercion.rb
 - lib/reform/form/composition.rb
 - lib/reform/form/json.rb
+- lib/reform/form/lotus.rb
 - lib/reform/form/model_reflections.rb
 - lib/reform/form/module.rb
+- lib/reform/form/mongoid.rb
 - lib/reform/form/multi_parameter_attributes.rb
+- lib/reform/form/orm.rb
 - lib/reform/form/populator.rb
 - lib/reform/form/prepopulate.rb
 - lib/reform/form/save.rb
 - lib/reform/form/scalar.rb
 - lib/reform/form/validate.rb
 - lib/reform/form/validation/unique_validator.rb
+- lib/reform/mongoid.rb
 - lib/reform/rails.rb
 - lib/reform/schema.rb
 - lib/reform/twin.rb
@@ -266,9 +273,11 @@ files:
 - test/form_test.rb
 - test/from_test.rb
 - test/inherit_test.rb
+- test/lotus_test.rb
 - test/model_reflections_test.rb
 - test/model_validations_test.rb
 - test/module_test.rb
+- test/mongoid_test.rb
 - test/populate_test.rb
 - test/prepopulator_test.rb
 - test/rails/integration_test.rb
@@ -282,7 +291,7 @@ files:
 - test/skip_setter_and_getter_test.rb
 - test/test_helper.rb
 - test/twin_test.rb
-- test/uniqueness_test.rb
+- test/unique_test.rb
 - test/validate_test.rb
 - test/virtual_test.rb
 - test/writeable_test.rb
@@ -351,9 +360,11 @@ test_files:
 - test/form_test.rb
 - test/from_test.rb
 - test/inherit_test.rb
+- test/lotus_test.rb
 - test/model_reflections_test.rb
 - test/model_validations_test.rb
 - test/module_test.rb
+- test/mongoid_test.rb
 - test/populate_test.rb
 - test/prepopulator_test.rb
 - test/rails/integration_test.rb
@@ -367,7 +378,7 @@ test_files:
 - test/skip_setter_and_getter_test.rb
 - test/test_helper.rb
 - test/twin_test.rb
-- test/uniqueness_test.rb
+- test/unique_test.rb
 - test/validate_test.rb
 - test/virtual_test.rb
 - test/writeable_test.rb