reform 0.1.2 → 0.2.0

data/test/nested_form_test.rb

@@ -0,0 +1,129 @@
+require 'test_helper'
+
+class NestedFormTest < MiniTest::Spec
+  class AlbumForm < Reform::Form
+    property :title
+
+    # class SongForm < Reform::Form
+    #   property :title
+    #   validates :title, :presence => true
+    # end
+
+    #form :hit, :class => SongForm
+    property :hit do
+      property :title
+      validates :title, :presence => true
+    end
+
+    collection :songs do
+      property :title
+      validates :title, :presence => true
+    end
+
+    validates :title, :presence => true
+  end
+
+  # AlbumForm::collection :songs, :form => SongForm
+  # should be: AlbumForm.new(songs: [Song, Song])
+
+  let (:album) do
+    OpenStruct.new(
+      :title  => "Blackhawks Over Los Angeles",
+      :hit    => song,
+      :songs  => songs # TODO: document this requirement
+    )
+  end
+  let (:song)  { OpenStruct.new(:title => "Downtown") }
+  let (:songs) { [OpenStruct.new(:title => "Calling")] }
+  let (:form)  { AlbumForm.new(album) }
+
+  it "responds to #to_hash" do
+    form.to_hash.must_equal({"hit"=>{"title"=>"Downtown"}, "title" => "Blackhawks Over Los Angeles", "songs"=>[{"title"=>"Calling"}]})
+  end
+
+  it "creates nested forms" do
+    form.hit.must_be_kind_of Reform::Form
+    form.songs.must_be_kind_of Reform::Form::Forms
+  end
+
+  describe "rendering" do
+    it { form.title.must_equal "Blackhawks Over Los Angeles" }
+    it { form.hit.title.must_equal "Downtown" }
+    it { form.songs[0].title.must_equal "Calling" }
+  end
+
+  describe "#save" do
+    before { @result = form.validate(
+      "hit"   =>{"title" => "Sacrifice"},
+      "title" =>"Second Heat",
+      "songs" => [{"title" => "Scarified"}])
+    } # TODO: test empty/non-present songs
+
+    it "updates internal Fields" do
+      data = {}
+
+      form.save do |f, nested_hash|
+        data[:title]        = f.title
+        data[:hit_title]    = f.hit.title
+        data[:first_title]  = f.songs.first.title
+      end
+
+      data.must_equal(:title=>"Second Heat", :hit_title => "Sacrifice", :first_title => "Scarified")
+    end
+
+    it "passes form instances in first argument" do
+      frm = nil
+
+      form.save { |f, hsh| frm = f }
+
+      frm.must_equal form
+      frm.title.must_be_kind_of String
+      frm.hit.must_be_kind_of Reform::Form
+      frm.songs.first.must_be_kind_of Reform::Form
+    end
+
+    it "returns nested hash with symbol keys" do
+      nested = nil
+
+      form.save do |hash, nested_hash|
+        nested = nested_hash
+      end
+
+      nested.must_equal(:title=>"Second Heat", :hit=>{"title"=>"Sacrifice"}, :songs=>[{"title"=>"Scarified"}])
+    end
+
+    it "pushes data to models" do
+      form.save
+
+      album.title.must_equal "Second Heat"
+      song.title.must_equal "Sacrifice"
+      songs.first.title.must_equal "Scarified"
+    end
+  end
+
+  # describe "with aliased nested form name" do
+  #   let (:form) do
+  #     Class.new(Reform::Form) do
+  #       form :hit, :class => AlbumForm::SongForm, :as => :song
+  #     end.new(OpenStruct.new(:hit => OpenStruct.new(:title => "")))
+  #   end
+
+  #   it "uses alias in errors" do
+  #     form.validate({})
+  #     form.errors.messages.must_equal({})
+  #   end
+  # end
+
+  class UnitTest < self
+    it "keeps Forms for form collection" do
+      form.send(:fields).songs.must_be_kind_of Reform::Form::Forms
+    end
+
+    describe "#validate" do
+      it "keeps Form instances" do
+        form.validate("songs"=>[{"title" => "Atwa"}])
+        form.songs.first.must_be_kind_of Reform::Form
+      end
+    end
+  end
+end

data/test/rails/integration_test.rb

@@ -0,0 +1,54 @@
+require_relative "../test_helper"
+
+require "dummy/config/environment"
+require "rails/test_help" # adds stuff like @routes, etc.
+
+# require "haml"
+# require "haml/template" # Thanks, Nathan!
+
+#ActiveRecord::Schema.define do
+  # create_table :artists do |table|
+  #   table.column :name, :string
+  #   table.timestamps
+  # end
+
+#   create_table :songs do |table|
+#     table.column :title, :string
+#     table.column :album_id, :integer
+#   end
+
+#   create_table :albums do |table|
+#     table.column :title, :string
+#   end
+# end
+
+class HasOneAndHasManyTest < ActionController::TestCase
+  tests AlbumsController
+
+  test "rendering 1-1 and 1-n" do
+    get :new
+    #puts @response.body
+
+    assert_select "form"
+
+    assert_select "form input" do |els|
+      assert_select "[name=?]", "album[title]"
+      assert_select "[name=?]", "album[songs_attributes][1][title]"
+      assert_select "[name=?]", "album[songs_attributes][0][title]"
+    end
+  end
+
+  test "submitting invalid form" do
+    params = {
+      "album"=>{"title"=>"Rio",
+        "songs_attributes"=>{
+          "0"=>{"name"=>""},
+          "1"=>{"name"=>""}
+      }}, "commit"=>"Create Album"}
+
+    post :create, params
+
+    assert_select "form"
+    assert_select "li", "Songs title can&#39;t be blank"
+  end
+end

data/test/reform_test.rb

@@ -1,31 +1,16 @@
 require 'test_helper'
 
-require 'active_record'
-class Artist < ActiveRecord::Base
-end
-ActiveRecord::Base.establish_connection(
-  :adapter => "sqlite3",
-  :database => "#{Dir.pwd}/database.sqlite3"
-)
-
-
 class RepresenterTest < MiniTest::Spec
   class SongRepresenter < Reform::Representer
-    properties [:title, :year]
+    property :title
+    property :name
   end
 
-  let (:rpr) { SongRepresenter.new(OpenStruct.new(:title => "Disconnect, Disconnect", :year => 1990)) }
-
-  # TODO: introduce representer_for helper.
-  describe "::properties" do
-    it "accepts array of property names" do
-      rpr.to_hash.must_equal({"title"=>"Disconnect, Disconnect", "year" => 1990} )
-    end
-  end
+  let (:rpr) { SongRepresenter.new(Object.new) }
 
   describe "#fields" do
     it "returns all properties as strings" do
-      rpr.fields.must_equal(["title", "year"])
+      rpr.fields.must_equal(["title", "name"])
     end
   end
 end
@@ -53,81 +38,29 @@ class FieldsTest < MiniTest::Spec
   end
 end
 
-class ReformTest < MiniTest::Spec
-  def errors_for(form)
-    errors = form.errors
-    errors = errors.messages unless ::ActiveModel::VERSION::MAJOR == 3 and ::ActiveModel::VERSION::MINOR == 0
-    errors
-  end
+class ReformTest < ReformSpec
+  let (:comp) { OpenStruct.new(:name => "Duran Duran", :title => "Rio") }
 
-  let (:duran)  { OpenStruct.new(:name => "Duran Duran") }
-  let (:rio)    { OpenStruct.new(:title => "Rio") }
+  let (:form) { SongForm.new(comp) }
 
-  let (:form) { SongForm.new(SongAndArtistMap, comp) }
 
-  class SongAndArtistMap < Reform::Representer
-    property :name, :on => :artist
-    property :title, :on => :song
+  describe "::properties" do
+    it do
+      Class.new(Reform::Form) do
+        properties [:name, :title]
+      end.new(comp).to_hash.must_equal({"name"=>"Duran Duran", "title"=>"Rio"})
+    end
   end
 
   class SongForm < Reform::Form
-  end
-
-  describe "Composition" do
-    class SongAndArtist < Reform::Composition
-      map({:artist => [:name], :song => [:title]}) #SongAndArtistMap.representable_attrs
-    end
-
-    let (:comp) { SongAndArtist.new(:artist => @artist=OpenStruct.new, :song => rio) }
-
-    it "delegates to models as defined" do
-      comp.name.must_equal nil
-      comp.title.must_equal "Rio"
-    end
-
-    it "raises when non-mapped property" do
-      assert_raises NoMethodError do
-        comp.raise_an_exception
-      end
-    end
-
-    it "creates readers to models" do
-      comp.song.object_id.must_equal rio.object_id
-      comp.artist.object_id.must_equal @artist.object_id
-    end
-
-    describe "::map_from" do
-      it "creates the same mapping" do
-        comp =
-        Class.new(Reform::Composition) do
-          map_from SongAndArtistMap
-        end.
-        new(:artist => duran, :song => rio)
+    property :name
+    property :title
 
-        comp.name.must_equal "Duran Duran"
-        comp.title.must_equal "Rio"
-      end
-    end
-
-    describe "#nested_hash_for" do
-      it "returns nested hash" do
-        comp.nested_hash_for(:name => "Jimi Hendrix", :title => "Fire").must_equal({:artist=>{:name=>"Jimi Hendrix"}, :song=>{:title=>"Fire"}})
-      end
-
-      it "works with strings" do
-        comp.nested_hash_for("name" => "Jimi Hendrix", "title" => "Fire").must_equal({:artist=>{:name=>"Jimi Hendrix"}, :song=>{:title=>"Fire"}})
-      end
-
-      it "works with strings in map" do
-        Class.new(Reform::Composition) do
-          map(:artist => ["name"])
-        end.new([nil]).nested_hash_for(:name => "Jimi Hendrix").must_equal({:artist=>{:name=>"Jimi Hendrix"}})
-      end
-    end
+    validates :name, :presence => true
   end
 
   describe "(new) form with empty models" do
-    let (:comp) { SongAndArtist.new(:artist => OpenStruct.new, :song => OpenStruct.new) }
+    let (:comp) { OpenStruct.new }
 
     it "returns empty fields" do
       form.title.must_equal nil
@@ -145,8 +78,6 @@ class ReformTest < MiniTest::Spec
   end
 
   describe "(edit) form with existing models" do
-    let (:comp) { SongAndArtist.new(:artist => duran, :song => rio) }
-
     it "returns filled-out fields" do
       form.name.must_equal  "Duran Duran"
       form.title.must_equal "Rio"
@@ -154,7 +85,7 @@ class ReformTest < MiniTest::Spec
   end
 
   describe "#validate" do
-    let (:comp) { SongAndArtist.new(:artist => OpenStruct.new, :song => OpenStruct.new) }
+    let (:comp) { OpenStruct.new }
 
     it "ignores unmapped fields in input" do
       form.validate("name" => "Duran Duran", :genre => "80s")
@@ -167,13 +98,26 @@ class ReformTest < MiniTest::Spec
       form.validate("name" => "Duran Duran").must_equal true
     end
 
+    it "exposes input via property accessors" do
+      comp.name.must_equal nil
+      form.name.must_equal nil
+
+      form.validate("name" => "Duran Duran")
+
+      form.name.must_equal "Duran Duran"
+      comp.name.must_equal nil # don't touch model, yet.
+    end
+
     # TODO: test errors. test valid.
     describe "invalid input" do
       class ValidatingForm < Reform::Form
+        property :name
+        property :title
+
         validates :name,  :presence => true
         validates :title, :presence => true
       end
-      let (:form) { ValidatingForm.new(SongAndArtistMap, comp) }
+      let (:form) { ValidatingForm.new(comp) }
 
       it "returns false when invalid" do
         form.validate({}).must_equal false
@@ -181,70 +125,87 @@ class ReformTest < MiniTest::Spec
 
       it "populates errors" do
         form.validate({})
-        errors_for(form).must_equal({:name=>["can't be blank"], :title=>["can't be blank"]})
+        form.errors.messages.must_equal({:name=>["can't be blank"], :title=>["can't be blank"]})
       end
     end
 
     describe "method validations" do
       it "allows accessing models" do
         form = Class.new(Reform::Form) do
+          property :name
           validate "name_correct?"
 
           def name_correct?
-            errors.add :name, "Please give me a name" if model.artist.name.nil?
+            errors.add :name, "Please give me a name" if model.name.nil?
           end
-        end.new(SongAndArtistMap, comp)
+        end.new(comp)
 
         form.validate({}).must_equal false
-        errors_for(form).must_equal({:name=>["Please give me a name"]})
+        form.errors.messages.must_equal({:name=>["Please give me a name"]})
       end
     end
 
     describe "UniquenessValidator" do
-      # ActiveRecord::Schema.define do
-      #   create_table :artists do |table|
-      #     table.column :name, :string
-      #   end
-      # end
-      #Artist.new(:name => "Racer X").save
-      let (:comp) { SongAndArtist.new(:artist => Artist.new, :song => OpenStruct.new) }
+      #  ActiveRecord::Schema.define do
+      #    create_table :artists do |table|
+      #      table.column :name, :string
+      #      table.timestamps
+      #    end
+      #  end
+      # Artist.new(:name => "Racer X").save
+
+      let (:form) do
+        require 'reform/active_record'
+        Class.new(Reform::Form) do
+          include Reform::Form::ActiveRecord
+          model :artist
+
+          property :name
+          property :created_at
+
+          validates_uniqueness_of :name
+          validates :created_at, :presence => true # have another property to test if we mix up.
+        end.
+        new(Artist.new)
+      end
 
       it "allows accessing the database" do
       end
 
       it "is valid when name is unique" do
-        ActiveRecordForm.new(SongAndArtistMap, comp).validate({"name" => "Paul Gilbert", "title" => "Godzilla"}).must_equal true
+        form.validate({"name" => "Paul Gilbert", "created_at" => "November 6, 1966"}).must_equal true
       end
 
       it "is invalid and shows error when taken" do
-        form = ActiveRecordForm.new(SongAndArtistMap, comp)
         form.validate({"name" => "Racer X"}).must_equal false
-        errors_for(form).must_equal({:name=>["has already been taken"], :title => ["can't be blank"]})
+        form.errors.messages.must_equal({:name=>["has already been taken"], :created_at => ["can't be blank"]})
       end
+    end
+  end
 
-      require 'reform/rails'
-      class ActiveRecordForm < Reform::Form
-        include Reform::Form::ActiveRecord
-        model :artist, :on => :artist # FIXME: i want form.artist, so move this out of ActiveModel into ModelDelegations.
+  describe "#errors" do
+    it { form.errors.must_be_kind_of Reform::Form::Errors }
 
-        validates_uniqueness_of :name
-        validates :title, :presence => true # have another property to test if we mix up.
-      end
+    it { form.errors.messages.must_equal({}) }
+
+    it do
+      form.validate({"name"=>""})
+      form.errors.messages.must_equal({:name=>["can't be blank"]})
     end
   end
 
 
   describe "#save" do
-    let (:comp) { SongAndArtist.new(:artist => OpenStruct.new, :song => OpenStruct.new) }
-    let (:form) { SongForm.new(SongAndArtistMap, comp) }
+    let (:comp) { OpenStruct.new }
+    let (:form) { SongForm.new(comp) }
 
     before { form.validate("name" => "Diesel Boy") }
 
     it "pushes data to models" do
       form.save
 
-      comp.artist.name.must_equal "Diesel Boy"
-      comp.song.title.must_equal nil
+      comp.name.must_equal "Diesel Boy"
+      comp.title.must_equal nil
     end
 
     describe "#save with block" do
@@ -266,8 +227,13 @@ class ReformTest < MiniTest::Spec
           hash = map
         end
 
-        hash.must_equal({:artist=>{:name=>"Diesel Boy"}})
+        hash.must_equal({:name=>"Diesel Boy"})
       end
     end
   end
+
+
+  describe "#model" do
+    it { form.send(:model).must_equal comp }
+  end
 end

data/test/test_helper.rb

@@ -1,2 +1,15 @@
 require 'reform'
-require 'minitest/autorun'
+require 'minitest/autorun'
+
+class ReformSpec < MiniTest::Spec
+  let (:duran)  { OpenStruct.new(:name => "Duran Duran") }
+  let (:rio)    { OpenStruct.new(:title => "Rio") }
+end
+
+require 'active_record'
+class Artist < ActiveRecord::Base
+end
+ActiveRecord::Base.establish_connection(
+  :adapter => "sqlite3",
+  :database => "#{Dir.pwd}/database.sqlite3"
+)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reform
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,24 +10,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-14 00:00:00.000000000 Z
+date: 2013-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: representable
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +67,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -75,7 +75,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.1.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -140,6 +140,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Freeing your AR models from form logic.
 email:
 - apotonick@gmail.com
@@ -159,16 +175,47 @@ files:
 - database.sqlite3
 - gemfiles/Gemfile.rails-3.0
 - lib/reform.rb
+- lib/reform/active_record.rb
+- lib/reform/composition.rb
 - lib/reform/form.rb
 - lib/reform/form/active_model.rb
 - lib/reform/form/active_record.rb
 - lib/reform/form/coercion.rb
-- lib/reform/form/dsl.rb
+- lib/reform/form/composition.rb
 - lib/reform/rails.rb
+- lib/reform/representer.rb
 - lib/reform/version.rb
 - reform.gemspec
 - test/active_model_test.rb
-- test/dsl_test.rb
+- test/coercion_test.rb
+- test/composition_test.rb
+- test/dummy/Rakefile
+- test/dummy/app/controllers/albums_controller.rb
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/controllers/musician_controller.rb
+- test/dummy/app/forms/album_form.rb
+- test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/models/album.rb
+- test/dummy/app/models/song.rb
+- test/dummy/app/views/albums/new.html.erb
+- test/dummy/app/views/layouts/application.html.erb
+- test/dummy/config.ru
+- test/dummy/config/application.rb
+- test/dummy/config/boot.rb
+- test/dummy/config/database.yml
+- test/dummy/config/environment.rb
+- test/dummy/config/environments/development.rb
+- test/dummy/config/environments/production.rb
+- test/dummy/config/environments/test.rb
+- test/dummy/config/locales/en.yml
+- test/dummy/config/routes.rb
+- test/dummy/db/test.sqlite3
+- test/dummy/log/production.log
+- test/dummy/log/server.log
+- test/errors_test.rb
+- test/form_composition_test.rb
+- test/nested_form_test.rb
+- test/rails/integration_test.rb
 - test/reform_test.rb
 - test/test_helper.rb
 homepage: ''
@@ -199,6 +246,34 @@ summary: Decouples your models from form by giving you form objects with validat
   presentation, workflows and security.
 test_files:
 - test/active_model_test.rb
-- test/dsl_test.rb
+- test/coercion_test.rb
+- test/composition_test.rb
+- test/dummy/Rakefile
+- test/dummy/app/controllers/albums_controller.rb
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/controllers/musician_controller.rb
+- test/dummy/app/forms/album_form.rb
+- test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/models/album.rb
+- test/dummy/app/models/song.rb
+- test/dummy/app/views/albums/new.html.erb
+- test/dummy/app/views/layouts/application.html.erb
+- test/dummy/config.ru
+- test/dummy/config/application.rb
+- test/dummy/config/boot.rb
+- test/dummy/config/database.yml
+- test/dummy/config/environment.rb
+- test/dummy/config/environments/development.rb
+- test/dummy/config/environments/production.rb
+- test/dummy/config/environments/test.rb
+- test/dummy/config/locales/en.yml
+- test/dummy/config/routes.rb
+- test/dummy/db/test.sqlite3
+- test/dummy/log/production.log
+- test/dummy/log/server.log
+- test/errors_test.rb
+- test/form_composition_test.rb
+- test/nested_form_test.rb
+- test/rails/integration_test.rb
 - test/reform_test.rb
 - test/test_helper.rb