reform 1.0.4 → 1.1.0

data/test/scalar_test.rb

@@ -0,0 +1,167 @@
+require 'test_helper'
+
+
+class SelfNestedTest < BaseTest
+  class Form < Reform::Form
+    property :title  do
+
+     end
+  end
+
+  let (:song) { Song.new("Crash And Burn") }
+  it do
+    Form.new(song)
+
+  end
+
+  it do
+    form = Form.new(song)
+
+    form.title = Class.new(Reform::Form) do
+      @form_name = "ficken"
+      def self.name # needed by ActiveModel::Validation and I18N.
+          @form_name
+        end
+
+      validates :model, :length => {:minimum => 10}
+
+
+      def update!(object)
+        model.replace(object)
+      end
+
+    end.new("Crash And Burn") # gets initialized with string (or image object, or whatever).
+
+    form.validate({"title" => "Teaser"})
+
+    form.errors.messages.must_equal({:"title.model"=>["is too short (minimum is 10 characters)"]})
+
+
+    # validation only kicks in when value present
+    form = Form.new(song)
+    form.validate({})
+    form.errors.messages.must_equal({})
+  end
+
+
+  class ImageForm < Reform::Form
+    # property :image, populate_if_empty: lambda { |object, args| object }  do
+    property :image, :scalar => true do
+      validates :size,  numericality: { less_than: 10 }
+      validates :length, numericality: { greater_than: 1 } # TODO: make better validators and remove AM::Validators at some point.
+
+      # FIXME: does that only work with representable 2.0?
+      # def size; model.size; end
+      # def type; model.class.to_s; end
+    end
+  end
+
+  AlbumCover = Struct.new(:image) do
+    include Saveable
+  end
+
+  # no image in params AND model.
+  it do
+    form = ImageForm.new(AlbumCover.new(nil))
+
+
+    form.validate({})
+    form.errors.messages.must_equal({})
+  end
+
+  # no image in params but in model.
+  it do
+    skip
+
+    # TODO: implement validations that only run when requested (only_validate_params: true)
+    form = ImageForm.new(AlbumCover.new("i don't know how i got here but i'm invalid"))
+
+
+    form.validate({})
+    form.errors.messages.must_equal({})
+  end
+
+  # image in params but NOT in model.
+  it do
+    form = ImageForm.new(AlbumCover.new(nil))
+
+    form.validate({"image" => "I'm OK!"})
+    puts form.inspect
+    form.errors.messages.must_equal({})
+    form.image.scalar.must_equal "I'm OK!"
+  end
+
+  # OK image, image existent.
+  it "hello" do
+    form = ImageForm.new(AlbumCover.new("nil"))
+
+    form.image.model.must_equal "nil"
+
+    form.validate({"image" => "I'm OK!"})
+    form.errors.messages.must_equal({})
+  end
+
+  # invalid image, image existent.
+  it "xx"do
+    form = ImageForm.new(AlbumCover.new("nil"))
+
+    form.validate({"image" => "I'm too long, is that a problem?"})
+    form.errors.messages.must_equal({:"image.size"=>["must be less than 10"]})
+  end
+
+
+
+  # validate string only if it's in params.
+  class StringForm < Reform::Form
+    property :image, :scalar => true do # creates "empty" form
+      validates :length => {:minimum => 10}
+    end
+  end
+
+
+  # validates when present.
+  # invalid
+  it do
+    form = StringForm.new(AlbumCover.new(nil))
+    form.validate("image" => "0x123").must_equal false
+    form.image.scalar.must_equal("0x123")
+    # TODO: errors, save
+
+    form.errors.messages.must_equal({:"image.scalar"=>["is too short (minimum is 10 characters)"]})
+  end
+
+  # valid
+  it "xxx" do
+    cover = AlbumCover.new(nil)
+
+    form = StringForm.new(cover)
+    form.validate("image" => "0x123456789").must_equal true
+
+    form.image.scalar.must_equal("0x123456789")
+    cover.image.must_equal nil
+
+    # errors
+    form.errors.messages.must_equal({})
+
+    # sync
+    form.sync
+    form.image.scalar.must_equal("0x123456789")
+    cover.image.must_equal "0x123456789" # that already writes it back.
+
+    # save
+    form.save
+    cover.image.must_equal "0x123456789" # #save writes back to model.
+
+    form.save do |hash|
+      hash.must_equal("image"=>"0x123456789")
+    end
+  end
+
+  # does not validate when absent (that's the whole point of this directive).
+  it do
+    form = StringForm.new(AlbumCover.new(nil))
+    form.validate({}).must_equal true
+  end
+
+  # DISCUSS: when AlbumCover.new("Hello").validate({}), does that fail?
+end

data/test/test_helper.rb

@@ -9,11 +9,21 @@ end
 require 'active_record'
 class Artist < ActiveRecord::Base
 end
+
+class Song < ActiveRecord::Base
+  belongs_to :artist
+end
+
+class Album < ActiveRecord::Base
+  has_many :songs
+end
+
 ActiveRecord::Base.establish_connection(
   :adapter => "sqlite3",
   :database => "#{Dir.pwd}/database.sqlite3"
 )
 
+
 #Artist.delete_all
 
 class BaseTest < MiniTest::Spec

data/test/validate_test.rb

@@ -85,6 +85,34 @@ class ValidateTest < BaseTest
     it { subject.songs[1].title.must_equal "Roxanne" }
   end
 
+
+  # not sure if we should catch that in Reform or rather do that in disposable. this is https://github.com/apotonick/reform/pull/104
+  # describe ":populator with :empty" do
+  #   let (:form) {
+  #     Class.new(Reform::Form) do
+  #       collection :songs, :empty => true, :populator => lambda { |fragment, index, args|
+  #         songs[index] = args.binding[:form].new(Song.new)
+  #       } do
+  #         property :title
+  #       end
+  #     end
+  #    }
+
+  #   let (:params) {
+  #     {
+  #       "songs" => [{"title" => "Fallout"}, {"title" => "Roxanne"}]
+  #     }
+  #   }
+
+  #   subject { form.new(Album.new("Hits", [], [])) }
+
+  #   before { subject.validate(params) }
+
+  #   it { subject.songs[0].title.must_equal "Fallout" }
+  #   it { subject.songs[1].title.must_equal "Roxanne" }
+  # end
+
+
   describe ":populate_if_empty, half-populated collection" do
     let (:form) {
       Class.new(Reform::Form) do
@@ -148,10 +176,22 @@ class ValidateTest < BaseTest
     it { subject.songs[0].title.must_equal "Fallout" }
     it { subject.songs[1].title.must_equal "Roxanne" }
 
-    it { album.hit.must_be_kind_of Struct }
-    it { album.songs.size.must_equal 2 } # #validate must associate items with model.
+    # population doesn't write to the model.
+    it { album.hit.must_equal nil }
+    it { album.songs.size.must_equal 0 }
 
     it { subject.band.label.name.must_equal "Epitaph" }
+
+
+    describe "missing parameters" do
+      let (:params) {
+        { }
+      }
+
+      before { subject.validate(params) }
+
+      it { subject.hit.must_equal nil }
+    end
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reform
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.1.0
 platform: ruby
 authors:
 - Nick Sutterer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-19 00:00:00.000000000 Z
+date: 2014-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: representable
@@ -17,42 +17,42 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 2.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 2.0.3
 - !ruby/object:Gem::Dependency
   name: disposable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.5
 - !ruby/object:Gem::Dependency
   name: uber
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.4
+        version: 0.0.8
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -87,14 +87,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 10.1.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 10.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -165,6 +165,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  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'
 description: Freeing your AR models from form logic.
 email:
 - apotonick@gmail.com
@@ -195,11 +209,14 @@ files:
 - lib/reform/contract/validate.rb
 - lib/reform/form.rb
 - lib/reform/form/active_model.rb
+- lib/reform/form/active_model/model_validations.rb
 - lib/reform/form/active_record.rb
 - lib/reform/form/coercion.rb
 - lib/reform/form/composition.rb
+- lib/reform/form/module.rb
 - lib/reform/form/multi_parameter_attributes.rb
 - lib/reform/form/save.rb
+- lib/reform/form/scalar.rb
 - lib/reform/form/sync.rb
 - lib/reform/form/validate.rb
 - lib/reform/form/virtual_attributes.rb
@@ -210,9 +227,11 @@ files:
 - test/active_model_test.rb
 - test/active_record_test.rb
 - test/as_test.rb
+- test/builder_test.rb
 - test/coercion_test.rb
 - test/composition_test.rb
 - test/contract_test.rb
+- test/deserialize_test.rb
 - test/dummy/Rakefile
 - test/dummy/app/controllers/albums_controller.rb
 - test/dummy/app/controllers/application_controller.rb
@@ -240,11 +259,13 @@ files:
 - test/feature_test.rb
 - test/form_builder_test.rb
 - test/form_composition_test.rb
+- test/inherit_test.rb
+- test/model_validations_test.rb
 - test/nested_form_test.rb
 - test/rails/integration_test.rb
 - test/reform_test.rb
 - test/save_test.rb
-- test/setup_test.rb
+- test/scalar_test.rb
 - test/sync_test.rb
 - test/test_helper.rb
 - test/validate_test.rb
@@ -277,9 +298,11 @@ test_files:
 - test/active_model_test.rb
 - test/active_record_test.rb
 - test/as_test.rb
+- test/builder_test.rb
 - test/coercion_test.rb
 - test/composition_test.rb
 - test/contract_test.rb
+- test/deserialize_test.rb
 - test/dummy/Rakefile
 - test/dummy/app/controllers/albums_controller.rb
 - test/dummy/app/controllers/application_controller.rb
@@ -307,11 +330,13 @@ test_files:
 - test/feature_test.rb
 - test/form_builder_test.rb
 - test/form_composition_test.rb
+- test/inherit_test.rb
+- test/model_validations_test.rb
 - test/nested_form_test.rb
 - test/rails/integration_test.rb
 - test/reform_test.rb
 - test/save_test.rb
-- test/setup_test.rb
+- test/scalar_test.rb
 - test/sync_test.rb
 - test/test_helper.rb
 - test/validate_test.rb

data/test/setup_test.rb

@@ -1,68 +0,0 @@
-require 'test_helper'
-
-class SetupTest < BaseTest
-  class AlbumForm < Reform::Form
-    property :title
-
-    property :hit do
-      property :title
-      validates :title, :presence => true
-    end
-
-    collection :songs do
-      property :title
-      validates :title, :presence => true
-
-      property :length do
-        property :minutes
-      end
-    end
-
-    property :band do # yepp, people do crazy stuff like that.
-      property :label do
-        property :name
-        validates :name, :presence => true
-      end
-      # TODO: make band a required object.
-    end
-
-    validates :title, :presence => true
-  end
-
-
-  describe "populated" do
-    subject { AlbumForm.new(Album.new("Best Of", hit, [Song.new("Fallout", Length.new(2,3)), Song.new("Roxanne")])) }
-
-    it { subject.title.must_equal "Best Of" }
-
-
-    it { subject.hit.must_be_kind_of Reform::Form }
-    it { subject.hit.title.must_equal "Roxanne" }
-
-    it { subject.songs.must_be_kind_of Array }
-    it { subject.songs.size.must_equal 2 }
-
-    it { subject.songs[0].must_be_kind_of Reform::Form }
-    it { subject.songs[0].title.must_equal "Fallout" }
-    it { subject.songs[0].length.minutes.must_equal 2 }
-
-    it { subject.songs[1].must_be_kind_of Reform::Form }
-    it { subject.songs[1].title.must_equal "Roxanne" }
-  end
-
-
-  describe "empty" do
-    subject { AlbumForm.new(Album.new) }
-
-    it { subject.title.must_equal nil }
-
-
-# TODO: discuss and implement.
-    # it { subject.hit.must_be_kind_of Reform::Form }
-    # it { subject.hit.title.must_equal nil }
-
-
-    # it { subject.songs.must_be_kind_of Reform::Form::Forms }
-    # it { subject.songs.size.must_equal 0 }
-  end
-end