roda-component 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e07b2592555f0305b5ff63e7b1a5d0cdc595f337
-  data.tar.gz: a9292504e6a90f5aec922f3908a8abed452cbb23
+  metadata.gz: 7a0aee4b44c06ddda8a7f16cadc0ab4f36cb8bdf
+  data.tar.gz: 3b43bcaccdcd4946f8e4cabcfabb9eae516c5d88
 SHA512:
-  metadata.gz: 7e3c511932310c7c1958b248944bd61b3507ce506191d4ced846618cc54a25b64ba955b1bd1c1cf83fbd140f3ac6d2f576f04b1e76f1a22b970532936e43cd70
-  data.tar.gz: 06c976af76747799ba76fe4661a21a00fa927a7614a8c4d7811f4261037ed53d31c05bab95a131a8da24f90861a2888557285c203e8675d86ff9dd096d06174c
+  metadata.gz: dd9fad6927044e7d4bf367ee524c68c4c600c93a3e93a26af8d5996d0669b7edecdf4d91f6c28ee47ba93b2160b8d63e7f9fc2eafb7d02ced7bd4e7b341a087f
+  data.tar.gz: e7c055e597beccfd745f60a08b8cd56947e2d5613aa93d97427e2f033cd9fb95aef33a6b4aaa9c7e6ec6b39d886fa991065d207475fe982dcca64b6b127f5db5

data/lib/roda/component/faye.rb

@@ -6,32 +6,79 @@ if RUBY_ENGINE == 'opal'
       class Faye
         include Native
 
-        def initialize url
-          super `new Faye.Client(#{url})`
-        end
-
         alias_native :subscribe
+        alias_native :unsubscribe
         alias_native :publish
+        alias_native :bind
+        alias_native :cancel
+        alias_native :on
+        alias_native :then
         alias_native :set_header, :setHeader
         alias_native :add_extension, :addExtension
+
+        def initialize url
+          super `new Faye.Client(#{url})`
+          set_header 'X-CSRF-TOKEN', Element.find('meta[name=_csrf]').attr('content')
+          add_extension({
+            incoming: ->(message, block) { incoming message, block },
+            outgoing: ->(message, block) { outgoing message, block }
+          })
+        end
+
+        def public_id
+          @public_id ||= generate_id
+        end
+
+        def private_id
+          @private_id ||= generate_id
+        end
+
+        def incoming message, block
+          msg = Native(message)
+
+          if (!@public_id && !@private_id) && msg[:channel] == '/meta/handshake'
+            subscribe "/components/incoming/#{private_id}/#{public_id}" do |data|
+              data     = Native(data)
+              event_id = data[:event_id]
+              body     = Element['body']
+
+              body.trigger(event_id, data[:local], data)
+              body.off event_id
+            end
+          end
+
+          block.call message
+        end
+
+        def outgoing message, block
+          message = %x{
+            message = #{message}
+            message.ext = message.ext || {};
+            message.ext.csrfToken = $('meta[name=_csrf]').attr('content');
+          }
+          block.call message
+        end
+
+        private
+
+        def generate_id
+          o = [('a'..'z'), ('A'..'Z'), (0..9)].map { |i| i.to_a }.flatten
+          (0...50).map { o[rand(o.length)] }.join
+        end
       end
     end
   end
 else
+  require 'faye'
+  require 'roda/component/ohm'
+  require 'roda/component/models/user'
+  require 'roda/component/models/channel'
+
   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 '======================'
-
+          def incoming(message, request, callback)
             session_token = request.session['csrf.token']
             message_token = message['ext'] && message['ext'].delete('csrfToken')
 
@@ -41,19 +88,47 @@ else
 
             callback.call(message)
           end
+        end
+
+        class ChannelManager
+          def incoming(message, request, callback)
+            app = get_app(request)
+
+            if data = message['data']
+              case data['type']
+              when 'event'
+                options = { local: data['local'] }
+                data['event_type'] == 'call' \
+                  ? options[:call] = data['event_method'] \
+                  : options[:trigger] = data['event_method']
+
+                message['data']['local'] = app.roda_component(:"#{data['name']}", options)
+                message['channel']       = message['channel'].gsub(/outgoing/, 'incoming')
+              end
+            end
+
+            callback.call message
+          end
+
+          # /components/:id/:comp/:action
+          # def outgoing(message, request, callback)
+          #   app = get_app request
           #
-          # 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)
+          #   # message[:data] = app.roda_component(:auth, call: :cow) || false
+          #
+          #   ap '====OUTGOING===='
+          #   ap message
+          #   ap '================'
+          #
+          #   callback.call message
           # end
+
+          def get_app request
+            request.env['RODA_COMPONENT_FROM_FAYE'] = true
+            a = Class.new(Roda::Component.app.class).new
+            a.instance_variable_set(:@_request, request)
+            a
+          end
         end
       end
     end

data/lib/roda/component/instance.rb

@@ -10,11 +10,11 @@ class Roda
 
       # 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)
+      def display *args, &block
+        method_missing('display', *args, &block)
       end
 
-      def method_missing method = 'display', *args, &block
+      def method_missing method, *args, &block
         if instance.respond_to? method, true
           instance.send method, *args, &block
         elsif server && scope && scope.respond_to?(method, true)

data/lib/roda/component/models/channel.rb

@@ -0,0 +1,11 @@
+class Roda
+  class Component
+    module Models
+      class Channel < Ohm::Model
+        attribute :name
+
+        collection :users, 'Roda::Component::Models::User'
+      end
+    end
+  end
+end

data/lib/roda/component/models/user.rb

@@ -0,0 +1,12 @@
+class Roda
+  class Component
+    module Models
+      class User < Ohm::Model
+        attribute :model_id
+        index :model_id
+
+        collection :channels, 'Roda::Component::Models::Channel'
+      end
+    end
+  end
+end

data/lib/roda/component/ohm.rb

@@ -0,0 +1,8 @@
+require 'ohm'
+require 'redic'
+
+class Roda
+  class Component
+    Ohm = ::Ohm.dup
+  end
+end

data/lib/roda/component/version.rb

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

data/lib/roda/component.rb

@@ -1,5 +1,6 @@
 unless RUBY_ENGINE == 'opal'
   require 'tilt'
+  require 'awesome_print'
 end
 
 require 'opal'
@@ -18,12 +19,35 @@ if RUBY_ENGINE == 'opal'
   }
 end
 
+module Overrideable
+  def self.included(c)
+    c.instance_methods(false).each do |m|
+      m = m.to_sym
+      c.class_eval %Q{
+        alias #{m}_original #{m}
+        def #{m}(*args, &block)
+          puts "Foo"
+          result = #{m}_original(*args, &block)
+          puts "Bar"
+          result
+        end
+      }
+    end
+  end
+end
+
 class Roda
   class Component
     attr_accessor :scope
 
     def initialize(scope = false)
       @scope = scope
+
+      if client?
+        $faye.subscribe "/components/#{self.class._name}" do |msg|
+          `window.console.log(#{msg})`
+        end
+      end
     end
 
     class << self
@@ -37,6 +61,38 @@ class Roda
         end
       end
 
+      def on_server &block
+        if server?
+          yield
+        else
+          m = Module.new(&block)
+
+          m.public_instance_methods(false).each do |meth|
+            define_method "#{meth}" do |*args, &blk|
+              name     = self.class._name
+              event_id = "comp-event-#{$faye.generate_id}"
+
+              Element['body'].on event_id do |event, local, data|
+                blk.call local, event, data
+              end
+
+              $faye.publish("/components/outgoing/#{$faye.private_id}/#{$faye.public_id}", {
+                name: name,
+                type: 'event',
+                event_type: 'call',
+                event_method: meth,
+                event_id: event_id,
+                local: args.first || nil
+              })
+
+              true
+            end
+          end
+
+          include m
+        end
+      end
+
       # The name of the component
       def name _name
         @_name = _name.to_s
@@ -78,6 +134,7 @@ class Roda
         unless @_cache
           @_cache ||= Roda::RodaCache.new
           @_cache[:tmpl] = {}
+          @_cache[:server_methods] = []
         end
 
         @_cache
@@ -146,22 +203,26 @@ class Roda
     end
 
     def dom
-      @_dom ||= DOM.new cache[:dom].dup || begin
-        if server?
+      if server?
+        @_dom ||= DOM.new cache[:dom].dup || begin
           Nokogiri::HTML cache[:html]
-        else
-          Element
         end
+      else
+        @_dom ||= DOM.new(Element)
       end
     end
 
     # Grab the template from the cache, use the nokogiri dom or create a
     # jquery element for server side
     def tmpl name
-      if server?
-        DOM.new cache[:tmpl][name][:dom].dup
+      if t = cache[:tmpl][name]
+        if server?
+          DOM.new t[:dom].dup
+        else
+          DOM.new Element[t[:html].dup]
+        end
       else
-        DOM.new Element[cache[:tmpl][name][:html].dup]
+        false
       end
     end
 

data/lib/roda/plugins/component.rb

@@ -3,6 +3,7 @@ require 'faye'
 require 'faye/redis'
 require 'roda/component'
 require 'roda/component/faye'
+require 'roda/component/ohm'
 require 'json'
 require "base64"
 
@@ -13,12 +14,6 @@ class Roda
         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={})
@@ -28,16 +23,33 @@ class Roda
           app.opts[:component] = opts.dup
         end
 
-        opts                    = app.opts[:component]
-        opts[:cache]            = app.thread_safe_cache if opts.fetch(:cache, true)
-        opts[:path]           ||= 'components'
-        opts[:route]          ||= 'components'
-        opts[:assets_route]   ||= 'assets/components'
-        opts[:class]          ||= Roda::Component
-        opts[:settings]       ||= {}
-        opts[:class_name]     ||= {}
-        opts[:events]         ||= {}
-        opts[:cache][:tmpl]   ||= {}
+        opts                     = app.opts[:component]
+        opts[:cache]             = app.thread_safe_cache if opts.fetch(:cache, true)
+        opts[:path]            ||= 'components'
+        opts[:route]           ||= 'components'
+        opts[:assets_route]    ||= 'assets/components'
+        opts[:class]           ||= Roda::Component
+        opts[:settings]        ||= {}
+        opts[:class_name]      ||= {}
+        opts[:events]          ||= {}
+        opts[:user_model]      ||= 'User'
+        opts[:redis_namespace] ||= 'roda:component:'
+        opts[:cache][:tmpl]    ||= {}
+
+        app.use(Faye::RackAdapter, {
+          mount: '/faye',
+          extensions: [
+            Roda::Component::Faye::CsrfProtection.new,
+            Roda::Component::Faye::ChannelManager.new
+          ],
+          engine: {
+            type:      Faye::Redis,
+            uri:       opts[:redis_uri],
+            namespace: opts[:redis_namespace]
+          }
+        })
+
+        Roda::Component::Ohm.redis = Redic.new opts[:redis_uri]
 
         # Set the current app
         opts[:class].set_app app
@@ -66,35 +78,10 @@ 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}"]
@@ -126,15 +113,19 @@ class Roda
             end
           end
 
-          if comp_response.is_a? Roda::Component::DOM
-            content = comp_response.to_html
-          else
-            content = comp_response.to_s
-          end
+          if !env['RODA_COMPONENT_FROM_FAYE']
+            if comp_response.is_a? Roda::Component::DOM
+              content = comp_response.to_html
+            else
+              content = comp_response.to_s
+            end
 
-          content += load_component_js comp, action
+            content += load_component_js comp, action
 
-          content
+            content
+          else
+            comp_response
+          end
         end
         alias :comp :component
         alias :roda_component :component

data/roda-component.gemspec

@@ -24,6 +24,9 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "faye-redis"
   spec.add_runtime_dependency "tilt"
   spec.add_runtime_dependency "rack_csrf"
+  spec.add_runtime_dependency "ohm"
+  spec.add_runtime_dependency "ohm-contrib"
+  spec.add_runtime_dependency "ohm-sorted"
   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.5
+  version: 0.0.6
 platform: ruby
 authors:
 - cj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-02 00:00:00.000000000 Z
+date: 2014-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -94,6 +94,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ohm
+  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: ohm-contrib
+  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: ohm-sorted
+  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
@@ -142,6 +184,9 @@ files:
 - lib/roda/component/events.rb
 - lib/roda/component/faye.rb
 - lib/roda/component/instance.rb
+- lib/roda/component/models/channel.rb
+- lib/roda/component/models/user.rb
+- lib/roda/component/ohm.rb
 - lib/roda/component/version.rb
 - lib/roda/plugins/component.rb
 - roda-component.gemspec