reform 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a65ba4e715246d4be150394d9ee6fbcd34af3e8
-  data.tar.gz: 8c12fd32b88fd52a7c20cbe2cf84f5a6bbf01c8d
+  metadata.gz: 777f16f9f2f9f029ad3d3b9ee1cdd2b12ec31bb7
+  data.tar.gz: a1dc7b0e61b13090a6a67bda43520104c58e502d
 SHA512:
-  metadata.gz: 922aee7abf462ddcc510ffcce88f90a88d6450586df3c9eed27e174f5c6f73a8c6e43022147a6b730daa61fd61016bf3e97f620458546d5da5e5c6d30f134c68
-  data.tar.gz: b752b34d4a88ab8ac02f594635fc793ea3f7d0f39c139971d1d944d26109aa921196b46242febbd7b68ea478e87e8b12cd06b0fe1765391b427cbfd0c7216a39
+  metadata.gz: 9ca591099b12b4b519311e74d1bb89c7251473b2f827115d7c56c9880886a8a9f76f4326d48d386dc4d36f42c753ccf74bedb088d714524764022a5a7b316dea
+  data.tar.gz: efb2ea5be6e19226fbe2ad6f9741380e9ab5a2b1630fcd96dabb146c0c26cb8478a7668ef7ff378170d1a7e66842a2c9b646ffb120d971bb37eaa438c9018116

data/CHANGES.md

@@ -1,3 +1,13 @@
+## 1.2.3
+
+* Make `ModelReflections` work with simple_form 3.1.0. (#176). It also provides `defined_enums` and `::reflect_on_association` now.
+* `nil` values passed into `#validate` will now be written to the model in `#sync` (#175). Formerly, only blank strings and values evaluating to true were considered when syncing. This allows blanking fields of the model as follows.
+
+    ```ruby
+    form.validate(title: nil)
+    ```
+* Calling `Form::reform_2_0!` will now properly inherit to nested forms.
+
 ## 1.2.2
 
 * Use new `uber` to allow subclassing `reform_2_0!` forms.

data/README.md

@@ -48,7 +48,7 @@ Luckily, this can be shortened as follows.
 ```ruby
 class SongForm < Reform::Form
   property :title, validates: {presence: true}
-  property :length, validates {numericality: true}
+  property :length, validates: {numericality: true}
 end
 ```
 
@@ -905,7 +905,7 @@ You can also provide the sync lambda at run-time.
 form.sync(title: lambda { |value, options| form.model.title = "HOT: #{value}" })
 ```
 
-This block is run in the caller's context allowing you to access environment variables. Note that the dynamic sync happens _before_ save, so the model id may unavailable.
+This block is run in the caller's context allowing you to access environment variables. Note that the dynamic sync happens _before_ save, so the model id may be unavailable.
 
 You can do the same for saving.
 

data/TODO.md

@@ -3,7 +3,7 @@
 * empty dont read, but write
 * read_only: read, don't write
 
-
+* make SkipUnchanged default?
 
 
 * `validates :title, :presence => true`

data/lib/reform/contract.rb

@@ -164,11 +164,6 @@ module Reform
       end
     end
 
-    inheritable_attr :reform_2_0 # TODO: remove me in 2.0.
-    def self.reform_2_0!
-      self.reform_2_0= true
-    end
-
     def self.register_feature(mod)
       features[mod] = true
     end
@@ -196,6 +191,19 @@ module Reform
 
     alias_method :aliased_model, :model
 
+    # TODO: remove me in 2.0.
+    module Reform20Switch
+      def self.included(base)
+        base.register_feature(Reform20Switch)
+      end
+    end
+    def self.reform_2_0!
+      include Reform20Switch
+    end
+    def self.reform_2_0
+      features[Reform20Switch]
+    end
+
 
     # Keeps values of the form fields. What's in here is to be displayed in the browser!
     # we need this intermediate object to display both "original values" and new input from the form after submitting.

data/lib/reform/form/model_reflections.rb

@@ -5,14 +5,33 @@
 # doesn't have to "guess" what simple_form and other form helpers need.
 module Reform::Form::ModelReflections
   def self.included(base)
+    base.extend ClassMethods
     base.register_feature self # makes it work in nested forms.
   end
 
+  module ClassMethods
+    # Delegate reflect_on_association to the model class to support simple_form's
+    # association input.
+    def reflect_on_association(*args)
+      model_name.to_s.constantize.reflect_on_association(*args)
+    end
+  end
+
   # Delegate column for attribute to the model to support simple_form's
   # attribute type interrogation.
   def column_for_attribute(name)
     model_for_property(name).column_for_attribute(name)
   end
 
+  def has_attribute?(name)
+    model_for_property(name).has_attribute?(name)
+  end
+
+  def defined_enums
+    return model.defined_enums unless is_a?(Reform::Form::Composition)
+
+    model.each.with_object({}) { |m,h| h.merge! m.defined_enums }
+  end
+
   # this should also contain to_param and friends as this is used by the form helpers.
 end

data/lib/reform/form/sync.rb

@@ -27,11 +27,15 @@ private
   # Transforms form input into what actually gets written to model.
   # output: {title: "Mint Car", hit: <Form>}
   def input_representer
-    self.class.representer(:input) do |dfn|
-      dfn.merge!(
-        :representable  => false,
-        :prepare        => lambda { |obj, *| obj }
-      )
+    self.class.representer(:input, :all => true) do |dfn|
+      if dfn[:form]
+        dfn.merge!(
+          :representable  => false,
+          :prepare        => lambda { |obj, *| obj },
+        )
+      else
+        dfn.merge!(:render_nil => true) # do sync nil values back to the model for scalars.
+      end
     end
   end
 

data/lib/reform/version.rb

@@ -1,3 +1,3 @@
 module Reform
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

data/test/model_reflections_test.rb

@@ -16,7 +16,19 @@ class ModelReflectionTest < MiniTest::Spec
 
   module ColumnForAttribute
     def column_for_attribute(*args)
-        "#{self.class}: #{args.inspect}"
+      "#{self.class}: #{args.inspect}"
+    end
+  end
+
+  module HasAttribute
+    def has_attribute?(*args)
+      "#{self.class}: has #{args.inspect}"
+    end
+  end
+
+  module DefinedEnums
+    def defined_enums
+      {self.class => []}
     end
   end
 
@@ -35,6 +47,47 @@ class ModelReflectionTest < MiniTest::Spec
     end
   end
 
+  describe "#has_attribute?" do
+    let (:artist) { Artist.new }
+    let (:song) { Song.new(artist: artist) }
+    let (:form) { SongForm.new(song) }
+
+    # delegate to model.
+    it do
+      song.extend(HasAttribute)
+      artist.extend(HasAttribute)
+
+      form.has_attribute?(:title).must_equal "Song: has [:title]"
+      form.artist.has_attribute?(:name).must_equal "Artist: has [:name]"
+    end
+  end
+
+  describe "#defined_enums" do
+    let (:artist) { Artist.new }
+    let (:song) { Song.new(artist: artist) }
+    let (:form) { SongForm.new(song) }
+
+    # delegate to model.
+    it do
+      song.extend(DefinedEnums)
+      artist.extend(DefinedEnums)
+
+      form.defined_enums.must_include Song
+      form.artist.defined_enums.must_include Artist
+    end
+  end
+
+  describe ".reflect_on_association" do
+    let (:artist) { Artist.new }
+    let (:song) { Song.new(artist: artist) }
+    let (:form) { SongForm.new(song) }
+
+    # delegate to model class.
+    it do
+      reflection = form.class.reflect_on_association(:artist)
+      reflection.must_be_instance_of ActiveRecord::Reflection::AssociationReflection
+    end
+  end
 
   class SongWithArtistForm < Reform::Form
     include Reform::Form::ActiveRecord
@@ -62,4 +115,20 @@ class ModelReflectionTest < MiniTest::Spec
       form.column_for_attribute(:title).must_equal "Song: [:title]"
     end
   end
-end
+
+  describe "#defined_enums with composition" do
+    let (:artist) { Artist.new }
+    let (:song) { Song.new }
+    let (:form) { SongWithArtistForm.new(artist: artist, song: song) }
+
+    # delegates to respective model.
+    it do
+      song.extend(DefinedEnums)
+      artist.extend(DefinedEnums)
+
+
+      form.defined_enums.must_include Song
+      form.defined_enums.must_include Artist
+    end
+  end
+end

data/test/sync_test.rb

@@ -39,4 +39,18 @@ class SyncTest < BaseTest
     it { song2.title.must_equal "Roxanne" }
     it { label.name.must_equal "Polydor" }
   end
+
+  describe "with incoming nil value" do
+    it do
+      album = Album.new("GI")
+      form  = ErrorsTest::AlbumForm.new(album)
+
+      form.title.must_equal "GI"
+
+      form.validate("title" => nil)
+      form.title.must_equal nil
+      form.sync
+      album.title.must_equal nil
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reform
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Nick Sutterer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-11 00:00:00.000000000 Z
+date: 2014-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: representable