wedge 0.1.24 → 0.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cd9d55e9e4a4e2552a9161a708dd2ca7ed3b9f9
-  data.tar.gz: c47e4e82a4a15245592838be2b34bf7b0d5f6c84
+  metadata.gz: 78f40ecf9915213fae0d4d1e04a9b540d2d3478d
+  data.tar.gz: a14f6a410247c07a2622382cd7f0167286b13fab
 SHA512:
-  metadata.gz: 9570eae6b1a09a342bb2fee0a664e6eb81706c46725ed755caa6fa044fbd36c27ca11be168b04b864b99734b36509219bfd12776eba6490301848e5214b1e654
-  data.tar.gz: e26f5afdf65df26d7f139456e9f7a78b0705714af66789318269dbbab7f72edbfef294d5c936b0e6fdfdc784143dfa1db63190af25df1933a377c7a25858a86d
+  metadata.gz: 863fe684a8d673637de4a47553bac75278a8343d875bd84bca7223709885d5c4617cc4ab936e9da639e08cf12b44f07860938c1b872f37e2c3fb2d533e7fbb05
+  data.tar.gz: 397aea986f9d2f14da80e80988d51a2ae3f02cb167435c6d2c51502bba822a57e2de0bbf02b78691ada2c64983f9777356bddda313c0987a9eb70c50611ff137

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in BrowserIO.gemspec
 gemspec
 
-gem 'opal', github: 'opal/opal'
+gem 'opal'
 gem 'opal-jquery', github: 'opal/opal-jquery'
 gem 'opal-rspec-cj'
 gem 'binding_of_caller'

data/Rakefile

@@ -9,26 +9,28 @@ require 'bundler'
 require 'bundler/gem_tasks'
 require 'bundler/setup'
 
-require 'config/boot'
-require 'tilt/erubis'
-require 'opal/rspec/rake_task'
-
-Opal.append_path File.expand_path('../lib', __FILE__)
-Opal.append_path File.expand_path('../playground/app', __FILE__)
-Opal.append_path File.expand_path('../playground/public', __FILE__)
-
-Opal::RSpec::RakeTask.new('opal:rspec', Playground) do |s|
-  s.index_path = 'spec/index.html.erb'
-end
-
-task default: [:test]
-
-require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new('ruby:rspec')
-
-task :test do
-  puts "--------------------------\nRun specs in Ruby\n--------------------------"
-  Rake::Task['ruby:rspec'].invoke
-  puts "--------------------------\nRun specs in Opal\n--------------------------"
-  Rake::Task['opal:rspec'].invoke
+if current_task['default'] || current_task['test'] || current_task[/:rspec/]
+  require 'config/boot'
+  require 'tilt/erubis'
+  require 'opal/rspec/rake_task'
+
+  Opal.append_path File.expand_path('../lib', __FILE__)
+  Opal.append_path File.expand_path('../playground/app', __FILE__)
+  Opal.append_path File.expand_path('../playground/public', __FILE__)
+
+  Opal::RSpec::RakeTask.new('opal:rspec', Playground) do |s|
+    s.index_path = 'spec/index.html.erb'
+  end
+
+  task default: [:test]
+
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new('ruby:rspec')
+
+  task :test do
+    puts "--------------------------\nRun specs in Ruby\n--------------------------"
+    Rake::Task['ruby:rspec'].invoke
+    puts "--------------------------\nRun specs in Opal\n--------------------------"
+    Rake::Task['opal:rspec'].invoke
+  end
 end

data/lib/wedge.rb

@@ -60,11 +60,46 @@ class Wedge
       DOM.new html
     end
 
-    def script_tag
-      "<script src='#{assets_url_with_host}/wedge.js'></script>"
-    end
-
     unless RUBY_ENGINE == 'opal'
+      # def script_tag
+      #   # note: ?body=1 is a hack for sprockets to make source maps work # correctly.
+      #   "<script src='#{assets_url_with_host}/wedge.js#{Wedge.config.debug ? '?body=1' : ''}' type='text/javascript'></script>"
+      # end
+
+      def script_tag name = 'wedge'
+        sprockets = Wedge.config.opal[:server].sprockets
+        prefix = Wedge.config.opal[:server].prefix
+        asset = sprockets[name]
+        raise "Cannot find asset: #{name}" if asset.nil?
+        scripts = []
+
+        get_asset_urls(name).each do |url|
+          scripts << %{<script src="#{url}"></script>}
+        end
+
+        scripts << %{<script>#{Wedge::Opal::Processor.load_asset_code(sprockets, name)}</script>}
+
+        scripts.join "\n"
+      end
+
+      def get_asset_urls name
+        sprockets = Wedge.config.opal[:server].sprockets
+        prefix = Wedge.config.opal[:server].prefix
+        asset = sprockets[name]
+        raise "Cannot find asset: #{name}" if asset.nil?
+        urls = []
+
+        if Wedge.config.opal[:server].debug
+          asset.to_a.map do |dependency|
+            urls << %{#{prefix}/#{dependency.logical_path}?body=1}
+          end
+        else
+          urls << %{#{prefix}/#{name}.js}
+        end
+
+        urls
+      end
+
       def javascript_cache
         @javascript_cache ||= IndifferentHash.new
       end
@@ -146,31 +181,57 @@ class Wedge
           build(path_name, options).to_s
         end
       else
-        url   = "#{Wedge.assets_url_with_host}/#{options[:path]}.js"
+        # 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]
 
-        `jQuery.ajax({ url: url, dataType: "script", cache: cache }).done(function() {`
-          # fix: at the moment to_js called from the server will set the class
-          # store for whatever method it calls.  we need to think of a better idea
-          # for global and local data store.
-          Wedge.config.component_class[options[:name]].config.store = options[:store].indifferent
+        if !Wedge.config.debug
+          url = "#{Wedge.assets_url_with_host}/#{options[:path]}.js"
 
-          if initialize_args = options.delete(:initialize_args)
-            comp = Wedge[options[:name], *initialize_args]
-          else
-            comp = Wedge[options[:name]]
-          end
+          `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
 
-          if options[:method_args].any?
-            comp.send(options[:method_called], options[:method_args])
-          else
-            comp.send(options[:method_called])
+            code = res[:body][:code]
+            `jQuery.globalEval(code);`
+
+            trigger_javascript_loaded path_name, options
           end
+        end
+      end
+    end
+
+    def trigger_javascript_loaded path_name, options
+      # fix: at the moment to_js called from the server will set the class
+      # store for whatever method it calls.  we need to think of a better idea
+      # for global and local data store.
+      Wedge.config.component_class[options[:name]].config.store = options[:store].indifferent
 
-          Wedge.trigger_browser_events
+      if initialize_args = options.delete(:initialize_args)
+        comp = Wedge[options[:name], *initialize_args]
+      else
+        comp = Wedge[options[:name]]
+      end
 
-         `}).fail(function(jqxhr, settings, exception){ window.console.log(exception); })`
+      if options[:method_args].any?
+        comp.send(options[:method_called], options[:method_args])
+      else
+        comp.send(options[:method_called])
       end
+
+      Wedge.trigger_browser_events
     end
 
     def config

data/lib/wedge/component.rb

@@ -196,7 +196,6 @@ class Wedge
                     'X-CSRF-TOKEN' => Element.find('meta[name=_csrf]').attr('content'),
                     'X-WEDGE-METHOD-REQUEST' => meth
                   },
-                  async: false,
                   payload: payload) do |response|
 
                     # We set the new csrf token

data/lib/wedge/config.rb

@@ -36,7 +36,8 @@ class Wedge
         server_methods: [],
         initialize_args: [],
         plugins: [],
-        allowed_client_data: %w(name path method_args method_called store tmpl key cache_assets assets_key assets_url assets_url_with_host)
+        opal: {},
+        allowed_client_data: %w(debug name path method_args method_called store tmpl key cache_assets assets_key assets_url assets_url_with_host)
       }.merge(opts))
     end
 

data/lib/wedge/middleware.rb

@@ -11,24 +11,25 @@ class Wedge
           settings.each { |k, v| Wedge.config.send "#{k}=", v }
         end
 
-        @opal  = { server: Wedge::Opal::Server.new { |s|
+        Wedge.config.opal = { server: Wedge::Opal::Server.new { |s|
           s.prefix = Wedge.config.assets_url
           s.debug  = Wedge.config.debug
           s.append_path "#{Dir.pwd}/#{Wedge.config.app_dir}"
         }}
 
         if Wedge.config.debug
-          @opal[:sprockets]   = @opal[:server].sprockets
-          @opal[:maps_prefix] = "#{Wedge.config.assets_url}/__OPAL_SOURCE_MAPS__"
-          @opal[:maps_app]    = Opal::SourceMapServer.new @opal[:sprockets], @opal[:maps_prefix]
+          Wedge.config.opal[:sprockets]   = Wedge.config.opal[:server].sprockets
+          Wedge.config.opal[:maps_prefix] = "#{Wedge.config.assets_url}/__OPAL_SOURCE_MAPS__"
+          Wedge.config.opal[:maps_app]    = Opal::SourceMapServer.new Wedge.config.opal[:sprockets], Wedge.config.opal[:maps_prefix]
 
-          Wedge::Opal::Sprockets::SourceMapHeaderPatch.inject! @opal[:maps_prefix]
+          Wedge::Opal::Sprockets::SourceMapHeaderPatch.inject! Wedge.config.opal[:maps_prefix]
         end
       end
 
       @app       = app
       @scope     = self.class.scope
       @skip_call = !self.class.skip_call.nil?? self.class.skip_call : Wedge.config.skip_call_middleware
+      @opal      = Wedge.config.opal
     end
 
     def call(env)
@@ -88,7 +89,13 @@ class Wedge
             method_called = data.delete(:__wedge_method__)
             method_args   = data.delete(:__wedge_args__)
 
-            if method_args == '__wedge_data__' && data
+
+            if wedge_path == 'wedge/list_assets'
+              res = {
+                urls: Wedge.get_asset_urls(data[:path_name]),
+                code: Wedge::Opal::Processor.load_asset_code(Wedge.config.opal[:server].sprockets, data[:path_name])
+              }
+            elsif method_args == '__wedge_data__' && data
               method_args = [data]
               res         = Wedge.scope!(scope, method_called)[name].send(method_called, *method_args) || ''
             else

data/lib/wedge/plugins/current_user.rb

@@ -14,8 +14,7 @@ class Wedge
         %w'ability_list current_user'.each do |type|
           config.compile_str ||= ''
           path = Wedge.config.component_class[:"#{type}"].config.path
-          code = File.read("#{Dir.pwd}/#{Wedge.config.app_dir}/#{path}.rb")
-          config.compile_str << Opal.original_compile("require 'wedge/plugins/#{type}'; #{code}")
+          config.compile_str << Wedge.javascript(path)
         end if for_client
       end
 

data/lib/wedge/version.rb

@@ -1,3 +1,3 @@
 class Wedge
-  VERSION = '0.1.24'
+  VERSION = '0.1.26'
 end

data/playground/app/components/layout.rb

@@ -16,7 +16,7 @@ class Playground
 
       head.add_child assets [:css, :default]
       html.add_child assets [:js, :default]
-      html.add_child Wedge.script_tag
+      html.add_child Wedge.script_tag 'wedge'
 
       inline_tags.each do |tag|
         html.add_child tag

data/wedge.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "opal"
-  spec.add_runtime_dependency "opal-jquery"
+  spec.add_runtime_dependency "opal", '~> 0.8.0.rc1'
+  spec.add_runtime_dependency "opal-jquery", '~> 0.3.0'
   spec.add_runtime_dependency "nokogiri"
 
   spec.add_development_dependency 'rspec'
@@ -27,7 +27,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "awesome_print"
   spec.add_development_dependency "yard"
-  spec.add_development_dependency "phantomjs.rb"
   spec.add_development_dependency 'roda'
 
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: wedge
 version: !ruby/object:Gem::Version
-  version: 0.1.24
+  version: 0.1.26
 platform: ruby
 authors:
 - cj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-01 00:00:00.000000000 Z
+date: 2015-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.0.rc1
 - !ruby/object:Gem::Dependency
   name: opal-jquery
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -122,20 +122,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: phantomjs.rb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: roda
   requirement: !ruby/object:Gem::Requirement