reform 1.2.6 → 2.0.0.beta1

data/test/virtual_test.rb

@@ -2,8 +2,6 @@ require 'test_helper'
 
 class VirtualTest < MiniTest::Spec
   class CreditCardForm < Reform::Form
-    reform_2_0!
-
     property :credit_card_number, virtual: true # no read, no write, it's virtual.
   end
 
@@ -12,7 +10,7 @@ class VirtualTest < MiniTest::Spec
   it {
     form.validate("credit_card_number" => "123")
 
-    form.credit_card_number.must_equal "123"
+    form.credit_card_number.must_equal "123"  # this is still readable in the UI.
 
     form.sync
 

data/test/writeable_test.rb

@@ -1,19 +1,18 @@
 require 'test_helper'
 
-class WriteableTest < MiniTest::Spec # TODO: remove me in 2.0.
+class WriteableTest < MiniTest::Spec
   Location = Struct.new(:country)
 
   class LocationForm < Reform::Form
-    reform_2_0!
-
     property :country, writeable: false
   end
 
   let (:loc) { Location.new("Australia") }
   let (:form) { LocationForm.new(loc) }
 
-  it { form.country.must_equal "Australia" }
   it do
+    form.country.must_equal "Australia"
+
     form.validate("country" => "Germany") # this usually won't change when submitting.
     form.country.must_equal "Germany"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: reform
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 2.0.0.beta1
 platform: ruby
 authors:
 - Nick Sutterer
@@ -9,36 +9,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: representable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: disposable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: uber
   requirement: !ruby/object:Gem::Requirement
@@ -71,16 +71,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -99,16 +99,16 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.4.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.4.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -179,7 +179,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Freeing your AR models from form logic.
+description: Form object decoupled from models.
 email:
 - apotonick@gmail.com
 - heinleng@gmail.com
@@ -202,29 +202,26 @@ files:
 - gemfiles/Gemfile.rails-4.0
 - lib/reform.rb
 - lib/reform/active_record.rb
-- lib/reform/composition.rb
 - lib/reform/contract.rb
 - lib/reform/contract/errors.rb
-- lib/reform/contract/setup.rb
 - lib/reform/contract/validate.rb
 - lib/reform/form.rb
 - lib/reform/form/active_model.rb
 - lib/reform/form/active_model/model_validations.rb
 - lib/reform/form/active_record.rb
-- lib/reform/form/changed.rb
 - lib/reform/form/coercion.rb
 - lib/reform/form/composition.rb
 - lib/reform/form/json.rb
 - lib/reform/form/model_reflections.rb
 - lib/reform/form/module.rb
 - lib/reform/form/multi_parameter_attributes.rb
+- lib/reform/form/populator.rb
 - lib/reform/form/prepopulate.rb
 - lib/reform/form/save.rb
 - lib/reform/form/scalar.rb
-- lib/reform/form/sync.rb
 - lib/reform/form/validate.rb
+- lib/reform/form/validation/unique_validator.rb
 - lib/reform/rails.rb
-- lib/reform/representer.rb
 - lib/reform/schema.rb
 - lib/reform/twin.rb
 - lib/reform/version.rb
@@ -262,19 +259,18 @@ files:
 - test/dummy/db/test.sqlite3
 - test/dummy/log/production.log
 - test/dummy/log/server.log
-- test/empty_test.rb
 - test/errors_test.rb
 - test/feature_test.rb
 - test/fields_test.rb
 - test/form_builder_test.rb
-- test/form_composition_test.rb
+- test/form_option_test.rb
 - test/form_test.rb
 - test/from_test.rb
 - test/inherit_test.rb
 - test/model_reflections_test.rb
 - test/model_validations_test.rb
-- test/nested_form_test.rb
-- test/prepopulate_test.rb
+- test/populate_test.rb
+- test/prepopulator_test.rb
 - test/rails/integration_test.rb
 - test/read_only_test.rb
 - test/readable_test.rb
@@ -283,12 +279,13 @@ files:
 - test/representer_test.rb
 - test/save_test.rb
 - test/scalar_test.rb
+- test/setup_test.rb
 - test/skip_if_test.rb
+- test/skip_setter_and_getter_test.rb
 - test/skip_unchanged_test.rb
-- test/sync_option_test.rb
-- test/sync_test.rb
 - test/test_helper.rb
 - test/twin_test.rb
+- test/uniqueness_test.rb
 - test/validate_test.rb
 - test/virtual_test.rb
 - test/writeable_test.rb
@@ -307,16 +304,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: Decouples your models from form by giving you form objects with validation,
-  presentation, workflows and security.
+summary: Form object decoupled from models with validation, population and presentation.
 test_files:
 - test/active_model_test.rb
 - test/active_record_test.rb
@@ -351,19 +347,18 @@ test_files:
 - test/dummy/db/test.sqlite3
 - test/dummy/log/production.log
 - test/dummy/log/server.log
-- test/empty_test.rb
 - test/errors_test.rb
 - test/feature_test.rb
 - test/fields_test.rb
 - test/form_builder_test.rb
-- test/form_composition_test.rb
+- test/form_option_test.rb
 - test/form_test.rb
 - test/from_test.rb
 - test/inherit_test.rb
 - test/model_reflections_test.rb
 - test/model_validations_test.rb
-- test/nested_form_test.rb
-- test/prepopulate_test.rb
+- test/populate_test.rb
+- test/prepopulator_test.rb
 - test/rails/integration_test.rb
 - test/read_only_test.rb
 - test/readable_test.rb
@@ -372,12 +367,13 @@ test_files:
 - test/representer_test.rb
 - test/save_test.rb
 - test/scalar_test.rb
+- test/setup_test.rb
 - test/skip_if_test.rb
+- test/skip_setter_and_getter_test.rb
 - test/skip_unchanged_test.rb
-- test/sync_option_test.rb
-- test/sync_test.rb
 - test/test_helper.rb
 - test/twin_test.rb
+- test/uniqueness_test.rb
 - test/validate_test.rb
 - test/virtual_test.rb
 - test/writeable_test.rb

data/lib/reform/composition.rb

@@ -1,63 +0,0 @@
-require 'disposable/composition'
-
-# TODO: replace that with lazy Twin and Composition from Disposable.
-module Reform
-  class Expose
-    include Disposable::Composition
-
-    # DISCUSS: this might be moved to Disposable::Twin::Expose.
-    class << self
-      # Builder for a concrete Composition class with configurations from the form's representer.
-      def from(representer)
-        options = {}
-
-        representer.representable_attrs.each do |definition|
-          process_definition!(options, definition)
-        end
-
-        Class.new(self).tap do |composition| # for 1.8 compat. you're welcome.
-          composition.map(options)
-          # puts composition@map.inspect
-        end
-      end
-
-    private
-      def process_definition!(options, definition)
-        options[:model] ||= []
-        options[:model] << [definition[:private_name], definition.name].compact
-      end
-    end
-  end
-
-  # Keeps composition of models and knows how to transform a plain hash into a nested hash.
-  class Composition < Expose
-
-    # DISCUSS: this might be moved to Disposable::Twin::Composition.
-    class << self
-      # Builder for a concrete Composition class with configurations from the form's representer.
-      def process_definition!(options, definition)
-        options[definition[:on]] ||= []
-        options[definition[:on]] << [definition[:private_name], definition.name].compact
-      end
-    end
-
-    def save
-      each.collect { |model| model.save }.all?
-    end
-
-    def nested_hash_for(attrs)
-      {}.tap do |hsh|
-        attrs.each do |name, val|
-          #obj = self.class.model_for_property(name)
-          config = self.class.instance_variable_get(:@map)[name.to_sym]
-
-          model  = config[:model]
-          method = config[:method]
-
-          hsh[model] ||= {}
-          hsh[model][method] = val
-        end
-      end
-    end
-  end
-end

data/lib/reform/contract/setup.rb

@@ -1,50 +0,0 @@
-module Reform
-  class Contract
-    module Setup
-      def initialize(model)
-        @model  = model # we need this for #save.
-        @fields = setup_fields  # delegate all methods to Fields instance.
-      end
-
-      # Setup#to_hash will create a nested hash of property values from the model.
-      # Nested properties will be recursively wrapped in a form instance.
-      def setup_representer
-        self.class.representer(:setup) do |dfn| # only nested forms.
-          dfn.merge!(
-            :representable => false, # don't call #to_hash, only prepare.
-            :prepare       => lambda { |model, args| args.binding[:form].new(model) } # wrap nested properties in form.
-          )
-        end
-      end
-
-      def setup_fields
-        representer = setup_representer.new(aliased_model)
-        options     = setup_options(Reform::Representer::Options[]) # handles :empty.
-
-        # populate the internal @fields set with data from the model.
-        create_fields(mapper.fields, representer.to_hash(options))
-      end
-
-      def create_fields(field_names, fields)
-        Fields.new(field_names, fields)
-      end
-
-      module SetupOptions
-        def setup_options(options)
-          options
-        end
-      end
-      include SetupOptions
-
-
-      module Readable
-        def setup_options(options)
-          empty_fields = mapper.representable_attrs.find_all { |d| d[:_readable] == false }.collect  { |d| d.name.to_sym }
-
-          options.exclude!(empty_fields)
-        end
-      end
-      include Readable
-    end
-  end # Setup
-end

data/lib/reform/form/changed.rb

@@ -1,9 +0,0 @@
-module Reform::Form::Changed
-  def changed?(name=nil)
-    !! changed[name.to_s]
-  end
-
-  def changed
-    @changed ||= {}
-  end
-end

data/lib/reform/form/sync.rb

@@ -1,116 +0,0 @@
-# #sync!
-#   1. assign scalars to model (respecting virtual, excluded attributes)
-#   2. call sync! on nested
-module Reform::Form::Sync
-  def sync_models(options={})
-    sync!(options)
-  end
-  alias_method :sync, :sync_models
-
-  # reading from fields allows using readers in form for presentation
-  # and writers still pass to fields in #validate????
-  def sync!(options) # semi-public.
-    options = Reform::Representer::Options[options.merge(:form => self)] # options local for this form, only.
-
-    input = sync_hash(options)
-    # if aliased_model was a proper Twin, we could do changed? stuff there.
-
-    options.delete(:exclude) # TODO: can we use 2 options?
-
-    dynamic_sync_representer.new(aliased_model).from_hash(input, options) # sync properties to Song.
-
-    model
-  end
-
-private
-
-  # Transforms form input into what actually gets written to model.
-  # output: {title: "Mint Car", hit: <Form>}
-  def input_representer
-    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
-
-  # Writes input to model.
-  def sync_representer
-    self.class.representer(:sync, :all => true) do |dfn|
-      if dfn[:form]
-        dfn.merge!(
-          :instance     => lambda { |fragment, *| fragment }, # use model's nested property for syncing.
-            # FIXME: do we allow options for #sync for nested forms?
-          :deserialize => lambda { |object, *| model = object.sync!({}) } # sync! returns the synced model.
-          # representable's :setter will do collection=([..]) or property=(..) for us on the model.
-        )
-      end
-    end
-  end
-
-  # This representer inherits from sync_representer and add functionality on top of that.
-  # It allows running custom dynamic blocks for properties when syncing.
-  def dynamic_sync_representer
-    self.class.representer(:dynamic_sync, superclass: sync_representer, :all => true) do |dfn|
-      next unless setter = dfn[:sync]
-
-      setter_proc = lambda do |value, options|
-        if options.binding[:sync] == true # sync: true will call the runtime lambda from the options hash.
-          options.user_options[options.binding.name.to_sym].call(value, options)
-          next
-        end
-
-        # evaluate the :sync block in form context (should we do that everywhere?).
-        options.user_options[:form].instance_exec(value, options, &setter)
-      end
-
-      dfn.merge!(:setter => setter_proc)
-    end
-  end
-
-
-  # API: semi-public.
-  module SyncHash
-    # This hash goes into the Writer that writes properties back to the model. It only contains "writeable" attributes.
-    def sync_hash(options)
-      input_representer.new(fields).to_hash(options)
-    end
-  end
-  include SyncHash
-
-
-  # Excludes :virtual and readonly properties from #sync in this form.
-  module Writeable
-    def sync_hash(options)
-      readonly_fields = mapper.fields { |dfn| dfn[:_writeable] == false }
-
-      options.exclude!(readonly_fields.map(&:to_sym))
-
-      super
-    end
-  end
-  include Writeable
-
-
-  # This will skip unchanged properties in #sync. To use this for all nested form do as follows.
-  #
-  #   class SongForm < Reform::Form
-  #     feature Synd::SkipUnchanged
-  module SkipUnchanged
-    def sync_hash(options)
-      # DISCUSS: we currently don't track if nested forms have changed (only their attributes). that's why i include them all here, which
-      # is additional sync work/slightly wrong. solution: allow forms to form.changed? not sure how to do that with collections.
-      scalars   = mapper.fields { |dfn| !dfn[:form] }
-      unchanged = scalars - changed.keys
-
-      # exclude unchanged scalars, nested forms and changed scalars still go in here!
-      options.exclude!(unchanged.map(&:to_sym))
-      super
-    end
-  end
-end