opal-rails 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fed15fdb17a5c9efd8ebd4797a10db2da7dfe2a
-  data.tar.gz: 4e0a78c92215cd5ba1519afdbd717b4ad4ae05ea
+  metadata.gz: e0661ea0ba30536cdab789f56ae7d2d408c48708
+  data.tar.gz: 3bd276dfe1b426bed1810b66d1d7993f85243a1d
 SHA512:
-  metadata.gz: 9eb90df0d27ac7759526c989fed3f4a84ff7e1f6d0ddd10a83dc3342c025b7f3657b08829a5b280ab95bd539cf09359343f518062158361a0cb387bd2175b51a
-  data.tar.gz: 35442c84f4a451546c8c3cfbad235f10713567965bd1a11a6553caee2f3b8c52c5a89e4e51614da9e996699762afa2671fcef06143fd50a185e491f5b29e697f
+  metadata.gz: 9cc46ffcde2aadc54905318e3ce4a4971074bed6f1f09d93485e8c41a9904fee236baaea18dcc536601a1b8d1849bb67cec2297a2a5f890c3bfca3130d6f17a7
+  data.tar.gz: 4faa926734875dc91bc1ead1cfc53d992ff1c7e5c83784cd9d0bbcd1157a71f1cd61f3107f682df315d7c8927f8e0ca0320b0e67a839c82fc1fe5864186be247

data/.travis.yml

@@ -1,9 +1,11 @@
 language: ruby
+cache: bundler
 
 rvm:
   - 1.8.7
   - 1.9.3
   - 2.0.0
+  - 2.1.1
 
 before_script:
   - "export DISPLAY=:99.0"
@@ -11,3 +13,4 @@ before_script:
 
 notifications:
   irc: "irc.freenode.org#opal"
+

data/Gemfile

@@ -1,13 +1,19 @@
 source 'https://rubygems.org'
 gemspec
 
-gem 'capybara-webkit' unless ENV['CI']
+gem 'capybara-webkit'
+gem 'capybara', '< 2'
+
 # gem 'opal',        :github => 'opal/opal'
-# gem 'opal-jquery', :github => 'opal/opal-jquery'
-# gem 'opal-rspec', :github => 'opal/opal-rspec'
+gem 'opal-jquery', :github => 'opal/opal-jquery'
+
+# gem 'opal',         :path => '~/Code/opal'
+# gem 'opal-jquery',  :path => '~/Code/opal-jquery'
+# gem 'opal-rspec',   :path => '~/Code/opal-rspec'
+# gem 'opal-browser', :path => '~/Code/opal-browser'
 
-platform :ruby_18 do
+if RUBY_VERSION.to_f < 1.9
   gem 'nokogiri', '< 1.6'
-  gem 'rails', '< 4.0'
-  gem 'rubyzip', '< 1'
+  gem 'rails',    '< 4.0'
+  gem 'rubyzip',  '< 1'
 end

data/README.md

@@ -95,7 +95,7 @@ end
 Each assign is filtered through JSON so it's reduced to basic types:
 
 ```ruby
-# app/views/posts/cerate.js.opal
+# app/views/posts/create.js.opal
 
 post = Element.find('.post')
 post.find('.title').html    = @post[:title]
@@ -104,7 +104,7 @@ post.find('.comments').html = comments_html
 ```
 
 
-### As an Haml filter (optional)
+### As a Haml filter (optional)
 
 Of course you need to require `haml-rails` separately since its presence is not assumed
 

data/app/controllers/opal_spec_controller.rb

@@ -21,11 +21,11 @@ class OpalSpecController < ActionController::Base
   end
 
   def all_spec_files
-    spec_files_for_glob '**'
+    spec_files_for_glob '**/*_spec{.js,}'
   end
 
   def spec_files_for_glob glob = '**'
-    Dir[Rails.root.join("{app,lib}/assets/javascripts/spec/#{glob}{,_spec{.js,}.{rb,opal}}")].map do |path|
+    Dir[Rails.root.join("{app,lib}/assets/javascripts/spec/#{glob}.{rb,opal}")].map do |path|
       path.split('assets/javascripts/spec/').flatten.last.gsub(/(\.rb|\.opal)/, '')
     end.uniq
   end

data/app/helpers/opal_helper.rb

@@ -0,0 +1,7 @@
+module OpalHelper
+  def opal_tag(&block)
+    opal_code = capture(&block)
+    js_code = Opal.compile(opal_code)
+    javascript_tag js_code
+  end
+end

data/lib/opal/rails/version.rb

@@ -1,5 +1,5 @@
 module Opal
   module Rails
-    VERSION = '0.6.2'
+    VERSION = '0.6.3'
   end
 end

data/opal-rails.gemspec

@@ -19,19 +19,17 @@ 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.5.0'
-  s.add_runtime_dependency 'opal-sprockets', '~> 0.3.0'
+  s.add_dependency 'rails',               '>= 3.2.13', '< 5.0'
+  s.add_dependency 'opal',                '~> 0.6.0'
+  s.add_dependency 'opal-jquery',         '>= 0.1.0'
+  s.add_dependency 'opal-rspec',          '~> 0.3.0.beta1'
+  s.add_dependency 'jquery-rails'
+  s.add_dependency 'opal-activesupport',  '>= 0.0.5'
 
-  s.add_runtime_dependency 'rails', '>= 3.2.13', '< 5.0'
-  s.add_runtime_dependency 'opal-jquery',        '>= 0.1.0'
-  s.add_runtime_dependency 'opal-rspec'
-  s.add_runtime_dependency 'opal-activesupport', '>= 0.0.5'
-  s.add_runtime_dependency 'jquery-rails'
+  s.add_development_dependency 'execjs'
+  s.add_development_dependency 'launchy'
+  s.add_development_dependency 'capybara'
 
   s.add_development_dependency 'rspec',       '~> 2.13'
   s.add_development_dependency 'rspec-rails', '~> 2.13'
-
-  s.add_development_dependency 'capybara',    '< 2'
-  s.add_development_dependency 'launchy'
-  s.add_development_dependency 'execjs'
 end

data/spec/integration/assigns_spec.rb

@@ -27,6 +27,11 @@ describe 'controller assignments' do
 
   def opal_eval source
     opal_source = get_source_of '/assets/opal.js'
+
+    # Any lib should be already required in the page,
+    # require won't work in this kind of templates.
+    opal_source << get_source_of('/assets/native.js')
+
     context = ExecJS.compile opal_source
     context.eval source
   rescue

data/spec/integration/in_browser_specs_spec.rb

@@ -1,9 +1,19 @@
 require 'spec_helper'
 
-describe 'In-browser specs runner' do
-  it 'runs all specs', :js do
+feature 'In-browser specs runner', :type => :request do
+  scenario 'runs all specs', :js do
     visit '/opal_spec'
-    page.should have_content('Running: example_spec')
+
+    page.should have_content('subdirectory/other_spec.js')
+    page.should have_content('example_spec.js ')
+    page.should have_content('2 examples, 0 failures')
+  end
+
+  scenario "runs single spec file", :js do
+    visit '/opal_spec'
+    click_link 'subdirectory/other_spec.js'
+
+    page.should have_content('Running: subdirectory/other_spec.js')
     page.should have_content('1 examples, 0 failures')
   end
 end

data/spec/integration/source_map_spec.rb

@@ -29,7 +29,7 @@ describe Opal::SourceMap do
 
   def extract_map_url response
     response.headers['X-SourceMap'] or
-    response.body.scan(%r{^//@ sourceMappingURL=([^\n]+)}).flatten.first.strip
+    response.body.scan(%r{^//[@#] sourceMappingURL=([^\n]+)}).flatten.first.to_s.strip
   end
 
 end

data/spec/support/capybara.rb

@@ -1,6 +1,4 @@
 require 'capybara/rspec'
 
-if RUBY_VERSION.to_f > 1.8 and not(ENV['CI'])
-  require 'capybara-webkit'
-  Capybara.javascript_driver = :webkit
-end
+require 'capybara-webkit'
+Capybara.javascript_driver = :webkit

data/test_app/app/assets/javascripts/spec/subdirectory/other_spec.js.rb

@@ -0,0 +1,5 @@
+describe "spec inside subdirectory" do
+  it "runs fine" do
+    1.should == 1
+  end
+end

data/test_app/config/initializers/secret_token.rb

@@ -5,3 +5,4 @@
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
 TestApp::Application.config.secret_token = '1e152bba0be759b82e7a970ad728b5a4946b793c042fed97b1900a9c6c752e789e5021af04066147fbcd5846718eb4a29740f33125fad2107b65a59a0af17b08'
+TestApp::Application.config.secret_key_base = TestApp::Application.config.secret_token if TestApp::Application.config.respond_to? :secret_key_base=

metadata

@@ -1,189 +1,175 @@
 --- !ruby/object:Gem::Specification
 name: opal-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Elia Schito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-13 00:00:00.000000000 Z
+date: 2014-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: opal
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.13
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.13
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: opal-sprockets
+  name: opal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: opal-jquery
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 3.2.13
-    - - <
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.13
-    - - <
-      - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
-  name: opal-jquery
+  name: opal-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.3.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.3.0.beta1
 - !ruby/object:Gem::Dependency
-  name: opal-rspec
+  name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !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
 - !ruby/object:Gem::Dependency
-  name: jquery-rails
+  name: execjs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: launchy
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.13'
 - !ruby/object:Gem::Dependency
-  name: execjs
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.13'
 description: Rails bindings for opal JS engine
 email:
 - elia@schito.me
@@ -191,14 +177,15 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - 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
 - lib/assets/javascripts/opal-rspec-runner.js.rb
@@ -227,6 +214,7 @@ files:
 - test_app/app/assets/javascripts/source_map_example.js.rb
 - test_app/app/assets/javascripts/spec.js
 - test_app/app/assets/javascripts/spec/example_spec.js.rb
+- test_app/app/assets/javascripts/spec/subdirectory/other_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
@@ -266,17 +254,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: opal-rails
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Rails bindings for opal JS engine