opal-rails 1.0.1 → 2.0.1

data/spec/integration/source_map_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 require 'opal/source_map'
 
 describe Opal::SourceMap do
-  let(:js_asset_path) { '/assets/source_map_example.self.js' }
+  let(:js_asset_path) { '/assets/source_map_example.debug.js' }
 
   before do
     expect(Rails.application.config.opal.source_map_enabled).to be_truthy
@@ -21,13 +21,16 @@ describe Opal::SourceMap do
       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
+      map_path = (header_map_path || comment_map_path)&.strip
+
+      get URI.join("http://example.com/", js_asset_path, map_path).path
 
-      get map_path
       expect(response).to be_successful, "url: #{map_path}\nstatus: #{response.status}"
+
       response.body
     end
   end
@@ -36,7 +39,8 @@ describe Opal::SourceMap do
 
   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
+    expect(map[:sections].size).to eq(1)
+    expect(map[:sections][0][:map][:sources]).to be_present
+    expect(map[:sections][0][:map][:mappings]).to be_present
   end
 end

data/test_apps/{application_controller.rb → app/application_controller.rb}

@@ -14,7 +14,7 @@ HTML
 
 WITH_ASSIGNMENTS = File.read "#{__dir__}/assets/javascripts/with_assignments.js.rb"
 
-require_relative '../app/helpers/opal_helper'
+require_relative '../../app/helpers/opal_helper'
 
 class ApplicationController < ActionController::Base
   include Rails.application.routes.url_helpers

data/test_apps/app/assets/config/manifest.js

@@ -0,0 +1 @@
+//= link_directory ../javascripts .js

data/test_apps/{assets → app/assets}/javascripts/application.js.rb

@@ -1,6 +1,7 @@
 require 'opal'
 require 'opal_ujs'
 require 'opal-parser'
+require 'json'
 
 require_tree '.'
 `window.opal_loaded = true`

data/test_apps/rails6.rb

@@ -1,6 +1,5 @@
 # FROM: http://www.rubytutorial.io/how-to-test-your-gem-against-multiple-rails/
 
-# test/apps/rails5.rb
 require 'rails'
 require 'rails/all'
 require 'action_view/testing/resolvers'
@@ -37,7 +36,6 @@ module RailsApp
       get '/favicon.ico' => -> { [404,{},[]] }
     end
 
-    config.assets.paths << File.join(__dir__, 'assets/javascripts')
     config.assets.debug = true
     config.assets.digest = true
 
@@ -46,5 +44,5 @@ module RailsApp
   end
 end
 
-require_relative './application_controller'
+require_relative './app/application_controller'
 RailsApp::Application.initialize!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal-rails
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.1
 platform: ruby
 authors:
 - Elia Schito
-autorequire: 
-bindir: bin
+autorequire:
+bindir: exe
 cert_chain: []
-date: 2019-09-07 00:00:00.000000000 Z
+date: 2021-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,110 +16,62 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7'
 - !ruby/object:Gem::Dependency
   name: sprockets-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.3.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: jquery-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: opal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: opal-jquery
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: opal-sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.6
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.6
-- !ruby/object:Gem::Dependency
-  name: opal-activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: execjs
   requirement: !ruby/object:Gem::Requirement
@@ -239,7 +191,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/main.yml"
+- ".github/workflows/build.yml"
 - ".gitignore"
 - ".powder"
 - ".rspec"
@@ -249,14 +201,27 @@ files:
 - README.md
 - Rakefile
 - app/helpers/opal_helper.rb
+- bin/rackup
+- bin/rails
+- bin/rails-engine
+- bin/rails-sandbox
+- bin/rake
+- bin/rspec
+- bin/sandbox
+- bin/sandbox-setup
+- bin/setup
 - config.ru
-- gemfiles/rails_5_1_opal_1_0.gemfile
-- gemfiles/rails_5_1_opal_master.gemfile
-- gemfiles/rails_5_2_opal_1_0.gemfile
-- gemfiles/rails_5_2_opal_master.gemfile
 - gemfiles/rails_6_0_opal_1_0.gemfile
-- gemfiles/rails_6_0_opal_master.gemfile
+- gemfiles/rails_6_0_opal_1_1.gemfile
+- gemfiles/rails_6_1_opal_1_0.gemfile
+- gemfiles/rails_6_1_opal_1_1.gemfile
 - lib/assets/javascripts/opal_ujs.js.rb
+- lib/generators/opal/assets/assets_generator.rb
+- lib/generators/opal/assets/templates/javascript.js.rb
+- lib/generators/opal/install/USAGE
+- lib/generators/opal/install/install_generator.rb
+- lib/generators/opal/install/templates/application.js.rb
+- lib/generators/opal/install/templates/initializer.rb
 - lib/opal-rails.rb
 - lib/opal/rails.rb
 - lib/opal/rails/engine.rb
@@ -264,32 +229,32 @@ files:
 - lib/opal/rails/slim_filter.rb
 - lib/opal/rails/template_handler.rb
 - lib/opal/rails/version.rb
-- lib/rails/generators/opal/assets/assets_generator.rb
-- lib/rails/generators/opal/assets/templates/javascript.js.rb
 - opal-rails.gemspec
 - spec/helpers/opal_helper_spec.rb
 - spec/integration/assigns_spec.rb
 - spec/integration/js_spec.rb
 - spec/integration/source_map_spec.rb
-- spec/integration/template_spec.rb
 - spec/spec_helper.rb
 - spec/support/capybara.rb
 - spec/support/reset_assets_cache.rb
 - spec/support/reset_config.rb
 - spec/support/test_app.rb
-- test_apps/application_controller.rb
-- test_apps/assets/javascripts/application.js.rb
-- test_apps/assets/javascripts/bar.rb
-- test_apps/assets/javascripts/foo.js.rb
-- test_apps/assets/javascripts/source_map_example.js.rb
-- test_apps/assets/javascripts/with_assignments.js.rb
-- test_apps/rails5.rb
+- test_apps/app/application_controller.rb
+- test_apps/app/assets/config/manifest.js
+- test_apps/app/assets/javascripts/application.js.rb
+- test_apps/app/assets/javascripts/bar.rb
+- test_apps/app/assets/javascripts/foo.js.rb
+- test_apps/app/assets/javascripts/source_map_example.js.rb
+- test_apps/app/assets/javascripts/with_assignments.js.rb
 - test_apps/rails6.rb
 homepage: https://github.com/opal/opal-rails#readme
 licenses:
 - MIT-LICENSE
-metadata: {}
-post_install_message: 
+metadata:
+  homepage_uri: https://github.com/opal/opal-rails#readme
+  source_code_uri: https://github.com/opal/opal-rails#readme
+  changelog_uri: https://github.com/opal/opal-rails/blob/master/CHANGELOG.md
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -297,15 +262,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Rails bindings for opal JS engine
 test_files:
@@ -313,7 +278,6 @@ test_files:
 - spec/integration/assigns_spec.rb
 - spec/integration/js_spec.rb
 - spec/integration/source_map_spec.rb
-- spec/integration/template_spec.rb
 - spec/spec_helper.rb
 - spec/support/capybara.rb
 - spec/support/reset_assets_cache.rb

data/gemfiles/rails_5_1_opal_1_0.gemfile

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

data/gemfiles/rails_5_1_opal_master.gemfile

@@ -1,11 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "c_lexer"
-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_1_0.gemfile

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

data/gemfiles/rails_5_2_opal_master.gemfile

@@ -1,11 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "c_lexer"
-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/gemfiles/rails_6_0_opal_master.gemfile

@@ -1,11 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "c_lexer"
-gem "rails", "~> 6.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/lib/rails/generators/opal/assets/assets_generator.rb

@@ -1,12 +0,0 @@
-require 'rails/generators/named_base'
-
-module Opal
-  module Generators
-    class AssetsGenerator < ::Rails::Generators::NamedBase
-      source_root __dir__+'/templates'
-      def copy_opal
-        template 'javascript.js.rb', File.join('app/assets/javascripts', class_path, "#{file_name}.js.rb")
-      end
-    end
-  end
-end

data/spec/integration/template_spec.rb

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

data/test_apps/rails5.rb

@@ -1,50 +0,0 @@
-# FROM: http://www.rubytutorial.io/how-to-test-your-gem-against-multiple-rails/
-
-# test/apps/rails5.rb
-require 'rails'
-require 'rails/all'
-require 'action_view/testing/resolvers'
-
-require 'opal-rails' # our gem
-
-module RailsApp
-  class Application < Rails::Application
-    config.root                                       = __dir__
-    config.cache_classes                              = true
-    config.eager_load                                 = false
-    config.public_file_server.enabled                 = true
-    config.public_file_server.headers                 = { 'Cache-Control' => 'public, max-age=3600' }
-    config.consider_all_requests_local                = true
-    config.action_controller.perform_caching          = false
-    config.action_dispatch.show_exceptions            = false
-    config.action_controller.allow_forgery_protection = false
-    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
-
-    routes.append do
-      get '/' => 'application#index'
-      get '/application/with_assignments' => 'application#with_assignments'
-
-      # just to reduce noise
-      get '/apple-touch-icon-precomposed.png' => -> { [404,{},[]] }
-      get '/favicon.ico' => -> { [404,{},[]] }
-    end
-
-    config.assets.paths << File.join(__dir__, 'assets/javascripts')
-    config.assets.debug = true
-    config.assets.digest = true
-
-    # Opal specific:
-    config.opal.source_map_enabled = true
-  end
-end
-
-require_relative './application_controller'
-RailsApp::Application.initialize!