roda-component 0.1.27 → 0.1.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34af2117ec9844c79388172c7925327234a15420
-  data.tar.gz: 47664199fa77227ee28102b6b3e7f0b79525f49e
+  metadata.gz: f394e3df58f2cc1e6ae4b050f1d3fa1c115e619a
+  data.tar.gz: 493c91445c9a9a4e609671c2e69b090cdb0a1671
 SHA512:
-  metadata.gz: e1da41e5dd0a4abb369e5c51b3d6407f5dfe46686bd43e7a5f44ba1cddf75300ab2993ab485d712e815cf5418289c1bd9f0024c6d33c2e852582b2cb6eee0541
-  data.tar.gz: 4bf89d4fb46a3d17ecab201d12e2fc462acb3baf2410ddbd857422f1ffc45dc5ab41600644c65ff720498c146ce38e37410339590e0d3d66c7fd1fef207e0589
+  metadata.gz: 1f69f31e023c2c386f62ac663e05965893df6be7da0b32c793da25d5b55fdecb98a64bba9be28f57acb95266cae653a95523c9b321ad8995e6f2e830a85fa342
+  data.tar.gz: 2da6028f1ab9951904757aebe7f7baa5452002a3585bd181e3c57c0fa9558c94837f7446612ff87bf03f71ee18cbd5a065c0b2cae85052a295cc7c6940578cb9

data/lib/roda/component/faye.rb

@@ -128,11 +128,12 @@ else
 
             case message['channel']
             when '/meta/connect'
+              callback.call message
+
               if session_id
                 redis.call 'HSET', "#{key}/ids", private_id, public_id
                 # puts redis.call 'HGETALL', "#{key}/ids"
               end
-              callback.call message
             when '/meta/disconnect'
               callback.call message
 
@@ -203,8 +204,25 @@ else
             data = app.roda_component(:"#{component_name}", { trigger: (joining ? :join : :leave), public_id: public_id, private_id: private_id })
 
             url = "http#{request.env['SERVER_PORT'] == '443' ? 's' : ''}://#{request.env['SERVER_NAME']}:#{request.env['SERVER_PORT']}/faye"
-            client = ::Faye::Client.new(url)
-            client.publish "/components/#{component_name}", type: (joining ? 'join' : 'leave'), public_id: public_id, token: app.component_opts[:token], local: data
+            # client = ::Faye::Client.new(url)
+            # client.publish "/components/#{component_name}", type: (joining ? 'join' : 'leave'), public_id: public_id, token: app.component_opts[:token], local: data
+            # EM.run {
+              http = EM::HttpRequest.new(url).post(
+                head: {
+                 'content-type' => 'application/json'
+                },
+                body: {
+                  channel: "/components/#{component_name}",
+                  data: {
+                    type: (joining ? 'join' : 'leave'), public_id: public_id, token: app.component_opts[:token], local: data }
+                  }.to_json
+              )
+              # http.callback {
+              #   ap http.response_header.status
+              #   ap http.response_header
+              #   ap http.response
+              # }
+            # }
           end
 
           # /components/:id/:comp/:action

data/lib/roda/component/version.rb

@@ -1,5 +1,5 @@
 class Roda
   class Component
-    VERSION = "0.1.27"
+    VERSION = "0.1.28"
   end
 end

data/lib/roda/component.rb

@@ -110,7 +110,9 @@ class Roda
     def initialize(scope = false)
       @scope   = scope
 
-      if client?
+      if client? && !$component_opts[:faye][:"#{self.class._name}"]
+        $component_opts[:faye][:"#{self.class._name}"] = true
+
         $faye.subscribe "/components/#{self.class._name}" do |msg|
           msg = Native(msg)
 

data/lib/roda/plugins/component.rb

@@ -91,6 +91,7 @@ class Roda
             end
 
             unless $component_opts[:comp][:"#{comp_name}"]
+              $component_opts[:faye] ||= {}
               $component_opts[:comp][:"#{comp_name}"] = true
               `$.getScript("/#{component_opts[:assets_route]}#{file_path}", function(){`
                 Document.ready? do

data/roda-component.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "opal", "~> 0.7.0.beta3"
   spec.add_runtime_dependency "opal-jquery", "~> 0.3.0.beta2"
   spec.add_runtime_dependency "redis-rack"
+  spec.add_runtime_dependency "rest-client"
   spec.add_runtime_dependency "faye", '~> 1.1.0'
   spec.add_runtime_dependency "faye-redis"
   spec.add_runtime_dependency "redic", "~> 1.1.1"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roda-component
 version: !ruby/object:Gem::Version
-  version: 0.1.27
+  version: 0.1.28
 platform: ruby
 authors:
 - cj
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: faye
   requirement: !ruby/object:Gem::Requirement