roda-component 0.1.11 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f4a5eae005846dcc62d4f857ab356a2c4e84d7d
-  data.tar.gz: 553ff76fca4ffce5052fc99a70a5a707e7b92da3
+  metadata.gz: c34cd225e507b714d1ed28cbcd790594ed9f1c6d
+  data.tar.gz: 573d2e494f92e75cd8fd5eaa78045258c604c738
 SHA512:
-  metadata.gz: 3b03cb1ec47537a9eda3f27575e0a39a340015da850a6721e7204962c647a98a181c70b31904096218deac5c917ec7b623ebc6fcffab991263211fd402ef3322
-  data.tar.gz: 6ccf36087e6be7d7e6ba42a8a8a614a6f0d5dee55cf492025bc23fc27b7f2922fe3cf68f5d305a7604f5a7dfca576a4c244b21fe1719314b29fb1098c6f896eb
+  metadata.gz: 24abc995392ede94e7dbc120d2f4ae0f67999456c2bee8f963cb3c822fa1487cd21cbca2d0c2646208bcc2c8210ad19ad87ca64bebc1b5a282d7073a20d52495
+  data.tar.gz: f7b60008671dce4daa71c1dedacbd74daa2cf727df68cf0b26ee27dfb31d99f0f3b962e68a2190f9e29ae1b7ad8a4d5f75b584a51a93f2e65a6040b0921a3f95

data/Makefile

@@ -22,7 +22,7 @@ install:
 server:
 	bundle
 	# cd test/dummy && touch dummy.db && rm dummy.db && bundle exec thin start -p 8080
-	cd test/dummy && touch dummy.db && bundle exec thin start -p 8080
+	cd test/dummy && touch dummy.db && bundle exec roda server
 
 test:
 	bundle exec pry-test --async

data/lib/roda/component.rb

@@ -3,10 +3,6 @@ require 'opal-jquery'
 
 unless RUBY_ENGINE == 'opal'
   require 'tilt'
-
-  if defined? Oga
-    require 'roda/component/oga'
-  end
 end
 
 require "base64"
@@ -14,6 +10,7 @@ require 'roda/component/faye'
 require 'roda/component/instance'
 require 'roda/component/dom'
 require 'roda/component/events'
+require 'roda/component/titleize'
 
 if RUBY_ENGINE == 'opal'
   require 'roda/component/element'
@@ -27,6 +24,28 @@ if RUBY_ENGINE == 'opal'
 end
 
 class Roda
+  class ::Hash
+    # add keys to hash
+    def to_obj
+      self.each do |k,v|
+        if v.kind_of? Hash
+          v.to_obj
+        end
+        k=k.to_s.gsub(/\.|\s|-|\/|\'/, '_').downcase.to_sym
+
+        ## create and initialize an instance variable for this key/value pair
+        self.instance_variable_set("@#{k}", v)
+
+        ## create the getter that returns the instance variable
+        self.class.send(:define_method, k, proc{self.instance_variable_get("@#{k}")})
+
+        ## create the setter that sets the instance variable
+        self.class.send(:define_method, "#{k}=", proc{|v| self.instance_variable_set("@#{k}", v)})
+      end
+      return self
+    end
+  end
+
   class Component
     attr_accessor :scope, :cache
 
@@ -282,6 +301,90 @@ class Roda
       end
     end
 
+    def render_fields data, options = {}
+      data = data.is_a?(Hash) ? data.to_obj : data
+
+      l_dom = options[:dom] || dom
+
+      l_dom.find("[data-if]") do |field_dom|
+        value = get_value_for field_dom['data-if'], data
+
+        unless value
+          field_dom.remove
+        end
+      end
+
+      l_dom.find("[data-unless]") do |field_dom|
+        value = get_value_for field_dom['data-unless'], data
+
+        if value
+          field_dom.remove
+        end
+      end
+
+      l_dom.find("[data-field]") do |field_dom|
+        if field = field_dom['data-field']
+          value = get_value_for field, data
+
+          if !value.nil?
+            value = value.to_s
+
+            if value != value.upcase && !value.match(Roda::Component::Form::EMAIL)
+              field_value = value.titleize
+            else
+              field_value = value
+            end
+
+            field_value = 'No'  if field_value == 'False'
+            field_value = 'Yes' if field_value == 'True'
+
+            field_dom.html = field_value
+          else
+            field_dom.html = ''
+          end
+        end
+      end
+    end
+
+    def get_value_for field, data
+      field = (field || '').split '.'
+
+      if field.length > 1
+        value = data.is_a?(Hash) ? data.to_obj : data
+
+        field.each_with_index do |f, i|
+          # might not have the parent object
+          unless !value.empty?
+            value = ''
+            next
+          end
+
+          if (i+1) < field.length
+            begin
+              value = value.send(f)
+            rescue
+              value = nil
+            end
+          else
+            begin
+              value = value.respond_to?(:present) ? value.present("print_#{f}") : value.send(f)
+            rescue
+              value = nil
+            end
+          end
+
+        end
+      else
+        begin
+          value = data.respond_to?(:present) ? data.present("print_#{field.first}") : data.send(field.first)
+        rescue
+          value = nil
+        end
+      end
+
+      value
+    end
+
     private
 
     def server?

data/lib/roda/component/dom.rb

@@ -7,7 +7,7 @@ class Roda
         @raw_html = html
 
         if server?
-          @dom = Component::HTML(raw_html)
+          @dom = raw_html.is_a?(String) ? Component::HTML(raw_html): raw_html
         else
           @dom = raw_html.is_a?(String) ? Element[raw_html] : raw_html
         end
@@ -15,30 +15,24 @@ class Roda
 
       def find string, &block
         if server?
-          @node = dom.css string
+          @node = dom.css(string)
         else
-          @node = dom.find string
+          @node = dom.find(string)
         end
 
         if block
-          if server?
-            node.each do |n|
-              block.call n
-            end
-          else
-            block.call node
+          node.each do |n|
+            block.call DOM.new n
           end
         else
           if server?
-            @node = node.first
+            @node = DOM.new node.first
+          else
+            @node = DOM.new node
           end
         end
 
-        if server?
-          self
-        else
-          node
-        end
+        node
       end
 
       def html= content

data/lib/roda/component/events.rb

@@ -1,12 +1,19 @@
 class Roda
   class Component
+    class ::Hash
+      def deep_merge(second)
+        merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
+        self.merge(second, &merger)
+      end
+    end
+
     class Events < Struct.new(:klass, :component_opts, :scope, :request)
-      def on name, options = {}, extra_opts = false, &block
+      def on name, options = {}, form_klass = false, extra_opts = false, &block
         if client? && options.is_a?(String)
           class_name   = klass._name
           class_events = (events[class_name] ||= {})
           event        = (class_events[:_jquery_events] ||= [])
-          event        << [block, class_name, options, extra_opts, name]
+          event        << [block, class_name, options, form_klass, extra_opts, name]
         elsif options.is_a?(Hash)
           limit_if = options.delete(:if) || []
           limit_if = [limit_if] unless limit_if.is_a? Array
@@ -28,7 +35,9 @@ class Roda
         return unless e = events[klass._name]
 
         (e[:_jquery_events] || []).each do |event|
-          block, comp, selector, opts, name = event
+          block, comp, selector, form_klass, opts, name = event
+
+          opts = {} unless opts
 
           name = name.to_s
 
@@ -38,10 +47,9 @@ class Roda
 
             Component::Instance.new(component(comp), scope).instance_exec el, &block
           when 'form'
-            klass = opts.delete :class
-            warn 'missing form class option' unless klass
+            warn 'missing form class option' unless form_klass
 
-            el = DOM.new Element.find(selector)
+            el = Element.find(selector)
 
             el.on :submit do |evt|
               evt.prevent_default
@@ -61,7 +69,20 @@ class Roda
                 params[name] = value
               end
 
-              form = klass.new params, dom: el
+              params_obj = {}
+
+              params.each do |param, value|
+                keys = param.gsub(/[^a-z0-9_]/, '|').gsub(/\|\|/, '|').gsub(/\|$/, '').split('|')
+                params_obj = params_obj.deep_merge keys.reverse.inject(value) { |a, n| { n => a } }
+              end
+
+              opts[:dom] = el
+
+              if opts && key = opts[:key]
+                form = form_klass.new params_obj[key], opts
+              else
+                form = form_klass.new params_obj, opts
+              end
 
               Component::Instance.new(component(comp), scope).instance_exec form, evt.current_target, evt, &block
             end

data/lib/roda/component/form.rb

@@ -5,6 +5,38 @@ class Roda
     class Form
       include Validations
 
+      class Attributes
+        def set_values(atts)
+          @_attributes = []
+
+          atts.each do |key, val|
+            send(:"#{key}=", val)
+            @_attributes << key
+          end
+        end
+
+        def set_attr_accessors attrs
+          attrs.each do |attr|
+            define_singleton_method "#{attr}=" do |value|
+              value = value.to_obj if value.is_a? Hash
+              instance_variable_set(:"@#{attr}", value)
+            end
+
+            define_singleton_method attr do
+              instance_variable_get(:"@#{attr}")
+            end
+          end
+        end
+
+        def _attributes
+          @_attributes ||= []
+        end
+
+        def empty?
+          _attributes.empty?
+        end
+      end
+
       # Initialize with a hash of attributes and values.
       # If extra attributes are sent, a NoMethodError exception will be raised.
       #
@@ -37,20 +69,35 @@ class Roda
       def initialize(atts, options = {})
         @_options = options
 
-        atts.each do |key, val|
-          send(:"#{key}=", val)
+        # @_attributes = Class.new(Attributes).new
+        @_attributes = Attributes.new
+        @_attributes.set_attr_accessors _attr_accessors
+        @_attributes.set_values atts
+      end
+
+      def self.attr_accessor(*vars)
+        @_attr_accessors ||= []
+        @_attr_accessors.concat vars
+      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
       end
 
       # Return hash of attributes and values.
       def attributes
         Hash.new.tap do |atts|
-          instance_variables.each do |ivar|
+          _attributes.instance_variables.each do |ivar|
             # todo: figure out why it's setting @constructor and @toString
-            next if ivar == :@errors || ivar == :@_options || ivar == :@_dom  || ivar == :@constructor || ivar == :@toString
+            next if ivar == :@constructor || ivar == :@toString || ivar == :@_attributes
 
             att = ivar[1..-1].to_sym
-            atts[att] = send(att)
+            atts[att] = _attributes.send(att)
           end
         end
       end
@@ -58,31 +105,93 @@ class Roda
       def slice(*keys)
         Hash.new.tap do |atts|
           keys.each do |att|
-            atts[att] = send(att)
+            atts[att] = _attributes.send(att)
           end
         end
       end
 
       def display_errors options = {}
+        d_errors = errors
+
+        if override_errors = options[:override_errors]
+          d_errors = override_errors
+        end
+
+        keys = options.delete(:keys) || (_options[:key] ? [_options[:key]] : [])
+
         if extra_errors = options.delete(:errors)
           extra_errors.each do |key, value|
-            errors[key] = value
+            d_errors[key] = value
           end
         end
 
-        errors.each do |key, error|
+        d_errors.each do |key, error|
+          d_keys = (keys.dup << key)
+
           error = error.first
-          field_error_dom = options.delete :tmpl
-          field_error_dom = DOM.new('<span class="field-error"><span>') unless field_error_dom
-          field_error_dom.html _error_name(key, error)
 
-          field = _dom.find("input[name='#{key}']")
-          field.before field_error_dom.dom
+          if error.is_a? Hash
+            d_options = options.dup
+            d_options[:keys] = d_keys
+            d_options[:override_errors] = d_errors[key].first
+
+            display_errors d_options
+          else
+            name = d_keys.each_with_index.map do |field, i|
+              i != 0 ? "[#{field}]" : field
+            end.join
+
+            field_error_dom = options.delete :tmpl
+            field_error_dom = DOM.new('<span class="field-error"><span>') unless field_error_dom
+            field_error_dom.html _error_name(key, error)
+
+            field = _dom.find("input[name='#{name}']")
+            field.before field_error_dom.dom
+          end
+        end
+      end
+      alias_method :render_errors, :display_errors
+
+      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
+              end
+            end
+          end
         end
       end
 
       protected
 
+      def self._attr_accessors
+        @_attr_accessors
+      end
+
+      def _attributes
+        @_attributes ||= []
+      end
+
+      def _attr_accessors
+        self.class._attr_accessors
+      end
+
       def _options
         @_options
       end
@@ -103,6 +212,10 @@ class Roda
           error
         end
       end
+
+      def empty?
+        _attributes.empty?
+      end
     end
   end
 end