wedge 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df960de9ec0aff5b5755f648b90f36bebfd54611
-  data.tar.gz: 44fe18577d66a8048f32c45cb6ca22ff263e59d6
+  metadata.gz: 1325b8416e2afc87ff70321a0a91c11722e56e09
+  data.tar.gz: a47ea5fdb2f6d59e2b8d4122a99aeec775ff85aa
 SHA512:
-  metadata.gz: e6f682ce625ca5e7c0b256ea447fd140d2a10f9bac29b8ccf291df603392d219cd52c606467095c8619b5e1af1ac67b71218e846b94aa0572b55605ea4245c47
-  data.tar.gz: e88022f54d6c51bf5061d6a935001575a21ef20f5845919c92c748f27e9f1adbda4176a034e61a3d9fdc9fdaea3745dea7b8642913096b478cb5a211e21d2b49
+  metadata.gz: 2daafe5c24e6e0d7aeb5a69a80d41a88d790d38da448619f5bbdc428ae05083e537c7eedd140791f2507c4ae5254db3663ab06c17d015afdffb415b4491f7294
+  data.tar.gz: a28ed8752d98e989756705e63666fd13be0ea943ea253ec8cc714ea7d87c9d752a03ee66d58dca874fbedf91c900d49f4ca38a29d8e26b4ee5f1e4023412f1cb

data/lib/roda/plugins/wedge.rb

@@ -75,7 +75,7 @@ class Roda
                 res = scope.wedge(name, data).send(method_called, *method_args) || ''
               end
 
-              scope.response.headers["BIO-CSRF-TOKEN"] = scope.csrf_token if scope.methods.include? :csrf_token
+              scope.response.headers["WEDGE-CSRF-TOKEN"] = scope.csrf_token if scope.methods.include? :csrf_token
 
               if res.is_a? Hash
                 scope.response.headers["Content-Type"] = 'application/json; charset=UTF-8'

data/lib/wedge.rb

@@ -22,7 +22,7 @@ module Wedge
 
   class << self
     attr_accessor :requires, :loaded_requires, :loaded_requires_events, :javascript_cache,
-      :wedge_javascript_loaded, :object_events, :browser_events
+      :wedge_javascript_loaded, :object_events, :browser_events, :events_triggered
 
     def compile_opal
       javascript
@@ -78,9 +78,13 @@ module Wedge
       # @return [Array] List of opal paths.
       def append_paths
         @append_paths ||= begin
-          file = method(:components).source_location.first.sub('/wedge.rb', '')
+          file     = method(:components).source_location.first.sub('/wedge.rb', '')
+          gems_dir = ::Opal.gem_dir.gsub(/(?<=gems)\/opal-.*/, '')
           Wedge::Opal.append_path file
           Wedge::Opal.append_path Dir.pwd
+          Dir["#{gems_dir}/**/"].sort.each do |folder|
+            Wedge::Opal.append_path "#{folder}/lib"
+          end
         end
       end
     end
@@ -132,6 +136,7 @@ module Wedge
           end
         end
       else
+        Wedge.events_triggered ||= []
         Wedge.loaded_requires ||= []
         Wedge.loaded_requires_events ||= []
         reqs     = Wedge.requires[options[:name].to_sym]
@@ -152,9 +157,17 @@ module Wedge
             comp          = Wedge[name, options]
 
             Document.ready? do
+              if method_called && !comp.wedge_opts.on_server_methods.include?(method_called)
+                comp.send(method_called, *method_args)
+              end
+
+              unless Wedge.events_triggered.include?(name)
+                comp.wedge_trigger :browser_events
+                Wedge.loaded_requires << name
+                Wedge.events_triggered << name
+              end
+
               trigger_requires_events requires.dup
-              comp.send(method_called, *method_args) if method_called
-              comp.wedge_trigger :browser_events
             end
           end
         end
@@ -166,9 +179,11 @@ module Wedge
 
       reqs.each do |r|
         next if Wedge.loaded_requires_events.include? r[:name]
+
         Wedge.loaded_requires_events << r[:name]
         comp = Wedge[r[:name], r]
         comp.wedge_trigger :browser_events
+        Wedge.events_triggered << r[:name]
       end
 
       trigger_requires_events requires if requires.any?
@@ -184,7 +199,7 @@ module Wedge
         Wedge.loaded_requires << r[:name]
 
         promises << -> { load_comp r }
-      end
+      end if reqs
 
       Promise.when(*promises.map!(&:call)).then do
         requires.any?? load_requires(requires, promise) : promise.resolve(true)
@@ -211,13 +226,17 @@ module Wedge
       path_name  = options[:path_name]
       assets_url = Wedge.assets_url_with_host
 
-      # fix: this could give people unwanted behaviour, change getScript to just
-      # use ajax.
-      `jQuery.ajaxSetup({ cache: true })` if Wedge.opts.cache_assets
-      `$.getScript(assets_url + "/" + path_name + ".js").done(function(){`
+      if !Wedge.components[options[:name]]
+        # fix: this could give people unwanted behaviour, change getScript to just
+        # use ajax.
+        `jQuery.ajaxSetup({ cache: true })` if Wedge.opts.cache_assets
+        `$.getScript(assets_url + "/" + path_name + ".js").done(function(){`
+          promise.resolve true
+        `}).fail(function(jqxhr, settings, exception){ window.console.log(exception); });`
+        #########################################################################
+      else
         promise.resolve true
-      `}).fail(function(jqxhr, settings, exception){ window.console.log(exception); });`
-      #########################################################################
+      end
 
       promise
     end

data/lib/wedge/component.rb

@@ -2,16 +2,19 @@ module Wedge
   class Component
     include Methods
 
-    ALLOWED_CLIENT_OPTS = %i(name path_name method_args method_called cache tmpl key cache_assets assets_key assets_url assets_url_with_host requires)
+    ALLOWED_CLIENT_OPTS = %i(name path_name method_args method_called cache tmpl key cache_assets assets_key assets_url assets_url_with_host requires skip_method_wrap on_server_methods)
 
     class << self
       # Override the default new behaviour
       def new(*args, &block)
-        obj = allocate
-
+        obj                 = allocate
         obj.wedge_opts.js   = args.delete(:js)
         obj.wedge_opts.init = args.delete(:init)
 
+        if args.any? && obj.wedge_opts.skip_method_wrap
+          obj.wedge_opts.init = args
+        end
+
         # Merge other args into opts
         args.each { |a| a.each {|k, v| obj.wedge_opts[k] = v } } if args.any?
 
@@ -34,7 +37,7 @@ module Wedge
         end
 
         # don't need to wrap the method if it's opal
-        unless RUBY_ENGINE == 'opal' || wedge_opts.methods_wrapped
+        unless RUBY_ENGINE == 'opal' || wedge_opts.methods_wrapped || wedge_opts.skip_method_wrap
           obj.wedge_opts.methods_wrapped = wedge_opts.methods_wrapped = true
 
           public_instance_methods(false).each do |meth|
@@ -185,7 +188,26 @@ module Wedge
 
       def wedge_on_server(&block)
         if server?
+          m = Module.new(&block)
+
           yield
+
+          m.public_instance_methods(false).each do |meth|
+            wedge_opts.on_server_methods << meth.to_s
+
+            alias_method :"wedge_on_server_#{meth}", :"#{meth}"
+            define_method "#{meth}" do |*args, &blk|
+              o_name = "wedge_on_server_#{meth}"
+
+              if method(o_name).parameters.length > 0
+                result = send(o_name, *args, &block)
+              else
+                result = send(o_name, &block)
+              end
+
+              blk ? blk.call(result) : result
+            end
+          end
         else
           m = Module.new(&block)
 
@@ -214,7 +236,7 @@ module Wedge
 
                   # We set the new csrf token
                   xhr  = Native(response.xhr)
-                  csrf = xhr.getResponseHeader('BIO-CSRF-TOKEN')
+                  csrf = xhr.getResponseHeader('WEDGE-CSRF-TOKEN')
                   Element.find('meta[name=_csrf]').attr 'content', csrf
                   ###########################
 

data/lib/wedge/config.rb

@@ -22,6 +22,7 @@ module Wedge
         scope: false,
         loaded: false,
         requires: [],
+        skip_method_wrap: false,
         on: [],
         on_server_methods: [],
         object_events: {},
@@ -84,6 +85,10 @@ module Wedge
       opts.to_h.inject({}) {|copy, (key, value)| copy[key] = value.dup rescue value; copy}
     end
 
+    def skip_method_wrap
+      opts.skip_method_wrap = true
+    end
+
     %w(scope assets_url assets_url_with_host cache_assets assets_key debug).each do |m|
       define_method m do |v|
         opts[m] = v

data/lib/wedge/dom.rb

@@ -14,6 +14,8 @@ module Wedge
     end
 
     def initialize html
+      html = '' if html.nil?
+
       @raw_html = html
 
       if server?

data/lib/wedge/events.rb

@@ -26,7 +26,7 @@ module Wedge
         end
       end
 
-      if event[:name].to_s == 'ready' || event[:name] =~ /[:\s]/ || event[:selector]
+      if %w(ready history_change).include?(event[:name].to_s) || event[:name] =~ /[:\s]/ || event[:selector]
         browser_events << event
       else
         event[:component] = scope.wedge_opts.name
@@ -73,7 +73,7 @@ module Wedge
         el = Element.find(event[:selector] != '' ? event[:selector] : 'body')
 
         comp.instance_exec el, &event[:block]
-      when  event[:name].to_s == 'history_change'
+      when event[:name].to_s == 'history_change'
         $window.history.change do |he|
           comp.instance_exec he, &event[:block]
         end

data/lib/wedge/plugins/form.rb

@@ -339,6 +339,14 @@ module Wedge
         _attributes.empty?
       end
 
+      def wedge_config
+        @wedge_config ||= begin
+          c = super
+          c.skip_method_wrap
+          c
+        end
+      end
+
       module InstanceMethods
         def render_fields data, options = {}
           data = data.is_a?(Hash) ? data.to_obj : data

data/lib/wedge/plugins/pjax.rb

@@ -1,30 +1,24 @@
+if RUBY_ENGINE == 'opal'
+  class Element
+    alias_native :mask
+    alias_native :remove_data, :removeData
+    alias_native :replace_with, :replaceWith
+    alias_native :selectize
+
+    def date_picker options = {}
+      `self.datepicker(JSON.parse(#{options.to_json}))`
+    end
+  end
+end
+
 module Wedge
   module Plugins
     class Pjax < Component
       config.name :pjax, :pjax_plugin
       config.requires :history_plugin
 
-      class Nanobar
-        include Native
-
-        alias_native :go
-        alias_native :start
-        alias_native :finish
-
-        def initialize options = {}
-          `var Nanobar=function(){"use strict";var t,i,e,s,h,n,o={width:"100%",height:"4px",zIndex:9999,top:"0"},a={width:0,height:"100%",clear:"both",transition:"height .3s"};return t=function(t,i){var e;for(e in i)t.style[e]=i[e];t.style["float"]="left"},s=function(){var t=this,i=this.width-this.here;.1>i&&i>-.1?(h.call(this,this.here),this.moving=!1,100==this.width&&(this.el.style.height=0,setTimeout(function(){t.cont.el.removeChild(t.el)},300))):(h.call(this,this.width-i/4),setTimeout(function(){t.go()},16))},h=function(t){this.width=t,this.el.style.width=this.width+"%"},n=function(){var t=new i(this);this.bars.unshift(t)},i=function(i){this.el=document.createElement("div"),this.el.style.backgroundColor=i.opts.bg,this.width=0,this.here=0,this.moving=!1,this.cont=i,t(this.el,a),i.el.appendChild(this.el)},i.prototype.go=function(t){t?(this.here=t,this.moving||(this.moving=!0,s.call(this))):this.moving&&s.call(this)},e=function(i){var e,s,h=this.opts=i||{};h.bg=h.bg||"#000",this.bars=[],e=this.el=document.createElement("div"),t(this.el,o),h.id&&(e.id=h.id),h.className&&(e.className=h.className),e.style.position=h.target?"relative":"fixed",h.target?(s=h.target,s.insertBefore(e,h.target.firstChild)):(s=document.getElementsByTagName("body")[0],s.appendChild(e)),s.className="nanobar-custom-parent",n.call(this)},e.prototype.go=function(t){this.bars[0].go(t),100==t&&n.call(this)},e.prototype.start=function(){(function(){var t=this.bars[0],i=function(){setTimeout(function(){var e=t.here+Math.round(10*Math.random());t.here>=99||(e>99&&(e=99),t.go(e),i())},500)};t.go(10),i()}).call(this)},e.prototype.finish=function(){this.go(100)},e}();`
-          super `new Nanobar(options)`
-        end
-      end if client?
-
-      def progress_bar
-        $pjax_progress_bar
-      end
-
       def get href = false
-        $pjax_progress_bar = Nanobar.new({bg: '#f99f22'}.to_n)
-        progress_bar.start
-        `$(document).trigger('page:click')`
+        `$(document).trigger('page:get')`
         $window.history.push href, pjax: true
       end
 
@@ -37,16 +31,101 @@ module Wedge
         end
       end
 
+      on :ready do
+        %x{
+          (function() {
+            (function($) {
+              $("<style type='text/css'>").text("#wedgePjaxLoader{-webkit-box-shadow:0 0 5px #333;-moz-box-shadow:0 0 5px #333;box-shadow:0 0 5px #333;background:#999;height:2px;position:fixed;top:0;width:50px;z-index:9999999}").appendTo("head");
+              return $.fn.wedgeLoadingBar = function(options) {
+                var settings;
+                settings = $.extend({
+                  turbolinks: true,
+                  ajax: true
+                }, options);
+                if (settings.turbolinks) {
+                  $(document).on('page:fetch', function() {
+                    return window.wedgePjaxLoader.startLoader();
+                  });
+                  $(document).on('page:receive', function() {
+                    return window.wedgePjaxLoader.sliderWidth = $('#wedgePjaxLoader').width();
+                  });
+                  $(document).on('page:load', function() {
+                    return window.wedgePjaxLoader.restoreLoader();
+                  });
+                  $(document).on('page:restore', function() {
+                    $('#wedgePjaxLoader').remove();
+                    return window.wedgePjaxLoader.restoreLoader();
+                  });
+                }
+                if (settings.ajax) {
+                  $(document).ajaxComplete(function(e) {
+                    $('#wedgePjaxLoader').remove();
+                    return window.wedgePjaxLoader.restoreLoader();
+                  });
+                  $(document).ajaxStart(function() {
+                    return window.wedgePjaxLoader.startLoader();
+                  });
+                }
+                return window.wedgePjaxLoader = {
+                  sliderWidth: 0,
+                  startLoader: function() {
+                    $('#wedgePjaxLoader').remove();
+                    return $('<div/>', {
+                      id: 'wedgePjaxLoader'
+                    }).appendTo('body').animate({
+                      width: $(document).width() * .4
+                    }, 2000).animate({
+                      width: $(document).width() * .6
+                    }, 6000).animate({
+                      width: $(document).width() * .90
+                    }, 10000).animate({
+                      width: $(document).width() * .99
+                    }, 20000);
+                  },
+                  restoreLoader: function() {
+                    return $('<div/>', {
+                      id: 'wedgePjaxLoader'
+                    }).css({
+                      width: window.wedgePjaxLoader.sliderWidth
+                    }).appendTo('body').animate({
+                      width: $(document).width()
+                    }, 500).fadeOut(function() {
+                      return $(this).remove();
+                    });
+                  }
+                };
+              };
+            })(jQuery);
+
+          }).call(this);
+        }
+        `$(window).wedgeLoadingBar({turbolinks: true, ajax: false})`
+      end
+
       on :history_change do |e|
         if e.data.pjax
-          progress_bar.start
-          `$(document).trigger('page:request')`
+          `$(document).trigger('page:fetch')`
           HTTP.get(e.url) do |response|
+            `$(document).trigger('page:receive')`
             res  = Native(response.xhr)
             html = res.responseText
+            # grab title
+            if title = dom.find('head title')
+              matches = html.match(/(<title[^>]*>)((.|[\n\r])*)<\/title>/im)
+              title.text matches[2]
+            end
             # grab and add the body
-            matches = html.match(/<body[^>]*>((.|[\n\r])*)<\/body>/im)
-            dom.find('body').html matches[1]
+            matches = html.match(/(<body[^>]*>)((.|[\n\r])*)<\/body>/im)
+            # grab the body attributes and set them
+            attr_str = matches[1].gsub(/(^<body|>$)/, '').strip
+            body = Element['<body/>']
+            attr_matches = attr_str.scan(/([a-z\-]*)(?:=)((?:')[^']*(?:')|(?:")[^"]*(?:"))/im)
+            attr_matches.each do |match|
+              k, v = match
+              body.attr(k, v.gsub(/(^("|')|("|')$)/, ''))
+            end
+            body.html matches[2]
+            dom.find('body').replace_with body
             # grab and eval the scripts
             matches = html.match(/<script>((.|[\n\r])*)<\/script>/im)
             # `eval(#{matches[0]})`
@@ -55,7 +134,6 @@ module Wedge
               script = script.strip.sub('</html>', '').sub('<script>', '')
               `jQuery.globalEval(script);`
             end
-            progress_bar.finish
             `$('html, body').animate({ scrollTop: 0 }, 0); $(document).trigger('page:load');`
           end
         end

data/lib/wedge/version.rb

@@ -1,3 +1,3 @@
 module Wedge
-  VERSION = '0.0.24'
+  VERSION = '0.0.25'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wedge
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
 platform: ruby
 authors:
 - cj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-02 00:00:00.000000000 Z
+date: 2015-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -218,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Components for the Browser and Server
@@ -235,3 +235,4 @@ test_files:
 - test/test_basic_component.rb
 - test/test_browserio.rb
 - test/test_helper.rb
+has_rdoc: