reform 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ce0b79a877613cd7bcd9cfd868d0a33414c531a
-  data.tar.gz: f0e06d22099e1d335f692e865aff069428e9dc75
+  metadata.gz: 201a01642c1743227a0209c716240374d884189f
+  data.tar.gz: 4327aa39fbfae302b0078c6787a0df387aa08080
 SHA512:
-  metadata.gz: 4f9f35619dea63561e09239ff40ec7765695a9f93638a32f1f5b743f6752aafce757497af1c28e9244fcb03cdaaf19cf07616dccb093881ce7b3b39b0d3f8af1
-  data.tar.gz: 30d28814ca8b99abba0385efb9c3ca391066402a39f81f45cacba4e927d52beb1e74516072fdb42a3946f4964099395bd48b12bd6ceb0aa1c2da0eb019c7927d
+  metadata.gz: 42bad26c32be288977aae6cc6be0f634382b5bdc0cc733ce5b0f2084096db897df33b7126923b58f9d3eee4f50e63b1ee0095650a2c414c12a2c1e9fbc5148fd
+  data.tar.gz: 94ebe84171e96c49fff4adbdc704d5c94cebc0713a27a35b86941ffc33e23947e7371afe9b8d6fce3f7bffee1cd6ba2363418635abd87f65230bbebf7b2bf385

data/CHANGES.md

@@ -1,3 +1,8 @@
+## 0.2.4
+
+* Accessors for properties (e.g. `title` and `title=`) can now be overridden in the form *and* call `super`. This is extremely helpful if you wanna do "manual coercion" since the accessors are invoked in `#validate`. Thanks to @cj for requesting this.
+* Inline forms now know their class name from the property that defines them. This is needed for I18N where `ActiveModel` queries the class name to compute translation keys. If you're not happy with it, use `::model`.
+
 ## 0.2.3
 
 * `#form_for` now properly recognizes a nested form when declared using `:form` (instead of an inline form).

data/README.md

@@ -386,7 +386,6 @@ form.save do |f, nested|
   f.country #=> "Australia"
 ```
 
-
 ## Agnosticism: Mapping Data
 
 Reform doesn't really know whether it's working with a PORO, an `ActiveRecord` instance or a `Sequel` row.
@@ -482,6 +481,21 @@ property :song, form: SongForm`
 The nested `SongForm` is a stand-alone form class you have to provide.
 
 
+### Overriding Accessors
+
+When "real" coercion is too much and you simply want to convert incoming data yourself, override the setter.
+
+```ruby
+class SongForm < Reform::Form
+  property :title
+
+  def title=(v)
+    super(v.upcase)
+  end
+```
+
+This will capitalize the title _after_ calling `form.validate` but _before_ validation happens. Note that you can use `super` to call the original setter.
+
 ## Support
 
 If you run into any trouble chat with us on irc.freenode.org#trailblazer.

data/lib/reform/form.rb

@@ -49,7 +49,13 @@ module Reform
 
     private
       def create_accessor(name)
-        delegate [name, "#{name}="] => :fields
+        # Make a module that contains these very accessors, then include it
+        # so they can be overridden but still are callable with super.
+        accessors = Module.new do
+          extend Forwardable # DISCUSS: do we really need Forwardable here?
+          delegate [name, "#{name}="] => :fields
+        end
+        include accessors
       end
 
       def process_options(name, options) # DISCUSS: do we need that hook?

data/lib/reform/representer.rb

@@ -55,12 +55,16 @@ module Reform
       @representable_attrs = attrs
     end
 
-    def self.inline_representer(base_module, &block) # DISCUSS: separate module?
+    def self.inline_representer(base_module, name, options, &block)
+      name = name.to_s.singularize.camelize
+
       Class.new(Form) do
         instance_exec &block
 
-        def self.name # FIXME: needed by ActiveModel::Validation - why?
-          "AnonInlineForm"
+        @form_name = name
+
+        def self.name # needed by ActiveModel::Validation and I18N.
+          @form_name
         end
       end
     end

data/lib/reform/version.rb

@@ -1,3 +1,3 @@
 module Reform
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/reform.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency             "representable",  "~> 1.7.0"
+  spec.add_dependency             "representable",  ">= 1.7.5"
   spec.add_dependency             "activemodel"
   spec.add_development_dependency "bundler",        "~> 1.3"
   spec.add_development_dependency "rake",           ">= 10.1.0"

data/test/active_model_test.rb

@@ -30,6 +30,48 @@ class NewActiveModelTest < MiniTest::Spec # TODO: move to test/rails/
 
     it { class_with_model.model_name.must_be_kind_of ActiveModel::Name }
     it { class_with_model.model_name.to_s.must_equal "Album" }
+
+    describe "inline with model" do
+      let (:form_class) {
+        Class.new(Reform::Form) do
+          include Reform::Form::ActiveModel
+
+          property :song do
+            include Reform::Form::ActiveModel
+            model :hit
+          end
+        end
+      }
+
+      let (:inline) { form_class.new(OpenStruct.new).song }
+
+      it { inline.class.model_name.must_be_kind_of ActiveModel::Name }
+      it { inline.class.model_name.to_s.must_equal "Hit" }
+    end
+
+    describe "inline without model" do
+      let (:form_class) {
+        Class.new(Reform::Form) do
+          include Reform::Form::ActiveModel
+
+          property :song do
+            include Reform::Form::ActiveModel
+          end
+
+          collection :hits do
+            include Reform::Form::ActiveModel
+          end
+        end
+      }
+
+      let (:form) { form_class.new(OpenStruct.new(:hits=>[OpenStruct.new], :song => OpenStruct.new)) }
+
+      it { form.song.class.model_name.must_be_kind_of ActiveModel::Name }
+      it { form.song.class.model_name.to_s.must_equal "Song" }
+      it "singularizes collection name" do
+        form.hits.first.class.model_name.to_s.must_equal "Hit"
+      end
+    end
   end
 end
 

data/test/reform_test.rb

@@ -272,4 +272,21 @@ class ReadonlyAttributesTest < MiniTest::Spec
 
     hash.must_equal("country"=> "Germany")
   end
+end
+
+class OverridingAccessorsTest < MiniTest::Spec
+  class SongForm < Reform::Form
+    property :title
+
+    def title=(v)
+      super v.upcase
+    end
+  end
+
+
+  it "allows overriding accessors while keeping super" do
+    form = SongForm.new(OpenStruct.new)
+    form.validate("title" => "Hey Little World")
+    form.title.must_equal "HEY LITTLE WORLD"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reform
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Nick Sutterer
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-16 00:00:00.000000000 Z
+date: 2013-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: representable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.7.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.7.5
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement