roda-component 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb40f8e16ac85061c67bd1682713ccb3f2b2ac5d
-  data.tar.gz: a59a3965324bc99366e09b30cd35c78ac6e0b1c8
+  metadata.gz: 4d2295718996694bcaf5a8f826f77ee2f488b415
+  data.tar.gz: d4232e47a4af010f6cbec1f8d3231fc8975b9f2d
 SHA512:
-  metadata.gz: 87300a93107f87aacde85afb7b8cf0c1348c8e4abe8cec88a0d4b639564e9c977263b795bfc5aee45d9c3e18ef2d215ee9ecb73ba46b0fa68137eeab77938a59
-  data.tar.gz: 86bcf3339b5abdda5341041f44689dadd60ea80a77516c47eb38fe0962df4f2cf5738ba6baa1492f72c3a2d07616c9371cd1924ec16217949d89be414e682aad
+  metadata.gz: a1404cb9742440c6f27210f56e2904c01543240aad4a675a8c0e6f8b11773fb2b165390886ec2fe46b7f66333cf58ea94955b5d1e548cfc994710be73cbe71d9
+  data.tar.gz: 327320da0c95ea40a015a8516627c730cc6e7fb2e7020d5bb78e556b2d9036cc371c5815272e3dbbddb629e272fe0e30e44a1a7891a895ba12a14f5617cc9337

data/lib/roda/component.rb

@@ -40,7 +40,7 @@ class Roda
         $faye.subscribe "/components/#{self.class._name}" do |msg|
           msg = Native(msg)
 
-          trigger :"#{msg[:type]}", msg unless $faye.public_id == msg[:public_id]
+          trigger :"#{msg[:type]}", msg['local'], msg unless $faye.public_id == msg[:public_id]
         end
 
         $faye.on 'transport:up' do

data/lib/roda/component/events.rb

@@ -1,12 +1,12 @@
 class Roda
   class Component
     class Events < Struct.new(:klass, :component_opts, :scope, :request)
-      def on name, options = {}, &block
+      def on name, options = {}, 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, name]
+          event        << [block, class_name, options, extra_opts, name]
         elsif options.is_a?(Hash)
           limit_if = options.delete(:if) || []
           limit_if = [limit_if] unless limit_if.is_a? Array
@@ -28,16 +28,48 @@ class Roda
         return unless e = events[klass._name]
 
         (e[:_jquery_events] || []).each do |event|
-          block, comp, selector, name = event
+          block, comp, selector, opts, name = event
 
           name = name.to_s
 
-          if name != 'ready'
-            Document.on name, selector do |evt|
-              Component::Instance.new(component(comp), scope).instance_exec evt.current_target, evt, &block
+          case name.to_s
+          when 'ready'
+            el = Element.find(selector)
+
+            Component::Instance.new(component(comp), scope).instance_exec el, &block
+          when 'form'
+            klass = opts.delete :class
+            warn 'missing form class option' unless klass
+
+            el = DOM.new Element.find(selector)
+
+            el.on :submit do |evt|
+              evt.prevent_default
+
+              params = {}
+              el.find('.field-error').remove
+
+              # loop through all the forum values
+              el.serialize_array.each do |row|
+                field, _ = row
+
+                # we need to make it native to access it like ruby
+                field    = Native(field)
+                name     = field['name']
+                value    = field['value']
+
+                params[name] = value
+              end
+
+              form = klass.new params, dom: el
+
+              Component::Instance.new(component(comp), scope).instance_exec form, evt.current_target, evt, &block
             end
           else
-            Component::Instance.new(component(comp), scope).instance_exec Document.find(selector), nil, &block
+            Document.on name, selector do |evt|
+              el = evt.current_target
+              Component::Instance.new(component(comp), scope).instance_exec el, evt, &block
+            end
           end
         end
       end

data/lib/roda/component/form.rb

@@ -34,7 +34,9 @@ class Roda
       #   # Now it's safe to initialize the model.
       #   post = Post.new(edit.attributes)
       #   post.save
-      def initialize(atts)
+      def initialize(atts, options = {})
+        @_options = options
+
         atts.each do |key, val|
           send(:"#{key}=", val)
         end
@@ -44,7 +46,8 @@ class Roda
       def attributes
         Hash.new.tap do |atts|
           instance_variables.each do |ivar|
-            next if ivar == :@errors
+            # todo: figure out why it's setting @constructor and @toString
+            next if ivar == :@errors || ivar == :@_options || ivar == :@_dom  || ivar == :@constructor || ivar == :@toString
 
             att = ivar[1..-1].to_sym
             atts[att] = send(att)
@@ -59,6 +62,47 @@ class Roda
           end
         end
       end
+
+      def display_errors options = {}
+        if extra_errors = options.delete(:errors)
+          extra_errors.each do |key, value|
+            errors[key] = value
+          end
+        end
+
+        errors.each do |key, error|
+          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
+        end
+      end
+
+      protected
+
+      def _options
+        @_options
+      end
+
+      def _dom
+        @_dom ||= @_options[:dom]
+      end
+
+      def _error_name key, error
+        case error.to_sym
+        when :not_email
+          'Email Isn\'t Valid.'
+        when :not_present
+          'Required.'
+        when :not_equal
+          'Password does not match.'
+        else
+          error
+        end
+      end
     end
   end
 end

data/lib/roda/component/version.rb

@@ -1,5 +1,5 @@
 class Roda
   class Component
-    VERSION = "0.1.7"
+    VERSION = "0.1.8"
   end
 end

data/test/dummy/components/chat.rb

@@ -14,6 +14,12 @@ class ChatComponent < Roda::Component
     end
   end
 
+  on :server do
+    def get_user_list
+
+    end
+  end
+
   on :reconnect do
     puts 'reconnected'
   end

data/test/dummy/components/login.rb

@@ -50,76 +50,29 @@ class LoginComponent < Roda::Component
     end
   end
 
-  on :ready, 'form.main-form' do |el|
-    el.on :submit do |evt|
-      evt.prevent_default
-
-      params = {}
-      el.find('.field-error').remove
-
-      # loop through all the forum values
-      el.serialize_array.each do |row|
-        field, _ = row
-
-        # we need to make it native to access it like ruby
-        field    = Native(field)
-        name     = field['name']
-        value    = field['value']
-
-        params[name] = value
-      end
-
-      form = Forms::Login.new params
-
-      if form.valid?
-        login_with params do |res|
-          if res['success']
-            # redirect them to the chatroom
-            `window.location.replace("/")`
+  on :form, 'form.main-form', class: Forms::Login do |form, el, evt|
+    if form.valid?
+      login_with form.attributes do |res|
+        if res['success']
+          # redirect them to the chatroom
+          `window.location.replace("/")`
+        else
+          case res['reason']
+          when /doesn't exist/
+            # Add fields for them to signup with
+            container = el.find('.field-container')
+            container.prepend('<input name="signup" type="hidden" value=true>')
+            container.prepend('<input name="last_name" type="text" placeholder="Last Name">')
+            container.prepend('<input name="first_name" type="text" placeholder="First Name">')
+            container.find("[name='password']").after('<input name="password_confirmation" type="password" placeholder="Confirm Password">')
           else
-            case res['reason']
-            when /doesn't exist/
-              # Add fields for them to signup with
-              container = el.find('.field-container')
-              container.prepend('<input name="signup" type="hidden" value=true>')
-              container.prepend('<input name="last_name" type="text" placeholder="Last Name">')
-              container.prepend('<input name="first_name" type="text" placeholder="First Name">')
-              container.find("[name='password']").after('<input name="password_confirmation" type="password" placeholder="Confirm Password">')
-            else
-              # Show server errors
-              display_errors res['errors']
-            end
+            # Show server errors
+            form.display_errors tmpl: tmpl(:field_error), errors: res['errors']
           end
         end
-      else
-        display_errors form.errors
       end
-    end
-  end
-
-  protected
-
-  def display_errors errors
-    errors.each do |key, error|
-      error = error.first
-      field_error = tmpl :field_error
-      field_error.html error_name(key, error)
-
-      field = dom.find("input[name='#{key}']")
-      field.before field_error.dom
-    end
-  end
-
-  def error_name key, error
-    case error.to_sym
-    when :not_email
-      'Email Isn\'t Valid.'
-    when :not_present
-      'Required.'
-    when :not_equal
-      'Password does not match.'
     else
-      error
+      form.display_errors tmpl: tmpl(:field_error)
     end
   end
 end

data/test/dummy/config.ru

@@ -11,6 +11,7 @@ Unreloader.require './models'
 Unreloader.require '../../lib/roda/component/dom.rb'
 Unreloader.require '../../lib/roda/component/faye.rb'
 Unreloader.require '../../lib/roda/component/form.rb'
+Unreloader.require '../../lib/roda/component/events.rb'
 Unreloader.require '../../lib/roda/component/form/validations.rb'
 Unreloader.require '../../lib/roda/component.rb'
 Unreloader.require '../../lib/roda/plugins/component.rb'

metadata

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