roda-component 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ef94d1cd1987c2500f1d353dbe75d281ff7a943
-  data.tar.gz: 48dfe7a0593ca87b23a261c53e252f4befd276b5
+  metadata.gz: e07b2592555f0305b5ff63e7b1a5d0cdc595f337
+  data.tar.gz: a9292504e6a90f5aec922f3908a8abed452cbb23
 SHA512:
-  metadata.gz: 85398abbd01f176710359312b133fb1da20161bb3193200aa60cacc00611353da2b9bc1086ae4a6c571001d488b0060e7cc65f9c21d41f60ea28b675b2043a83
-  data.tar.gz: f6c9792ce59edc426c9ab32a33d877c509522554ee11ff807d616ea305398902b8ca61800c21cbce87faae42d48893104c6342e58ac99539b23b6d8f0f9428b5
+  metadata.gz: 7e3c511932310c7c1958b248944bd61b3507ce506191d4ced846618cc54a25b64ba955b1bd1c1cf83fbd140f3ac6d2f576f04b1e76f1a22b970532936e43cd70
+  data.tar.gz: 06c976af76747799ba76fe4661a21a00fa927a7614a8c4d7811f4261037ed53d31c05bab95a131a8da24f90861a2888557285c203e8675d86ff9dd096d06174c

data/lib/roda/component/events.rb

@@ -2,24 +2,32 @@ class Roda
   class Component
     class Events < Struct.new(:klass, :component_opts, :scope)
       def on name, options = {}, &block
+        limit_if = options.delete(:if) || []
+        limit_if = [limit_if] unless limit_if.is_a? Array
+
         class_name   = options.delete(:for) || klass._name
         class_events = (events[class_name] ||= {})
-        event        = (class_events[name] ||= [])
+        event        = (class_events[name.to_s] ||= [])
+
+        # remove the type, if we have an on if and it isn't in the engine_type
+        if limit_if.any? && !limit_if.include?(engine_type.to_sym)
+          block = Proc.new {}
+        end
         event << [block, klass._name, options]
       end
 
       def trigger name, options = {}
         content = ''
 
-        events[klass._name][name].each do |event|
+        events[klass._name][name.to_s].each do |event|
           block, comp, _ = event
 
-          response = Instance.new(component(comp), scope).instance_exec options, &block
+          response = Component::Instance.new(component(comp), scope).instance_exec options, &block
 
           if response.is_a? Roda::Component::DOM
             content = response.to_html
           elsif response.is_a? String
-            content = response.to_s
+            content = response
           end
         end
 
@@ -40,37 +48,19 @@ class Roda
         component_opts[:events]
       end
 
+      def engine_type
+        RUBY_ENGINE == 'ruby' ? 'server' : 'client'
+      end
+
       def server?
-        RUBY_ENGINE == 'ruby'
+        RUBY_ENGINE == 'ruby' ? 'server' : false
       end
       alias :server :server?
 
       def client?
-        RUBY_ENGINE == 'opal'
+        RUBY_ENGINE == 'opal' ? 'client' : false
       end
       alias :client :client?
-
-      class Instance < Struct.new(:instance, :scope)
-        def method_missing method, *args, &block
-          if instance.respond_to? method, true
-            instance.send method, *args, &block
-          elsif server && scope.respond_to?(method, true)
-            scope.send method, *args, &block
-          else
-            super
-          end
-        end
-
-        def server?
-          RUBY_ENGINE == 'ruby'
-        end
-        alias :server :server?
-
-        def client?
-          RUBY_ENGINE == 'opal'
-        end
-        alias :client :client?
-      end
     end
   end
 end

data/lib/roda/component/faye.rb

@@ -0,0 +1,61 @@
+if RUBY_ENGINE == 'opal'
+  require 'native'
+
+  class Roda
+    class Component
+      class Faye
+        include Native
+
+        def initialize url
+          super `new Faye.Client(#{url})`
+        end
+
+        alias_native :subscribe
+        alias_native :publish
+        alias_native :set_header, :setHeader
+        alias_native :add_extension, :addExtension
+      end
+    end
+  end
+else
+  class Roda
+    class Component
+      class Faye
+        class CsrfProtection
+          def incoming(m, request, callback)
+            # # fix due to opal and wrapping message in native like Native(message)
+            message = { '_id' => m['_id']}
+            message.merge! m['native']
+
+            ap '======================'
+            ap message
+            ap request.session
+            ap '======================'
+
+            session_token = request.session['csrf.token']
+            message_token = message['ext'] && message['ext'].delete('csrfToken')
+
+            unless session_token == message_token
+              message['error'] = '401::Access denied'
+            end
+
+            callback.call(message)
+          end
+          #
+          # def outgoing(m, request, callback)
+          #   ap '======================'
+          #   ap 'outgoing'
+          #   ap m
+          #   ap request.session
+          #   ap '======================'
+          #   #
+          #   # unless session_token == message_token
+          #   #   message['error'] = '401::Access denied'
+          #   # end
+          #   callback.call(m)
+          # end
+        end
+      end
+    end
+  end
+end

data/lib/roda/component/instance.rb

@@ -0,0 +1,38 @@
+class Roda
+  class Component
+    class Instance
+      attr_accessor :instance, :scope
+
+      def initialize instance, scope = false
+        @instance = instance
+        @scope    = scope
+      end
+
+      # this is a hack because it seems like display is a ruby object method
+      # when doing method(:display) it gives #<Method: # Roda::Component::Instance(Kernel)#display>
+      def display *args
+        method_missing(*args)
+      end
+
+      def method_missing method = 'display', *args, &block
+        if instance.respond_to? method, true
+          instance.send method, *args, &block
+        elsif server && scope && scope.respond_to?(method, true)
+          scope.send method, *args, &block
+        else
+          super
+        end
+      end
+
+      def server?
+        RUBY_ENGINE == 'ruby'
+      end
+      alias :server :server?
+
+      def client?
+        RUBY_ENGINE == 'opal'
+      end
+      alias :client :client?
+    end
+  end
+end

data/lib/roda/component/version.rb

@@ -1,5 +1,5 @@
 class Roda
   class Component
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/lib/roda/component.rb

@@ -1,6 +1,12 @@
+unless RUBY_ENGINE == 'opal'
+  require 'tilt'
+end
+
 require 'opal'
 require 'opal-jquery'
 require "base64"
+require 'roda/component/faye'
+require 'roda/component/instance'
 require 'roda/component/dom'
 require 'roda/component/events'
 
@@ -12,7 +18,6 @@ if RUBY_ENGINE == 'opal'
   }
 end
 
-
 class Roda
   class Component
     attr_accessor :scope
@@ -34,11 +39,11 @@ class Roda
 
       # The name of the component
       def name _name
+        @_name = _name.to_s
+
         if server?
-          component_opts[:class_name][_name] = self.to_s
+          component_opts[:class_name][@_name] = self.to_s
         end
-
-        @_name = _name
       end
 
       # The html source
@@ -109,6 +114,14 @@ class Roda
         end
       end
 
+      def method_missing method, *args, &block
+        if server && app.respond_to?(method, true)
+          app.send method, *args, &block
+        else
+          super
+        end
+      end
+
       private
 
       def server?
@@ -133,15 +146,13 @@ class Roda
     end
 
     def dom
-      d = cache[:dom] || begin
+      @_dom ||= DOM.new cache[:dom].dup || begin
         if server?
           Nokogiri::HTML cache[:html]
         else
           Element
         end
       end
-
-      DOM.new d
     end
 
     # Grab the template from the cache, use the nokogiri dom or create a
@@ -162,6 +173,14 @@ class Roda
       events.trigger(*args)
     end
 
+    def method_missing method, *args, &block
+      if server && scope.respond_to?(method, true)
+        scope.send method, *args, &block
+      else
+        super
+      end
+    end
+
     private
 
     def server?

data/lib/roda/plugins/component.rb

@@ -1,11 +1,26 @@
 require 'tilt'
+require 'faye'
+require 'faye/redis'
 require 'roda/component'
+require 'roda/component/faye'
 require 'json'
 require "base64"
 
 class Roda
   module RodaPlugins
     module Component
+      def self.load_dependencies(app, opts={})
+        Faye::WebSocket.load_adapter('thin')
+
+        app.plugin :csrf, header: 'X-CSRF-TOKEN'
+
+        app.use Faye::RackAdapter,
+          mount: '/faye',
+          timeout: 25,
+          extensions: [Roda::Component::Faye::CsrfProtection.new],
+          :engine  => { :type  => Faye::Redis }
+      end
+
       def self.configure(app, opts={})
         if app.opts[:component]
           app.opts[:component].merge!(opts)
@@ -35,7 +50,7 @@ class Roda
 
         def load_component name
           Object.const_get(
-            component_opts[:class_name][name.to_sym]
+            component_opts[:class_name][name.to_s]
           ).new self
         end
 
@@ -51,8 +66,37 @@ class Roda
           options   = Base64.encode64 options.to_json
           comp_name = comp.class._name
 
+          # client.addExtension({
+          #   outgoing: function(message, callback) {
+          #     message.ext = message.ext || {};
+          #     message.ext.csrfToken = $('meta[name=csrf-token]').attr('content');
+          #     callback(message);
+          #   }
+          # });
           js = <<-EOF
             Document.ready? do
+              unless $faye
+                $faye = Roda::Component::Faye.new('/faye')
+
+                $faye.set_header 'X-CSRF-TOKEN', Element.find('meta[name=_csrf]').attr('content')
+
+                $faye.add_extension({
+                  outgoing: ->(message, block) {
+                    message = Native(message)
+                    message.ext = message.ext || {}
+                    message.ext.csrfToken = Element.find('meta[name=_csrf]').attr('content')
+
+                    block.call message
+                  }
+                })
+
+                $faye.subscribe '/foo' do |message|
+                  puts '===================='
+                  puts message
+                  puts '===================='
+                end
+              end
+
               unless $component_opts[:comp][:"#{comp_name}"]
                 c = $component_opts[:comp][:"#{comp_name}"] = #{comp.class}.new
                 c.cache = JSON.parse Base64.decode64('#{cache}')
@@ -67,14 +111,19 @@ class Roda
         def component name, options = {}, &block
           comp = load_component name
 
-          action = options[:call] || 'display'
+          action  = options[:call]    || :display
+          trigger = options[:trigger] || false
 
           # call action
           # TODO: make sure the single method parameter isn't a block
-          if comp.method(action).parameters.length > 0
-            comp_response = comp.send(action, options, &block)
+          if trigger
+            comp_response = comp.trigger trigger, options
           else
-            comp_response = comp.send(action, &block)
+            if comp.method(action).parameters.length > 0
+              comp_response = comp.send(action, options, &block)
+            else
+              comp_response = comp.send(action, &block)
+            end
           end
 
           if comp_response.is_a? Roda::Component::DOM
@@ -84,6 +133,8 @@ class Roda
           end
 
           content += load_component_js comp, action
+
+          content
         end
         alias :comp :component
         alias :roda_component :component
@@ -143,16 +194,12 @@ class Roda
           end
 
           on self.class.component_route_regex do |comp, type, action|
-            comp = scope.load_component(comp.to_sym)
-
             case type
             when 'call'
-              response.write comp.public_send action
+              scope.roda_component(comp, call: action)
             when 'trigger'
-              response.write scope.load_component(comp.to_sym).events.trigger action.to_sym
+              scope.roda_component(comp, trigger: action)
             end
-
-            response.write scope.load_component_js comp, action
           end
         end
       end

data/roda-component.gemspec

@@ -21,7 +21,9 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "opal"
   spec.add_runtime_dependency "opal-jquery"
   spec.add_runtime_dependency "faye"
+  spec.add_runtime_dependency "faye-redis"
   spec.add_runtime_dependency "tilt"
+  spec.add_runtime_dependency "rack_csrf"
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roda-component
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - cj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-01 00:00:00.000000000 Z
+date: 2014-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: faye-redis
+  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: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rack_csrf
+  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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -112,6 +140,8 @@ files:
 - lib/roda/component.rb
 - lib/roda/component/dom.rb
 - lib/roda/component/events.rb
+- lib/roda/component/faye.rb
+- lib/roda/component/instance.rb
 - lib/roda/component/version.rb
 - lib/roda/plugins/component.rb
 - roda-component.gemspec