rectify 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76e80de9044d3a1b477393b19707c90ca78e64e2
-  data.tar.gz: e7f8fa99d59f1adf320f322d4fc237f4927e9c34
+  metadata.gz: 4511c35c01c0537574a5a687cdd29ca0b920d368
+  data.tar.gz: f6cc201bcf222a71f5698f1a14e58d2a3d6f6ce8
 SHA512:
-  metadata.gz: d4f18bb20decef78424111d079cee4762da7c2e864c91a89e1429e6ce4fc688f9295f96f10735ca4f1d832a2a9dba3e400300070b1f5f62287c6a4702f6b2390
-  data.tar.gz: 8309c1d194bf83f7d1484b1c201317cadd54083ea867e87ac0a7fbc73c4b5a26e93f24b5888b14768d67a891e4d81276e07e76d4434e07fcffada6cd914a185a
+  metadata.gz: 59ab549209b787188e97bb0ac3914e6cb833f5d83256f49f6c786b721bbe0447c036043c1bd671209d35d7450068f3a03b2267109476f1a2b5dd06b2a925c596
+  data.tar.gz: 14e6e8fa08b122f14816bbdef5b521c16376c1f737eec97970d1d673290e48bb638bf15f3e8a227b0f51686913f0831ae1363e0c7aa51ec72a8ee6535c6260b4

data/lib/rectify.rb

@@ -8,6 +8,8 @@ require "active_record"
 
 require "rectify/version"
 require "rectify/form"
+require "rectify/form_attribute"
+require "rectify/build_form_from_model"
 require "rectify/command"
 require "rectify/presenter"
 require "rectify/query"

data/lib/rectify/build_form_from_model.rb

@@ -0,0 +1,35 @@
+module Rectify
+  class BuildFormFromModel
+    def initialize(form_class, model)
+      @form_class = form_class
+      @model = model
+    end
+
+    def build
+      form.tap do
+        matching_attributes.each do |a|
+          model_value = model.public_send(a.name)
+          form.public_send("#{a.name}=", a.value_from(model_value))
+        end
+      end
+    end
+
+    private
+
+    attr_reader :form_class, :form, :model
+
+    def form
+      @form ||= form_class.new
+    end
+
+    def attribute_set
+      form_class.attribute_set
+    end
+
+    def matching_attributes
+      attribute_set
+        .select { |a| model.respond_to?(a.name) }
+        .map    { |a| FormAttribute.new(a) }
+    end
+  end
+end

data/lib/rectify/form.rb

@@ -16,7 +16,7 @@ module Rectify
     end
 
     def self.from_model(model)
-      new(model.attributes)
+      Rectify::BuildFormFromModel.new(self, model).build
     end
 
     def self.mimic(model_name)

data/lib/rectify/form_attribute.rb

@@ -0,0 +1,35 @@
+module Rectify
+  class FormAttribute < SimpleDelegator
+    def value_from(model_value)
+      return declared_class.from_model(model_value) if form_object?
+
+      if collection_of_form_objects?
+        return model_value.map { |child| element_class.from_model(child) }
+      end
+
+      model_value
+    end
+
+    private
+
+    def form_object?
+      declared_class.respond_to?(:from_model)
+    end
+
+    def collection_of_form_objects?
+      collection? && element_class.respond_to?(:from_model)
+    end
+
+    def collection?
+      type.respond_to?(:member_type)
+    end
+
+    def element_class
+      type.member_type
+    end
+
+    def declared_class
+      primitive
+    end
+  end
+end

data/lib/rectify/version.rb

@@ -1,3 +1,3 @@
 module Rectify
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/readme.md

@@ -1022,3 +1022,13 @@ rake db:migrate   # => Migrates the test database
 rake db:schema    # => Dumps database schema
 rake g:migration  # => Create a new migration file
 ```
+
+### Releasing a new version
+
+Bump the version in `lib/rectify/version.rb` then do the following:
+
+```
+bundle
+gem build rectify.gemspec
+gem push rectify-0.0.0.gem
+```

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rectify
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Andy Pike
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-18 00:00:00.000000000 Z
+date: 2016-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -200,10 +200,12 @@ extra_rdoc_files: []
 files:
 - LICENSE.txt
 - lib/rectify.rb
+- lib/rectify/build_form_from_model.rb
 - lib/rectify/command.rb
 - lib/rectify/controller_helpers.rb
 - lib/rectify/errors.rb
 - lib/rectify/form.rb
+- lib/rectify/form_attribute.rb
 - lib/rectify/null_query.rb
 - lib/rectify/presenter.rb
 - lib/rectify/query.rb