opal-rails 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b314c6a269955167f4f34d06e85c89e8f9c800eeb45e8e502b493507eec0385c
-  data.tar.gz: dc06fbc463089f0aa2708f01009abe1450c8040acfb64704582e34ddcccbfa4a
+  metadata.gz: 3e7eccec608dbb61b5b803b1c7800a9040d457e2fecf7f3846a19a36078d5ac4
+  data.tar.gz: 2fbc3fe3a0801c672264989a726aa5fd619183fc0faf9db50d1e2b2894638d43
 SHA512:
-  metadata.gz: 21659200f07711d09a7bc6db2a47578dc5c4f7a26c0e4b6f7dfa64a13601388b1fe173bf3facdf4ba6ef7c6745858e0dbd69e571cfd8f455b674399e3bb4e6de
-  data.tar.gz: 5910962dfb5ad9122147ee71a61dec9bfa3523837514397793cce9150808d4207ed03cb06ebe1e5263f6d41df68ee651a8ca2b69a5100e5cd916b0a3069cc3ca
+  metadata.gz: e95a46eabeb4904fce2a865711114dd9f3790963c3514473e6849e5af63da5dd18d85f23d3c3ae04e449e5cda9b4f6e1d035e0a76c4113672d666ad851c4c9ab
+  data.tar.gz: 7bfe7674b4608851ebd69f2256a9089ca99654805ba04168f5df8fdb55bff1fa1b887948067a48e95a14dbb21b8552d47ecbd047570a0755d806f68358cb66a1

data/.gitignore

@@ -12,7 +12,7 @@ Gemfile.lock
 # Files generated by `rake opal` but unneded in the gem
 /lib/assets/javascripts/specs.js
 /lib/assets/javascripts/opal-rails.js
-/gemfiles
+/gemfiles/.bundle
 
 # old test app dir
 /test_app/db/*.sqlite3

data/.travis.yml

@@ -5,20 +5,37 @@ sudo: false
 cache:
   bundler: true
 
-rvm:
-  - 2.5.0
-  - 2.4.2
-  - 2.3.5
-  - 2.2.8
-  - 2.1.10
-
-gemfile:
-  - gemfiles/rails_4_2_opal_master.gemfile
-  - gemfiles/rails_5_0_opal_master.gemfile
-  - gemfiles/rails_5_1_opal_master.gemfile
-  - gemfiles/rails_4_2_opal_0_10.gemfile
-  - gemfiles/rails_5_0_opal_0_10.gemfile
-  - gemfiles/rails_5_1_opal_0_10.gemfile
+matrix:
+  fast_finish: true
+
+  include:
+    - gemfile: gemfiles/rails_4_2_opal_master.gemfile
+      rvm: 2.3.7
+    - gemfile: gemfiles/rails_5_0_opal_master.gemfile
+      rvm: 2.4.4
+    - gemfile: gemfiles/rails_5_1_opal_master.gemfile
+      rvm: 2.5.1
+    - gemfile: gemfiles/rails_5_2_opal_master.gemfile
+      rvm: 2.5.1
+
+    - gemfile: gemfiles/rails_4_2_opal_0_11.gemfile
+      rvm: 2.3.7
+    - gemfile: gemfiles/rails_5_0_opal_0_11.gemfile
+      rvm: 2.4.4
+    - gemfile: gemfiles/rails_5_1_opal_0_11.gemfile
+      rvm: 2.5.1
+    - gemfile: gemfiles/rails_5_2_opal_0_11.gemfile
+      rvm: 2.5.1
+
+  allow_failures:
+    - gemfile: gemfiles/rails_4_2_opal_master.gemfile
+      rvm: 2.3.7
+    - gemfile: gemfiles/rails_5_0_opal_master.gemfile
+      rvm: 2.4.4
+    - gemfile: gemfiles/rails_5_1_opal_master.gemfile
+      rvm: 2.5.1
+    - gemfile: gemfiles/rails_5_2_opal_master.gemfile
+      rvm: 2.5.1
 
 before_script: bundle install
 script: "bundle exec rake"

data/Appraisals

@@ -4,14 +4,18 @@ ruby_2_4_0 = Gem::Version.new('2.4.0')
 
 ENV['OPAL_VERSION'] = nil # ensure the env is clean
 
+github = -> repo_name { "https://github.com/#{repo_name}.git" }
+
 {
   opal_master: -> gemfile do
-    gemfile.gem 'opal', github: 'opal', branch: :master
-    gemfile.gem 'opal-rspec', github: 'opal/opal-rspec', branch: 'elia/opal-master'
-    gemfile.gem 'opal-sprockets', github: 'opal/opal-sprockets', branch: :master
+    gemfile.gem 'opal', git: github['opal/opal'], branch: :master
+    gemfile.gem 'opal-rspec', git: github['opal/opal-rspec'], branch: :master
+    gemfile.gem 'opal-sprockets', git: github['opal/opal-sprockets'], branch: :master
   end,
-  opal_0_10: -> gemfile do
-    gemfile.gem 'opal', '~> 0.10.5'
+  opal_0_11: -> gemfile do
+    gemfile.gem 'opal', '~> 0.11.0'
+    gemfile.gem 'opal-rspec', git: github['opal/opal-rspec'], branch: :master
+    gemfile.gem 'opal-sprockets'
   end,
 }.each do |opal_version, gem_opal|
   appraise "rails-4-1-#{opal_version}" do
@@ -34,4 +38,9 @@ ENV['OPAL_VERSION'] = nil # ensure the env is clean
     gem "rails", "~> 5.1.0"
     gem_opal[self]
   end if current_ruby >= ruby_2_2_2
+
+  appraise "rails-5-2-#{opal_version}" do
+    gem "rails", "~> 5.2.0"
+    gem_opal[self]
+  end if current_ruby >= ruby_2_2_2
 end

data/CHANGELOG.md

@@ -21,7 +21,23 @@ Whitespace conventions:
 
 
 
-## [0.9.4](https://github.com/opal/opal-rails/compare/v0.9.3...HEAD) - 2018-02-13
+## [0.9.5](https://github.com/opal/opal-rails/compare/v0.9.4...v0.9.5) - 2018-09-07
+
+
+### Added
+
+- Added support for inline source-maps provided by opal-sprockets 0.4.2+
+- Added Rails 5.2 to the test matrix
+
+
+### Removed
+
+- Removed support for Opal v0.10
+
+
+
+
+## [0.9.4](https://github.com/opal/opal-rails/compare/v0.9.3...v0.9.4) - 2018-02-13
 
 
 ### Changed

data/Gemfile

@@ -7,7 +7,7 @@ end
 
 if ENV['OPAL_VERSION'] == 'master'
   gem 'opal', github: 'opal', branch: :master
-  gem 'opal-rspec', github: 'opal/opal-rspec', branch: 'elia/opal-master'
+  gem 'opal-rspec', github: 'opal/opal-rspec', branch: :master
   gem 'opal-sprockets', github: 'opal/opal-sprockets', branch: :master
 end
 

data/gemfiles/rails_4_2_opal_0_11.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.2.7"
+gem "opal", "~> 0.11.0"
+gem "opal-rspec", git: "https://github.com/opal/opal-rspec.git", branch: :master
+gem "opal-sprockets"
+
+gemspec path: "../"

data/gemfiles/rails_4_2_opal_master.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.2.7"
+gem "opal", git: "https://github.com/opal/opal.git", branch: :master
+gem "opal-rspec", git: "https://github.com/opal/opal-rspec.git", branch: :master
+gem "opal-sprockets", git: "https://github.com/opal/opal-sprockets.git", branch: :master
+
+gemspec path: "../"

data/gemfiles/rails_5_0_opal_0_11.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 5.0.0"
+gem "opal", "~> 0.11.0"
+gem "opal-rspec", git: "https://github.com/opal/opal-rspec.git", branch: :master
+gem "opal-sprockets"
+
+gemspec path: "../"

data/gemfiles/rails_5_0_opal_master.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 5.0.0"
+gem "opal", git: "https://github.com/opal/opal.git", branch: :master
+gem "opal-rspec", git: "https://github.com/opal/opal-rspec.git", branch: :master
+gem "opal-sprockets", git: "https://github.com/opal/opal-sprockets.git", branch: :master
+
+gemspec path: "../"

data/gemfiles/rails_5_1_opal_0_11.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 5.1.0"
+gem "opal", "~> 0.11.0"
+gem "opal-rspec", git: "https://github.com/opal/opal-rspec.git", branch: :master
+gem "opal-sprockets"
+
+gemspec path: "../"

data/gemfiles/rails_5_1_opal_master.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 5.1.0"
+gem "opal", git: "https://github.com/opal/opal.git", branch: :master
+gem "opal-rspec", git: "https://github.com/opal/opal-rspec.git", branch: :master
+gem "opal-sprockets", git: "https://github.com/opal/opal-sprockets.git", branch: :master
+
+gemspec path: "../"

data/gemfiles/rails_5_2_opal_0_11.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 5.2.0"
+gem "opal", "~> 0.11.0"
+gem "opal-rspec", git: "https://github.com/opal/opal-rspec.git", branch: :master
+gem "opal-sprockets"
+
+gemspec path: "../"

data/gemfiles/rails_5_2_opal_master.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 5.2.0"
+gem "opal", git: "https://github.com/opal/opal.git", branch: :master
+gem "opal-rspec", git: "https://github.com/opal/opal-rspec.git", branch: :master
+gem "opal-sprockets", git: "https://github.com/opal/opal-sprockets.git", branch: :master
+
+gemspec path: "../"

data/lib/opal/rails/engine.rb

@@ -34,14 +34,16 @@ module Opal
           Opal::Config.send(key, value) if Opal::Config.respond_to? key
         end
 
-        app.routes.prepend do
-          if Opal::Config.source_map_enabled && config.assets.compile && config.assets.debug
-            maps_prefix = '/__OPAL_SOURCE_MAPS__'
-            maps_app    = Opal::SourceMapServer.new(app.assets, maps_prefix)
+        if defined?(Opa::SourceMapServer)
+          app.routes.prepend do
+            if Opal::Config.source_map_enabled && config.assets.compile && config.assets.debug
+              maps_prefix = '/__OPAL_SOURCE_MAPS__'
+              maps_app    = Opal::SourceMapServer.new(app.assets, maps_prefix)
 
-            ::Opal::Sprockets::SourceMapHeaderPatch.inject!(maps_prefix)
+              ::Opal::Sprockets::SourceMapHeaderPatch.inject!(maps_prefix)
 
-            mount maps_app => maps_prefix
+              mount maps_app => maps_prefix
+            end
           end
         end
       end

data/lib/opal/rails/version.rb

@@ -1,5 +1,5 @@
 module Opal
   module Rails
-    VERSION = '0.9.4'
+    VERSION = '0.9.5'
   end
 end

data/opal-rails.gemspec

@@ -29,9 +29,9 @@ Gem::Specification.new do |s|
   s.add_dependency 'sprockets-rails',     '>= 2.3.3', '< 4.0'
   s.add_dependency 'jquery-rails'
 
-  s.add_dependency 'opal',                '>= 0.10.0', '< 0.12'
+  s.add_dependency 'opal',                '>= 0.11.0', '< 0.12'
   s.add_dependency 'opal-jquery',         '~> 0.4.0'
-  s.add_dependency 'opal-sprockets',      '~> 0.4.1'
+  s.add_dependency 'opal-sprockets',      '~> 0.4.2'
   s.add_dependency 'opal-activesupport',  '>= 0.0.5'
 
   s.add_development_dependency 'execjs'
@@ -41,6 +41,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec-rails'
   s.add_development_dependency 'appraisal', '~> 2.1'
   s.add_development_dependency 'sqlite3'
-  s.add_development_dependency 'capybara-webkit'
   s.add_development_dependency 'puma'
 end

data/spec/integration/assigns_spec.rb

@@ -47,7 +47,7 @@ describe 'controller assignments' do
 
   def get_source_of path
     get path
-    response.should be_success
+    response.should be_successful
     source = response.body
   end
 

data/spec/integration/source_map_spec.rb

@@ -1,3 +1,4 @@
+require 'base64'
 require 'spec_helper'
 require 'opal/source_map'
 
@@ -9,35 +10,33 @@ describe Opal::SourceMap do
     expect(Rails.application.config.assets.compile).to be_truthy
     expect(Rails.application.assets).to be_present
     expect(Rails.application.config.assets.debug).to be_truthy
-    get js_asset_path
   end
 
-  let(:map_path) { extract_map_path(response) }
-
   let(:map_body) do
-    get map_path
-    expect(response).to be_success, "url: #{map_path}\nstatus: #{response.status}"
-    response.body
-  end
+    get js_asset_path
 
-  let(:map) { JSON.parse(map_body) }
+    inline_map_prefix = '//# sourceMappingURL=data:application/json;base64,'
 
-  it 'has the source map header or magic comment' do
-    expect(extract_map_path(response)).to be_present
-  end
+    if response.body.lines.last.start_with? inline_map_prefix
+      Base64.decode64(response.body.lines.last.split(inline_map_prefix, 2)[1])
+    else
+      source_map_regexp = %r{^//[@#] sourceMappingURL=([^\n]+)}
+      header_map_path = response.headers['X-SourceMap'].presence
+      comment_map_path = response.body.scan(source_map_regexp).flatten.first.to_s.strip.presence
+
+      map_path = header_map_path || comment_map_path
 
-  it "the map is a valid json" do
-    get map_path
-    %w[sources mappings].each do |key|
-      expect(map_body[key]).to be_present
+      get map_path
+      expect(response).to be_successful, "url: #{map_path}\nstatus: #{response.status}"
+      response.body
     end
   end
 
-  def extract_map_path response
-    source_map_regexp = %r{^//[@#] sourceMappingURL=([^\n]+)}
-    header_map_path = response.headers['X-SourceMap'].presence
-    comment_map_path = response.body.scan(source_map_regexp).flatten.first.to_s.strip.presence
+  let(:map) { JSON.parse(map_body, symbolize_names: true) }
 
-    header_map_path or comment_map_path
+  it 'has the source map be there' do
+    expect(map).to be_present
+    expect(map[:sources]).to be_present
+    expect(map[:mappings]).to be_present
   end
 end

data/spec/integration/template_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'template handler' do
   it 'has the correct content type' do
     get '/application/with_assignments.js'
-    expect(response).to be_success
+    expect(response).to be_successful
     expect(response.headers['Content-Type']).to eq('text/javascript; charset=utf-8')
   end
 end

data/test_apps/application_controller.rb

@@ -44,3 +44,9 @@ class ApplicationController < ActionController::Base
     render type: :js, locals: { local_var: 'i am local' }
   end
 end
+
+Rails.logger = Logger.new(STDOUT) if $DEBUG
+
+require 'opal/sprockets/version'
+p rails: Rails.version, opal: Opal::VERSION, ruby: RUBY_VERSION, opal_sprockets: Opal::Sprockets::VERSION
+

data/test_apps/rails5.rb

@@ -21,6 +21,10 @@ module RailsApp
     config.active_support.deprecation                 = :stderr
     config.secret_key_base                            = '49837489qkuweoiuoqwe'
 
+    if config.active_record.sqlite3
+      config.active_record.sqlite3.represent_boolean_as_integer = true
+    end
+
     config.middleware.delete Rack::Lock
     config.middleware.delete ActionDispatch::Flash
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal-rails
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Elia Schito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-14 00:00:00.000000000 Z
+date: 2018-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -70,7 +70,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.12'
@@ -80,7 +80,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 0.11.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '0.12'
@@ -104,14 +104,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: opal-activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -224,20 +224,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: capybara-webkit
-  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: puma
   requirement: !ruby/object:Gem::Requirement
@@ -270,6 +256,14 @@ files:
 - Rakefile
 - app/helpers/opal_helper.rb
 - config.ru
+- gemfiles/rails_4_2_opal_0_11.gemfile
+- gemfiles/rails_4_2_opal_master.gemfile
+- gemfiles/rails_5_0_opal_0_11.gemfile
+- gemfiles/rails_5_0_opal_master.gemfile
+- gemfiles/rails_5_1_opal_0_11.gemfile
+- gemfiles/rails_5_1_opal_master.gemfile
+- gemfiles/rails_5_2_opal_0_11.gemfile
+- gemfiles/rails_5_2_opal_master.gemfile
 - lib/assets/javascripts/opal_ujs.js.rb
 - lib/opal-rails.rb
 - lib/opal/rails.rb
@@ -319,7 +313,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: opal-rails
-rubygems_version: 2.7.4
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Rails bindings for opal JS engine