roda-component 0.1.20 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c498627e08894de678599a4c6f1e5ee3c2c51a23
-  data.tar.gz: ba8977a923ef51aa5378fcd14760c5811d4f0537
+  metadata.gz: a16bb2b329a369806cff4a67ac5988eac549382c
+  data.tar.gz: 4cf66e8d5cd2579d3949cb2629dc10eeef204dbd
 SHA512:
-  metadata.gz: 7cd6097f479d63615a6b6b2c393dc5191f166e7b6da8e6e84ad00a732622f4c586326152f1980b9ed78420c0b3596a9c35304cfb8d25707325a07caf8fe7e021
-  data.tar.gz: b653b8d9c78622090a362e23b9a53429de4434157103ebc251753971301a3e7097ca7e86ae1dc926d8d159d982b34adc3eb96288720e45ff37b8ec3f74b8bb86
+  metadata.gz: dd5d13d7a64980b0b8e894b2eb34674a349cd492e44efd2d3bdf7816ff7720e9f0acbcda0738a06f17af2467c958d3cc631fcd30bb588c6c19724a8d9f7732cc
+  data.tar.gz: 99af32ec110135bd65a7970600d62811490201879099baea649a6b2d40461c502a453b70d9d47b85a1b522c893d1497acf3d5bed3d6ad1aee0c7bd9a5dbaa094

data/lib/roda/component/events.rb

@@ -68,7 +68,6 @@ class Roda
               evt.prevent_default
 
               params = {}
-              el.find('.field-error').remove
 
               # loop through all the forum values
               el.serialize_array.each do |row|
@@ -97,6 +96,8 @@ class Roda
                 form = form_klass.new params_obj, opts
               end
 
+              el.find(opts[:error_selector] || '.field-error').remove
+
               Component::Instance.new(component(comp), scope).instance_exec form, evt.current_target, evt, &block
             end
           else

data/lib/roda/component/form.rb

@@ -10,8 +10,10 @@ class Roda
           @_attributes = []
 
           atts.each do |key, val|
-            send(:"#{key}=", val)
-            @_attributes << key
+            if respond_to?("#{key}=")
+              send(:"#{key}=", val)
+              @_attributes << key
+            end
           end
         end
 
@@ -67,17 +69,38 @@ class Roda
       #   post = Post.new(edit.attributes)
       #   post.save
       def initialize(atts, options = {})
+        @_data    = atts
+        @_data    = atts.to_obj if atts.is_a? Hash
         @_options = options
 
         # @_attributes = Class.new(Attributes).new
         @_attributes = Attributes.new
         @_attributes.set_attr_accessors _attr_accessors
-        @_attributes.set_values atts
+        @_attributes.set_values _data
+
+        _form.each do |key, klass|
+          opts = {}
+          opts[key] = _data.send(key) if _data.respond_to?(key)
+          @_attributes.set_values opts
+        end
       end
 
       def self.attr_accessor(*vars)
         @_attr_accessors ||= []
-        @_attr_accessors.concat vars
+        @_form ||= {}
+
+        vars.each do |v|
+          if !v.is_a? Hash
+            @_attr_accessors << v unless @_attr_accessors.include? v
+          else
+            v = v.first
+
+            unless @_attr_accessors.include? v.first
+              @_attr_accessors << v.first
+              @_form[v.first] = v.last
+            end
+          end
+        end
       end
 
       def method_missing method, *args, &block
@@ -94,7 +117,7 @@ class Roda
         Hash.new.tap do |atts|
           _attributes.instance_variables.each do |ivar|
             # todo: figure out why it's setting @constructor and @toString
-            next if ivar == :@constructor || ivar == :@toString || ivar == :@_attributes
+            next if ivar == :@constructor || ivar == :@toString || ivar == :@_attributes || ivar == :@_data || ivar == :@_forms
 
             att = ivar[1..-1].to_sym
             atts[att] = _attributes.send(att)
@@ -155,25 +178,35 @@ class Roda
       def render_values dom = false, key = false, data = false
         dom = _options[:dom] unless dom
         key = _options[:key] if !key && _options.key?(:key)
-        data = attributes unless data
 
-        data.each do |k, v|
-          k = "#{key}[#{k}]" if !key.nil?
-          if v.is_a?(Hash)
-            render_values dom, k, v
-          else
-            dom.find('input, select') do |element|
-              if element['name'] == k
-                case element.name
-                when 'select'
-                  element.find('option').each do |x|
-                    x['selected'] = true if x['value']==v.to_s
-                  end
-                when 'input'
-                  element['value'] = v.to_s
-                end
+        dom.find('input, select') do |element|
+          name  = element['name']
+          name  = name.gsub(/\A#{key}/, '') if key
+          keys  = name.gsub(/\A\[/, '').gsub(/[^a-z0-9_]/, '|').gsub(/\|\|/, '|').gsub(/\|$/, '').split('|')
+          value = false
+
+          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
+          end
+
+          case element.name
+          when 'select'
+            element.find('option') do |x|
+              x['selected'] = true if x['value'] == value.to_s
             end
+          when 'input'
+            element['value'] = value.to_s
           end
         end
       end
@@ -184,10 +217,22 @@ class Roda
         @_attr_accessors
       end
 
+      def self._form
+        @_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

@@ -107,19 +107,16 @@ class Roda
         # @param [Symbol] att The attribute you wish to verify the presence of.
         # @param [Array<Symbol, Symbol>] error The error that should be returned
         #                                when the validation fails.
-        def assert_present(att, error = [att, :not_present], klass = false)
-          if error.is_a? Class
-            error_new = klass.dup
-            klass = error
-            error = error_new || [att, :not_present]
-
+        def assert_present(att, error = [att, :not_present])
+          if klass = _form[att]
             options = {}
             options[:key] = _options[:key] if _options.key? :key
 
-            f = klass.new(_attributes.send(att), options)
+            f = klass.new(send(att), options)
             assert(f.valid?, [att, f.errors])
           else
-            assert(!_attributes.send(att).to_s.empty?, error)
+            binding.pry if att.to_s == 'line1'
+            assert(!send(att).to_s.empty?, error)
           end
         end
 

data/lib/roda/component/version.rb

@@ -1,5 +1,5 @@
 class Roda
   class Component
-    VERSION = "0.1.20"
+    VERSION = "0.1.21"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roda-component
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.21
 platform: ruby
 authors:
 - cj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-29 00:00:00.000000000 Z
+date: 2015-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal