wedge 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef2f58249fc92d7275ded58a7adf02cb4c902cc7
-  data.tar.gz: 9ca0bf1765457342dc330f60e65fb2ae4f4fa388
+  metadata.gz: a0bb0fe7c7495477be902553128393527696afe1
+  data.tar.gz: 11a43824c93d96973043520a5429e73bc89f94df
 SHA512:
-  metadata.gz: 6c00389efaee2f6a672c1631c6c9b5ed198a1236f4b8aa08e2b8b1a46952701b376d71561263a7a0027a9de68095bfb8e8bbfa8b9060c67eabd61c643e4ffde5
-  data.tar.gz: 1de60359395c01ef233f3c6e23cfcfc0aa264692d7bcc0ad4ada476c30004a2f29a5f437c35d22bc926226e75feab7d47e2015ba239fac67b2c308b74c1ad4f7
+  metadata.gz: 394f8a1cef109e32f546ea7d9166a67307f11ed6701739ce4feab23b9e7d6033397e0ef90b0e13b57a5311dd2e996ef6189452110f517c092eab5621924b007b
+  data.tar.gz: 49b95ed36fe62f5ab1fe7234e4bac2066d6f027c9dbea69082df961f091e2f5c5d50152fa5f5f4e419f4b05106cadf076078331bfa29d8f31d0fbd5ed8813eeb

data/lib/roda/plugins/wedge.rb

@@ -76,7 +76,10 @@ class Roda
                 method_args   = [data]
                 res = scope.wedge(name).send(method_called, *method_args) || ''
               else
-                res = scope.wedge(name, data).send(method_called, *method_args) || ''
+                # This used to send things like init, we need a better way to
+                # send client config data to the server
+                # res = scope.wedge(name, data).send(method_called, *method_args) || ''
+                res = scope.wedge(name).send(method_called, *method_args) || ''
               end
 
               scope.response.headers["WEDGE-CSRF-TOKEN"] = scope.csrf_token if scope.methods.include? :csrf_token

data/lib/wedge.rb

@@ -11,6 +11,7 @@ require 'base64'
 unless RUBY_ENGINE == 'opal'
   require 'nokogiri'
   require 'wedge/utilis/nokogiri'
+  require 'wedge/middleware'
 end
 require 'wedge/html'
 require 'wedge/dom'
@@ -31,6 +32,19 @@ class Wedge
       "#{url}#{config.cache_assets ? "/#{config.assets_key}" : ''}"
     end
 
+    def requires
+      @requires ||= IndifferentHash.new
+    end
+
+    def assets_url_regex
+      @assets_url_regex ||= begin
+        assets_url = ::Wedge.assets_url.gsub(%r{^\/}, '')
+        # # We also allow for no assets key so when we post server methods there
+        # # isn't an error if the key has been changed since a browser refresh.
+        %r{(?:#{assets_url}|#{assets_url.sub("#{::Wedge.config.assets_key}/", '')})/(.*)\.(.*)$}
+      end
+    end
+
     def assets_url_with_host
       "#{config.assets_url}#{config.cache_assets ? "/#{config.assets_key}" : ''}"
     end
@@ -126,11 +140,28 @@ class Wedge
             compiled_data = Base64.encode64 config.client_data.to_json
             # We need to merge in some data that is only set on the server.
             # i.e. path, assets_key etc....
-            js << Opal.compile("Wedge.config.data = HashObject.new(JSON.parse(Base64.decode64('#{compiled_data}')).merge Wedge.config.data.to_h)")
+            js << Opal.compile("Wedge.config.data = HashObject.new(Wedge.config.data.to_h.merge JSON.parse(Base64.decode64('#{compiled_data}')))")
             # load all global plugins into wedge
             config.plugins.each do |path|
               js << Wedge.javascript(path)
             end
+          elsif comp_class = Wedge.config.component_class[path_name.gsub(/\//, '__')]
+            comp_name     = comp_class.config.name
+            compiled_data = Base64.encode64 comp_class.config.client_data.to_json
+
+            js << Opal.compile("Wedge.config.component_class[:#{comp_name}].config.data = HashObject.new(Wedge.config.component_class[:#{comp_name}].config.data.to_h.merge JSON.parse(Base64.decode64('#{compiled_data}')))")
+
+            if requires = config.requires[path_name.gsub(/\//, '__')]
+
+              requires.each do |path|
+                next unless comp_class = Wedge.config.component_class[path]
+
+                comp_name     = comp_class.config.name
+                compiled_data = Base64.encode64 comp_class.config.client_data.to_json
+
+                js << Opal.compile("Wedge.config.component_class[:#{comp_name}].config.data = HashObject.new(Wedge.config.component_class[:#{comp_name}].config.data.to_h.merge JSON.parse(Base64.decode64('#{compiled_data}')))")
+              end
+            end
           end
 
           js
@@ -159,7 +190,7 @@ class Wedge
         args = { klass: self, component_class: IndifferentHash.new }
 
         unless RUBY_ENGINE == 'opal'
-          args[:path]       = caller.first.gsub(/(?<=\.rb):.*/, '')
+          # args[:path]       = caller.first.gsub(/(?<=\.rb):.*/, '')
           args[:assets_key] = begin
             if defined?(PlatformAPI) && ENV['HEROKU_TOKEN'] && ENV['HEROKU_APP']
               heroku = PlatformAPI.connect_oauth(ENV['HEROKU_TOKEN'], default_headers: {'Range' => 'version ..; order=desc'})

data/lib/wedge/component.rb

@@ -1,3 +1,5 @@
+require 'wedge/require'
+
 class Wedge
   class Component
     include Methods
@@ -94,8 +96,10 @@ class Wedge
       def wedge_dom &block
         @wedge_dom ||= DOM.new wedge_config.html
 
-        if block_given?
-          yield
+        unless RUBY_ENGINE == 'opal'
+          if block_given?
+            yield
+          end
         end
 
         @wedge_dom
@@ -166,7 +170,7 @@ class Wedge
               # we want to remove the assets key from the call so we don't get
               # an error if they assets_key has changed and the user hasn't
               # refreshed the browser yet.
-              call_url = "#{Wedge.assets_url.sub("#{Wedge.config.assets_key}/")}/#{path_name}.call"
+              call_url = "#{Wedge.assets_url.sub("#{Wedge.config.assets_key}/",'')}/#{path_name}.call"
 
               HTTP.post(call_url,
                 headers: {

data/lib/wedge/config.rb

@@ -21,6 +21,7 @@ class Wedge
         assets_key: false,
         cache_assets: false,
         is_plugin: false,
+        requires: IndifferentHash.new,
         triggered_browser_events: false,
         store: IndifferentHash.new,
         settings: IndifferentHash.new,

data/lib/wedge/events.rb

@@ -46,7 +46,8 @@ class Wedge
         if for_component = event[:options].delete(:for)
           events = @events[for_component] ||= IndifferentHash.new({
             browser_events: [],
-            object_events: IndifferentHash.new
+            object_events: IndifferentHash.new,
+            on_count: 0
           })
         end
 

data/lib/wedge/middleware.rb

@@ -0,0 +1,104 @@
+class Wedge
+  class Middleware
+    def initialize(app, settings = {})
+      @app = app
+
+      # Add settings to wedge
+      settings.each do |k, v|
+        Wedge.config.send "#{k}=", v
+      end
+    end
+
+    def call(env)
+      responder = Responder.new(@app, env)
+      responder.respond
+    end
+
+    class Responder
+      attr_accessor :app, :env, :wedge_path, :extension
+
+      def initialize(app, env)
+        @app = app; @env = env
+      end
+
+      def respond
+        if path =~ Wedge.assets_url_regex
+          @wedge_path, @extension = $1, $2
+          body, headers, status = [], {}, 200
+
+          case extension
+          when 'map'
+            ::Wedge.source_map wedge_path
+          when 'rb'
+            if wedge_path =~ /^wedge/
+              path = ::Wedge.config.path.gsub(/\/wedge.rb$/, '')
+              File.read("#{path}/#{wedge_path}.rb")
+            else
+              File.read("#{ROOT_PATH}/#{wedge_path}.rb")
+            end if Wedge.config.debug
+          when 'call'
+            body = scope.request.body.read
+            data = scope.request.params
+
+            begin
+              data.merge!(body ? JSON.parse(body) : {})
+            rescue
+              # can't be parsed by json
+            end
+
+            data          = data.indifferent
+            name          = data.delete(:wedge_name)
+            method_called = data.delete(:wedge_method_called)
+            method_args   = data.delete(:wedge_method_args)
+
+            if method_args == 'wedge_data' && data
+              method_args   = [data]
+              res = Wedge.scope!(app)[name].send(method_called, *method_args) || ''
+            else
+              res = Wedge.scope!(app)[name, data].send(method_called, *method_args) || ''
+            end
+
+            headers["WEDGE-CSRF-TOKEN"] = scope.csrf_token if scope.methods.include? :csrf_token
+
+            if res.is_a? Hash
+              headers["Content-Type"] = 'application/json; charset=UTF-8'
+              body = res.to_json
+            else
+              body = res.to_s
+            end
+          else
+            headers['Content-Type'] = 'application/javascript; charset=UTF-8'
+
+            if Wedge.config.debug
+              body << "#{Wedge.javascript(wedge_path)}\n//# sourceMappingURL=#{Wedge.assets_url}/#{wedge_path}.map"
+            else
+              binding.pry
+              body << Wedge.javascript(wedge_path)
+            end
+          end
+
+          [status, headers, body.join]
+        else
+          response.finish
+        end
+      end
+
+      private
+
+      def path
+        @env['PATH_INFO']
+      end
+
+      def request
+        @request ||= Rack::Request.new(@env)
+      end
+
+      def response
+        @response ||= begin
+          status, headers, body = @app.call(request.env)
+          Rack::Response.new(body, status, headers)
+        end
+      end
+    end
+  end
+end

data/lib/wedge/require.rb

@@ -0,0 +1,47 @@
+unless RUBY_ENGINE == 'opal'
+  module Kernel
+    # make an alias of the original require
+    alias_method :wedge_original_require, :require
+
+    # rewrite require
+    def require(name)
+      return wedge_original_require(name) unless defined?(Wedge)
+
+      result = wedge_original_require name
+
+      if name[/\Awedge/] || name[Dir.pwd]
+        name       = name.sub("#{Dir.pwd}/", '').gsub(/\.rb$/, '').gsub(/\//, '__')
+        caller_str = "#{caller[0]}".gsub(/(#{Dir.pwd}\/|.*(?=wedge))/, '').gsub(/:.+$/, '').gsub(/\.rb$/, '').gsub(/\//, '__')
+
+        if !caller_str['.'] && !(Wedge.config.requires[caller_str] ||= []).include?(name)
+          Wedge.config.requires[caller_str] << name
+        end
+      end
+
+      result
+    end
+
+    # make an alias of the original require
+    alias_method :wedge_original_require_relative, :require_relative
+
+    # rewrite require_relative
+    def require_relative(name)
+      return wedge_original_require_relative(name) unless defined?(Wedge)
+
+      caller_str       = "#{caller[0]}".gsub(/:.+$/, '').gsub(/\.rb$/, '')
+      caller_path_name = caller_str.gsub(%r{(#{Dir.pwd}/|.*wedge)}, '').gsub(/:.+$/, '').gsub(/^\//, '')
+
+      path_name = caller_path_name.gsub(/(?<=\/)([^\/]*)$/, "#{name}")
+      path_name = File.expand_path(path_name).sub("#{Dir.pwd}/", '') if path_name['..']
+      path_name = path_name.gsub(/\//, '__')
+      file      = caller_str.gsub(/(?<=\/)([^\/]*)$/, "#{name}")
+      caller_path_name = caller_path_name.gsub(/\//, '__')
+
+      if !caller_path_name['.'] && !(Wedge.config.requires[caller_path_name] ||= []).include?(path_name)
+        Wedge.config.requires[caller_path_name] << path_name
+      end
+
+      wedge_original_require file
+    end
+  end
+end

data/lib/wedge/version.rb

@@ -1,3 +1,3 @@
 class Wedge
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/test/dummy/components/layout.rb

@@ -9,10 +9,12 @@ class DummyApp
           #{Wedge.script_tag}
         </head>
         <body>
+          <div id='template'>Template</div>
         </body>
       </html>
     HTML
     dom do
+      tmpl :template, dom.find('#template')
       dom.find('body') << assets(:js)
     end
 

data/test/dummy/components/root.rb

@@ -1,3 +1,4 @@
+require_relative 'layout'
 require_relative 'base'
 require_relative 'bar'
 require_relative '../forms/foo'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wedge
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - cj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-17 00:00:00.000000000 Z
+date: 2015-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -169,12 +169,14 @@ files:
 - lib/wedge/dom.rb
 - lib/wedge/events.rb
 - lib/wedge/html.rb
+- lib/wedge/middleware.rb
 - lib/wedge/opal.rb
 - lib/wedge/plugins/form.rb
 - lib/wedge/plugins/history.rb
 - lib/wedge/plugins/location.rb
 - lib/wedge/plugins/pjax.rb
 - lib/wedge/plugins/validations.rb
+- lib/wedge/require.rb
 - lib/wedge/utilis/blank.rb
 - lib/wedge/utilis/element.rb
 - lib/wedge/utilis/hash.rb
@@ -218,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Components for the Browser and Server