opal-connect 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9cff9dcf8a66a0ca2119adcf3fce943b40b03cba
-  data.tar.gz: c875f500590d114afef77540202d8825291a9874
+  metadata.gz: f88b83b2a3997a5d494b41fedd83777c104a05c9
+  data.tar.gz: 1dcededce0860ec8c3314a74900950c17d862147
 SHA512:
-  metadata.gz: 7e8fbfe0d1925ed42764343cec7ebd1629c56ec4ef980d8110a4dfd5b282967ad94faddfeb8b3137004ef88afce88b4bc2e4e17fd4da0ba249145f5f42a9aa0e
-  data.tar.gz: 662b9cbeafd47b5f3b7b0a682315112b9e4473ee9214c11dcdd3d59ad7d30f193a947652d96291c2e38946da36152117b881f05e07679085c29ad1f287b1cc83
+  metadata.gz: 6094189c9f0a4c87911703e7968a42814a4ff6d90871472999f328cbfa9089c21cf7a7e2bef1e1ae40bf26571e6c4ec9b09ee367130fad5c7b83fde56f8a55b6
+  data.tar.gz: 6a7ba6691da29aed4eee614188414680ea040d1408b01caa0c19ddda88282ff9c41af6aede4d94ad40815b7861baf8be45c83a5d08d4cf5d9911bb31127c4dd2

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

@@ -7,7 +7,8 @@ module Opal
         module InstanceMethods
           def connect_event_instance_variables(event, _name, _selector)
             # gives you access to this, like jquery
-            @this = dom event.current_target
+            @this  = dom event.current_target
+            @event = event
           end
         end
 

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

@@ -25,6 +25,12 @@ module Opal
           end
         end
 
+        module ClassMethods
+          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

@@ -2,6 +2,12 @@ module Opal
   module Connect
     module ConnectPlugins
       module Scope
+        def self.configure(connect, options = false)
+          return unless options
+
+          connect.options[:scope] = options
+        end
+
         module InstanceMethods
           def scope(new_scope = false)
             if new_scope
@@ -23,8 +29,12 @@ module Opal
         end
 
         module ClassMethods
-          def scope(scope, *args)
-            new(*args).scope(scope)
+          def scope(new_scope = false, *args)
+            if new_scope
+              @_scope = new(*args).scope(new_scope || Connect.options[:scope])
+            else
+              @_scope
+            end
           end
         end
       end

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

@@ -19,7 +19,12 @@ module Opal
 
           def server(method = false, *args, &block)
             if RUBY_ENGINE != 'opal'
-              method ||= Module.new(&block)
+
+              if method
+                include method
+              else
+                method = Module.new(&block)
+              end
 
               yield if block_given?
 

data/lib/opal/connect/rake_task.rb

@@ -9,8 +9,11 @@ module Opal
         options = DEFAULT_OPTIONS.merge opts
 
         namespace name do
-          Opal::Connect.setup
-          Opal::Config.dynamic_require_severity = 'ignore'
+          return unless defined? Opal.append_path
+
+          Opal::Connect.write_plugins_file
+          Opal::Connect.write_entry_file
+
           Opal.append_path Dir.pwd
 
           opal_file_path = "#{Dir.pwd}/.connect/opal.js"

data/lib/opal/connect/version.rb

@@ -1,5 +1,5 @@
 module Opal
   module Connect
-    VERSION = "0.0.8"
+    VERSION = "0.0.9"
   end
 end

data/lib/opal/connect.rb

@@ -19,70 +19,24 @@ module Opal
     class << self
       attr_accessor :pids
 
-      def run(scope, server, opts = {})
-        if ENV['CUTEST']
-          scope.run server
-        else
-          @pids   = []
-          options = { env: { RACK_ENV: ENV['RACK_ENV']} }.merge opts
-
-          envs = options[:env].to_a.map { |k, v| "#{k}=#{v}" }.join ' '
-          pids << {
-            name: 'webpack',
-            pid: Process.spawn("#{envs} bundle exec rake webpack:run")
-          }
-
-          if (cutest = Connect.options[:cutest]) && pids.select { |pid| pid[:name] == 'cutest' }.empty?
-            envs = cutest[:env].to_a.map { |k, v| "#{k}=#{v}" }.join ' '
-            pids << {
-              name: 'cutest',
-              pid: Process.spawn("#{envs} #{cutest[:run]}")
-            }
-          end
-
-          scope.send(:at_exit) { quit_pids }
-
-          scope.run server
-        end
-      rescue
-        quit_pids
-      end
-
-      def quit_pids
-        begin
-          while pids.length > 0
-            Process.kill "QUIT", (pids.shift)[:pid]
-          end
-        rescue
-          # process already dead
-        end
-      end
-
       def options
-        @options ||= Connect::ConnectCache.new(
+        @_options ||= Connect::ConnectCache.new(
           hot_reload: false,
           url: '/connect',
           plugins: [],
-          setup_ran: false,
           javascript: [],
-          plugin_requires: []
+          plugin_requires: [],
+          setup_blocks: []
         )
       end
 
-      def options=(opts)
-        @options = opts
-      end if RUBY_ENGINE == 'opal'
-
       def setup(&block)
         instance_exec(&block) if block_given?
 
         # make sure we include the default plugins with connect
         options[:plugins].each { |plug| Connect.plugin plug }
 
-        unless RUBY_ENGINE == 'opal'
-          write_plugins_file
-          write_entry_file
-        end
+        options[:setup_blocks].each { |b| Class.new { include Opal::Connect }.new.instance_exec(&b) }
       end
 
       def included(klass)
@@ -239,7 +193,12 @@ module Opal
           end
 
           def setup(&block)
-            yield
+            if block_given?
+              @_setup_block = block
+              Connect.options[:setup_blocks] << @_setup_block
+            else
+              @_setup_block
+            end
           end
 
           # Load a new plugin into the current class.  A plugin can be a module
@@ -252,23 +211,31 @@ module Opal
             included = (args.first == :included) ? args.shift : false
 
             raise ConnectError, "Cannot add a plugin to a frozen Connect class" if RUBY_ENGINE != 'opal' && frozen?
+
             if plugin.is_a?(Symbol)
               Connect.options[:plugins] << plugin unless Connect.options[:plugins].include? plugin
               plugin = ConnectPlugins.load_plugin(plugin)
             end
+
             plugin.load_dependencies(self, *args, &block) if !included && plugin.respond_to?(:load_dependencies)
+
             return unless plugin
+
             include(plugin::InstanceMethods) if defined?(plugin::InstanceMethods)
-            extend(plugin::ClassMethods) if defined?(plugin::ClassMethods)
+            extend(plugin::ClassMethods)     if defined?(plugin::ClassMethods)
+
             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)
+
               unless RUBY_ENGINE == 'opal'
                 Connect.options[:javascript] << plugin::ConnectJavascript if defined?(plugin::ConnectJavascript)
               end
             end
+
             plugin.configure(self, *args, &block) if !included && plugin.respond_to?(:configure)
+
             nil
           end
 
@@ -307,7 +274,7 @@ module Opal
 
                   Opal::Connect.start_events unless $connect_events_started
                 end
-              }
+              } if klass.class.name
             end
 
             def write_entry_file(klass = false, method = false, *options)
@@ -323,15 +290,23 @@ module Opal
 
               client_options = Base64.encode64 client_options.to_json
 
-              code = "Opal::Connect.options = JSON.parse(Base64.decode64('#{client_options}'));"
-              code = "#{code} Opal::Connect.setup;"
+              code = %{
+                options = JSON.parse(Base64.decode64('#{client_options}'));
+                options.each do |key, value|
+                  Opal::Connect.options[key] = value
+                end
+              }
+              code = "#{code} Opal::Connect.options[:plugins].each { |plug| Opal::Connect.plugin plug };"
+
               if Connect.respond_to? :templates
                 templates = Base64.encode64 Connect.templates.hash.to_json
                 code      = "#{code} Opal::Connect.templates = JSON.parse(Base64.decode64('#{templates}'));"
               end
+
               code  = %{#{code} Opal::Connect.server_methods = JSON.parse(
                 Base64.decode64('#{Base64.encode64 Connect.server_methods.to_json}')
               );}
+
               code = "#{code} #{Connect.options[:entry]}" if Connect.options[:entry]
 
 
@@ -360,6 +335,8 @@ module Opal
                 }
               end
 
+              code = "#{code} Opal::Connect.options[:setup_blocks].each { |b| Class.new { include Opal::Connect }.new.instance_exec(&b) }"
+
               FileUtils.mkdir_p(File.dirname(path))
               File.write(path, build(code))
             end
@@ -368,10 +345,6 @@ module Opal
       end
     end
 
-    if RUBY_ENGINE == 'opal'
-      require ".connect/plugins"
-    end
-
     extend ConnectPlugins::Base::ClassMethods
     plugin ConnectPlugins::Base
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal-connect
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - cj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-05 00:00:00.000000000 Z
+date: 2016-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal