opal-sprockets 0.4.1.0.11.0.3.1 → 0.4.2.pre.1.0.11.0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65a213501892ad4e0cbe740d2588b5600c8f34ce4f47b159ece62f2306c828d3
-  data.tar.gz: f04dff21d4e3573efa70aac176b802766d98fe919a7b2bb845ba20118531b21d
+  metadata.gz: c9f4fd15ecf2dfdcb1d252b9fe800c835c106295c7a46494876f0c88ad1c3342
+  data.tar.gz: 6b142da62511a90f76d62546b832a9b7983fd8b59cee93ec5ea0b2db7be81d82
 SHA512:
-  metadata.gz: 3958fd882260605a1aa57dc81de92552ada141f33d3aa2f58ef71d65300e20d96875a0c49f938a257179b6f12b302c6afe3519d2ee1da6830bf93fa362678a00
-  data.tar.gz: 0f71514562c80f9b807fc5d17f37a1880b787d3464773934451fc69ce6d5f1a6c6a51cfd83459dbdc20bc20e04c95b9767698a30c2469ae27ebb0494c484673a
+  metadata.gz: 5b8510a4797ea716f7c5b38d0a993dda59dc581dfcdfeb7387ad0f8e8204a04f27926f02103f0402c621351ea7e68374594aca009e7b80054d3a859261ced89d
+  data.tar.gz: 14c629c523cfa8a82e3c1f524fc9975048ac08bfdf11347d79b2022a9075131ce970155bd2d6c5979b1a61a22dc7a2c503d30fbf519a3a859a62ba2a2075bab8

data/.travis.yml

@@ -2,16 +2,15 @@ language: ruby
 
 matrix:
   include:
-    - rvm: 2.0.0
-      env: RACK_VERSION='< 2.0.0' SPROCKETS_VERSION='~> 3.4.1'
     - rvm: 2.1.10
-      env: RACK_VERSION='< 2.0.0' SPROCKETS_VERSION='~> 3.5.2'
-    - rvm: 2.2.9
+      env: RACK_VERSION='< 2.0.0' SPROCKETS_VERSION='~> 3.4.1'
+    - rvm: 2.2.10
+      env: SPROCKETS_VERSION='~> 3.5.2'
+    - rvm: 2.3.7
       env: SPROCKETS_VERSION='~> 3.6.3'
-    - rvm: 2.3.6
+    - rvm: 2.4.4
       env: SPROCKETS_VERSION='~> 3.7.1'
-    - rvm: 2.4.3
-    # - rvm: 2.5.0
+    - rvm: 2.5.1
 
 notifications:
   irc: "irc.freenode.org#opal"

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+# Changelog
+
+## [v0.4.1](https://github.com/opal/opal-sprockets/compare/v0.4.0.0.10.0.3.0.0...v0.4.1.0.11.0.3.1)
+
+*30 December 2017*
+
+- Added support for Opal 0.11
+- `Opal::Sprockets.load_asset` now works without the need to access the sprockets environment (needed by `sprockets-rails` v3+)
+- Documentation updates

data/README.md

@@ -112,6 +112,14 @@ $ bundle exec rackup
 
 And then visit `http://127.0.0.1:9292` in any browser.
 
+### Source Maps
+
+`opal-sprockets` will create source maps for all assets by default. You can disable this with:
+
+```ruby
+Opal::Config.source_map_enabled = false
+```
+
 ## License
 
 (The MIT License)

data/example/app/application.rb

@@ -1,8 +1,11 @@
 require 'opal'
 require 'user'
+require 'native'
 
 module MyApp
   class Application
+    attr_reader :user
+
     def initialize
       @user = User.new('Bill')
       @user.authenticated?
@@ -18,3 +21,5 @@ $app = MyApp::Application.new
 
 p $app
 puts "Done!"
+
+$$.document.write("user is #{$app.user.name}")

data/example/app/user.rb

@@ -1,4 +1,6 @@
 class User
+  attr_reader :name
+
   def initialize(name)
     @name = name
   end

data/lib/opal/sprockets.rb

@@ -36,7 +36,7 @@ module Opal
 
       "if (typeof(Opal) !== 'undefined') { "\
         "Opal.loaded(#{loaded.to_json}); "\
-        "if (typeof(OpalLoaded) === 'undefined') Opal.loaded(OpalLoaded); "\
+        "if (typeof(OpalLoaded) !== 'undefined') Opal.loaded(OpalLoaded); "\
         "if (Opal.modules[#{name.to_json}]) Opal.load(#{name.to_json}); "\
       "}"
     end
@@ -64,7 +64,7 @@ module Opal
 
       if debug
         asset.to_a.map do |dependency|
-          scripts << %{<script src="#{prefix}/#{dependency.logical_path}?body=1"></script>}
+          scripts << %{<script src="#{prefix}/#{dependency.digest_path}?body=1"></script>}
         end
       else
         scripts << %{<script src="#{prefix}/#{name}.js"></script>}

data/lib/opal/sprockets/processor.rb

@@ -154,7 +154,9 @@ module Opal::Sprockets::Processor
       path_extnames     = -> path  { File.basename(path).scan(/\.[^.]+/) }
       processed_by_opal = -> asset { (path_extnames[asset.filename] & opal_extnames).any? }
 
-      unless processed_by_opal[asset]
+      if processed_by_opal[asset]
+        input[:data]
+      else
         [
           input[:data],
           %{if (typeof(OpalLoaded) === 'undefined') OpalLoaded = []; OpalLoaded.push(#{input[:name].to_json});}

data/lib/opal/sprockets/server.rb

@@ -1,7 +1,6 @@
 require 'rack'
 require 'opal/source_map'
 require 'sprockets'
-require 'sourcemap'
 require 'erb'
 require 'opal/sprockets/source_map_server'
 require 'opal/sprockets/source_map_header_patch'

data/lib/opal/sprockets/version.rb

@@ -1,6 +1,6 @@
 module Opal
   module Sprockets
-    BASE_VERSION = '0.4.1'
+    BASE_VERSION = '0.4.2.pre.1'
     OPAL_VERSION = '0.11.0'
     SPROCKETS_VERSION = '3.1'
     VERSION = "#{BASE_VERSION}.#{OPAL_VERSION}.#{SPROCKETS_VERSION}"

data/opal-sprockets.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rack-test'
+  s.add_development_dependency 'sourcemap'
 end

data/spec/sprockets/server_spec.rb

@@ -77,7 +77,12 @@ describe Opal::Sprockets::Server do
       get maps_prefix+'/source_map/subfolder/other_file.self.map'
       expect(last_response).to be_ok
       map = ::SourceMap::Map.from_json(last_response.body)
-      expect(map.sources).to include(maps_prefix+'/source_map/subfolder/other_file.rb')
+
+      if Gem::Version.new(Opal::VERSION) >= Gem::Version.new('0.11.2')
+        expect(map.sources).to include(maps_prefix+'/source_map/subfolder/other_file.rb')
+      else
+        expect(map.sources).to include(maps_prefix+'/source_map/subfolder/other_file')
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opal-sprockets
 version: !ruby/object:Gem::Version
-  version: 0.4.1.0.11.0.3.1
+  version: 0.4.2.pre.1.0.11.0.3.1
 platform: ruby
 authors:
 - Elia Schito
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-30 00:00:00.000000000 Z
+date: 2018-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -95,6 +95,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sourcemap
+  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'
 description: Sprockets support for Opal.
 email: elia@schito.me
 executables: []
@@ -104,6 +118,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
@@ -111,7 +126,7 @@ files:
 - example/app/application.rb
 - example/app/user.rb
 - example/config.ru
-- example/index.html
+- example/index.html.erb
 - lib/opal-sprockets.rb
 - lib/opal/sprockets.rb
 - lib/opal/sprockets/environment.rb
@@ -160,12 +175,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Sprockets support for Opal.