opal-connect 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8eb1755efb4187fb0fe313046b83862a7943ac3
-  data.tar.gz: fd330a60e16e736d1e5cb29e402ef3b83233a761
+  metadata.gz: de60747b1ade488a697ae66c25931d1bad6dd5c5
+  data.tar.gz: 2bc80456910377dadeff20ebada2a9b8c3a3a13a
 SHA512:
-  metadata.gz: bce04a189804b540bd3382d6de3722ce6e177dd9e7c8b98e2d1e720cc9f9dabf392bf14dd45f60eb7d1a9ec3ef3ed15f75dc47006b9b7e643532857e13cfdc3d
-  data.tar.gz: fecc33e53a01ddffb92dea830892eee8f7578d216524011fe3a3f855ea46bfaee70c4086272f136ee287010dbddc83398f17d94bea00305ec56e5ca6c44efe52
+  metadata.gz: 4cbfab39d084eaaf3eb6848155bff391a3734efa802bb14a7ac90f48fd3cb69f28bdfe60acc16c48db63f461da2b8081f2a26446bb9c97ba744e4675676b0f3a
+  data.tar.gz: b6e9af69f0aa91683401b01788efecdd6b1cc13e55df4722a5197ae49ba3c4f1e781261a3d51a31c29c5660b5fcc1fc485dc330935e7848169685673c1452c1a

data/lib/opal/connect/plugins/dom.rb

@@ -10,6 +10,8 @@ module Opal
       # each protected by a mutex.
       module Dom
         module ConnectClassMethods
+          attr_accessor :templates
+
           def templates
             @templates ||= ConnectCache.new
           end
@@ -42,14 +44,14 @@ module Opal
             end
           end
 
-          def dom
+          def dom(selector = false)
             if RUBY_ENGINE == 'opal'
-              selector = 'html'
+              selector ||= 'html'
+              Instance.new selector, cache
             else
-              selector = false
+              selector ||= false
+              @dom ||= Instance.new selector, cache
             end
-
-            @dom ||= Instance.new false, cache
           end
         end
 
@@ -58,18 +60,20 @@ module Opal
             self.class.cache
           end
 
-          def dom
+          def dom(selector = false)
             if RUBY_ENGINE == 'opal'
-              selector = 'html'
+              selector ||= 'html'
+              Instance.new selector, cache
             else
-              selector = cache[:html]
+              selector ||= cache[:html]
+              @dom ||= Instance.new selector, cache
             end
-
-            @dom ||= Instance.new selector, cache
           end
         end
 
         class Instance
+          RETURN_VALUE_FIELDS = %w'attr prop'
+
           attr_reader :selector, :cache, :dom
 
           def initialize(selector, cache)
@@ -98,6 +102,11 @@ module Opal
           end
           alias set! set
 
+          def load html
+            Instance.new(html, cache)
+          end
+          alias load! load
+
           def save template_name = false, remove = true
             if template_name
               cache[:"#{template_name}"] = self.to_html
@@ -146,6 +155,8 @@ module Opal
                 else
                   node.each { |n| n.set(key, value) }
                 end
+
+                self
               else
                 if node.respond_to? :get
                   node.get(key)
@@ -153,8 +164,6 @@ module Opal
                   node.first.get(key)
                 end
               end
-
-              self
             end
 
             def remove
@@ -176,7 +185,7 @@ module Opal
             end
           end
 
-          def append(content, &block)
+          def append(content = false, &block)
             # content becomes scope in this case
             content = HTML::DSL.scope!(content).html(&block).to_html if block_given?
 
@@ -184,7 +193,7 @@ module Opal
               node.append(content)
             else
               if content.is_a? Dom::Instance
-                content = content.children
+                content = content.node.children
               else
                 content = Oga.parse_html(content).children
               end
@@ -192,14 +201,14 @@ module Opal
               if node.is_a?(Oga::XML::NodeSet)
                 node.each { |n| n.children = (n.children + content) }
               else
-                node.children = (children + content)
+                node.children = (node.children + content)
               end
             end
 
             self
           end
 
-          def prepend(content, &block)
+          def prepend(content = false, &block)
             # content becomes scope in this case
             content = HTML::DSL.scope!(content).html(&block).to_html if block_given?
 
@@ -264,21 +273,31 @@ module Opal
           end
 
           def node
-            if self.is_a?(Dom::Instance)
-              self.dom
+            if self.dom.respond_to? :dom
+              self.dom.dom
             else
-              dom
+              self.dom
             end
           end
 
           # This allows you to use all the oga or opal jquery methods if a
           # global one isn't set
           def method_missing(method, *args, &block)
-            if dom.respond_to?(method, true)
-              dom.send(method, *args, &block)
+            if RUBY_ENGINE == 'opal' && node.respond_to?(method, true)
+              n = node.send(method, *args, &block)
+            elsif RUBY_ENGINE != 'opal'
+              if node.is_a?(Oga::XML::NodeSet) && node.first.respond_to?(method, true)
+                n = node.first.send(method, *args, &block)
+              elsif node.respond_to?(method, true)
+                n = node.send(method, *args, &block)
+              else
+                super
+              end
             else
               super
             end
+
+            RETURN_VALUE_FIELDS.include?(method.to_s) ? n : Instance.new(n, cache)
           end
         end
       end

data/lib/opal/connect/plugins/events.rb

@@ -2,6 +2,8 @@ module Opal
   module Connect
     module ConnectPlugins
       module Events
+        $connect_events = ConnectCache.new if RUBY_ENGINE == 'opal'
+
         module ClassMethods
           if RUBY_ENGINE == 'opal'
             def connect_events
@@ -9,55 +11,66 @@ module Opal
             end
           end
 
-          def __events_el__ el = false
-            @connect_el = el if el
-            @connect_el
-          end
-          alias events_el __events_el__
+          attr_accessor :events_dom
 
+          def events_dom(selector = false)
+            if selector
+              @events_dom = selector
+            else
+              @events_dom
+            end
+          end
 
-          def __on__(name, selector = nil, method = nil, &handler)
+          def on(name, selector = nil, method = nil, &handler)
             if RUBY_ENGINE == 'opal'
+              return if $connect_events_started
+
+              if name.to_s != 'document' && events_dom
+                selector = "#{events_dom} #{selector}"
+              end
+
               handler = proc { |evt| __send__(method, evt) } if method
-              event = [name, selector, handler]
+              event   = [name, selector, handler]
               connect_events << event unless connect_events.include? event
             end
           end
-          alias on __on__
         end
 
         if RUBY_ENGINE == 'opal'
           module ConnectClassMethods
-            $connect_events = ConnectCache.new unless $connect_events
-
-            def events_teardown
-              if $connect_events
-                $connect_events.each do |klass, events|
-                  el = Dom[klass.connect_el || 'body']
+            def teardown_events
+              $connect_events.each do |klass, events|
+                el = dom('html')
 
-                  events.each do |event|
-                    name, selector, wrapper = event
+                events.each do |event|
+                  name, selector, wrapper = event
+                  if name.to_s != 'document'
                     el.off(name, selector, &wrapper)
+                  else
+                    Document.off(selector, &wrapper)
                   end
                 end
-
-                $connect_events = ConnectCache.new
               end
             end
 
-            def events_start
+            def start_events
+              $connect_events_started = true
               $connect_events.each do |klass, events|
-                el = Dom[klass.connect_el || 'body']
+                el = dom('html')
 
                 events.map! do |event|
                   name, selector, handler = event
                   wrapper = proc do |e|
                     # gives you access to this, like jquery
-                    @this = Dom[e.target]
+                    @this = dom(e.current_target)
                     instance_exec(e, &handler)
                   end
 
-                  el.on(name, selector, &wrapper)
+                  if name.to_s != 'document'
+                    el.on(name, selector, &wrapper)
+                  else
+                    Document.on(selector, &wrapper)
+                  end
                   [name, selector, wrapper]
                 end
               end

data/lib/opal/connect/plugins/html.rb

@@ -13,6 +13,12 @@ module Opal
                   script section select small source span strike strong style sub summary sup table tbody
                   td textarea tfoot th thead time title tr track tt u ul var video wbr}
 
+        module InstanceMethods
+          def html(&block)
+            HTML::DSL.scope!(self).html(&block).to_html
+          end
+        end
+
         # http://erikonrails.snowedin.net/?p=379
         class DSL
           def initialize(tag, *args, &block)

data/lib/opal/connect/plugins/scope.rb

@@ -21,6 +21,12 @@ module Opal
             end
           end
         end
+
+        module ClassMethods
+          def scope(scope, *args)
+            new(*args).scope(scope)
+          end
+        end
       end
 
       register_plugin :scope, Scope

data/lib/opal/connect/version.rb

@@ -1,5 +1,5 @@
 module Opal
   module Connect
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/lib/opal/connect.rb

@@ -13,7 +13,6 @@ end
 # Opal corelib is already loaded from CDN
 module Opal
   module Connect
-
     CLIENT_OPTIONS = %w'url plugins' unless RUBY_ENGINE == 'opal'
 
     class << self
@@ -21,7 +20,8 @@ module Opal
         @options ||= Connect::ConnectCache.new(
           hot_reload: false,
           url: '/connect',
-          plugins: []
+          plugins: [],
+          setup_ran: false
         )
       end
 
@@ -33,7 +33,7 @@ module Opal
         yield(options) if block_given?
 
         # make sure we include the default plugins with connect
-        options[:plugins].each { |plug| Connect.plugin plug.to_sym }
+        options[:plugins].each { |plug| Connect.plugin plug }
 
         unless RUBY_ENGINE == 'opal'
           write_plugins_file
@@ -49,8 +49,7 @@ module Opal
 
         klass.extend ConnectPlugins::Base::ClassMethods
 
-        # include default plugins
-        Connect.options[:plugins].each { |plug| klass.plugin plug.to_sym }
+        Connect.options[:plugins].each { |plug| klass.plugin plug, :included }
       end
 
       # We need to wripte a plugins.rb file which has all the plugins required
@@ -61,7 +60,13 @@ module Opal
         FileUtils.mkdir_p(File.dirname(path))
         File.open(path, 'w+') do |file|
           ConnectPlugins.plugins.each do |name, _|
-            file.puts "require 'opal/connect/plugins/#{name}'"
+            plugins_path = Connect.options[:plugins_path]
+
+            if plugins_path && File.exist?("#{plugins_path}/#{name}.rb")
+              file.puts "require '#{plugins_path}/#{name}'"
+            else
+              file.puts "require 'opal/connect/plugins/#{name}'"
+            end
           end
         end
       end
@@ -128,7 +133,14 @@ module Opal
         h = @plugins
         unless plugin = h[name]
           unless RUBY_ENGINE == 'opal'
-            require "opal/connect/plugins/#{name}"
+            plugins_path = Connect.options[:plugins_path]
+
+            if plugins_path && File.exists?("#{plugins_path}/#{name}.rb")
+              require "#{plugins_path}/#{name}"
+            else
+              require "opal/connect/plugins/#{name}"
+            end
+
             raise ConnectError, "Plugin #{name} did not register itself correctly in Roda::RodaPlugins" unless plugin = h[name]
           end
         end
@@ -146,24 +158,28 @@ module Opal
       module Base
         module InstanceMethods
           if RUBY_ENGINE != 'opal'
-            def to_js(method, *options)
+            def render(method, *options, &block)
               if hl = Connect.options[:hot_reload]
                 hl = {} unless hl.is_a? Hash
                 hl = { host: 'http://localhost', port: 8080 }.merge hl
 
                 Connect.write_entry_file(self.class, method, *options)
 
-                "#{__send__(method, *options)}<script src='#{hl[:host]}:#{hl[:port]}/main.js'></script>"
+                "#{public_send(method, *options, &block)}<script src='#{hl[:host]}:#{hl[:port]}/main.js'></script>"
               else
                 js = Connect.build Connect.javascript(self.class, method, *options)
 
-                "#{send(method, *options)}<script>#{js}</script>"
+                "#{public_send(method, *options, &block)}<script>#{js}</script>"
               end
             end
           end
         end
 
         module ClassMethods
+          def render(method, *args, &block)
+            new.render(method, *args, &block)
+          end
+
           def setup(&block)
             yield
           end
@@ -175,13 +191,19 @@ module Opal
           #   Connect.plugin PluginModule
           #   Connect.plugin :csrf
           def plugin(plugin, *args, &block)
+            included = (args.first == :included) ? args.shift : false
+
             raise ConnectError, "Cannot add a plugin to a frozen Connect class" if RUBY_ENGINE != 'opal' && frozen?
             plugin = ConnectPlugins.load_plugin(plugin) if plugin.is_a?(Symbol)
             plugin.load_dependencies(self, *args, &block) if plugin.respond_to?(:load_dependencies)
+            return unless plugin
             include(plugin::InstanceMethods) if defined?(plugin::InstanceMethods)
             extend(plugin::ClassMethods) if defined?(plugin::ClassMethods)
-            Connect.extend(plugin::ConnectClassMethods) if defined?(plugin::ConnectClassMethods)
-            Connect.include(plugin::ConnectInstanceMethods) if defined?(plugin::ConnectInstanceMethods)
+            unless included
+              Connect.extend(plugin::ConnectClassMethods) if defined?(plugin::ConnectClassMethods)
+              Connect.include(plugin::ConnectInstanceMethods) if defined?(plugin::ConnectInstanceMethods)
+              Connect.instance_exec(plugin, &plugin::ConnectSetup) if defined?(plugin::ConnectSetup)
+            end
             plugin.configure(self, *args, &block) if plugin.respond_to?(:configure)
             nil
           end
@@ -201,10 +223,6 @@ module Opal
               return unless klass
 
               %{
-                Opal::Connect.server_methods = JSON.parse(
-                  Base64.decode64('#{Base64.encode64 Connect.server_methods.to_json}')
-                )
-
                 Document.ready? do
                   klass = #{klass.name}.new
 
@@ -212,7 +230,7 @@ module Opal
                     klass.__send__(:#{method}, *JSON.parse(Base64.decode64('#{Base64.encode64 options.to_json}')))
                   end
 
-                  Opal::Connect.events_start
+                  Opal::Connect.start_events
                 end
               }
             end
@@ -222,8 +240,8 @@ module Opal
 
               path = "#{Dir.pwd}/.connect/entry.js"
 
-              required_files = Connect.files.map do |file|
-                "`require('#{file}')`"
+              required_files = Connect.files.uniq.map do |file|
+                !Connect.options[:hot_reload] ? "require('#{file}')" : "`require('#{file}')`"
               end.join(';')
 
               client_options = Connect.options.hash.select do |key, _|
@@ -236,6 +254,10 @@ module Opal
               code = "Opal::Connect.options = JSON.parse(Base64.decode64('#{client_options}'));"
               code = "#{code} Opal::Connect.setup;"
               code = "#{code} Opal::Connect.templates = JSON.parse(Base64.decode64('#{templates}'));"
+              code  = %{#{code} Opal::Connect.server_methods = JSON.parse(
+                Base64.decode64('#{Base64.encode64 Connect.server_methods.to_json}')
+              );}
+
 
               if !Connect.options[:hot_reload]
                 code = "#{code} #{required_files}"
@@ -243,8 +265,20 @@ module Opal
                 code << %{
                   `if (module.hot) {`
                     `module.hot.accept()`
+
+                    if Opal::Connect.respond_to? :teardown_events
+                      Opal::Connect.teardown_events
+                      connect_events  = $connect_events[Opal::Connect]
+                      $connect_events = Opal::Connect::ConnectCache.new
+
+                      if connect_events
+                        $connect_events[Opal::Connect] = connect_events
+                      end
+
+                      $connect_events_started = false
+                    end
+
                     #{required_files}
-                    Opal::Connect.events_teardown
                     #{Connect.javascript(klass, method, *options)}
                   `}`
                 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal-connect
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - cj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-20 00:00:00.000000000 Z
+date: 2016-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal