rectify 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d2a653fa353d25d4303b71cddb5858ad2562355
-  data.tar.gz: 783cacad47dd54af9d9adb22afc5399214715443
+  metadata.gz: 4f81f92c6b9b526d6000d455dbb9ba6fa54f2918
+  data.tar.gz: 941296c66a7deedccde2e30cd90021edbaab2980
 SHA512:
-  metadata.gz: 7240ab43419d70d321e9000473639e3397752ed5d3dc6b8a589c86af2193b5f17dab94f7f4628f904f174a147f1500104e27f317c9f2ed85ebd408040699e305
-  data.tar.gz: b56649c7dcac2d0fbebd93fe78c1f4757afb93f0db3653d7d9143860bf5e2b3e59941b4da004ad09b328fdaeb5feae77183abb463b7ad2f9274ef7d72cd233cc
+  metadata.gz: e5824327074db708534c6d3009769b7b4b7669bd294fa609e5020784fded58738a363eba433b23376530cd754200d2e5f1c3a372a3203fcffcfb2c77996cca7e
+  data.tar.gz: aa430bbd17f4ed0075f918fe203da94fc73d04a4a23c8602945c84f3f19d58c439b9ad6a10e526c7b43fca2eb78b73188d9f5e89399e9678ff2913b3295baf55

data/lib/rectify/form.rb

@@ -17,22 +17,7 @@ module Rectify
         .merge(params_hash.slice(*attribute_names))
         .merge(additional_params)
 
-      convert_indexed_hashes_to_arrays(attributes_hash)
-
-      new(attributes_hash)
-    end
-
-    def self.convert_indexed_hashes_to_arrays(attributes_hash)
-      array_attribute_names.each do |name|
-        attribute = attributes_hash[name]
-        next unless attribute.is_a?(Hash)
-
-        attributes_hash[name] = attribute.values
-      end
-    end
-
-    def self.array_attribute_names
-      attribute_set.select { |a| a.primitive == Array }.map { |a| a.name.to_s }
+      new(FormatAttributesHash.new(attribute_set).format(attributes_hash))
     end
 
     def self.from_model(model)
@@ -93,6 +78,10 @@ module Rectify
       super.except(:id)
     end
 
+    def attributes_with_values
+      attributes.reject { |attribute| public_send(attribute).nil? }
+    end
+
     def map_model(model)
       # Implement this in your form object for custom mapping from model to form
       # object as part of the `.from_model` call after matching attributes are

data/lib/rectify/format_attributes_hash.rb

@@ -0,0 +1,46 @@
+# Based on http://stackoverflow.com/questions/8706930/converting-nested-hash-keys-from-camelcase-to-snake-case-in-ruby
+
+module Rectify
+  class FormatAttributesHash
+    def initialize(attribute_set)
+      @attribute_set = attribute_set
+    end
+
+    def format(params)
+      convert_indexed_hashes_to_arrays(params)
+      convert_hash_keys(params)
+    end
+
+    private
+
+    attr_reader :attribute_set
+
+    def convert_indexed_hashes_to_arrays(attributes_hash)
+      array_attribute_names.each do |name|
+        attribute = attributes_hash[name]
+        next unless attribute.is_a?(Hash)
+
+        attributes_hash[name] = attribute.values
+      end
+    end
+
+    def array_attribute_names
+      attribute_set.select { |a| a.primitive == Array }.map { |a| a.name.to_s }
+    end
+
+    def convert_hash_keys(value)
+      case value
+      when Array
+        value.map { |v| convert_hash_keys(v) }
+      when Hash
+        Hash[value.map { |k, v| [underscore_key(k), convert_hash_keys(v)] }]
+      else
+        value
+      end
+    end
+
+    def underscore_key(k)
+      k.to_s.underscore.to_sym
+    end
+  end
+end

data/lib/rectify/version.rb

@@ -1,3 +1,3 @@
 module Rectify
-  VERSION = "0.8.0".freeze
+  VERSION = "0.9.0".freeze
 end

data/lib/rectify.rb

@@ -9,6 +9,7 @@ require "active_record"
 require "rectify/version"
 require "rectify/form"
 require "rectify/form_attribute"
+require "rectify/format_attributes_hash"
 require "rectify/build_form_from_model"
 require "rectify/command"
 require "rectify/presenter"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rectify
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Andy Pike
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-05 00:00:00.000000000 Z
+date: 2017-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: virtus
@@ -192,6 +192,7 @@ files:
 - lib/rectify/errors.rb
 - lib/rectify/form.rb
 - lib/rectify/form_attribute.rb
+- lib/rectify/format_attributes_hash.rb
 - lib/rectify/null_query.rb
 - lib/rectify/presenter.rb
 - lib/rectify/query.rb