reform 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66d8c635567dc8211aecd707abdb5e087091a31c
-  data.tar.gz: 651a3fe9eef9a320329de238b7fdb8782d0d5400
+  metadata.gz: be845dd1b0e8a941df46ef6ed8d582b440b44acf
+  data.tar.gz: 4a4d7e81be355c4164fb884060eb07194bad0af6
 SHA512:
-  metadata.gz: 11fd15d412d2184659d601891e612a7e103e3c9a90240356dea9124fd17c8f8422a4018ca46c4bb66cfc3074199e37b046032b77859d186887db161e0d91b02a
-  data.tar.gz: 752b5e00845adf198af51a556c9f7c2ef63bd86ca08fce45585c8ccbf2e22e7a1ee9fb1081a2fd7edc06025233c7c345c8774ff8d473955a9d0e80b40c522c37
+  metadata.gz: 0c3c10fbedfb3cf9df5afdfbd98088a1ef948b9aa7b8730d294673b624309786658a450dcdafdd4571ef35ffbbfd3e3e724accd1bc2e250f9345c323f57640c6
+  data.tar.gz: 3c24007806a3469ce08ecc1ff13c40bf7e271b46d8fdaa8e098e2da0ed1a62571c51fcd7e0feca928c56c01c49bda1d632cb47c8aa7f2fdf9c9255274fbb2c5d

data/CHANGES.md

@@ -1,3 +1,27 @@
+## 1.0.4
+
+Reverting what I did in 1.0.3. Leave your code as it is. You may override a writers like `#title=` to sanitize or filter incoming data, as in
+
+```ruby
+def title=(v)
+  super(v.strip)
+end
+```
+
+This setter will only be called in `#validate`.
+
+Readers still work the same, meaning that
+
+```ruby
+def title
+  super.downcase
+end
+```
+
+will result in lowercased title when rendering the form (and only then).
+
+The reason for this confusion is that you don't blog enough about Reform. Only after introducing all those deprecation warnings, people started to contact me to ask what's going on. This gave me the feedback I needed to decide what's the best way for filtering incoming data.
+
 ## 1.0.3
 
 * Systematically use `fields` when saving the form. This avoids calling presentational readers that might have been defined by the user.

data/lib/reform/form/save.rb

@@ -52,9 +52,7 @@ module Reform::Form::Save
 
   require "active_support/hash_with_indifferent_access" # DISCUSS: replace?
   def to_nested_hash
-    source = deprecate_potential_readers_used_in_sync_or_save(fields) # TODO: remove in 1.1.
-
-    map = mapper.new(source).extend(NestedHash)
+    map = mapper.new(fields).extend(NestedHash)
 
     ActiveSupport::HashWithIndifferentAccess.new(map.to_hash)
   end

data/lib/reform/form/sync.rb

@@ -52,47 +52,10 @@ module Reform::Form::Sync
   # reading from fields allows using readers in form for presentation
   # and writers still pass to fields in #validate????
   def sync! # semi-public.
-    source = deprecate_potential_readers_used_in_sync_or_save(fields) # TODO: remove in 1.1.
-
-    input_representer = mapper.new(source).extend(InputRepresenter) # FIXME: take values from self.fields!
+    input_representer = mapper.new(fields).extend(InputRepresenter)
 
     input = input_representer.to_hash
 
     mapper.new(aliased_model).extend(Writer).from_hash(input)
   end
-
-  def deprecate_potential_readers_used_in_sync_or_save(fields) # TODO: remove in 1.1.
-    readers = []
-
-    mapper.representable_attrs.each do |definition|
-      return fields if definition[:presentation_accessors]
-
-      name = definition.name
-      next if method(name).source_location.inspect =~ /forwardable/ # defined by Reform, not overridden by user.
-
-      readers << name
-    end
-    return fields if readers.size == 0
-
-    warn "[Reform] Deprecation: You're overriding the following readers: #{readers.join(', ')}. In Reform 1.1, those readers will be used for presentation in the view, only. In case you are using the readers deliberately to modify incoming data for #save or #sync: this won't work anymore. If you just use the custom readers in the form view, add `presentation_accessors: true` to a property to suppress this message and use the new behaviour."
-
-    self # old mode
-  end
-  def deprecate_potential_writers_used_in_validate(fields) # TODO: remove in 1.1.
-    readers = []
-
-    mapper.representable_attrs.each do |definition|
-      return fields if definition[:presentation_accessors]
-
-      name = definition.setter
-      next if method(name).source_location.inspect =~ /forwardable/ # defined by Reform, not overridden by user.
-
-      readers << name
-    end
-    return fields if readers.size == 0
-
-    warn "[Reform] Deprecation: You're overriding the following writers: #{readers.join(', ')}. In Reform 1.1, those writers will be used for presentation in the view, only. In case you are using the writers deliberately to modify incoming data for #setup or #validate: this won't work anymore.  Add `presentation_accessors: true` to a property to suppress this message and use the new behaviour."
-
-    self # old mode
-  end
 end

data/lib/reform/form/validate.rb

@@ -99,14 +99,12 @@ module Reform::Form::Validate
 
 private
   def populate!(params)
-    target = deprecate_potential_writers_used_in_validate(fields) # TODO: remove in 1.1.
-
-    mapper.new(target).extend(Populator).from_hash(params, :parent_form => self) # TODO: remove model(form) once we found out how to synchronize the model correctly. see https://github.com/apotonick/reform/issues/86#issuecomment-43402047
+    # populate only happens for nested forms, if you override that setter it's your fault.
+    mapper.new(fields).extend(Populator).from_hash(params, :parent_form => self) # TODO: remove model(form) once we found out how to synchronize the model correctly. see https://github.com/apotonick/reform/issues/86#issuecomment-43402047
   end
 
   def deserialize!(params)
-    target = deprecate_potential_writers_used_in_validate(fields) # TODO: remove in 1.1.
-
-    mapper.new(target).extend(Update).from_hash(params)
+    # using self here will call the form's setters like title= which might be overridden.
+    mapper.new(self).extend(Update).from_hash(params)
   end
 end

data/lib/reform/version.rb

@@ -1,3 +1,3 @@
 module Reform
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/test/reform_test.rb

@@ -307,58 +307,7 @@ class ReadonlyAttributesTest < MiniTest::Spec
 end
 
 
-# TODO: formatter: lambda { |args| 1 }
-# to define reader for presentation layer (e.g. default value for #weight).
 class OverridingAccessorsTest < BaseTest
-  class SongForm < Reform::Form
-    property :title, :presentation_accessors => true
-
-    def title=(v)
-      super v*2
-    end
-
-    def title
-      super.downcase
-    end
-  end
-
-  let (:song) { Song.new("Pray") }
-  subject { SongForm.new(song) }
-
-  # override reader for presentation.
-  it { subject.title.must_equal "pray" }
-
-  # overridden writer only works when called explicitely.
-  it do
-    subject.title = "Swing Life Away"
-    subject.title.must_equal "swing life awayswing life away"
-  end
-
-
-  describe "#save" do
-    before { subject.validate("title" => "Hey Little World") }
-
-    # for presentation, always use overridden accessor
-    it { subject.title.must_equal "hey little world" }
-
-    # the reader is not used when saving/syncing.
-    it do
-      subject.save do |f, hash|
-        hash["title"].must_equal "Hey Little World"
-      end
-    end
-
-    # the reader is not used when saving/syncing.
-    it do
-      song.extend(Saveable)
-      subject.save
-      song.title.must_equal "Hey Little World"
-    end
-  end
-end
-
-
-class OLDOverridingAccessorsTest < BaseTest # TODO: remove in 1.1
   class SongForm < Reform::Form
     property :title
 
@@ -387,15 +336,15 @@ class OLDOverridingAccessorsTest < BaseTest # TODO: remove in 1.1
     # the reader is not used when saving/syncing.
     it do
       subject.save do |f, hash|
-        hash["title"].must_equal "hey little worldhey little world"
+        hash["title"].must_equal "Hey Little WorldHey Little World"
       end
     end
 
-    # reader and writer used when saving/syncing.
+    # no reader or writer used when saving/syncing.
     it do
       song.extend(Saveable)
       subject.save
-      song.title.must_equal "hey little worldhey little world"
+      song.title.must_equal "Hey Little WorldHey Little World"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reform
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Nick Sutterer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-13 00:00:00.000000000 Z
+date: 2014-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: representable