roda-component 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bcb71e1c19b6a5f891e8b09bf302420e228d002
-  data.tar.gz: e89514ca3ee82085f2bd873ebd35d3096d067034
+  metadata.gz: 5bef9cd915de03f311fd62891aedbfebccd50451
+  data.tar.gz: 5480b90c5e44cac8ad05b50e7e1cfe0863e127f3
 SHA512:
-  metadata.gz: 6253081b5d4ad072f4ed5c1523888ac6804b6475224cd637fa071f3839d55e0bd013113799ca1cb43378237869792261a18e7c69234ec1369253c8b7af807a21
-  data.tar.gz: 430473a6561d6912746dd692d2b5ceab95c3cd4ff5dfdfc0233ed4a9f3d2a73db7f4861fea1d6e07080ce59aa6c76a0f9a2731a68abdc04dffa3aeaae6044dc5
+  metadata.gz: 1c980094da6effd8e22d4bcbc12a251513cfbdf194c513707eabebad40ae456cc05cf7742dbd8aa11621d1f0d23b8c3543c0cbbc503ae534d9e58d84750b741b
+  data.tar.gz: 55bb0afb501e7d3ec17177e19b99398305a2ad6eac0333a861d4b3f2660e256af34e8f4e4a384d4eab1f5bff9fe24793a712143f3c7023e4bbade42ffe511a54

data/lib/roda/component.rb

@@ -151,16 +151,16 @@ class Roda
       end
 
       def HTML raw_html
-        if defined? Oga
-          Oga.parse_html(raw_html)
-        elsif defined? Nokogiri
-          if raw_html[/\A<!DOCTYPE/]
-            Nokogiri::HTML(raw_html)
+        if raw_html[/\A<!DOCTYPE/] || raw_html[/\A<html/]
+          Nokogiri::HTML(raw_html)
+        else
+          parsed_html = Nokogiri::HTML.fragment(raw_html)
+
+          if parsed_html.children.length == 1
+            parsed_html.children.first
           else
-            Nokogiri::HTML.fragment(raw_html)
+            parsed_html
           end
-        else
-          warn 'No HTML parsing lib loaded.  Please require Nokogiri or Oga'
         end
       end
 
@@ -177,7 +177,7 @@ class Roda
         if args.first.to_s != 'server'
           events.on(*args, &block)
         else
-          on_server &block
+          on_server(&block)
         end
       end
 
@@ -206,7 +206,7 @@ class Roda
       # the reason we ave the raw html is so that we can use it client side.
       def tmpl name, dom, remove = true
         cache[:tmpl][name] = { dom: remove ? dom.remove : dom }
-        cache[:tmpl][name][:html] = cache[:tmpl][name][:dom].to_xml
+        cache[:tmpl][name][:html] = cache[:tmpl][name][:dom].to_html
         cache[:tmpl][name]
       end
       alias :add_tmpl :tmpl
@@ -251,7 +251,7 @@ class Roda
     def dom
       if server?
         # TODO: duplicate cache[:dom] so we don't need to parse all the html again
-        @_dom ||= DOM.new(cache[:dom].dom.to_s)
+        @_dom ||= DOM.new(cache[:dom].dom.to_html)
       else
         @_dom ||= DOM.new(Element)
       end
@@ -260,6 +260,7 @@ class Roda
 
     # Grab the template from the cache, use the nokogiri dom or create a
     # jquery element for server side
+    # issue: can't use the cached dom because duping doesn't work.
     def tmpl name
       if t = cache[:tmpl][name]
         DOM.new t[:html]

data/lib/roda/component/dom.rb

@@ -1,16 +1,20 @@
+require 'delegate'
+
 class Roda
   class Component
-    class DOM
+    class DOM < SimpleDelegator
       attr_accessor :dom, :raw_html
 
       def initialize html
-        @raw_html = html
+        @raw_html = html.dup
 
         if server?
-          @dom = Component::HTML(html.dup)
+          @dom = Component::HTML(raw_html)
         else
-          @dom = html.is_a?(String) ? Element[html.dup] : html
+          @dom = raw_html.is_a?(String) ? Element[raw_html] : raw_html
         end
+
+        super dom
       end
 
       def find string, &block
@@ -34,11 +38,7 @@ class Roda
           end
         end
 
-        if server?
-          self
-        else
-          node
-        end
+        node
       end
 
       def html= content
@@ -67,17 +67,6 @@ class Roda
         @node || dom
       end
 
-      # This allows you to use all the nokogiri or opal jquery methods if a
-      # global one isn't set
-      def method_missing method, *args, &block
-        # respond_to?(symbol, include_all=false)
-        if dom.respond_to? method, true
-          dom.send method, *args, &block
-        else
-          super
-        end
-      end
-
       private
 
       def server? &block

data/lib/roda/component/version.rb

@@ -1,5 +1,5 @@
 class Roda
   class Component
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

data/test/dummy/components/chat.rb

@@ -27,10 +27,12 @@ class ChatComponent < Roda::Component
   end
 
   on :join do |data|
-    return user_details unless client
-
-    `console.log(#{data});`
-    puts 'joined'
+    if client?
+      `console.log(#{data});`
+      puts 'joined'
+    else
+      user_details
+    end
   end
 
   on :leave do |data|

data/test/dummy/components/login.rb

@@ -16,6 +16,11 @@ class LoginComponent < Roda::Component
     end
   end
 
+  def logout
+    logout(Models::User)
+    request.redirect 'login'
+  end
+
   on :server do
     def login_with params
       signup = params.delete('signup')

metadata

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