roda-component 0.1.24 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff8336613ebc26d6354cb84d5f66318bb85bbcc9
-  data.tar.gz: 600e954b6328e17635784196b778ee41da113db7
+  metadata.gz: 3597012e5d7d5f29e2313055ae0d4bf2636f2e61
+  data.tar.gz: 0c9f50edc7029a9a827b4605e27b5459c8dd5926
 SHA512:
-  metadata.gz: 3c956b16f6ee27862ca8a9a9eff6ab2e60a3c784424777fa9c98790591835f286aacb0666b6dd9b9188d3ec7c109f83dce73acd875862d0be34e91025a2466a2
-  data.tar.gz: 004554a394e137ed9424028168a2329e9aa92636a80a80174b61b46cd13b6e5b169bd536a94b71511e4dde7e1bc0463852e5282c62e9e5e96db0dfba59c54ded
+  metadata.gz: a71b97dd28899591a0e33bc68e5b6cd9b62ea9700ef8a42fff5bf714d8a734850776473c7d998f49c864a8fb0fbb554e45cd253b1e11097f30b615a6bbdf59d7
+  data.tar.gz: a42ee5d887dbb60490faf2f462d08729d426becb1fcef526cc7c16ab39bdbe20d13cbb349c2591c3865c21e3d6ea6b71367a69750baae4643b162c45ec2d0bd6

data/lib/roda/component/form.rb

@@ -1,10 +1,25 @@
 require 'roda/component/form/validations'
+require 'forwardable'
 
 class Roda
   class Component
     class Form
       include Validations
 
+      module Delegates
+        def _delegates(*names)
+          accessors = Module.new do
+            extend Forwardable # DISCUSS: do we really need Forwardable here?
+            names.each do |name|
+              delegate [name, "#{name}="] => :_attributes
+            end
+          end
+          include accessors
+        end
+      end
+
+      extend Delegates
+
       class Attributes
         def set_values(atts)
           @_attributes = []
@@ -22,6 +37,8 @@ class Roda
             define_singleton_method "#{attr}=" do |value|
               value = value.to_obj if value.is_a? Hash
               instance_variable_set(:"@#{attr}", value)
+              @_attributes ||= []
+              @_attributes << attr
             end
 
             define_singleton_method attr do
@@ -78,10 +95,16 @@ class Roda
         @_attributes.set_attr_accessors _attr_accessors
         @_attributes.set_values _data
 
+        _data.each do |key, val|
+          send("#{key}=", val)
+        end
+
         _form.each do |key, klass|
           opts = {}
-          opts[key] = _data.send(key) if _data.respond_to?(key)
+          opts[key] = klass.new(_data.send(key)) if _data.respond_to?(key)
           @_attributes.set_values opts
+
+          send("#{key}=", opts[key])
         end
       end
 
@@ -101,15 +124,14 @@ class Roda
             end
           end
         end
+
+        _delegates(*_attr_accessors)
       end
 
       def method_missing method, *args, &block
-        # respond_to?(symbol, include_all=false)
-        if _attributes.respond_to? method, true
-          _attributes.send method, *args, &block
-        else
-          super
-        end
+        return if method[/\=\z/]
+
+        super
       end
 
       # Return hash of attributes and values.
@@ -131,10 +153,11 @@ class Roda
         data.each do |k, v|
           if klass = _form[k.to_s.to_sym]
             data = data[k]
+            data = data.attributes if data.is_a?(Form)
 
             f = klass.new data
             k = "#{k}_attributes"
-            data = f.attributes
+            data = f.model_attributes
 
             hash[k] = model_attributes data
           elsif v.is_a? Hash
@@ -219,13 +242,6 @@ class Roda
           keys.each do |k|
             begin
               value = value ? value.send(k) : send(k)
-
-              if klass = _form[k.to_s.to_sym]
-                options = {}
-                options[:key] = _options[:key] if _options.key? :key
-
-                value = klass.new(value, options)
-              end
             rescue
               value = ''
             end
@@ -244,8 +260,16 @@ class Roda
         end
       end
 
+      def _attributes
+        @_attributes ||= {}
+      end
+
       protected
 
+      def _data
+        @_data ||= {}
+      end
+
       def self._attr_accessors
         @_attr_accessors
       end
@@ -254,18 +278,10 @@ class Roda
         @_form
       end
 
-      def _attributes
-        @_attributes ||= []
-      end
-
       def _form
         self.class._form
       end
 
-      def _data
-        @_data ||= []
-      end
-
       def _attr_accessors
         self.class._attr_accessors
       end

data/lib/roda/component/form/validations.rb

@@ -112,7 +112,7 @@ class Roda
             options = {}
             options[:key] = _options[:key] if _options.key? :key
 
-            f = klass.new(send(att), options)
+            f = klass.new(send(att).attributes, options)
             assert(f.valid?, [att, f.errors])
           else
             binding.pry if att.to_s == 'line1'

data/lib/roda/component/version.rb

@@ -1,5 +1,5 @@
 class Roda
   class Component
-    VERSION = "0.1.24"
+    VERSION = "0.1.25"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roda-component
 version: !ruby/object:Gem::Version
-  version: 0.1.24
+  version: 0.1.25
 platform: ruby
 authors:
 - cj