wedge 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 104befdb183707b249388b194de614ac87ebc47c
-  data.tar.gz: 9b007fe20e46d8207c4334c9defeebf8007e0fd3
+  metadata.gz: c28c7cc402cb626100b4890daa762072096d0e0a
+  data.tar.gz: 1f0c5c2356493eb129497d939b888d36ac8904ce
 SHA512:
-  metadata.gz: a99bbb4dddcea088c59fc6e5600c169c9c77e025c73bbe59f68c97c4945a489b9d814c2a65505ed30b48f7f78ca4fcb25cf5d06cad4f5cabb317ab4e91fadfcb
-  data.tar.gz: 860a55ee486f858393be4bcb539fa94a23123f6adbcfb732850379e4e908c442acf0a6b0be0a75325dc2a13468f7787a0fd5f4f971307ede66ef31d8cf7c32ad
+  metadata.gz: 69e20c930d5eab6c1de8a456ffd0975529a7f9198d8b50bab204a5e294168660681629266807c0523e5dc3cb6534ea4be6a4110306a1cceeca381afd4022830f
+  data.tar.gz: 41a17bed621248980ec71dca986af93c84a93f50dd9376df91b94b32498b821701e3ce2f695b2a7950206b3d6e8a855776ee680f63535c95a4c7d462f5bd5bb7

data/lib/wedge/component.rb

@@ -2,7 +2,7 @@ module Wedge
   class Component
     include Methods
 
-    ALLOWED_CLIENT_OPTS = %i(name path_name method_args method_called cache tmpl key cache_assets assets_key assets_url requires object_events)
+    ALLOWED_CLIENT_OPTS = %i(name path_name method_args method_called cache tmpl key cache_assets assets_key assets_url requires)
 
     class << self
       # Override the default new behaviour
@@ -53,7 +53,7 @@ module Wedge
               end
 
               # Append the initialize javscript
-              if server? && opts.js
+              if server? && meth == wedge_opts.method_called && opts.js
                 result = result.to_html if result.is_a? DOM
                 result << wedge_javascript if result.is_a? String
               end
@@ -190,7 +190,7 @@ module Wedge
               payload[:method_called] = meth
               payload[:method_args]   = args
 
-              HTTP.post("/#{wedge_opts.assets_url}/#{path_name}.call",
+              HTTP.post("#{Wedge.assets_url}/#{path_name}.call",
                 headers: {
                   'X-CSRF-TOKEN' => Element.find('meta[name=_csrf]').attr('content'),
                   'X-WEDGE-METHOD-REQUEST' => true
@@ -325,6 +325,12 @@ module Wedge
     end
     alias_method :trigger, :wedge_trigger
 
+    def wedge_super *args, &block
+      caller_str = "#{caller[0]}"
+      calling_method = (caller_str =~ /`([^']*)'/ and $1)
+      self.class.superclass.instance_method(:"wedge_original_#{calling_method}").bind(self).call(*args, &block)
+    end
+
     if RUBY_ENGINE == 'opal'
       def wedge(*args)
         Wedge[*args]

data/lib/wedge/dom.rb

@@ -25,18 +25,18 @@ module Wedge
 
     def find string, &block
       if client?
-        node = DOM.new dom.find(string)
+        node = Wedge::DOM.new dom.find(string)
       elsif server?
         if block_given?
-          node = DOM.new dom.css(string)
+          node = Wedge::DOM.new dom.css(string)
         else
-          node = DOM.new dom.at(string)
+          node = Wedge::DOM.new dom.at(string)
         end
       end
 
       if block_given?
         node.each_with_index do |n, i|
-          block.call DOM.new(n), i
+          block.call Wedge::DOM.new(n), i
         end
       end
 
@@ -103,9 +103,9 @@ module Wedge
       end
 
       def to_html
-        @dom ||= DOM.new '<div>'
+        @dom ||= Wedge::DOM.new '<div>'
         el = dom.first
-        DOM.new('<div>').append(el).html
+        Wedge::DOM.new('<div>').append(el).html
       end
     end
 

data/lib/wedge/events.rb

@@ -65,18 +65,16 @@ module Wedge
     def trigger_browser_event event
       comp = Wedge[scope.wedge_opts.name]
 
-      case event[:name]
-      when 'ready'
+      case
+      when event[:name].to_s == 'ready'
         el = Element.find(event[:selector] != '' ? event[:selector] : 'body')
 
         comp.instance_exec el, &event[:block]
-      when 'history_change'
+      when  event[:name].to_s == 'history_change'
         $window.history.change do |he|
           comp.instance_exec he, &event[:block]
         end
-      when 'form'
-        warn 'missing form class option' unless event[:klass]
-
+      when event[:name].to_s == 'submit' && event[:options][:form]
         Document.on :submit, event[:selector] do |evt|
           el = evt.current_target
           evt.prevent_default
@@ -102,12 +100,13 @@ module Wedge
             params_obj = params_obj.deep_merge keys.reverse.inject(value) { |a, n| { n => a } }
           end
 
+          opts = event[:options].dup.reject { |k, v| k.to_s == 'form' }
           opts[:dom] = el
 
           if opts && key = opts[:key]
-            form = event[:klass].new params_obj[key], opts
+            form = Wedge[event[:options][:form], init: [params_obj[key], opts]]
           else
-            form = event[:klass].new params_obj, opts
+            form = Wedge[event[:options][:form], init: [params_obj, opts]]
           end
 
           el.find(opts[:error_selector] || '.field-error').remove

data/lib/wedge/utilis/nokogiri.rb

@@ -18,10 +18,8 @@ module Nokogiri
 
       alias_method :original_coerce, :coerce
       def coerce data # :nodoc:
-        if data.class.to_s == 'Wedge::DOM'
+        if data.class.to_s[/DOM$/]
           data = data.dom
-        elsif data.class.to_s[/DOM$/]
-          return original_coerce data
         end
 
         case data

data/lib/wedge/version.rb

@@ -1,3 +1,3 @@
 module Wedge
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/dummy/app.rb

@@ -31,4 +31,4 @@ end
 Dir["#{ROOT_PATH}/forms/*.rb"].sort.each { |file| require file }
 Dir["#{ROOT_PATH}/components/*.rb"].sort.each { |file| require file }
 
-Wedge.cache # cache files on app load
+Wedge.compile_opal # cache files on app load

data/test/dummy/components/layout.rb

@@ -0,0 +1,26 @@
+class DummyApp
+  class LayoutComponent < Wedge::Component
+    config.name :layout
+    config.html <<-HTML
+      <!DOCTYPE html>
+      <html>
+        <head>
+          <script src="//code.jquery.com/jquery-1.11.2.js"></script>
+          #{Wedge.script_tag}
+        </head>
+        <body>
+        </body>
+      </html>
+    HTML
+    config.dom do
+      dom.find('body') << assets(:js)
+    end
+
+    def display &block
+      return unless server?
+
+      dom.find('body').add_child block.call
+      dom
+    end
+  end
+end

data/test/dummy/components/root.rb

@@ -3,26 +3,14 @@ require_relative 'base' unless RUBY_ENGINE == 'opal'
 class DummyApp
   class RootComponent < BaseComponent
     config.name :root
-    config.html <<-HTML
-      <!DOCTYPE html>
-      <html>
-        <head>
-          <script src="//code.jquery.com/jquery-1.11.2.js"></script>
-          #{Wedge.script_tag}
-        </head>
-        <body>
-          <div id='foo'>bar</div>
-        </body>
-      </html>
-    HTML
-    config.dom do
-      dom.find('body') << assets(:js)
-    end
     config.requires :base, :bar, :foo_form, :pjax_plugin
+    config.html "<div id='foo'>bar</div>"
 
     def display
       if server?
-        dom
+        wedge(:layout).display do
+          dom.to_html
+        end
       else
         el = Element['<div>']
         el.html 'foo'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wedge
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - cj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-27 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -188,6 +188,7 @@ files:
 - test/dummy/app.rb
 - test/dummy/components/bar.rb
 - test/dummy/components/base.rb
+- test/dummy/components/layout.rb
 - test/dummy/components/root.rb
 - test/dummy/config.ru
 - test/dummy/forms/bar.rb
@@ -225,6 +226,7 @@ test_files:
 - test/dummy/app.rb
 - test/dummy/components/bar.rb
 - test/dummy/components/base.rb
+- test/dummy/components/layout.rb
 - test/dummy/components/root.rb
 - test/dummy/config.ru
 - test/dummy/forms/bar.rb