opal-connect 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ee622b62ef725481b6c98e606815d1498b4f847
-  data.tar.gz: a27b1855decd4c7af2df0e92974a3be0ee5e9b87
+  metadata.gz: a8eb1755efb4187fb0fe313046b83862a7943ac3
+  data.tar.gz: fd330a60e16e736d1e5cb29e402ef3b83233a761
 SHA512:
-  metadata.gz: fd927ee3c2efe5fa14c11bd096b5f4cf261dedf30160ccb269254754941b679e06cc6659d9b9b649221a8a2d3a2120821ab10a7f689027ef39171623644e3ea1
-  data.tar.gz: 33dd26a3bef73247df061b1ed8c52751abd04a58bdb2568fc11be8f8e9ed5f2c785f708366085c952d561f07dee66e17b42e3f061d9e151827ccd5499b4eefc8
+  metadata.gz: bce04a189804b540bd3382d6de3722ce6e177dd9e7c8b98e2d1e720cc9f9dabf392bf14dd45f60eb7d1a9ec3ef3ed15f75dc47006b9b7e643532857e13cfdc3d
+  data.tar.gz: fecc33e53a01ddffb92dea830892eee8f7578d216524011fe3a3f855ea46bfaee70c4086272f136ee287010dbddc83398f17d94bea00305ec56e5ca6c44efe52

data/lib/opal/connect.rb

@@ -13,15 +13,33 @@ end
 # Opal corelib is already loaded from CDN
 module Opal
   module Connect
+
+    CLIENT_OPTIONS = %w'url plugins' unless RUBY_ENGINE == 'opal'
+
     class << self
-      def __options__
-        @options ||= Connect::ConnectCache.new(hot_reload: false)
+      def options
+        @options ||= Connect::ConnectCache.new(
+          hot_reload: false,
+          url: '/connect',
+          plugins: []
+        )
+      end
+
+      def options=(opts)
+        @options = opts
+      end if RUBY_ENGINE == 'opal'
 
-        yield(@options) if block_given?
+      def setup
+        yield(options) if block_given?
 
-        @options
+        # make sure we include the default plugins with connect
+        options[:plugins].each { |plug| Connect.plugin plug.to_sym }
+
+        unless RUBY_ENGINE == 'opal'
+          write_plugins_file
+          write_entry_file
+        end
       end
-      alias options __options__
 
       def included(klass)
         if RUBY_ENGINE != 'opal'
@@ -30,19 +48,21 @@ module Opal
         end
 
         klass.extend ConnectPlugins::Base::ClassMethods
-        klass.plugin :server
-        klass.plugin :html
-        klass.plugin :dom
-        klass.plugin :events
+
+        # include default plugins
+        Connect.options[:plugins].each { |plug| klass.plugin plug.to_sym }
       end
 
+      # We need to wripte a plugins.rb file which has all the plugins required
+      # by the server, so that the client can require them.  Opal doesn't handle
+      # dynamically generated imports, which is the reason we make a single file.
       def write_plugins_file
-        ConnectPlugins.plugins.each do |name, klass|
-          path = klass.instance_methods(false).map { |m|
-            klass.instance_method(m).source_location.first
-          }.uniq
-
-          binding.pry
+        path = "#{Dir.pwd}/.connect/plugins.rb"
+        FileUtils.mkdir_p(File.dirname(path))
+        File.open(path, 'w+') do |file|
+          ConnectPlugins.plugins.each do |name, _|
+            file.puts "require 'opal/connect/plugins/#{name}'"
+          end
         end
       end
     end
@@ -78,6 +98,14 @@ module Opal
         @mutex.synchronize { @hash.to_json }
       end
 
+      def hash
+        if RUBY_ENGINE == 'opal'
+          @hash
+        else
+          @mutex.synchronize { @hash }
+        end
+      end
+
       def each
         if RUBY_ENGINE == 'opal'
           @hash.each { |key, value| yield key, value }
@@ -152,8 +180,8 @@ module Opal
             plugin.load_dependencies(self, *args, &block) if plugin.respond_to?(:load_dependencies)
             include(plugin::InstanceMethods) if defined?(plugin::InstanceMethods)
             extend(plugin::ClassMethods) if defined?(plugin::ClassMethods)
-            self.extend(plugin::ConnectClassMethods) if defined?(plugin::ConnectClassMethods)
-            self.include(plugin::ConnectInstanceMethods) if defined?(plugin::ConnectInstanceMethods)
+            Connect.extend(plugin::ConnectClassMethods) if defined?(plugin::ConnectClassMethods)
+            Connect.include(plugin::ConnectInstanceMethods) if defined?(plugin::ConnectInstanceMethods)
             plugin.configure(self, *args, &block) if plugin.respond_to?(:configure)
             nil
           end
@@ -166,21 +194,13 @@ module Opal
             def build(code)
               builder = Opal::Builder.new
 
-              builder.build_str(code, '(inline)' \
-                , dynamic_require_severity: :ignore).to_s
+              builder.build_str(code, '(inline)').to_s
             end
 
             def javascript(klass, method, *options)
-              if hot_reload = Connect.options[:hot_reload]
-                required_files = Connect.files.map do |file|
-                  "`require('#{file}')`"
-                end.join(';')
-              end
+              return unless klass
 
               %{
-                #{!hot_reload ? '' : 'Opal::Connect.events_teardown'}
-                #{!hot_reload ? '' : required_files}
-
                 Opal::Connect.server_methods = JSON.parse(
                   Base64.decode64('#{Base64.encode64 Connect.server_methods.to_json}')
                 )
@@ -197,17 +217,41 @@ module Opal
               }
             end
 
-            def write_entry_file(klass, method, *options)
+            def write_entry_file(klass = false, method = false, *options)
               Opal.use_gem 'opal-jquery'
 
-              code = %{
-                `if (module.hot) {`
-                  `module.hot.accept()`
-                  #{Connect.javascript(klass, method, *options)}
-                `}`
-              }
+              path = "#{Dir.pwd}/.connect/entry.js"
+
+              required_files = Connect.files.map do |file|
+                "`require('#{file}')`"
+              end.join(';')
+
+              client_options = Connect.options.hash.select do |key, _|
+                CLIENT_OPTIONS.include? key.to_s
+              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.options[:hot_reload]
+                code = "#{code} #{required_files}"
+              else
+                code << %{
+                  `if (module.hot) {`
+                    `module.hot.accept()`
+                    #{required_files}
+                    Opal::Connect.events_teardown
+                    #{Connect.javascript(klass, method, *options)}
+                  `}`
+                }
+              end
 
-              File.write("#{Dir.pwd}/.connect/entry.js", build(code))
+              FileUtils.mkdir_p(File.dirname(path))
+              File.write(path, build(code))
             end
           end
         end
@@ -220,7 +264,5 @@ module Opal
 
     extend ConnectPlugins::Base::ClassMethods
     plugin ConnectPlugins::Base
-    plugin :server
-    plugin :events
   end
 end

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

@@ -9,45 +9,72 @@ module Opal
       # A thread safe cache class, offering only #[] and #[]= methods,
       # each protected by a mutex.
       module Dom
-        extend self
+        module ConnectClassMethods
+          def templates
+            @templates ||= ConnectCache.new
+          end
 
-        if RUBY_ENGINE != 'opal'
-          def html_file(caller)
-            path = "#{Dir.pwd}/.connect/html/#{caller[0][/[^:]*/].sub(Dir.pwd, '')[1..-1].sub('.rb', '.html')}"
-            FileUtils.mkdir_p(File.dirname(path))
-            path
+          if RUBY_ENGINE == 'opal'
+            def templates=(tmpls)
+              @templates = tmpls
+            end
           end
         end
 
-        def html(scope = false, &block)
-          if !block_given?
-            HTML::DSL.html(&scope).to_html
-          else
-            HTML::DSL.scope!(scope).html(&block).to_html
+        module ClassMethods
+          if RUBY_ENGINE != 'opal'
+            def html_file(caller)
+              path = "#{Dir.pwd}/.connect/html/#{caller[0][/[^:]*/].sub(Dir.pwd, '')[1..-1].sub('.rb', '.html')}"
+              FileUtils.mkdir_p(File.dirname(path))
+              path
+            end
           end
-        end
 
-        def [](selector)
-          if RUBY_ENGINE == 'opal'
-            file_name = false
-          else
-            file_name = html_file(caller)
+          def cache
+            @cache ||= (Connect.templates[self.name] ||= {})
+          end
 
-            if selector.is_a?(Symbol)
-              file_name = "#{file_name}.#{selector}"
-              selector  = File.read(file_name)
+          def html(scope = false, &block)
+            if !block_given?
+              HTML::DSL.html(&scope).to_html
+            else
+              HTML::DSL.scope!(scope).html(&block).to_html
             end
           end
 
-          Instance.new selector, file_name
+          def dom
+            if RUBY_ENGINE == 'opal'
+              selector = 'html'
+            else
+              selector = false
+            end
+
+            @dom ||= Instance.new false, cache
+          end
+        end
+
+        module InstanceMethods
+          def cache
+            self.class.cache
+          end
+
+          def dom
+            if RUBY_ENGINE == 'opal'
+              selector = 'html'
+            else
+              selector = cache[:html]
+            end
+
+            @dom ||= Instance.new selector, cache
+          end
         end
 
         class Instance
-          attr_reader :selector, :file_name, :dom
+          attr_reader :selector, :cache, :dom
 
-          def initialize(selector, file_name = false)
-            @selector   = selector
-            @file_name  = file_name
+          def initialize(selector, cache)
+            @selector = selector
+            @cache    = cache
 
             if selector.is_a?(String)
               if RUBY_ENGINE == 'opal'
@@ -57,7 +84,7 @@ module Opal
                 if selector["\n"]
                   @dom = Oga.parse_html(selector)
                 else
-                  @dom = Oga.parse_html(File.read(file_name))
+                  @dom = cache[:html]
                   @dom = dom.css(selector) unless selector == 'html'
                 end
               end
@@ -66,15 +93,34 @@ module Opal
             end
           end
 
-          if RUBY_ENGINE != 'opal'
-            def to_html
+          def set html
+            @dom = Instance.new(html, cache)
+          end
+          alias set! set
+
+          def save template_name = false, remove = true
+            if template_name
+              cache[:"#{template_name}"] = self.to_html
+              dom.remove if remove
+            else
+              cache[:html] = self.to_html
+            end
+          end
+          alias save! save
+
+          def to_html
+            if RUBY_ENGINE == 'opal'
+              node.html
+            else
               if node.respond_to?(:first)
                 node.first.to_xml
               else
                 node.to_xml
               end
             end
+          end
 
+          if RUBY_ENGINE != 'opal'
             def to_s
               if dom.respond_to?(:first)
                 dom.first.to_xml
@@ -83,16 +129,6 @@ module Opal
               end
             end
 
-            def save template_name = false, remove = true
-              if template_name
-                File.write("#{file_name}.#{template_name.to_s}", self.to_html)
-                dom.remove if remove
-              else
-                File.write(file_name, self.to_html)
-              end
-            end
-            alias save! save
-
             def text(content)
               if node.respond_to?(:inner_text)
                 node.inner_text = content
@@ -132,6 +168,14 @@ module Opal
             end
           end
 
+          def tmpl(name)
+            if cached_tmpl = cache[:"#{name}"]
+              Instance.new(cached_tmpl, cache)
+            else
+              puts "There is no template `#{name}`"
+            end
+          end
+
           def append(content, &block)
             # content becomes scope in this case
             content = HTML::DSL.scope!(content).html(&block).to_html if block_given?
@@ -212,11 +256,11 @@ module Opal
               end
             end
 
-            Instance.new(new_node, file_name)
+            Instance.new(new_node, cache)
           end
 
           def each
-            node.each { |n| yield Instance.new(n, file_name) }
+            node.each { |n| yield Instance.new(n, cache) }
           end
 
           def node
@@ -243,5 +287,3 @@ module Opal
     end
   end
 end
-
-Dom = Opal::Connect::ConnectPlugins::Dom

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

@@ -9,18 +9,21 @@ module Opal
             end
           end
 
-          def connect_el el = false
+          def __events_el__ el = false
             @connect_el = el if el
             @connect_el
           end
+          alias events_el __events_el__
 
-          def connect_on(name, selector = nil, method = nil, &handler)
+
+          def __on__(name, selector = nil, method = nil, &handler)
             if RUBY_ENGINE == 'opal'
               handler = proc { |evt| __send__(method, evt) } if method
               event = [name, selector, handler]
               connect_events << event unless connect_events.include? event
             end
           end
+          alias on __on__
         end
 
         if RUBY_ENGINE == 'opal'

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

@@ -0,0 +1,29 @@
+module Opal
+  module Connect
+    module ConnectPlugins
+      module Scope
+        module InstanceMethods
+          def scope(new_scope = false)
+            if new_scope
+              @scope = new_scope
+
+              self
+            else
+              @scope
+            end
+          end
+
+          def method_missing(method, *args, &block)
+            if scope.respond_to?(method, true)
+              scope.send(method, *args, &block)
+            else
+              super
+            end
+          end
+        end
+      end
+
+      register_plugin :scope, Scope
+    end
+  end
+end

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

@@ -17,7 +17,7 @@ module Opal
             Connect.server_methods[self.name] ||= []
           end
 
-          def connect_server(m = false, &block)
+          def __server__(m = false, &block)
             return if RUBY_ENGINE == 'opal'
 
             m ||= Module.new(&block)
@@ -28,10 +28,11 @@ module Opal
               connect_server_methods << meth unless connect_server_methods.include? meth
             end
           end
+          alias server __server__
         end
 
-        module ConnectInstanceMethods
-          def __connect_server__(method, *args)
+        module InstanceMethods
+          def __server__(method, *args)
             if Connect.server_methods[self.class.name].include? method
               promise = Promise.new
 
@@ -41,7 +42,7 @@ module Opal
                 klass: self.class.name
               }
 
-              HTTP.post('/connect', payload: payload) do |response|
+              HTTP.post(Connect.options[:url], payload: payload) do |response|
                 if response.ok?
                   res = JSON.from_object(`response`)
                   promise.resolve res[:body], response
@@ -55,7 +56,7 @@ module Opal
               raise "#{method} is not a server method"
             end
           end
-          alias connect_server __connect_server__
+          alias server __server__
         end
       end
 

data/lib/opal/connect/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal-connect
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - cj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-18 00:00:00.000000000 Z
+date: 2016-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -96,6 +96,7 @@ files:
 - lib/opal/connect/plugins/dom.rb
 - lib/opal/connect/plugins/events.rb
 - lib/opal/connect/plugins/html.rb
+- lib/opal/connect/plugins/scope.rb
 - lib/opal/connect/plugins/server.rb
 - lib/opal/connect/version.rb
 - opal-connect.gemspec