roda-component 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 215bb6602958dc06a8502a62335096657a0850c3
-  data.tar.gz: b4371617ad7f91ed5e77f2aa359ce97f3f4526b4
+  metadata.gz: 8bcb71e1c19b6a5f891e8b09bf302420e228d002
+  data.tar.gz: e89514ca3ee82085f2bd873ebd35d3096d067034
 SHA512:
-  metadata.gz: 9c93adfa28fff329aeda042c96cecdda13275eb5adb842040cf378d82aea9a2961f972cbae996c908a99182431fe19242628dbcc6199c32614f4d174c4e51b0f
-  data.tar.gz: 0a0816a7b3eb6f3f554be124073e7bc8d3dd5eb9e271562b305d7435d2e6ef3bcdd9b3d6cd749aacb74ddb9b6eaaa8080ae7631299fc2d4af17f1e81ec45b0fd
+  metadata.gz: 6253081b5d4ad072f4ed5c1523888ac6804b6475224cd637fa071f3839d55e0bd013113799ca1cb43378237869792261a18e7c69234ec1369253c8b7af807a21
+  data.tar.gz: 430473a6561d6912746dd692d2b5ceab95c3cd4ff5dfdfc0233ed4a9f3d2a73db7f4861fea1d6e07080ce59aa6c76a0f9a2731a68abdc04dffa3aeaae6044dc5

data/Makefile

@@ -21,7 +21,8 @@ install:
 
 server:
 	bundle
-	cd test/dummy && touch dummy.db && rm dummy.db && bundle exec thin start -p 8080
+	# 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
 
 test:
 	bundle exec pry-test --async

data/lib/roda/component.rb

@@ -214,10 +214,10 @@ class Roda
 
       # shortcut to comp opts
       def component_opts
-        if server?
-          app.component_opts
-        else
+        if client?
           $component_opts
+        else
+          super
         end
       end
 
@@ -292,7 +292,7 @@ class Roda
     alias_method :server, :server?
 
     def client?
-      !server?
+      RUBY_ENGINE == 'opal'
     end
     alias_method :client, :client?
   end

data/lib/roda/component/version.rb

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

data/lib/roda/plugins/component.rb

@@ -55,7 +55,11 @@ class Roda
 
       module InstanceMethods
         def component_opts
-          self.class.component_opts
+          @_component_opts || self.class.component_opts.dup
+        end
+
+        def loaded_component_js
+          request.env['loaded_component_js'] ||= []
         end
 
         def load_component name
@@ -91,7 +95,7 @@ class Roda
             end
           EOF
 
-          ("<script>" + Opal.compile(js) + "</script>")
+          loaded_component_js << ("<script>" + Opal.compile(js) + "</script>")
         end
 
         def component name, options = {}, &block
@@ -118,25 +122,24 @@ class Roda
             end
           end
 
-          if request && !request.env['RODA_COMPONENT_FROM_FAYE']
-            if comp_response.is_a? Roda::Component::DOM
-              content = comp_response.to_xml
-            else
-              content = comp_response
-            end
+          load_component_js comp, action
 
-            unless request.env.include? 'HTTP_X_RODA_COMPONENT_ON_SERVER'
-              content = content.to_s
-              content += load_component_js comp, action
-            end
+          if comp_response.is_a? Roda::Component::DOM
+            comp_response = comp_response.to_xml
+          end
 
-            content
-          else
-            comp_response
+          if comp_response.is_a?(String) && js = options.delete(:js)
+            comp_response << component_js
           end
+
+          comp_response
         end
         alias :comp :component
         alias :roda_component :component
+
+        def component_js
+          loaded_component_js.join('\n').to_s
+        end
       end
 
       module ClassMethods

data/test/dummy/app.rb

@@ -78,10 +78,10 @@ class TestApp < Roda
       r.run Rack::Directory.new("#{path}/../public/chat/font-awesome-4.1.0/fonts")
     end
 
-    r.root { component(:chat) }
+    r.root { component(:chat, js: true) }
 
-    r.on('login') { component(:login) }
-    r.on('logout') { component(:login, call: :logout) }
+    r.on('login') { component(:login, js: true) }
+    r.on('logout') { component(:login, call: :logout, js: true) }
 
     r.on 'session/:key/:value' do |key, value|
       session[key] = value

data/test/dummy/components/chat.rb

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

data/test/dummy/components/layout.rb

@@ -11,7 +11,6 @@ class LayoutComp < Roda::Component
       <script type="text/javascript" src="/assets/components"></script>
       <script type="text/javascript" src="/faye/client.js"></script>
     EOF
-
   end
 
   def display data, &block

metadata

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