opal-rails 0.8.1 → 0.9.0

data/app/helpers/opal_helper.rb

@@ -1,7 +1,7 @@
 module OpalHelper
   def opal_tag(opal_code = nil, &block)
     opal_code ||= capture(&block)
-    compiler_options = Opal::Processor.compiler_options.merge(requirable: false)
+    compiler_options = Opal::Config.compiler_options.merge(requirable: false)
     compiler = Opal::Compiler.new(opal_code, compiler_options)
     js_code = compiler.compile
     javascript_tag js_code
@@ -16,7 +16,7 @@ module OpalHelper
     return script_tags if skip_loader
 
     sources.each do |source|
-      loading_code = Opal::Processor.load_asset_code(sprockets, source)
+      loading_code = Opal::Sprockets.load_asset(source, sprockets)
       script_tags << javascript_tag(loading_code) if loading_code.present?
     end
 

data/config.ru

@@ -0,0 +1,10 @@
+# This file is used by Rack-based servers to start the application.
+
+require 'bundler/setup'
+require 'rails'
+rails_version = Rails::VERSION::MAJOR
+ENV["RAILS_ENV"] = "test"
+ENV['DATABASE_URL'] = 'sqlite3::memory:'
+require_relative "test_apps/rails#{rails_version}"
+
+run RailsApp::Application

data/lib/opal/rails.rb

@@ -1,11 +1,9 @@
 require 'opal'
 require 'opal-jquery'
 require 'opal-activesupport'
-require 'opal-rspec'
 
 require 'opal/rails/engine'
 require 'opal/rails/template_handler'
-require 'opal/rails/sprockets_cache_key_fix'
 require 'opal/rails/version'
 
 require 'jquery-rails'

data/lib/opal/rails/engine.rb

@@ -1,7 +1,6 @@
 require 'rails'
 require 'opal/sprockets/server'
 require 'opal/sprockets/processor'
-require 'opal/rails/spec_builder'
 
 module Opal
   module Rails
@@ -10,11 +9,6 @@ module Opal
 
       config.opal = ActiveSupport::OrderedOptions.new
 
-      config.opal.enable_specs = ::Rails.env.development? || ::Rails.env.test?
-
-      # new default location, override-able in a Rails initializer
-      config.opal.spec_location = 'spec-opal'
-
       config.opal.dynamic_require_severity = :ignore
 
       # Cache eager_load_paths now, otherwise the assets dir is added
@@ -26,15 +20,6 @@ module Opal
       end
 
       initializer 'opal.asset_paths', :after => 'sprockets.environment', :group => :all do |app|
-        if app.config.opal.enable_specs
-          spec_location = app.root.join(app.config.opal.spec_location).to_s
-          runner_dir = ::Opal::Rails::SpecBuilder.runner_dir(app.root)
-          runner_dir.mkpath
-
-          app.assets.append_path runner_dir.to_s
-          app.assets.append_path spec_location
-        end
-
         Opal.paths.each do |path|
           app.assets.append_path path
         end
@@ -47,11 +32,11 @@ module Opal
         config = app.config
         config.opal.each_pair do |key, value|
           key = "#{key}="
-          Opal::Processor.send(key, value) if Opal::Processor.respond_to? key
+          Opal::Config.send(key, value) if Opal::Config.respond_to? key
         end
 
         app.routes.prepend do
-          if Opal::Processor.source_map_enabled && config.assets.compile && config.assets.debug
+          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)
 
@@ -59,10 +44,6 @@ module Opal
 
             mount maps_app => maps_prefix
           end
-
-          if app.config.opal.enable_specs
-            get '/opal_spec' => 'opal_spec#run', as: :opal_spec
-          end
         end
       end
 

data/lib/opal/rails/version.rb

@@ -1,5 +1,5 @@
 module Opal
   module Rails
-    VERSION = '0.8.1'
+    VERSION = '0.9.0'
   end
 end

data/opal-rails.gemspec

@@ -11,6 +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.rubyforge_project = 'opal-rails'
 
@@ -21,16 +25,18 @@ Gem::Specification.new do |s|
 
   required_ruby_version = '>= 1.9.3'
 
-  s.add_dependency 'rails',               '>= 3.2', '< 5.0'
-  s.add_dependency 'opal',                '~> 0.8.0'
+  s.add_dependency 'rails',               '>= 4.0', '< 6.0'
+  s.add_dependency 'sprockets-rails',     '< 3.0'
+  s.add_dependency 'opal',                '>= 0.8.0', '< 0.11'
   s.add_dependency 'opal-jquery',         '~> 0.4.0'
-  s.add_dependency 'opal-rspec',          '~> 0.4.3'
   s.add_dependency 'jquery-rails'
   s.add_dependency 'opal-activesupport',  '>= 0.0.5'
-  s.add_dependency 'sprockets-rails',     '< 3.0'
 
   s.add_development_dependency 'execjs'
   s.add_development_dependency 'launchy'
-  s.add_development_dependency 'capybara',    '~> 2.3'
+  s.add_development_dependency 'capybara', '~> 2.3'
   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'
 end

data/spec/spec_helper.rb

@@ -1,19 +1,6 @@
 root_dir = File.expand_path('../../', __FILE__)
 
-
-# OPAL-RAILS
-
-$:.unshift File.expand_path('lib', root_dir)
-require 'opal-rails'
-
-
-# RAILS
-
-# Configure Rails Environment
-ENV['RAILS_ENV'] = 'test'
-
-require File.expand_path('test_app/config/environment.rb', root_dir)
-
+require 'support/test_app'
 require 'rspec/rails'
 require 'support/capybara'
 require 'support/reset_assets_cache'

data/spec/support/test_app.rb

@@ -0,0 +1,6 @@
+require 'rails'
+rails_version = Rails::VERSION::MAJOR
+ENV["RAILS_ENV"] = "test"
+ENV['DATABASE_URL'] = 'sqlite3::memory:'
+require_relative "../../test_apps/rails#{rails_version}"
+

data/test_apps/application_controller.rb

@@ -0,0 +1,52 @@
+LAYOUT = <<-HTML
+<!DOCTYPE html>
+<html>
+<head><%= javascript_include_tag "application" %></head>
+<body><%= yield %></body>
+</html>
+HTML
+
+INDEX = <<-HTML
+<script type="text/ruby">
+raise 'pippo'
+</script>
+HTML
+
+WITH_ASSIGNMENTS = <<-RUBY
+return {
+  number_var: @number_var,
+  string_var: @string_var,
+  array_var:  @array_var,
+  hash_var:   @hash_var,
+  object_var: @object_var,
+  local_var:  local_var
+}.to_n
+RUBY
+
+class ApplicationController < ActionController::Base
+  include Rails.application.routes.url_helpers
+  layout 'application'
+  self.view_paths = [ActionView::FixtureResolver.new(
+    'layouts/application.html.erb'         => LAYOUT,
+    'application/index.html.erb'           => INDEX,
+    'application/with_assignments.js.opal' => WITH_ASSIGNMENTS,
+  )]
+
+  def index
+  end
+
+  def with_assignments
+    object = Object.new
+    def object.as_json options = {}
+      {contents: 'json representation'}
+    end
+
+    @number_var = 1234
+    @string_var = 'hello'
+    @array_var  = [1,'a']
+    @hash_var   = {a: 1, b: 2}
+    @object_var = object
+
+    render type: :js, locals: { local_var: 'i am local' }
+  end
+end

data/test_apps/rails4.rb

@@ -0,0 +1,43 @@
+# FROM: http://www.rubytutorial.io/how-to-test-your-gem-against-multiple-rails/
+
+# test/apps/rails4.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.serve_static_files                         = true
+    config.static_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'
+
+    config.middleware.delete 'Rack::Lock'
+    config.middleware.delete 'ActionDispatch::Flash'
+    config.middleware.delete 'ActionDispatch::BestStandardsSupport'
+
+    routes.append do
+      get '/' => 'application#index'
+      get '/application/with_assignments' => 'application#with_assignments'
+    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!

data/test_apps/rails5.rb

@@ -0,0 +1,42 @@
+# 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.serve_static_files                         = 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'
+
+    config.middleware.delete Rack::Lock
+    config.middleware.delete ActionDispatch::Flash
+
+    routes.append do
+      get '/' => 'application#index'
+      get '/application/with_assignments' => 'application#with_assignments'
+    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!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal-rails
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Elia Schito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2016-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,62 +16,68 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: opal
+  name: sprockets-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: opal-jquery
+  name: opal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.8.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.8.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.11'
 - !ruby/object:Gem::Dependency
-  name: opal-rspec
+  name: opal-jquery
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -100,20 +106,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.5
-- !ruby/object:Gem::Dependency
-  name: sprockets-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: execjs
   requirement: !ruby/object:Gem::Requirement
@@ -170,6 +162,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  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: 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'
 description: Rails bindings for opal JS engine
 email:
 - elia@schito.me
@@ -178,84 +212,50 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".powder"
 - ".rspec"
 - ".spectator.rb"
 - ".travis.yml"
+- Appraisals
 - CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
-- app/controllers/opal_spec_controller.rb
 - app/helpers/opal_helper.rb
-- app/views/layouts/opal_spec.html.erb
-- app/views/opal_spec/run.html.erb
+- config.ru
 - lib/assets/javascripts/opal_ujs.js.rb
 - lib/opal-rails.rb
 - lib/opal/rails.rb
 - lib/opal/rails/engine.rb
 - lib/opal/rails/haml_filter.rb
 - lib/opal/rails/slim_filter.rb
-- lib/opal/rails/spec_builder.rb
-- lib/opal/rails/sprockets_cache_key_fix.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
-- lib/tasks/opal-rails_tasks.rake
 - opal-rails.gemspec
 - script/rails
 - spec/helpers/opal_helper_spec.rb
 - spec/integration/assigns_spec.rb
-- spec/integration/in_browser_specs_spec.rb
 - spec/integration/source_map_spec.rb
 - spec/spec_helper.rb
 - spec/support/capybara.rb
 - spec/support/reset_assets_cache.rb
-- test_app/.gitignore
-- test_app/Rakefile
-- test_app/app/assets/images/rails.png
-- test_app/app/assets/javascripts/application.js.rb
-- test_app/app/assets/javascripts/bar.rb
-- test_app/app/assets/javascripts/foo.js.rb
-- test_app/app/assets/javascripts/source_map_example.js.rb
-- test_app/app/assets/stylesheets/application.css
-- test_app/app/controllers/application_controller.rb
-- test_app/app/views/application/index.html.erb
-- test_app/app/views/application/with_assignments.js.opal
-- test_app/app/views/layouts/application.html.erb
-- test_app/config.ru
-- test_app/config/application.rb
-- test_app/config/boot.rb
-- test_app/config/environment.rb
-- test_app/config/environments/development.rb
-- test_app/config/environments/production.rb
-- test_app/config/environments/test.rb
-- test_app/config/initializers/backtrace_silencers.rb
-- test_app/config/initializers/inflections.rb
-- test_app/config/initializers/mime_types.rb
-- test_app/config/initializers/secret_token.rb
-- test_app/config/initializers/session_store.rb
-- test_app/config/initializers/wrap_parameters.rb
-- test_app/config/locales/en.yml
-- test_app/config/routes.rb
-- test_app/lib/assets/.gitkeep
-- test_app/lib/tasks/.gitkeep
-- test_app/log/.gitkeep
-- test_app/public/404.html
-- test_app/public/422.html
-- test_app/public/500.html
-- test_app/public/favicon.ico
-- test_app/public/robots.txt
-- test_app/script/rails
-- test_app/spec-opal/example_spec.js.rb
-- test_app/spec-opal/requires_opal_spec.js.rb
-- test_app/spec-opal/spec_helper.rb
-- test_app/spec-opal/subdirectory/other_spec.js.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/rails4.rb
+- test_apps/rails5.rb
 homepage: http://elia.github.com/opal-rails
 licenses:
 - MIT-LICENSE
 metadata: {}
-post_install_message: 
+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.
 rdoc_options: []
 require_paths:
 - lib
@@ -271,15 +271,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: opal-rails
-rubygems_version: 2.4.8
+rubygems_version: 2.6.4
 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/in_browser_specs_spec.rb
 - spec/integration/source_map_spec.rb
 - spec/spec_helper.rb
 - spec/support/capybara.rb
 - spec/support/reset_assets_cache.rb
+- spec/support/test_app.rb