opal-rails 0.9.1 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36eac0db3f7ca54d4e90348a784fc39719be3524
-  data.tar.gz: db4a917040f7c9869303fa76131dde1f297135d3
+  metadata.gz: d45a6c9723969146b15e0ad972edf6404c9be369
+  data.tar.gz: bb9b728766323da3fecfc62055798e56d73edcd2
 SHA512:
-  metadata.gz: c79a5503e7c54e39c83f71349e053a5cb5c3eca1d6d1cc93847813b560f14fb05396fa885562ea088b36db64a573b6f788adf82096413a53926f5f4d6aa17722
-  data.tar.gz: 78332734b60237a4e77a6797d76c659bf6b9e5b3013098973c93c33d53bff27dd3a2127d87d37f3945887e2ff40ebe59ac577b865f0d229f4459fe83e35ff237
+  metadata.gz: 0eb449a56a0939671ead5111a45afcdfd60535aa20b50277d1b9ba79b43251d1b7b60b9e11614588bb3608ec12b7163a52928945c8dd65d02e1c883018fa7213
+  data.tar.gz: 0b1acc765c5abf1d3f286990ec792a2caff104b01d9e260facfbd62b93e234f46ec0644ffe2e49c1c8b30c4869eae307e82f22904bf59e5f039fe4f047f474d1

data/.travis.yml

@@ -6,14 +6,14 @@ cache:
   bundler: true
 
 rvm:
+  - 2.4.0
   - 2.3.3
   - 2.2.4
   - 2.1.10
-  - 2.0.0
 
 before_script:
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
+  # - "export DISPLAY=:99.0"
+  # - "sh -e /etc/init.d/xvfb start"
   - "gem install appraisal"
   - "appraisal install"
 

data/Appraisals

@@ -1,11 +1,20 @@
+current_ruby = Gem::Version.new(RUBY_VERSION)
+ruby_2_2_2 = Gem::Version.new('2.2.2')
+ruby_2_4_0 = Gem::Version.new('2.4.0')
+
 appraise "rails-4-1" do
-  gem "rails", "~> 4.1.14"
-end
+  gem "rails", "~> 4.1.16"
+  gem "sprockets-rails", "< 3"
+end if current_ruby < ruby_2_4_0
 
 appraise "rails-4-2" do
-  gem "rails", "~> 4.2.5"
+  gem "rails", "~> 4.2.7"
 end
 
-appraise "rails-5" do
+appraise "rails-5-0" do
   gem "rails", "~> 5.0.0"
-end if  Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.2.2')
+end if current_ruby >= ruby_2_2_2
+
+appraise "rails-5-1" do
+  gem "rails", "~> 5.1.0"
+end if current_ruby >= ruby_2_2_2

data/CHANGELOG.md

@@ -15,13 +15,38 @@ Changes are grouped as follows:
 Whitespace conventions:
 - 4 spaces before ## titles
 - 2 spaces before ### titles
-- 2 spaces before ### titles
 - 1 spaces before normal text
  -->
 
 
 
 
+## [0.9.3] - 2017-05-08
+
+
+### Added
+
+- Support for async in `javascript_include_tag` by attaching Opal bootstrap code in the `onload` attribute instead of using a separate tag (the previous behaviour is still available by passing `force_opal_loader_tag: true` to `javascript_include_tag`).
+
+
+### Changed
+
+- `javascript_include_tag` no longer adds an extra javascript tag for the Opal bootstrapping code by default (See *Added* above).
+
+
+
+
+## ~~[0.9.2] - 2017-04-22~~
+
+*yanked: due to an error that prevented the generation of the loading code only in production*
+
+### Added
+
+- Added support for `sprockets-rails` v3
+
+
+
+
 ## [0.9.1] - 2016-11-30
 
 
@@ -37,6 +62,7 @@ Whitespace conventions:
 
 
 
+
 ## [0.9.0] - 2016-06-16
 
 
@@ -75,6 +101,8 @@ Whitespace conventions:
 - All specs now need to `require "opal"` and `require "opal-rspec"` explicitly
 
 
+
+
 ## [0.7.0] - 2015-02-02
 
 - Opal v0.7
@@ -84,6 +112,8 @@ Whitespace conventions:
 - Add a view rails generator `rails g opal:assets` to generate example view classes.
 
 
+
+
 ## [0.6.3] - 2014-03-07
 
 - Add `opal_tag` helper, similar to `javascript_tag`
@@ -91,6 +121,8 @@ Whitespace conventions:
 - Updated to Opal v0.6
 
 
+
+
 ## [0.6.2] - 2013-12-13
 
 - Added fun
@@ -98,11 +130,15 @@ Whitespace conventions:
 - Rely on `Opal::Processor` to know if source maps are enabled
 
 
+
+
 ## [0.6.1] - 2013-11-05
 
 - Fix the rake task, now uses `opal-rspec` too
 
 
+
+
 ## [0.6.0] - 2013-11-05
 
 - Don't load source maps if they're not enabled via `config.opal.source_map_enabled`
@@ -110,6 +146,8 @@ Whitespace conventions:
 - Run in-browser specs with `opal-rspec`
 
 
+
+
 ## [0.5.2] - 2013-09-05
 
 - Add `opal-activesupport` as a dependency
@@ -117,11 +155,15 @@ Whitespace conventions:
 - Add the `rake opal:spec` task to run browser specs from the terminal (requires phantomjs)
 
 
+
+
 ## [0.5.1] - 2013-07-02
 
 - `.js` suffix is now optional for in-browser specs
 
 
+
+
 ## [0.5.0] - 2013-06-30
 
 - Add support for source-maps
@@ -129,6 +171,8 @@ Whitespace conventions:
 - migrate `#to_native` to the new signature: `#to_n`
 
 
+
+
 ## [0.4.0] - 2013-06-03
 
 - Add `Rails.application.config.opal` which accepts:
@@ -140,11 +184,15 @@ Whitespace conventions:
 - Add the Changelog
 
 
+
+
 ## [0.3.8] - 2013-05-07
 
 - Add `opal/rails` alongside to `opal-rails` for older bundlers autorequire
 
 
+
+
 ## [0.3.7] - 2013-05-04
 
 - Rails 4.0.0 support
@@ -154,7 +202,8 @@ Whitespace conventions:
 
 
 
-[Unreleased]: https://github.com/opal/opal-rails/compare/v0.9.1...HEAD
+[Unreleased]: https://github.com/opal/opal-rails/compare/v0.9.2...HEAD
+[0.9.2]: https://github.com/opal/opal-rails/compare/v0.9.1...v0.9.2
 [0.9.1]: https://github.com/opal/opal-rails/compare/v0.9.0...v0.9.1
 [0.9.0]: https://github.com/opal/opal-rails/compare/v0.8.1...v0.9.0
 [0.8.1]: https://github.com/opal/opal-rails/compare/v0.8.0...v0.8.1

data/app/helpers/opal_helper.rb

@@ -9,17 +9,23 @@ module OpalHelper
 
   def javascript_include_tag(*sources)
     options = sources.extract_options!
-    sprockets = Rails.application.assets
     skip_loader = options.delete(:skip_opal_loader)
-    script_tags = super(*sources, options)
+    skip_onload = options.delete(:force_opal_loader_tag)
+    debug = options["debug"] != false && request_debug_assets? # taken from spro
 
-    return script_tags if skip_loader
+    return super(*sources, options) if skip_loader
 
+    script_tags = "".html_safe
     sources.each do |source|
-      loading_code = Opal::Sprockets.load_asset(source, sprockets)
-      script_tags << javascript_tag(loading_code) if loading_code.present?
-    end
+      loading_code = Opal::Sprockets.load_asset(source)
 
+      if skip_onload
+        script_tags << super(source, options)
+        script_tags << javascript_tag(loading_code)
+      else
+        script_tags << super(source, options.merge(onload: loading_code))
+      end
+    end
     script_tags
   end
 end

data/lib/opal/rails/engine.rb

@@ -20,10 +20,8 @@ module Opal
         app.config.eager_load_paths = app.config.eager_load_paths.dup - Dir["#{app.root}/app/{assets,views}"]
       end
 
-      initializer 'opal.asset_paths', :after => 'sprockets.environment', :group => :all do |app|
-        Opal.paths.each do |path|
-          app.assets.append_path path
-        end
+      initializer 'opal.append_assets_path', after: :append_assets_path, group: :all do |app|
+        app.config.assets.paths.unshift(*Opal.paths)
       end
 
       config.after_initialize do |app|

data/lib/opal/rails/version.rb

@@ -1,5 +1,5 @@
 module Opal
   module Rails
-    VERSION = '0.9.1'
+    VERSION = '0.9.3'
   end
 end

data/lib/rails/generators/opal/assets/templates/javascript.js.rb

@@ -30,10 +30,12 @@ class <%= class_name %>View
 
   attr_reader :selector, :element
 
-  # Look for elements in the scope of the base selector
-  def find(selector)
-    Element.find("#{@selector} #{selector}")
-  end
+  # Uncomment the following method to look for elements in the scope of the
+  # base selector:
+  #
+  # def find(selector)
+  #   Element.find("#{@selector} #{selector}")
+  # end
 
   # Register events on document to save memory and be friends to Turbolinks
   def on(event, selector = nil, &block)

data/opal-rails.gemspec

@@ -11,10 +11,10 @@ Gem::Specification.new do |s|
   s.summary     = %q{Rails bindings for opal JS engine}
   s.description = %q{Rails bindings for opal JS engine}
   s.license     = 'MIT-LICENSE'
-  s.post_install_message = [
-   "BEWARE: Spec support is being extracted from `opal-rails` into `opal-rspec-rails`",
-   "        Please use `opal-rspec-rails` or the 0-8-stable branch."
-  ].join("\n")
+  # s.post_install_message = [
+  #  "BEWARE: Spec support is being extracted from `opal-rails` into `opal-rspec-rails`",
+  #  "        Please use `opal-rspec-rails` or the 0-8-stable branch."
+  # ].join("\n")
 
   s.rubyforge_project = 'opal-rails'
 
@@ -23,22 +23,24 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  required_ruby_version = '>= 1.9.3'
+  required_ruby_version = '>= 2.1'
 
-  s.add_dependency 'rails',               '>= 4.0', '< 6.0'
-  s.add_dependency 'sprockets-rails',     '< 3.0'
+  s.add_dependency 'rails',               '>= 4.1', '< 6.0'
+  s.add_dependency 'sprockets-rails',     '>= 2.3.3', '< 4.0'
   s.add_dependency 'jquery-rails'
 
   s.add_dependency 'opal',                '>= 0.8.0', '< 0.11'
   s.add_dependency 'opal-jquery',         '~> 0.4.0'
-  s.add_dependency 'opal-sprockets',      '~> 0.4.0'
+  s.add_dependency 'opal-sprockets',      '~> 0.4.1'
   s.add_dependency 'opal-activesupport',  '>= 0.0.5'
 
   s.add_development_dependency 'execjs'
   s.add_development_dependency 'launchy'
   s.add_development_dependency 'capybara', '~> 2.3'
+  s.add_development_dependency 'poltergeist', '~> 1.15.0'
   s.add_development_dependency 'rspec-rails', '~> 3.0'
   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/helpers/opal_helper_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
-describe OpalHelper do
-  subject(:helper) { double.extend described_class }
+describe OpalHelper, type: :helper do
+  # subject(:helper) { double(javascript_include_tag: '<super>').extend described_class }
 
   describe '#opal_tag' do
     it 'compiles to js' do
@@ -12,7 +12,25 @@ describe OpalHelper do
         .with(ruby_code, hash_including(requirable: false))
         .and_call_original
 
-      expect(helper.opal_tag(ruby_code)).to include('.$puts(')
+      expect(helper.opal_tag(ruby_code)).to include('self.$puts(5)')
     end
   end
+
+  specify '#javascript_include_tag' do
+    # sprockets-rails v3 sets Rails.application.assets to nil in production mode
+    allow(Rails.application).to receive(:assets).and_return(nil)
+
+    loading_code = %Q{Opal.load("application");}
+    escaped_loading_code = ERB::Util.h loading_code
+
+    expect(helper.javascript_include_tag('application', debug: true)).to  include(escaped_loading_code)
+    expect(helper.javascript_include_tag('application', debug: false)).to include(escaped_loading_code)
+    expect(helper.javascript_include_tag('application', skip_opal_loader: true)).not_to include(escaped_loading_code)
+    expect(helper.javascript_include_tag('application', skip_opal_loader: true)).not_to include(escaped_loading_code)
+
+    expect(helper.javascript_include_tag('application', force_opal_loader_tag: true, debug: true)).to  include(loading_code)
+    expect(helper.javascript_include_tag('application', force_opal_loader_tag: true, debug: false)).to include(loading_code)
+    expect(helper.javascript_include_tag('application', force_opal_loader_tag: true, skip_opal_loader: true)).not_to include(loading_code)
+    expect(helper.javascript_include_tag('application', force_opal_loader_tag: true, skip_opal_loader: true)).not_to include(loading_code)
+  end
 end

data/spec/integration/js_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+require 'support/capybara'
+
+RSpec.describe 'The example app', type: :feature, js: true do
+  it 'loads Opal' do
+    visit '/'
+    expect(page.evaluate_script('window.opal_loaded === true')).to eq(true)
+  end
+end

data/spec/integration/source_map_spec.rb

@@ -7,6 +7,7 @@ describe Opal::SourceMap do
   before do
     expect(Rails.application.config.opal.source_map_enabled).to be_truthy
     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

data/spec/support/capybara.rb

@@ -1,4 +1,16 @@
 require 'capybara/rspec'
 
-require 'capybara-webkit'
-Capybara.javascript_driver = :webkit
+require 'capybara/poltergeist'
+
+
+PoltergeistConsole = StringIO.new
+
+RSpec.configure do |config|
+  config.before { PoltergeistConsole.reopen }
+end
+
+Capybara.register_driver :poltergeist do |app|
+  Capybara::Poltergeist::Driver.new(app, phantomjs_logger: PoltergeistConsole)
+end
+
+Capybara.javascript_driver = :poltergeist

data/test_apps/application_controller.rb

@@ -8,14 +8,17 @@ HTML
 
 INDEX = <<-HTML
 <script type="text/ruby">
-raise 'pippo'
+puts 'hello from a script tag!'
 </script>
 HTML
 
 WITH_ASSIGNMENTS = File.read "#{__dir__}/assets/javascripts/with_assignments.js.rb"
 
+require_relative '../app/helpers/opal_helper'
+
 class ApplicationController < ActionController::Base
   include Rails.application.routes.url_helpers
+  helper OpalHelper
   layout 'application'
   self.view_paths = [ActionView::FixtureResolver.new(
     'layouts/application.html.erb'         => LAYOUT,

data/test_apps/assets/javascripts/application.js.rb

@@ -3,3 +3,4 @@ require 'opal_ujs'
 require 'opal-parser'
 
 require_tree '.'
+`window.opal_loaded = true`

data/test_apps/rails5.rb

@@ -12,7 +12,7 @@ module RailsApp
     config.root                                       = __dir__
     config.cache_classes                              = true
     config.eager_load                                 = false
-    config.serve_static_files                         = true
+    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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal-rails
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.3
 platform: ruby
 authors:
 - Elia Schito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-30 00:00:00.000000000 Z
+date: 2017-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
         version: '6.0'
@@ -34,16 +34,22 @@ dependencies:
   name: sprockets-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.3.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        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: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -98,14 +104,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: opal-activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -162,6 +168,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: poltergeist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.15.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.15.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -218,6 +238,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: puma
+  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: Rails bindings for opal JS engine
 email:
 - elia@schito.me
@@ -247,9 +281,9 @@ files:
 - lib/rails/generators/opal/assets/assets_generator.rb
 - lib/rails/generators/opal/assets/templates/javascript.js.rb
 - opal-rails.gemspec
-- script/rails
 - 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
@@ -269,9 +303,7 @@ homepage: https://github.com/opal/opal-rails#readme
 licenses:
 - MIT-LICENSE
 metadata: {}
-post_install_message: |-
-  BEWARE: Spec support is being extracted from `opal-rails` into `opal-rspec-rails`
-          Please use `opal-rspec-rails` or the 0-8-stable branch.
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -287,13 +319,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: opal-rails
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Rails bindings for opal JS engine
 test_files:
 - 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

data/script/rails

@@ -1,8 +0,0 @@
-#!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
-
-ENGINE_ROOT = File.expand_path('../..', __FILE__)
-ENGINE_PATH = File.expand_path('../../lib/opal/rails/engine', __FILE__)
-
-require 'rails/all'
-require 'rails/engine/commands'