reform 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1daff9bd1feb2e5837a1818a792593760425064f
-  data.tar.gz: aa9c43f132c21fcd97d33e52afdc7d33522e8edc
+  metadata.gz: 680817cba6358a6d4d0137a83f0ffb44c19b2af5
+  data.tar.gz: d4644a6a3a3b649c8bd4947ccd2170ee6ac6f571
 SHA512:
-  metadata.gz: daf9c4562f38f981a028cbdec983b4db381c7df75ca71389a7242a8623eec61f07092c1515305377ec5417cd943ac67fc1c93584b6454d4de6362b0262aaa775
-  data.tar.gz: bcdfd8f9e12074ae4dc8f207c7c9be2af51860cb75f1621ffe537a516f7e496e16130ed723168374f89254b884d212e710e8f69cb90c735f1a4df32f6b6e1556
+  metadata.gz: ac84655f78735243502f6f5766e7c29afa2cbb02c5581aeec2b5b8416a13b9ceee08dc78e7912f63409b061eb9c4d2fb0f97e5f61ca8960ea5a8578f414e7e56
+  data.tar.gz: 15fcd74cada0345010c306d91b1ece413f5979ccc4d167fbb63d385bfb9cb1e60b65e8034163c0ba88916a7587e4eb24db9b11156aff4e608fc159cb1beae909

data/CHANGES.md

@@ -1,3 +1,7 @@
+## 2.2.1
+
+* Fix `Contract::Properties`. Thanks @simonc. <3
+
 ## 2.2.0
 
 * Remove `reform/rails`. This is now handled via the `reform-rails` gem which you have to bundle.

data/lib/reform/contract.rb

@@ -29,7 +29,7 @@ module Reform
 
     # FIXME: test me.
     def self.properties(*args)
-      options = args.pop if args.last.is_a?(Hash)
+      options = args.last.is_a?(Hash) ? args.pop : {}
       args.each { |name| property(name, options.dup) }
     end
 

data/lib/reform/version.rb

@@ -1,3 +1,3 @@
 module Reform
-  VERSION = "2.2.0"
+  VERSION = "2.2.1"
 end

data/test/contract_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class ContractTest < MiniTest::Spec
   Song  = Struct.new(:title, :album, :composer)
-  Album = Struct.new(:name, :songs, :artist)
+  Album = Struct.new(:name, :duration, :songs, :artist)
   Artist = Struct.new(:name)
 
   class ArtistForm < Reform::Form
@@ -11,6 +11,10 @@ class ContractTest < MiniTest::Spec
 
   class AlbumForm < Reform::Contract
     property :name
+
+    properties :duration
+    properties :year, :style, readable: false
+
     validation do
       key(:name).required
     end
@@ -36,7 +40,7 @@ class ContractTest < MiniTest::Spec
   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", [song, song_with_composer], artist) }
+  let (:album)              { Album.new("The Dissent Of Man", 123, [song, song_with_composer], artist) }
 
   let (:form) { AlbumForm.new(album) }
 
@@ -45,6 +49,27 @@ class ContractTest < MiniTest::Spec
     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 [: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\"}>" }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reform
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Nick Sutterer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-20 00:00:00.000000000 Z
+date: 2016-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: disposable