opal-connect 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b52883ea798fba1bc5ef8e7e3b77083fe082634e
-  data.tar.gz: 055c956583030f66affcd36a84e96f0cb498d0d6
+  metadata.gz: 3a72b12d975226cbaf9f606a275f479652f7f5fd
+  data.tar.gz: bc02721d66f97dc7dd5393e18fca455774e47c32
 SHA512:
-  metadata.gz: 872c395c0bdfbc176ee10d55374318f94ef063151af77143135f6d600c88e79651bebfb15d0c3d5f41406e1bd40a0ebf40834fdb1df052791f04f3959e3a477e
-  data.tar.gz: 88a527535fc13204d3d95588fd6f56692f405ee1b27a42d786da5e4d7cd565eb1f3ccce3ff7e36555081bed5db53bd92b06a4da0b4cc9edfe307288c0b221915
+  metadata.gz: 8da7fefa7c29860141b0cddcdb89a2f9b8e8e601277eecafa39df1b77d02c3f44743001a5751f0f16bb1cb02d8d684229eb5fb5cd6ff1929cba9f670f6b61e87
+  data.tar.gz: 384e1482e818813dac36b0b0940761fc0ffce26099407d57677458b40b0b210e77cf6fb90d6915621c590f707b31bce7a03fd2d09b11657ab53e7cecb42488dc

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

@@ -9,19 +9,19 @@ module Opal
         end
 
         def self.configure(connect, options = false)
-          if options
-            unless RUBY_ENGINE == 'opal'
-              Connect::CLIENT_OPTIONS << 'current_user'
-              connect.options[:plugin_requires] << options[:class_path]
-              require options[:class_path]
-            end
+          return unless options
 
-            connect.options[:current_user] = options
+          unless RUBY_ENGINE == 'opal'
+            Connect::CLIENT_OPTIONS << 'current_user'
+            connect.options[:plugin_requires] << options[:class_path]
+            require options[:class_path]
           end
+
+          connect.options[:current_user] = options
         end
 
         ConnectJavascript = -> do
-          "$current_user = Base64.decode64('#{Base64.encode64 current_user.to_h.to_json}')"
+          "$current_user = JSON.parse Base64.decode64('#{Base64.encode64 current_user.to_h.to_json}')"
         end
 
         module InstanceMethods

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

@@ -40,17 +40,17 @@ module Opal
             if !block_given?
               HTML::DSL.html(&scope).to_html
             else
-              HTML::DSL.scope!(scope).html(&block).to_html
+              HTML::DSL.scope!(scope).html!(&block).to_html
             end
           end
 
           def dom(selector = false)
             if RUBY_ENGINE == 'opal'
               selector ||= 'html'
-              Instance.new selector, cache
+              Instance.new selector, cache, self
             else
               selector ||= false
-              @dom ||= Instance.new selector, cache
+              @dom ||= Instance.new selector, cache, self
             end
           end
         end
@@ -63,22 +63,21 @@ module Opal
           def dom(selector = false)
             if RUBY_ENGINE == 'opal'
               selector ||= 'html'
-              Instance.new selector, cache
+              Instance.new selector, cache, self
             else
               selector ||= cache[:html]
-              @dom ||= Instance.new selector, cache
+              @dom ||= Instance.new selector, cache, self
             end
           end
         end
 
         class Instance
-          RETURN_VALUE_FIELDS = %w'attr prop'
+          attr_reader :selector, :cache, :dom, :scope
 
-          attr_reader :selector, :cache, :dom
-
-          def initialize(selector, cache)
+          def initialize(selector, cache, scope)
             @selector = selector
             @cache    = cache
+            @scope    = scope
 
             if selector.is_a?(String)
               if RUBY_ENGINE == 'opal'
@@ -98,12 +97,14 @@ module Opal
           end
 
           def set html
-            @dom = Instance.new(html, cache)
+            @dom = Instance.new(html, cache, scope)
+            @dom.save!
+            @dom
           end
           alias set! set
 
           def load html
-            Instance.new(html, cache)
+            Instance.new(html, cache, scope)
           end
           alias load! load
 
@@ -129,7 +130,20 @@ module Opal
             end
           end
 
-          if RUBY_ENGINE != 'opal'
+          if RUBY_ENGINE == 'opal'
+            def on(name, selector = false, &handler)
+              if scope.respond_to?(:connect_events_started)
+                wrapper = -> (e) do
+                  scope.connect_events_started(e, name, selector)
+                  scope.instance_exec(e, &handler)
+                end
+
+                node.on(name, selector, &wrapper)
+              else
+                node.on(name, selector, &handler)
+              end
+            end
+          else
             def to_s
               if dom.respond_to?(:first)
                 dom.first.to_xml
@@ -179,7 +193,7 @@ module Opal
 
           def tmpl(name)
             if cached_tmpl = cache[:"#{name}"]
-              Instance.new(cached_tmpl, cache)
+              Instance.new(cached_tmpl, cache, scope)
             else
               puts "There is no template `#{name}`"
             end
@@ -187,7 +201,7 @@ module Opal
 
           def append(content = false, &block)
             # content becomes scope in this case
-            content = HTML::DSL.scope!(content).html(&block).to_html if block_given?
+            content = HTML::DSL.scope!(content).html!(&block).to_html if block_given?
 
             if RUBY_ENGINE == 'opal'
               node.append(content)
@@ -210,7 +224,7 @@ module Opal
 
           def prepend(content = false, &block)
             # content becomes scope in this case
-            content = HTML::DSL.scope!(content).html(&block).to_html if block_given?
+            content = HTML::DSL.scope!(content).html!(&block).to_html if block_given?
 
             if RUBY_ENGINE == 'opal'
               node.prepend(content)
@@ -233,7 +247,7 @@ module Opal
 
           def html(content = false, &block)
             # content becomes scope in this case
-            content = HTML::DSL.scope!(content).html(&block).to_html if block_given?
+            content = HTML::DSL.scope!(content).html!(&block).to_html if block_given?
 
             if RUBY_ENGINE == 'opal'
               node.html(content)
@@ -265,11 +279,11 @@ module Opal
               end
             end
 
-            Instance.new(new_node, cache)
+            Instance.new(new_node, cache, scope)
           end
 
           def each
-            node.each { |n| yield Instance.new(n, cache) }
+            node.each { |n| yield Instance.new(n, cache, scope) }
           end
 
           def node
@@ -297,7 +311,11 @@ module Opal
               super
             end
 
-            RETURN_VALUE_FIELDS.include?(method.to_s) ? n : Instance.new(n, cache)
+            if RUBY_ENGINE == 'opal'
+              n.is_a?(Element) ? Instance.new(n, cache, scope) : n
+            else
+              n.class.name['Oga::'] ? Instance.new(n, cache, scope) : n
+            end
           end
         end
       end

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

@@ -4,6 +4,13 @@ module Opal
       module Events
         $connect_events = ConnectCache.new if RUBY_ENGINE == 'opal'
 
+        module InstanceMethods
+          def connect_event_instance_variables(event, _name, _selector)
+            # gives you access to this, like jquery
+            @this = dom event.current_target
+          end
+        end
+
         module ClassMethods
           if RUBY_ENGINE == 'opal'
             def connect_events
@@ -61,16 +68,19 @@ module Opal
 
                 events.map! do |event|
                   klass, name, selector, handler = event
-                  c = klass.name == 'Opal::Connect' ? klass : klass.new
 
                   wrapper = ->(e) do
-                    # gives you access to this, like jquery
-                    c.instance_variable_set(:@this, dom(e.current_target))
+                    # we want to create an anonymous class so we can use instance
+                    # methods if events are coming from the Connect module.
+                    c = klass.name == 'Opal::Connect' \
+                      ? Class.new { include Opal::Connect }.new \
+                      : klass.new
+                    c.connect_event_instance_variables(e, name, selector)
                     c.instance_exec(e, &handler)
                   end
 
-                  if name.to_s != 'document'
-                    el.on(name, selector, &wrapper)
+                  if name != :document
+                    el.dom.on(name, selector, &wrapper)
                   else
                     Document.on(selector, &wrapper)
                   end

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

@@ -0,0 +1,39 @@
+unless RUBY_ENGINE == 'opal'
+  Opal.use_gem 'scrivener-opal'
+end
+
+require 'scrivener'
+
+module Opal
+  module Connect
+    class Form < ::Scrivener; end
+
+    module ConnectPlugins
+      module Form
+        FORM_EVENTS = %i`submit keydown keyup change`
+
+        def self.load_dependencies(connect, *args)
+          connect.plugin :events
+        end
+
+        module InstanceMethods
+          def connect_event_instance_variables(_event, name, _selector)
+            super
+
+            # we only want to grab form params if we are submitting a form
+            return unless FORM_EVENTS.include?(name)
+
+            @params = {}
+
+            # grab all of the form params!
+            Native(@this.serialize_array).each do |item|
+              @params[item[:name]] = item[:value]
+            end
+          end
+        end
+      end
+
+      register_plugin :form, Form
+    end
+  end
+end

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

@@ -14,8 +14,8 @@ module Opal
                   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
+          def html!(&block)
+            HTML::DSL.scope!(self).html!(&block).to_html
           end
         end
 
@@ -66,7 +66,7 @@ module Opal
           class << self
             attr_accessor :scope
 
-            def html &block
+            def html! &block
               DSL.scope!(scope).new(nil, nil, &block)
             end
 

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

@@ -17,9 +17,23 @@ module Opal
             Connect.server_methods[self.name] ||= []
           end
 
-          def __server__(method = false, *args, &block)
+          def server(method = false, *args, &block)
+            if RUBY_ENGINE != 'opal'
+              method ||= Module.new(&block)
+
+              yield if block_given?
+
+              method.public_instance_methods(false).each do |meth|
+                connect_server_methods << meth unless connect_server_methods.include? meth
+              end
+            end
+          end
+        end
+
+        module InstanceMethods
+          def server(method, *args)
             if RUBY_ENGINE == 'opal'
-              klass_name = self.name
+              klass_name = self.class.name
 
               if Connect.server_methods[klass_name].include? method
                 promise = Promise.new
@@ -44,23 +58,9 @@ module Opal
                 raise "#{method} is not a server method"
               end
             else
-              method ||= Module.new(&block)
-
-              yield if block_given?
-
-              method.public_instance_methods(false).each do |meth|
-                connect_server_methods << meth unless connect_server_methods.include? meth
-              end
+              send(method, *args)
             end
           end
-          alias server __server__
-        end
-
-        module InstanceMethods
-          def __server__(method, *args)
-            self.class.server(method, *args)
-          end
-          alias server __server__
         end
       end
 

data/lib/opal/connect/rake_task.rb

@@ -0,0 +1,41 @@
+module Opal
+  module Connect
+    class RakeTask
+      include Rake::DSL if defined? Rake::DSL
+
+      DEFAULT_OPTIONS = { port: 8080, host: '0.0.0.0' }
+
+      def initialize(name = 'webpack', opts = {})
+        options = DEFAULT_OPTIONS.merge opts
+
+        namespace name do
+          Opal::Connect.setup
+          Opal::Config.dynamic_require_severity = 'ignore'
+          Opal.append_path Dir.pwd
+
+          opal_file_path = "#{Dir.pwd}/.connect/opal.js"
+
+          unless File.exist? opal_file_path
+            builder = Opal::Builder.new
+            build_str = '`require("expose?$!expose?jQuery!jquery")`; require "opal"; require "opal-jquery"; require "opal/connect"; require "opal-parser";'
+            builder.build_str(build_str, '(inline)', { dynamic_require_severity: :ignore })
+            File.write opal_file_path, builder.to_s
+          end
+
+          desc "Start webpack"
+          task :run do
+            exec({"OPAL_LOAD_PATH" => Opal.paths.join(":")}, "webpack-dev-server --progress -d --host #{options[:host]} --port #{options[:port]} --compress --devtool eval --progress --colors --historyApiFallback true --hot --watch")
+          end
+
+          desc "Build webpack"
+          task :build do
+            exec({
+              "OPAL_LOAD_PATH" => Opal.paths.join(":"),
+              "RACK_ENV" => 'production'
+            }, 'webpack --progress')
+          end
+        end
+      end
+    end
+  end
+end

data/lib/opal/connect/version.rb

@@ -1,5 +1,5 @@
 module Opal
   module Connect
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

data/lib/opal/connect.rb

@@ -8,14 +8,56 @@ if RUBY_ENGINE == 'opal'
       $console.log(*args)
     end
   end
+else
+  Opal.append_path File.expand_path('../..', __FILE__).untaint
 end
 
-# Opal corelib is already loaded from CDN
 module Opal
   module Connect
     CLIENT_OPTIONS = %w'url plugins' unless RUBY_ENGINE == '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(
           hot_reload: false,
@@ -65,14 +107,18 @@ module Opal
             plugins_path = Connect.options[:plugins_path]
 
             if plugins_path && File.exist?("#{plugins_path}/#{name}.rb")
-              file.puts "require '#{plugins_path}/#{name}'"
+              path = "require('#{plugins_path}/#{name}')"
+              path = "`#{path}`" if Connect.options[:hot_reload]
+              file.puts path
             else
-              file.puts "require 'opal/connect/plugins/#{name}'"
+              file.puts "require('opal/connect/plugins/#{name}')"
             end
           end
 
           Connect.options[:plugin_requires].each do |require_path|
-            file.puts "require '#{require_path}'"
+            path = "require('#{require_path}')"
+            path = "`#{path}`" if Connect.options[:hot_reload]
+            file.puts path
           end
         end
       end
@@ -238,12 +284,14 @@ module Opal
               javascript = Connect.options[:javascript]
 
               if javascript.length
-                javascript.each do |block|
+                javascript.uniq.each do |block|
                   js << klass.instance_exec(&block)
                 end
               end
 
               %{
+                #{js.join(';')}
+
                 Document.ready? do
                   klass = #{klass.class.name}.new
 
@@ -251,20 +299,16 @@ module Opal
                     klass.__send__(:#{method}, *JSON.parse(Base64.decode64('#{Base64.encode64 options.to_json}')))
                   end
 
-                  #{js.join(';')}
-
                   Opal::Connect.start_events unless $connect_events_started
                 end
               }
             end
 
             def write_entry_file(klass = false, method = false, *options)
-              Opal.use_gem 'opal-jquery'
-
               path = "#{Dir.pwd}/.connect/entry.js"
 
               required_files = Connect.files.uniq.map do |file|
-                !Connect.options[:hot_reload] ? "require('#{file}')" : "`require('#{file}')`"
+                "`require('#{file}')`"
               end.join(';')
 
               client_options = Connect.options.hash.select do |key, _|
@@ -272,11 +316,13 @@ module Opal
               end
 
               client_options = Base64.encode64 client_options.to_json
-              templates      = Base64.encode64 Connect.templates.hash.to_json
 
               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}'));"
+              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}')
               );}

data/lib/opal-connect.rb

@@ -0,0 +1 @@
+require 'opal/connect'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal-connect
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - cj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-31 00:00:00.000000000 Z
+date: 2016-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -92,15 +92,18 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- lib/opal-connect.rb
 - lib/opal/connect.rb
 - lib/opal/connect/plugins/abilities.rb
 - lib/opal/connect/plugins/current_user.rb
 - lib/opal/connect/plugins/dom.rb
 - lib/opal/connect/plugins/events.rb
+- lib/opal/connect/plugins/form.rb
 - lib/opal/connect/plugins/html.rb
 - lib/opal/connect/plugins/pjax.rb
 - lib/opal/connect/plugins/scope.rb
 - lib/opal/connect/plugins/server.rb
+- lib/opal/connect/rake_task.rb
 - lib/opal/connect/version.rb
 - opal-connect.gemspec
 homepage: ''
@@ -123,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Connects Opal to Ruby.