wedge 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c93ae71aeb6b571d456229ac1c8f445b90d22d7
-  data.tar.gz: d11d01de2de851f3a4bda2d463f763d86c6ae68e
+  metadata.gz: c71fcced61481b9f728755337c97887dda0694c5
+  data.tar.gz: 1ab6d87facb32dfc95fd4251ba172959f8eb12e7
 SHA512:
-  metadata.gz: 8011b201963883dc776f0f5928d9d22ace4f25ef2f817170c164dc3cd5b075ca9a30cbd3818513f433cbd468614d97c5b1bad8073eec13f297ce78f18a3e91a1
-  data.tar.gz: 164309fabb1a40652cda03ff73c2997e8e8db8466b3ba4ce45e6939e236310f80492744fef213e866cced7c68853921c9df9d0e61ddf5fb7895dcca35bbadca6
+  metadata.gz: a041c32b5a735350d65379a9b2e01172a49748bb91d3bedf8bb993f7d220c62685549e4622b10689bc5eebf50f6a1620336b1b27407d2909dd29a6d7355bb4db
+  data.tar.gz: c4a459c0dcabb30556997bc436caea9ff6f993aeec49d70ddc24685deb18933e8348aa61ef1cf9165e2f6948474531e3721dee0de1ba2038039d2c0e1833e108

data/lib/wedge.rb

@@ -1,7 +1,9 @@
-require 'opal'
-require 'opal-jquery'
+unless RUBY_ENGINE == 'opal'
+  require 'opal'
+  Opal.append_path File.expand_path('../', __FILE__).untaint
+end
+
 require 'wedge/version'
-require 'wedge/opal'
 require 'wedge/utilis/indifferent_hash'
 require 'wedge/utilis/hash'
 require 'wedge/utilis/blank'
@@ -12,6 +14,7 @@ require 'wedge/utilis/element'
 require 'base64'
 require 'forwardable'
 unless RUBY_ENGINE == 'opal'
+  require 'wedge/opal'
   require 'nokogiri'
   require 'wedge/utilis/nokogiri'
   require 'wedge/middleware'
@@ -22,7 +25,7 @@ require 'wedge/dom'
 require 'wedge/events'
 require 'wedge/config'
 require 'wedge/component'
-require 'wedge/railtie' if RUBY_ENGINE == 'RUBY' && defined?(Rails::Railtie)
+require 'wedge/railtie' if RUBY_ENGINE != 'opal' && defined?(Rails::Railtie)
 
 class Wedge
   include Methods
@@ -214,35 +217,7 @@ class Wedge
           build(path_name, options).to_s
         end
       else
-        # note: ?body=1 is a hack for sprockets to make source maps work # correctly.
-        # url   = "#{url}?body=1" if Wedge.config.debug
-        cache = options[:cache_assets]
-
-        if !Wedge.config.debug
-          url ||= "#{Wedge.assets_url_with_host}/#{options[:path]}.js"
-
-          `jQuery.ajax({ url: url, dataType: "script", cache: cache }).done(function() {`
-            trigger_javascript_loaded path_name, options
-           `}).fail(function(jqxhr, settings, exception){ window.console.log(exception); })`
-        else
-          url     = "#{Wedge.assets_url_with_host}/wedge/list_assets.call"
-          payload = { path_name: path_name}
-          headers = {
-            'X-CSRF-TOKEN' => Element.find('meta[name=_csrf]').attr('content'),
-          }
-          HTTP.post(url, dataType: 'json', headers: headers, payload:  payload) do |response|
-            res  = JSON.from_object(`response`)
-
-            res[:body][:urls].each do |url|
-              `jQuery.ajax({url: url, dataType: "script", cache: cache, async: false})`
-            end
-
-            code = res[:body][:code]
-            `jQuery.globalEval(code);`
-
-            trigger_javascript_loaded path_name, options
-          end
-        end
+        trigger_javascript_loaded path_name, options
       end
     end
 

data/lib/wedge/component.rb

@@ -150,7 +150,7 @@ class Wedge
       def wedge_on_server(m = false, &block)
         m ||= Module.new(&block)
 
-        if server?
+        if RUBY_ENGINE != 'opal'
           yield if block_given?
 
           m.public_instance_methods(false).each do |meth|

data/lib/wedge/opal.rb

@@ -1,80 +1,13 @@
 class Wedge
+  module Plugins
+  end
+
   # Create our own opal instance.
   Opal = ::Opal.dup
+  # Opal = Marshal.load(Marshal.dump(::Opal))
 
   unless RUBY_ENGINE == 'opal'
     module Opal
-      class Builder
-        # @return [String] Compiled javascript.
-        def javascript
-          to_s
-        end
-      end
-
-      def self.original_compile(source, options = {})
-        Compiler.new(source, options).original_compile
-      end
-
-      class Compiler
-        alias_method :original_compile, :compile
-        def compile
-          @result = original_compile
-
-          if defined? Wedge
-            logical_path = self.file
-            classes    = Wedge.config.component_class
-            comp_class = classes["#{Wedge.config.app_dir}/#{logical_path}".gsub(/\//, '__')] || classes[logical_path.gsub(/\//, '__')]
-
-            if logical_path == 'wedge'
-              compiled_data = Base64.encode64 Wedge.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....
-              @result << Opal.original_compile("require '#{self.file}'; Wedge.config.data = HashObject.new(Wedge.config.data.to_h.merge JSON.parse(Base64.decode64('#{compiled_data}')))")
-              # load all global plugins into wedge
-              Wedge.config.plugins.each do |path|
-                @result << Builder.build(path).to_s
-              end
-            elsif comp_class
-              comp_class.config.on_compile.each { |blk| comp_class.instance_exec(true, &blk) }
-              comp_name     = comp_class.config.name
-              compiled_data = Base64.encode64 comp_class.config.client_data.to_json
-              js            = ''
-
-              js << "require '#{self.file}'; 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}')))"
-              # todo: discuss: pass plugin settings that were set server side?
-              js << "; Wedge.plugin(:#{comp_name.to_s.gsub(/_plugin$/, '')})" if comp_class.config.is_plugin
-
-              @result << Opal.original_compile(js)
-
-              if compile_str = comp_class.config.compile_str
-                @result << compile_str
-              end
-
-              load_requires logical_path
-            end
-          end
-
-          @result
-        end
-
-        def load_requires path_name
-          if requires = Wedge.config.requires[path_name.gsub(/\//, '__')]
-            requires.each do |path|
-              next unless comp_class = Wedge.config.component_class[path]
-
-              comp_class.config.on_compile.each { |blk| comp_class.instance_eval(&blk) }
-
-              comp_name     = comp_class.config.name
-              compiled_data = Base64.encode64 comp_class.config.client_data.to_json
-
-              load_requires path
-
-              @result << Opal.original_compile("require '#{path}'; 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
-      end
-
       class Server
         attr_accessor :headers, :gzip
 
@@ -165,24 +98,5 @@ if RUBY_ENGINE == 'opal'
     alias_native :replace_with, :replaceWith
     # alias_native :selectize
   end
-else
-  # issue: 
-  # Wedge::Opal.use_gem 'wedge'
-  # NoMethodError:  method `runtime_dependencies' for nil:NilClass
-  # /home/rof/cache/bundler/ruby/2.1.0/bundler/gems/opal-921df0c1dcf0/lib/opal/paths.rb:36:in `require_paths_for_gem'
-  # /home/rof/cache/bundler/ruby/2.1.0/bundler/gems/opal-921df0c1dcf0/lib/opal/paths.rb:37:in `block in require_paths_for_gem'
-  # /home/rof/cache/bundler/ruby/2.1.0/bundler/gems/opal-921df0c1dcf0/lib/opal/paths.rb:36:in `each'
-  # /home/rof/cache/bundler/ruby/2.1.0/bundler/gems/opal-921df0c1dcf0/lib/opal/paths.rb:36:in `require_paths_for_gem'
-  # /home/rof/cache/bundler/ruby/2.1.0/bundler/gems/opal-921df0c1dcf0/lib/opal/paths.rb:27:in `use_gem'
-  # /home/rof/cache/bundler/ruby/2.1.0/gems/wedge-0.1.29/lib/wedge/opal.rb:92:in `<top (required)>'
-  # /home/rof/cache/bundler/ruby/2.1.0/gems/wedge-0.1.29/lib/wedge.rb:1:in `require'
-  # /home/rof/cache/bundler/ruby/2.1.0/gems/wedge-0.1.29/lib/wedge.rb:1:in `<top (required)>'
-  # /home/rof/src/github.com/acdcorp/autolink.cuba/app/config/boot.rb:10:in `require'
-  # /home/rof/src/github.com/acdcorp/autolink.cuba/app/config/boot.rb:10:in `<top (required)>'
-  # /home/rof/src/github.com/acdcorp/autolink.cuba/Rakefile:15:in `require'
-  # /home/rof/src/github.com/acdcorp/autolink.cuba/Rakefile:15:in `<top (required)>'
-  # (See full trace by running task with --trace)
-  # make: *** [test] Error 1
-  Wedge::Opal.append_path Wedge.method(:version).source_location.first.sub('wedge/opal.rb', '')
 end
 

data/lib/wedge/version.rb

@@ -1,3 +1,3 @@
 class Wedge
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wedge
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - cj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-18 00:00:00.000000000 Z
+date: 2016-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal-jquery