reform 2.3.2 → 2.6.1

data/test/contract_old_api.rb

@@ -1,77 +0,0 @@
-require "test_helper"
-
-class ContractTest < MiniTest::Spec
-  Song  = Struct.new(:title, :album, :composer)
-  Album = Struct.new(:name, :duration, :songs, :artist)
-  Artist = Struct.new(:name)
-
-  class ArtistForm < TestForm
-    property :name
-  end
-
-  class AlbumForm < TestContract
-    property :name
-
-    properties :duration
-    properties :year, :style, readable: false
-
-    validation do
-      required(:name).filled
-    end
-
-    collection :songs do
-      property :title
-      validation do
-        required(:title).filled
-      end
-
-      property :composer do
-        property :name
-        validation do
-          required(:name).filled
-        end
-      end
-    end
-
-    property :artist, form: ArtistForm
-  end
-
-  let(:song)               { Song.new("Broken") }
-  let(:song_with_composer) { Song.new("Resist Stance", nil, composer) }
-  let(:composer)           { Artist.new("Greg Graffin") }
-  let(:artist)             { Artist.new("Bad Religion") }
-  let(:album)              { Album.new("The Dissent Of Man", 123, [song, song_with_composer], artist) }
-
-  let(:form) { AlbumForm.new(album) }
-
-  # accept `property form: SongForm`.
-  it do
-    form.artist.must_be_instance_of ArtistForm
-  end
-
-  describe ".properties" do
-    it "defines a property when called with one argument" do
-      form.must_respond_to :duration
-    end
-
-    it "defines several properties when called with multiple arguments" do
-      form.must_respond_to :year
-      form.must_respond_to :style
-    end
-
-    it "passes options to each property when options are provided" do
-      readable = AlbumForm.new(album).options_for(:style)[:readable]
-      readable.must_equal false
-    end
-
-    it "returns the list of defined properties" do
-      returned_value = AlbumForm.properties(:hello, :world, virtual: true)
-      returned_value.must_equal %i[hello world]
-    end
-  end
-
-  describe "#options_for" do
-    it { AlbumForm.options_for(:name).extend(Declarative::Inspect).inspect.must_equal "#<Disposable::Twin::Definition: @options={:private_name=>:name, :name=>\"name\"}>" }
-    it { AlbumForm.new(album).options_for(:name).extend(Declarative::Inspect).inspect.must_equal "#<Disposable::Twin::Definition: @options={:private_name=>:name, :name=>\"name\"}>" }
-  end
-end

data/test/errors_old_api.rb

@@ -1,230 +0,0 @@
-require "test_helper"
-
-class ErrorsTest < MiniTest::Spec
-  class AlbumForm < TestForm
-    property :title
-    validation do
-      required(:title).filled
-    end
-
-    property :artists, default: []
-    property :producer do
-      property :name
-    end
-
-    property :hit do
-      property :title
-      validation do
-        required(:title).filled
-      end
-    end
-
-    collection :songs do
-      property :title
-      validation do
-        required(:title).filled
-      end
-    end
-
-    property :band do # yepp, people do crazy stuff like that.
-      property :name
-      property :label do
-        property :name
-        validation do
-          required(:name).filled
-        end
-      end
-      # TODO: make band a required object.
-
-      validation do
-        configure do
-          config.messages_file = "test/fixtures/dry_error_messages.yml"
-
-          def good_musical_taste?(value)
-            value != "Nickelback"
-          end
-        end
-
-        required(:name).filled(:good_musical_taste?)
-      end
-    end
-
-    validation do
-      required(:title).filled
-      required(:artists).each(:str?)
-      required(:producer).schema do
-        required(:name).filled
-      end
-    end
-  end
-
-  let(:album_title) { "Blackhawks Over Los Angeles" }
-  let(:album) do
-    OpenStruct.new(
-      title: album_title,
-      hit: song,
-      songs: songs, # TODO: document this requirement,
-      band: Struct.new(:name, :label).new("Epitaph", OpenStruct.new),
-      producer: Struct.new(:name).new("Sun Records")
-    )
-  end
-  let(:song)  { OpenStruct.new(title: "Downtown") }
-  let(:songs) { [song = OpenStruct.new(title: "Calling"), song] }
-  let(:form)  { AlbumForm.new(album) }
-
-  describe "#validate with invalid array property" do
-    it do
-      form.validate(
-        title: "Swimming Pool - EP",
-        band: {
-          name: "Marie Madeleine",
-          label: {name: "Ekler'o'shocK"}
-        },
-        artists: [42, "Good Charlotte", 43]
-      ).must_equal false
-      form.errors.messages.must_equal(artists: {0 => ["must be a string"], 2 => ["must be a string"]})
-      form.errors.size.must_equal(1)
-    end
-  end
-
-  describe "#errors without #validate" do
-    it do
-      form.errors.size.must_equal 0
-    end
-  end
-
-  describe "blank everywhere" do
-    before do
-      form.validate(
-        "hit" => {"title" => ""},
-        "title" => "",
-        "songs" => [{"title" => ""}, {"title" => ""}],
-        "producer" => {"name" => ""}
-      )
-    end
-
-    it do
-      form.errors.messages.must_equal(
-        title: ["must be filled"],
-        "hit.title": ["must be filled"],
-        "songs.title": ["must be filled"],
-        "band.label.name": ["must be filled"],
-        "producer.name": ["must be filled"]
-      )
-    end
-
-    # it do
-    #   form.errors.must_equal({:title  => ["must be filled"]})
-    #   TODO: this should only contain local errors?
-    # end
-
-    # nested forms keep their own Errors:
-    it { form.producer.errors.messages.must_equal(name: ["must be filled"]) }
-    it { form.hit.errors.messages.must_equal(title: ["must be filled"]) }
-    it { form.songs[0].errors.messages.must_equal(title: ["must be filled"]) }
-
-    it do
-      form.errors.messages.must_equal(
-        title: ["must be filled"],
-        "hit.title": ["must be filled"],
-        "songs.title": ["must be filled"],
-        "band.label.name": ["must be filled"],
-        "producer.name": ["must be filled"]
-      )
-      form.errors.size.must_equal(5)
-    end
-  end
-
-  describe "#validate with main form invalid" do
-    it do
-      form.validate("title" => "", "band" => {"label" => {name: "Fat Wreck"}}, "producer" => nil).must_equal false
-      form.errors.messages.must_equal(title: ["must be filled"], producer: ["must be a hash"])
-      form.errors.size.must_equal(2)
-    end
-  end
-
-  describe "#validate with middle nested form invalid" do
-    before { @result = form.validate("hit" => {"title" => ""}, "band" => {"label" => {name: "Fat Wreck"}}) }
-
-    it { @result.must_equal false }
-    it { form.errors.messages.must_equal("hit.title": ["must be filled"]) }
-    it { form.errors.size.must_equal(1) }
-  end
-
-  describe "#validate with collection form invalid" do
-    before { @result = form.validate("songs" => [{"title" => ""}], "band" => {"label" => {name: "Fat Wreck"}}) }
-
-    it { @result.must_equal false }
-    it { form.errors.messages.must_equal("songs.title": ["must be filled"]) }
-    it { form.errors.size.must_equal(1) }
-  end
-
-  describe "#validate with collection and 2-level-nested invalid" do
-    before { @result = form.validate("songs" => [{"title" => ""}], "band" => {"label" => {}}) }
-
-    it { @result.must_equal false }
-    it { form.errors.messages.must_equal("songs.title": ["must be filled"], "band.label.name": ["must be filled"]) }
-    it { form.errors.size.must_equal(2) }
-  end
-
-  describe "#validate with nested form using :base invalid" do
-    it do
-      result = form.validate("songs" => [{"title" => "Someday"}], "band" => {"name" => "Nickelback", "label" => {"name" => "Roadrunner Records"}})
-      result.must_equal false
-      form.errors.messages.must_equal("band.name": ["you're a bad person"])
-      form.errors.size.must_equal(1)
-    end
-  end
-
-  describe "#add" do
-    let(:album_title) { nil }
-    it do
-      form.errors.add(:before, "validate")
-      form.errors.add(:before, "validate 2")
-      form.errors.add(:title, "before validate")
-      result = form.validate("songs" => [{"title" => "Someday"}], "band" => {"name" => "Nickelback", "label" => {"name" => "Roadrunner Records"}})
-      result.must_equal false
-      form.errors.messages.must_equal(before: ["validate", "validate 2"], title: ["before validate", "must be filled"], "band.name": ["you're a bad person"])
-      # add a new custom error
-      form.errors.add(:policy, "error_text")
-      form.errors.messages.must_equal(before: ["validate", "validate 2"], title: ["before validate", "must be filled"], "band.name": ["you're a bad person"], policy: ["error_text"])
-      # does not duplicate errors
-      form.errors.add(:title, "must be filled")
-      form.errors.messages.must_equal(before: ["validate", "validate 2"], title: ["before validate", "must be filled"], "band.name": ["you're a bad person"], policy: ["error_text"])
-      # merge existing errors
-      form.errors.add(:policy, "another error")
-      form.errors.messages.must_equal(before: ["validate", "validate 2"], title: ["before validate", "must be filled"], "band.name": ["you're a bad person"], policy: ["error_text", "another error"])
-    end
-  end
-
-  describe "correct #validate" do
-    before do
-      @result = form.validate(
-        "hit"   => {"title" => "Sacrifice"},
-        "title" => "Second Heat",
-        "songs" => [{"title" => "Heart Of A Lion"}],
-        "band"  => {"label" => {name: "Fat Wreck"}}
-      )
-    end
-
-    it { @result.must_equal true }
-    it { form.hit.title.must_equal "Sacrifice" }
-    it { form.title.must_equal "Second Heat" }
-    it { form.songs.first.title.must_equal "Heart Of A Lion" }
-    it do
-      skip "WE DON'T NEED COUNT AND EMPTY? ON THE CORE ERRORS OBJECT"
-      form.errors.size.must_equal(0)
-      form.errors.empty?.must_equal(true)
-    end
-  end
-
-  describe "Errors#to_s" do
-    before { form.validate("songs" => [{"title" => ""}], "band" => {"label" => {}}) }
-
-    # to_s is aliased to messages
-    it {
-      skip "why do we need Errors#to_s ?"
-      form.errors.to_s.must_equal "{:\"songs.title\"=>[\"must be filled\"], :\"band.label.name\"=>[\"must be filled\"]}"
-    }
-  end
-end

data/test/fixtures/dry_new_api_error_messages.yml

@@ -1,104 +0,0 @@
-en:
-  dry_validation:
-    errors:
-      array?: "must be an array"
-
-      empty?: "must be empty"
-
-      excludes?: "must not include %{value}"
-
-      excluded_from?:
-        arg:
-          default: "must not be one of: %{list}"
-          range: "must not be one of: %{list_left} - %{list_right}"
-
-      eql?: "must be equal to %{left}"
-
-      not_eql?: "must not be equal to %{left}"
-
-      filled?: "must be filled"
-
-      format?: "is in invalid format"
-
-      number?: "must be a number"
-
-      odd?: "must be odd"
-
-      even?: "must be even"
-
-      gt?: "must be greater than %{num}"
-
-      gteq?: "must be greater than or equal to %{num}"
-
-      hash?: "must be a hash"
-
-      included_in?:
-        arg:
-          default: "must be one of: %{list}"
-          range: "must be one of: %{list_left} - %{list_right}"
-
-      includes?: "must include %{value}"
-
-      bool?: "must be boolean"
-
-      true?: "must be true"
-
-      false?: "must be false"
-
-      int?: "must be an integer"
-
-      float?: "must be a float"
-
-      decimal?: "must be a decimal"
-
-      date?: "must be a date"
-
-      date_time?: "must be a date time"
-
-      time?: "must be a time"
-
-      key?: "is missing"
-
-      attr?: "is missing"
-
-      lt?: "must be less than %{num}"
-
-      lteq?: "must be less than or equal to %{num}"
-
-      max_size?: "size cannot be greater than %{num}"
-
-      min_size?: "size cannot be less than %{num}"
-
-      none?: "cannot be defined"
-
-      str?: "must be a string"
-
-      type?: "must be %{type}"
-
-      size?:
-        arg:
-          default: "size must be %{size}"
-          range: "size must be within %{size_left} - %{size_right}"
-
-        value:
-          string:
-            arg:
-              default: "length must be %{size}"
-              range: "length must be within %{size_left} - %{size_right}"
-
-
-
-      rules:
-        name:
-          good_musical_taste?: "you're a bad person"
-        title:
-          good_musical_taste?: "you're a bad person"
-        songs:
-          a_song?: "must have at least one enabled song"
-        artist:
-          with_last_name?: "must have last name"
-
-de:
-  dry_validation:
-    errors:
-      filled?: "muss abgefüllt sein"

data/test/form_old_api.rb

@@ -1,57 +0,0 @@
-require "test_helper"
-
-class FormTest < MiniTest::Spec
-  Artist = Struct.new(:name)
-
-  class AlbumForm < TestForm
-    property :title
-
-    property :hit do
-      property :title
-    end
-
-    collection :songs do
-      property :title
-    end
-
-    property :band do # yepp, people do crazy stuff like that.
-      property :label do
-        property :name
-      end
-    end
-  end
-
-  describe "::dup" do
-    let(:cloned) { AlbumForm.clone }
-
-    # #dup is called in Op.inheritable_attr(:contract_class), it must be subclass of the original one.
-    it { cloned.wont_equal AlbumForm }
-    it { AlbumForm.definitions.wont_equal cloned.definitions }
-
-    it do
-      # currently, forms need a name for validation, even without AM.
-      cloned.singleton_class.class_eval do
-        def name
-          "Album"
-        end
-      end
-
-      cloned.validation do
-        required(:title).filled
-      end
-
-      cloned.new(OpenStruct.new).validate({})
-    end
-  end
-
-  describe "#initialize" do
-    class ArtistForm < TestForm
-      property :name
-      property :current_user, virtual: true
-    end
-
-    it "allows injecting :virtual options" do
-      ArtistForm.new(Artist.new, current_user: Object).current_user.must_equal Object
-    end
-  end
-end

data/test/form_option_old_api.rb

@@ -1,24 +0,0 @@
-require "test_helper"
-
-class FormOptionTest < MiniTest::Spec
-  Song  = Struct.new(:title)
-  Album = Struct.new(:song)
-
-  class SongForm < TestForm
-    property :title
-    validation do
-      required(:title).filled
-    end
-  end
-
-  class AlbumForm < TestForm
-    property :song, form: SongForm
-  end
-
-  it do
-    form = AlbumForm.new(Album.new(Song.new("When It Comes To You")))
-    form.song.title.must_equal "When It Comes To You"
-
-    form.validate(song: {title: "Run For Cover"})
-  end
-end

data/test/inherit_old_api.rb

@@ -1,105 +0,0 @@
-require "test_helper"
-require "representable/json"
-
-class InheritTest < BaseTest
-  Populator = Reform::Form::Populator
-
-  class SkipParse
-    include Uber::Callable
-    def call(*_args)
-      false
-    end
-  end
-
-  class AlbumForm < TestForm
-    property :title, deserializer: {instance: "Instance"}, skip_if: "skip_if in AlbumForm" # allow direct configuration of :deserializer.
-
-    property :hit, populate_if_empty: ->(*) { Song.new } do
-      property :title
-      validation do
-        required(:title).filled
-      end
-    end
-
-    collection :songs, populate_if_empty: -> {}, skip_if: :all_blank do
-      property :title
-    end
-
-    property :band, populate_if_empty: -> {} do
-      def band_id
-        1
-      end
-    end
-  end
-
-  class CompilationForm < AlbumForm
-    property :title, inherit: true, skip_if: "skip_if from CompilationForm"
-    property :hit, inherit: true, populate_if_empty: ->(*) { Song.new }, skip_if: SkipParse.new do
-      property :rating
-      validation do
-        required(:rating).filled
-      end
-    end
-
-    # NO collection here, this is entirely inherited.
-
-    property :band, inherit: true do # inherit everything, but explicitely.
-    end
-  end
-
-  let(:album) { Album.new(nil, Song.new, [], Band.new) }
-  subject { CompilationForm.new(album) }
-
-  it do
-    subject.validate("hit" => {"title" => "LA Drone", "rating" => 10})
-    subject.hit.title.must_equal "LA Drone"
-    subject.hit.rating.must_equal 10
-    subject.errors.messages.must_equal({})
-  end
-
-  it do
-    subject.validate({})
-    assert_nil subject.model.hit.title
-    assert_nil subject.model.hit.rating
-    subject.errors.messages.must_equal("hit.title": ["must be filled"], "hit.rating": ["must be filled"])
-  end
-
-  it "xxx" do
-    # sub hashes like :deserializer must be properly cloned when inheriting.
-    AlbumForm.options_for(:title)[:deserializer].object_id.wont_equal CompilationForm.options_for(:title)[:deserializer].object_id
-
-    # don't overwrite direct deserializer: {} configuration.
-    AlbumForm.options_for(:title)[:internal_populator].must_be_instance_of Reform::Form::Populator::Sync
-    AlbumForm.options_for(:title)[:deserializer][:skip_parse].must_equal "skip_if in AlbumForm"
-
-    # AlbumForm.options_for(:hit)[:internal_populator].inspect.must_match /Reform::Form::Populator:.+ @user_proc="Populator"/
-    # AlbumForm.options_for(:hit)[:deserializer][:instance].inspect.must_be_instance_with Reform::Form::Populator, user_proc: "Populator"
-
-    AlbumForm.options_for(:songs)[:internal_populator].must_be_instance_of Reform::Form::Populator::IfEmpty
-    AlbumForm.options_for(:songs)[:deserializer][:skip_parse].must_be_instance_of Reform::Form::Validate::Skip::AllBlank
-
-    AlbumForm.options_for(:band)[:internal_populator].must_be_instance_of Reform::Form::Populator::IfEmpty
-
-    CompilationForm.options_for(:title)[:deserializer][:skip_parse].must_equal "skip_if from CompilationForm"
-    # pp CompilationForm.options_for(:songs)
-    CompilationForm.options_for(:songs)[:internal_populator].must_be_instance_of Reform::Form::Populator::IfEmpty
-
-    CompilationForm.options_for(:band)[:internal_populator].must_be_instance_of Reform::Form::Populator::IfEmpty
-
-    # completely overwrite inherited.
-    CompilationForm.options_for(:hit)[:deserializer][:skip_parse].must_be_instance_of SkipParse
-
-    # inherit: true with block will still inherit the original class.
-    AlbumForm.new(OpenStruct.new(band: OpenStruct.new)).band.band_id.must_equal 1
-    CompilationForm.new(OpenStruct.new(band: OpenStruct.new)).band.band_id.must_equal 1
-  end
-
-  class CDForm < AlbumForm
-    # override :band's original populate_if_empty but with :inherit.
-    property :band, inherit: true, populator: "CD Populator" do
-
-    end
-  end
-
-  it { CDForm.options_for(:band)[:internal_populator].instance_variable_get(:@user_proc).must_equal "CD Populator" }
-end