Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: opal/opal-rails
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: a2dad377d0ba
Choose a base ref
...
head repository: opal/opal-rails
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7ade0083d47b
Choose a head ref
  • 4 commits
  • 3 files changed
  • 1 contributor

Commits on Mar 30, 2015

  1. Track opal 0.8

    @elia
    elia committed Mar 30, 2015

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    6aba36a View commit details

  2. Shouldn’t be our concern to make threads behave

    @elia
    elia committed Mar 30, 2015

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    860aba9 View commit details

  3. Sometimes seems that sprockets will need a moment to pickup the new file

    @elia
    elia committed Mar 30, 2015

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    9ce97c7 View commit details

  4. Track master of opal-jquery and opal-rspec

    @elia
    elia committed Mar 30, 2015

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    7ade008 View commit details
Showing with 14 additions and 7 deletions.
  1. +7 −3 Gemfile
  2. +6 −3 lib/tasks/opal-rails_tasks.rake
  3. +1 −1 opal-rails.gemspec
10 changes: 7 additions & 3 deletions Gemfile
View file
Original file line number Diff line number Diff line change
@@ -2,10 +2,14 @@ source 'https://rubygems.org'
gemspec

gem 'capybara-webkit'
# gem 'opal-jquery', github: 'opal/opal-jquery'
gem 'opal', github: 'opal'
# gem 'opal-jquery', path: '../opal-jquery'

# gem 'opal', path: '../opal'
# gem 'opal-rspec', path: '../opal-rspec'
# gem 'opal-jquery', path: '../opal-jquery'

gem 'opal', github: 'opal'
gem 'opal-rspec', github: 'opal/opal-rspec'
gem 'opal-jquery', github: 'opal/opal-jquery'

if RUBY_VERSION.to_f < 1.9
gem 'nokogiri', '< 1.6'
9 changes: 6 additions & 3 deletions lib/tasks/opal-rails_tasks.rake
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
require 'opal/rspec/rake_task'

Thread.abort_on_exception = true

Opal::RSpec::RakeTask.new('opal:spec' => :environment) do |server|
require 'opal/rails/spec_builder'
pattern = ENV['PATTERN'] || nil
@@ -19,5 +17,10 @@ Opal::RSpec::RakeTask.new('opal:spec' => :environment) do |server|
server.sprockets.clear_paths
builder.paths.each { |path| server.append_path path }

server.main = runner.basename.to_s.gsub(/(\.js)?\.rb$/, '')
main_name = runner.basename.to_s.gsub(/(\.js)?\.rb$/, '')

# Sometimes seems that sprockets will need a moment to pickup the new file
sleep 0.1 unless server.sprockets[main_name]

server.main = main_name
end
2 changes: 1 addition & 1 deletion opal-rails.gemspec
View file
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
required_ruby_version = '>= 1.9.3'

s.add_dependency 'rails', '>= 3.2', '< 5.0'
s.add_dependency 'opal', '~> 0.7.0'
s.add_dependency 'opal', '~> 0.8.0.dev'
s.add_dependency 'opal-jquery', '~> 0.3.0'
s.add_dependency 'opal-rspec', '~> 0.4.2'
s.add_dependency 'jquery-rails'