opal-sprockets 0.4.0.0.11.dev.3.1.beta1 → 0.4.0.0.11.0.rc1.3.1.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32661426be37d64787c573dce2cc35f816489310
-  data.tar.gz: de0cef69723ae23293fc0b79f812e62cd703ad7a
+  metadata.gz: 7f468bcbf61d1f13cb364f124c53b8ae927ea02a
+  data.tar.gz: 6f759a6a77b4e6ae82733c2a504a1b0ffc562fd3
 SHA512:
-  metadata.gz: e2094ff150dbb679d7734cf4df0ee5e10e725cb9eecd64e3d24f66b29fabfe257fa5d6006ff4b1fda306ad43a224f05490b3bba39d5e58dff7256be8fde1f600
-  data.tar.gz: af5c8dab0703e5a7f1ebebaa3f4e80b4f09e80c0f7112f62ba744874f4bca1c3adfb147aa0e592dccdb10363d6aae1889ca7b24a8b79e46d5b2dd6b16917f307
+  metadata.gz: b894dc0cd1e9b0b8443f3e915dc18719786a63c0443f096d419ca71b4551e50c3d6f42d7f96f74e61b9c7cad1c01e46490539fcc7d5f686d912380867bb61186
+  data.tar.gz: 2718a9c2659da6a27d290102f00b0405af71760547f65a77cb96754205a4165e96aba496561da57f57d272e4c51ad95b7bbc226e399f26e2cd93597888b26095

data/.travis.yml

@@ -8,9 +8,9 @@ matrix:
       env: RACK_VERSION='< 2.0.0' SPROCKETS_VERSION='~> 3.5.2'
     - rvm: 2.2.5
       env: SPROCKETS_VERSION='~> 3.6.3'
-    - rvm: 2.3.1
-      env: SPROCKETS_VERSION='~> 3.7.0'
-    - rvm: 2.4.0-preview1
+    - rvm: 2.3.4
+      env: SPROCKETS_VERSION='~> 3.7.1'
+    - rvm: 2.4.0
 
 notifications:
   irc: "irc.freenode.org#opal"

data/README.md

@@ -81,8 +81,10 @@ Bundler.require
 
 run Opal::Sprockets::Server.new { |s|
   s.append_path 'app'
-
   s.main = 'application'
+
+  # This can be used to provide a custom index file.
+  # s.index_path = 'my_index.erb'
 }
 ```
 

data/example/app/application.rb

@@ -6,8 +6,15 @@ module MyApp
     def initialize
       @user = User.new('Bill')
       @user.authenticated?
+    rescue
+      @user = User.new('Bob')
+      @user.authenticated?
+      p @user
     end
   end
 end
 
-MyApp::Application.new
+$app = MyApp::Application.new
+
+p $app
+puts "Done!"

data/lib/opal/sprockets/processor.rb

@@ -141,6 +141,30 @@ module Opal
   end
 end
 
+module Opal::Sprockets::Processor
+  module PlainJavaScriptLoader
+    def self.call(input)
+      sprockets = input[:environment]
+      asset = OpenStruct.new(input)
+
+      opal_extnames = sprockets.engines.map do |ext, engine|
+        ext if engine <= ::Opal::Processor
+      end.compact
+
+      path_extnames     = -> path  { File.basename(path).scan(/\.[^.]+/) }
+      processed_by_opal = -> asset { (path_extnames[asset.filename] & opal_extnames).any? }
+
+      unless processed_by_opal[asset]
+        [
+          input[:data],
+          %{if (typeof(OpalLoaded) === 'undefined') OpalLoaded = []; OpalLoaded.push(#{input[:name].to_json});}
+        ].join(";\n")
+      end
+    end
+  end
+end
+
+
 if Sprockets.respond_to? :register_transformer
   extra_args = [{mime_type: 'application/javascript', silence_deprecation: true}]
 else
@@ -149,3 +173,5 @@ end
 
 Sprockets.register_engine '.rb',  Opal::Processor, *extra_args
 Sprockets.register_engine '.opal',  Opal::Processor, *extra_args
+Sprockets.register_postprocessor 'application/javascript', Opal::Sprockets::Processor::PlainJavaScriptLoader
+

data/lib/opal/sprockets/version.rb

@@ -1,8 +1,8 @@
 module Opal
   module Sprockets
     BASE_VERSION = '0.4.0'
-    OPAL_VERSION = '0.11.dev'
+    OPAL_VERSION = '0.11.0.rc1'
     SPROCKETS_VERSION = '3.1'
-    VERSION = "#{BASE_VERSION}.#{OPAL_VERSION}.#{SPROCKETS_VERSION}.beta1"
+    VERSION = "#{BASE_VERSION}.#{OPAL_VERSION}.#{SPROCKETS_VERSION}.beta2"
   end
 end

data/lib/opal/sprockets.rb

@@ -10,7 +10,7 @@ module Opal
     #
     # @example
     #
-    #   Opal::Sprockets.load_asset(Rails.application.assets, 'application')
+    #   Opal::Sprockets.load_asset('application')
     #
     # @example Will output the following JavaScript:
     #
@@ -20,38 +20,24 @@ module Opal
     #     Opal.load("application");
     #   }
     #
-    # @param name      [String] The logical name of the main asset to be loaded (without extension)
-    # @param sprockets [Sprockets::Environment]
+    # @param name [String] The logical name of the main asset to be loaded (without extension)
     #
     # @return [String] JavaScript code
-    def self.load_asset(name, sprockets)
-      asset = sprockets[name.sub(/(\.(js|rb|opal))*#{REGEXP_END}/, '.js')]
-      return '' if asset.nil?
-
-      opal_extnames = sprockets.engines.map do |ext, engine|
-        ext if engine <= ::Opal::Processor
-      end.compact
+    def self.load_asset(name, _sprockets = :deprecated)
+      if _sprockets != :deprecated && !@load_asset_warning_displayed
+        @load_asset_warning_displayed = true
+        warn "Passing a sprockets environment to Opal::Sprockets.load_asset no more needed.\n  #{caller(1, 3).join("\n  ")}"
+      end
 
-      module_name       = -> asset { asset.logical_path.sub(/\.js#{REGEXP_END}/, '') }
-      path_extnames     = -> path  { File.basename(path).scan(/\.[^.]+/) }
-      mark_loaded       = -> paths { "Opal.loaded([#{paths.map(&:inspect).join(',')}]);" }
-      processed_by_opal = -> asset { (path_extnames[asset.pathname] & opal_extnames).any? }
+      name = name.sub(/(\.(js|rb|opal))*\z/, '')
       stubbed_files     = ::Opal::Config.stubbed_files
 
-      non_opal_assets = ([asset]+asset.dependencies)
-        .select { |asset| not(processed_by_opal[asset]) }
-        .map { |asset| module_name[asset] }
-
-      loaded = ['opal'] + non_opal_assets + stubbed_files.to_a
-
-      if processed_by_opal[asset]
-        load_asset_code = "Opal.load(#{module_name[asset].inspect});"
-      end
-
+      loaded = ['opal', 'corelib/runtime'] + stubbed_files.to_a
 
       "if (typeof(Opal) !== 'undefined') { "\
-        "#{mark_loaded[loaded]} "\
-        "#{load_asset_code} "\
+        "Opal.loaded(#{loaded.to_json}); "\
+        "if (typeof(OpalLoaded) === 'undefined') Opal.loaded(OpalLoaded); "\
+        "if (Opal.modules[#{name.to_json}]) Opal.load(#{name.to_json}); "\
       "}"
     end
 
@@ -84,7 +70,7 @@ module Opal
         scripts << %{<script src="#{prefix}/#{name}.js"></script>}
       end
 
-      scripts << %{<script>#{::Opal::Sprockets.load_asset(name, sprockets)}</script>}
+      scripts << %{<script>#{::Opal::Sprockets.load_asset(name)}</script>}
 
       scripts.join "\n"
     end

data/opal-sprockets.gemspec

@@ -4,11 +4,11 @@ require File.expand_path('../lib/opal/sprockets/version', __FILE__)
 Gem::Specification.new do |s|
   s.name         = 'opal-sprockets'
   s.version      = Opal::Sprockets::VERSION
-  s.author       = 'Adam Beynon'
-  s.email        = 'adam.beynon@gmail.com'
+  s.authors      = ['Elia Schito', 'Adam Beynon']
+  s.email        = 'elia@schito.me'
   s.homepage     = 'http://opalrb.org'
-  s.summary      = 'Sprockets support for opal'
-  s.description  = 'Sprockets suppoer for opal.'
+  s.summary      = 'Sprockets support for Opal.'
+  s.description  = 'Sprockets support for Opal.'
 
   s.files          = `git ls-files`.split("\n")
   s.test_files     = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/sprockets/processor_spec.rb

@@ -61,7 +61,7 @@ describe Opal::Processor do
       allow(environment).to receive(:[]).with('bar.js') { asset }
       allow(environment).to receive(:engines) { {'.rb' => described_class, '.opal' => described_class} }
 
-      code = ::Opal::Sprockets.load_asset('bar', environment)
+      code = ::Opal::Sprockets.load_asset('bar')
       expect(code).to match(stubbed_file)
     end
   end

data/spec/sprockets_spec.rb

@@ -7,21 +7,28 @@ describe Opal::Sprockets do
 
   describe '.load_asset' do
     it 'loads the main asset' do
-      code = described_class.load_asset('console', env)
+      code = described_class.load_asset('console')
       expect(code).to include('Opal.load("console");')
     end
 
     it 'marks as loaded "opal" plus all non opal assets' do
-      code = described_class.load_asset('corelib/runtime', env)
+      code = described_class.load_asset('corelib/runtime')
       expect(code).to include('Opal.loaded(["opal","corelib/runtime"]);')
     end
 
-    it 'returns an empty string if the asset is not found' do
-      code = described_class.load_asset('foo', env)
-      expect(code).to eq('')
+    it 'tries to load an asset if it is registered as opal module' do
+      code = described_class.load_asset('foo')
+      expect(code).to include('if (Opal.modules["foo"]) Opal.load("foo");')
     end
   end
 
+  it 'warns the user that passing an env is not needed, only once' do
+    expect(described_class).to receive(:warn).once
+    described_class.load_asset('foo', env)
+    described_class.load_asset('foo', env)
+    described_class.load_asset('foo', env)
+  end
+
   describe '.javascript_include_tag' do
     it 'works with trailing / in the prefix' do
       code = described_class.javascript_include_tag('corelib/runtime', prefix: '/', sprockets: env, debug: false)

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: opal-sprockets
 version: !ruby/object:Gem::Version
-  version: 0.4.0.0.11.dev.3.1.beta1
+  version: 0.4.0.0.11.0.rc1.3.1.beta2
 platform: ruby
 authors:
+- Elia Schito
 - Adam Beynon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-28 00:00:00.000000000 Z
+date: 2017-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -30,14 +31,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.dev
+        version: 0.11.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.dev
+        version: 0.11.0.rc1
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
@@ -94,8 +95,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Sprockets suppoer for opal.
-email: adam.beynon@gmail.com
+description: Sprockets support for Opal.
+email: elia@schito.me
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -164,10 +165,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
-summary: Sprockets support for opal
+summary: Sprockets support for Opal.
 test_files:
 - spec/fixtures/complex_sprockets.js.rb.erb
 - spec/fixtures/file_with_directives.js