opal-rails 0.4.0 → 0.5.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32adae8b04d04337405ba3018e5b863435d5d67d
-  data.tar.gz: 882a63b23907f3ee8a7076838a40af8803aaa055
+  metadata.gz: 06be2a87140ad5dd193bf6e7cf4c604bd73b967b
+  data.tar.gz: a1a79d8e9ec0bdc5d9d4affa4f264307be2eeb3c
 SHA512:
-  metadata.gz: b4a4748f5d127153eecd3eba0ade49273c1b253929e3cf57b74b8789d68461192c866b1ef85c97e2dffdda5250b0d97e50719388369c0d365783bdf235767d3d
-  data.tar.gz: a7aadcf9bbe904443c0a4ec9621d96209d40c2ac52ffd35a9588dccc8a90db1e50a09d17bbc66c78a5dde4bc9061b1cc8ca0d14af69f4b66c36f4aeba53bff89
+  metadata.gz: 0db0ad35ce410a22e4a334c88fc6b108a380a7ebbbb4fe30df4fa418cae41b8457d5ea4dc1e10900f4c2ad5d1098fd7c37f6f7292f991138f29bc7ad607284ea
+  data.tar.gz: 541662e0f82e1852246544e7347a5f566c61c2983fca85060fb401410912d7e2bc04a842fd6c1cf029a364768c56fc802637ac0d8407c240cab16ec8557fc136

data/.gitignore

@@ -1,6 +1,7 @@
 /.bundle/
 /log/*.log
 /pkg/
+/tmp
 /test_app/db/*.sqlite3
 /test_app/log/*.log
 /test_app/tmp/

data/Gemfile

@@ -2,3 +2,5 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'capybara-webkit' unless ENV['CI']
+gem 'opal',        :github => 'opal/opal'
+gem 'opal-jquery', :github => 'opal/opal-jquery'

data/lib/opal/rails.rb

@@ -8,3 +8,4 @@ require 'opal/rails/version'
 require 'opal/rails/haml_filter' if defined?(Haml)
 
 require 'jquery-rails'
+require 'opal/sprockets_source_map_header'

data/lib/opal/rails/engine.rb

@@ -1,5 +1,6 @@
 require 'rails'
-require 'opal/default_options'
+require 'opal/server'
+require 'opal/processor'
 
 module Opal
   module Rails
@@ -13,16 +14,29 @@ module Opal
       # and its .rb files are eagerly loaded.
       config.eager_load_paths
 
-      initializer 'opal.asset_paths', :after => 'sprockets.environment', :group => :all do |app|
-        app.config.before_initialize do
-          app.config.eager_load_paths = app.config.eager_load_paths.dup - Dir["#{app.root}/app/{assets,views}"]
-        end
+      config.before_initialize do |app|
+        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
+      end
 
-        Opal.default_options = config.opal
+      config.after_initialize do |app|
+        config.opal.each_pair do |key, value|
+          key = "#{key}="
+          Opal::Processor.send(key, value) if Opal::Processor.respond_to? key
+        end
+
+        config = app.config
+        maps_app = Opal::SourceMapServer.new(app.assets)
+
+        app.routes.prepend do
+          mount maps_app => maps_app.prefix
+          get '/opal_spec' => 'opal_spec#run'
+        end
       end
 
     end

data/lib/opal/rails/version.rb

@@ -1,5 +1,5 @@
 module Opal
   module Rails
-    VERSION = '0.4.0'
+    VERSION = '0.5.0.pre'
   end
 end

data/lib/opal/sprockets_source_map_header.rb

@@ -0,0 +1,21 @@
+require 'sprockets/server'
+
+module Sprockets
+  module Server
+
+    # Adds the source map header to all sprocket responses for assets
+    # with a .rb or .opal extension in the extension chain.
+    def headers_with_opal_source_maps(env, asset, length)
+      headers_without_opal_source_maps(env, asset, length).tap do |headers|
+        if asset.pathname.to_s =~ /\.(rb|opal)\b/
+          headers['X-SourceMap'] = '/__opal_source_maps__/'+asset.logical_path + '.map'
+        end
+      end
+    end
+
+    # Poor man's alias_method_chain :)
+    alias headers_without_opal_source_maps headers
+    alias headers headers_with_opal_source_maps
+
+  end
+end

data/opal-rails.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_runtime_dependency 'opal',  '~> 0.3.43'
+  s.add_runtime_dependency 'opal',  '~> 0.4.1'
 
   s.add_runtime_dependency 'rails', '>= 3.2.13', '< 5.0'
   s.add_runtime_dependency 'opal-jquery', '>= 0.0.8'

data/spec/opal/processor_spec.rb

@@ -1,9 +1,10 @@
 require 'spec_helper'
 
 describe Opal::Processor do
-  # Preparing a context that responds to #logical_path and #require_asset
-  # should't be necessary:
-  let(:_context) { double('_context', :logical_path => 'asdf.js.rb' ) }
+  let(:pathname) { Pathname('/Code/app/mylib/opal/asdf.rb') }
+  let(:_context) do
+    double('_context', :logical_path => 'asdf.js.rb', :pathname => pathname)
+  end
 
   it "is registered for '.opal' files" do
     Tilt['test.opal'].should eq(Opal::Processor)

data/spec/opal/source_map_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+require 'opal/source_map'
+
+describe Opal::SourceMap do
+  let(:assets) { Opal::Environment.new }
+  let(:asset)  { assets['opal'] }
+  let(:source) { asset.to_s }
+  let(:map)    { described_class.new(source, asset.pathname.to_s) }
+
+  it 'source has the magic comments' do
+    described_class::FILE_REGEXP.should match(source)
+    described_class::LINE_REGEXP.should match(source)
+  end
+
+  it 'does not blow while generating the map' do
+    expect { map.as_json }.not_to raise_exception
+  end
+end

data/spec/support/reset_assets_cache.rb

@@ -1,5 +1,5 @@
 require 'fileutils'
 
 RSpec.configure do |config|
-  config.before(:suite) { FileUtils.rmtree(Rails.root.join('tmp/cache/assets')) }
+  config.before(:suite) { FileUtils.rmtree(Rails.root.join('tmp/cache/assets').to_s) }
 end

data/test_app/app/assets/javascripts/application.js

@@ -10,6 +10,6 @@
 // WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
 // GO AFTER THE REQUIRES BELOW.
 //
-//= require jquery
-//= require jquery_ujs
-//= require_tree .
+//= require opal
+//= require opal_ujs
+//= require opal-parser

data/test_app/app/views/application/index.html.erb

@@ -0,0 +1,3 @@
+<script type="text/ruby">
+raise 'pippo'
+</script>

data/test_app/app/views/application/with_assignments.js.opal

@@ -5,4 +5,4 @@ return {
   hash_var:   @hash_var,
   object_var: @object_var,
   local_var:  local_var
-}.to_native
+}.to_n

data/test_app/config/application.rb

@@ -1,3 +1,7 @@
+require 'fileutils'
+# Clear assets cache to avoid false errors
+FileUtils.rmtree(File.expand_path('../../tmp/cache/assets'))
+
 require File.expand_path('../boot', __FILE__)
 
 # Pick the frameworks you want:

data/test_app/config/routes.rb

@@ -1,60 +1,4 @@
 TestApp::Application.routes.draw do
   get 'application/with_assignments' => 'application#with_assignments'
-
-  # The priority is based upon order of creation:
-  # first created -> highest priority.
-
-  # Sample of regular route:
-  #   match 'products/:id' => 'catalog#view'
-  # Keep in mind you can assign values other than :controller and :action
-
-  # Sample of named route:
-  #   match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
-  # This route can be invoked with purchase_url(:id => product.id)
-
-  # Sample resource route (maps HTTP verbs to controller actions automatically):
-  #   resources :products
-
-  # Sample resource route with options:
-  #   resources :products do
-  #     member do
-  #       get 'short'
-  #       post 'toggle'
-  #     end
-  #
-  #     collection do
-  #       get 'sold'
-  #     end
-  #   end
-
-  # Sample resource route with sub-resources:
-  #   resources :products do
-  #     resources :comments, :sales
-  #     resource :seller
-  #   end
-
-  # Sample resource route with more complex sub-resources
-  #   resources :products do
-  #     resources :comments
-  #     resources :sales do
-  #       get 'recent', :on => :collection
-  #     end
-  #   end
-
-  # Sample resource route within a namespace:
-  #   namespace :admin do
-  #     # Directs /admin/products/* to Admin::ProductsController
-  #     # (app/controllers/admin/products_controller.rb)
-  #     resources :products
-  #   end
-
-  # You can have the root of your site routed with "root"
-  # just remember to delete public/index.html.
-  # root :to => 'welcome#index'
-
-  # See how all your routes lay out with "rake routes"
-
-  # This is a legacy wild controller route that's not recommended for RESTful applications.
-  # Note: This route will make all actions in every controller accessible via GET requests.
-  # match ':controller(/:action(/:id))(.:format)'
+  root :to => 'application#index'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opal-rails
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0.pre
 platform: ruby
 authors:
 - Elia Schito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-03 00:00:00.000000000 Z
+date: 2013-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opal
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.43
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.43
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -173,27 +173,25 @@ files:
 - app/controllers/opal_spec_controller.rb
 - app/views/layouts/opal_spec.html.erb
 - app/views/opal_spec/run.html.erb
-- config/routes.rb
 - lib/assets/javascripts/opal-spec-runner.js.rb
 - lib/assets/javascripts/opal_ujs.js.rb
 - lib/opal-rails.rb
-- lib/opal/default_options.rb
 - lib/opal/rails.rb
 - lib/opal/rails/engine.rb
 - lib/opal/rails/haml_filter.rb
 - lib/opal/rails/template_handler.rb
 - lib/opal/rails/version.rb
+- lib/opal/sprockets_source_map_header.rb
 - lib/tasks/opal-rails_tasks.rake
 - opal-rails.gemspec
 - script/rails
 - spec/integration/assigns_spec.rb
 - spec/integration/in_browser_specs_spec.rb
-- spec/opal/default_options_spec.rb
 - spec/opal/processor_spec.rb
+- spec/opal/source_map_spec.rb
 - spec/spec_helper.rb
 - spec/support/capybara.rb
 - spec/support/reset_assets_cache.rb
-- spec/support/reset_default_options.rb
 - test_app/.gitignore
 - test_app/Rakefile
 - test_app/app/assets/images/rails.png
@@ -202,6 +200,7 @@ files:
 - test_app/app/assets/javascripts/spec/example_spec.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
@@ -243,9 +242,9 @@ 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: opal-rails
 rubygems_version: 2.0.3
@@ -255,9 +254,8 @@ summary: Rails bindings for opal JS engine
 test_files:
 - spec/integration/assigns_spec.rb
 - spec/integration/in_browser_specs_spec.rb
-- spec/opal/default_options_spec.rb
 - spec/opal/processor_spec.rb
+- spec/opal/source_map_spec.rb
 - spec/spec_helper.rb
 - spec/support/capybara.rb
 - spec/support/reset_assets_cache.rb
-- spec/support/reset_default_options.rb

data/config/routes.rb

@@ -1,3 +0,0 @@
-Rails.application.routes.draw do
-  get '/opal_spec' => 'opal_spec#run' if %w[test development].include? Rails.env
-end

data/lib/opal/default_options.rb

@@ -1,18 +0,0 @@
-require 'opal'
-
-class << Opal
-  attr_writer :default_options
-  def default_options
-    @default_options ||= {}
-  end
-
-  def parse_with_default_options source, options = {}
-    parse_without_default_options(source, default_options.merge(options))
-  end
-
-  alias parse_without_default_options parse
-  alias parse parse_with_default_options
-end
-
-
-

data/spec/opal/default_options_spec.rb

@@ -1,13 +0,0 @@
-require 'spec_helper'
-require 'opal/default_options'
-
-describe Opal::Parser do
-  let(:default_options) { {:method_missing => false} }
-  let(:source) { 'puts "ciao"' }
-  before { Opal.default_options = default_options }
-
-  it 'fetches default options defined in the Opal module' do
-    described_class.any_instance.should_receive(:parse).with(source, default_options)
-    Opal.parse(source)
-  end
-end

data/spec/support/reset_default_options.rb

@@ -1,3 +0,0 @@
-RSpec.configure do |config|
-  config.before { Opal.default_options = nil }
-end