kotovalexarian-likes-github
/
rails--rails
mirror of https://github.com/rails/rails.git
1
0
Fork 0
Code Releases Activity

Use sprockets 3 in the Rails 5 release

This commit is contained in:
Rafael Mendonça França 2015-12-16 16:30:58 -02:00
parent 7241498e51
commit 877a411d0c
5 changed files with 46 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gemfile
View File

@ -20,9 +20,7 @@ gem 'turbolinks', github: 'rails/turbolinks', branch: 'master'
gem 'arel', github: 'rails/arel', branch: 'master'
gem 'mail', github: 'mikel/mail', branch: 'master'
gem 'sprockets', '~> 4.0', github: 'rails/sprockets', branch: 'master'
gem 'sprockets-rails', '~> 3.0.0.beta3', github: 'rails/sprockets-rails', branch: 'master'
gem 'sass-rails', github: 'rails/sass-rails', branch: 'master'
# require: false so bcrypt is loaded only when has_secure_password is used.
# This is to avoid Active Model (and by extension the entire framework)

86
Gemfile.lock
View File

@ -21,7 +21,7 @@ GIT
GIT
remote: git://github.com/mikel/mail.git
revision: 9c313a401729b9aa9177878836829a61adf67b54
revision: f0efbd4850d1bc06cdcba6178c282eeaba9c8c43
branch: master
specs:
mail (2.6.3.edge)
@ -29,7 +29,7 @@ GIT
GIT
remote: git://github.com/rack/rack.git
revision: 35599cfc2751e0ee611c0ff799924b8e7fe0c0b4
revision: 96ae9b9fed8d6809383b6f48a5884437e76f8ca4
branch: master
specs:
rack (2.0.0.alpha)
@ -37,14 +37,14 @@ GIT
GIT
remote: git://github.com/rails/arel.git
revision: 3c429c5d86e9e2201c2a35d934ca6a8911c18e69
revision: 899e8428c50c586e6c8d4884b542ac9fdf01e95f
branch: master
specs:
arel (7.0.0.alpha)
GIT
remote: git://github.com/rails/globalid.git
revision: 1d8fca667740570d204fd955a0bd39ac539bac7f
revision: 4e74ec6bb60d735ef3c56080f9c9f1dee9cadaaf
branch: master
specs:
globalid (0.3.6)
@ -60,20 +60,9 @@ GIT
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
GIT
remote: git://github.com/rails/sass-rails.git
revision: 6e4eee736bcbfa5b2962467673c7a51abf434c67
branch: master
specs:
sass-rails (6.0.0)
railties (>= 4.0.0, < 5.0)
sass (~> 3.4)
sprockets (>= 4.0)
sprockets-rails (< 4.0)
GIT
remote: git://github.com/rails/sprockets-rails.git
revision: 93a45b1c463a063ec7cf4d160107b67aa3db7a1a
revision: 06d84e952490d7d391592124f6e3b79f9c596674
branch: master
specs:
sprockets-rails (3.0.0.beta3)
@ -81,17 +70,9 @@ GIT
activesupport (>= 4.0)
sprockets (>= 3.0.0)
GIT
remote: git://github.com/rails/sprockets.git
revision: 5a77f8b007b8ec61edd783c48baf9d971f1c684d
branch: master
specs:
sprockets (4.0.0)
rack (>= 1, < 3)
GIT
remote: git://github.com/rails/turbolinks.git
revision: 83d4b3d2c52a681f07900c28adb28bc8da604733
revision: ad583843fdaa0c1f61462a346a495981ca314460
branch: master
specs:
turbolinks (3.0.0)
@ -99,10 +80,10 @@ GIT
GIT
remote: git://github.com/sass/sass.git
revision: 4e3e1d5684cc29073a507578fc977434ff488c93
revision: bce9509f396225d721501ea1070a6871b708abb1
branch: stable
specs:
sass (3.4.19)
sass (3.4.20)
PATH
remote: .
@ -165,7 +146,7 @@ GEM
remote: https://rubygems.org/
specs:
amq-protocol (2.0.0)
backburner (1.1.0)
backburner (1.2.0)
beaneater (~> 1.0)
dante (> 0.1.5)
bcrypt (3.1.10)
@ -174,9 +155,9 @@ GEM
beaneater (1.0.0)
benchmark-ips (2.3.0)
builder (3.2.2)
bunny (2.2.0)
bunny (2.2.1)
amq-protocol (>= 2.0.0)
byebug (8.2.0)
byebug (8.2.1)
celluloid (0.17.2)
celluloid-essentials
celluloid-extras
@ -200,10 +181,10 @@ GEM
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.9.1.1)
coffee-script-source (1.10.0)
concurrent-ruby (1.0.0)
connection_pool (2.2.0)
dalli (2.7.4)
dalli (2.7.5)
dante (0.2.0)
delayed_job (4.1.1)
activesupport (>= 3.0, < 5.0)
@ -229,7 +210,7 @@ GEM
nokogiri (>= 1.5.9)
metaclass (0.0.4)
method_source (0.8.2)
mime-types (2.6.2)
mime-types (2.99)
mini_portile2 (2.0.0)
minitest (5.3.3)
mocha (0.14.0)
@ -238,14 +219,23 @@ GEM
multi_json (1.11.2)
mustache (1.0.2)
mysql (2.9.1)
mysql2 (0.4.1)
mysql (2.9.1-x86-mingw32)
mysql2 (0.4.2)
mysql2 (0.4.2-x64-mingw32)
mysql2 (0.4.2-x86-mingw32)
nokogiri (1.6.7)
mini_portile2 (~> 2.0.0.rc2)
pg (0.18.3)
psych (2.0.15)
nokogiri (1.6.7-x64-mingw32)
mini_portile2 (~> 2.0.0.rc2)
nokogiri (1.6.7-x86-mingw32)
mini_portile2 (~> 2.0.0.rc2)
pg (0.18.4)
pg (0.18.4-x64-mingw32)
pg (0.18.4-x86-mingw32)
psych (2.0.16)
que (0.11.2)
racc (1.4.13)
rack-cache (1.5.0)
racc (1.4.14)
rack-cache (1.5.1)
rack (>= 0.4)
rack-test (0.6.3)
rack (>= 1.0)
@ -263,7 +253,7 @@ GEM
ffi (>= 0.5.0)
rdoc (4.2.0)
redcarpet (3.2.3)
redis (3.2.1)
redis (3.2.2)
redis-namespace (1.5.2)
redis (~> 3.0, >= 3.0.4)
resque (1.25.2)
@ -277,19 +267,18 @@ GEM
redis (~> 3.0)
resque (~> 1.25)
rufus-scheduler (~> 3.0)
rufus-scheduler (3.1.7)
rufus-scheduler (3.1.10)
sdoc (0.4.1)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
sequel (4.27.0)
sequel (4.29.0)
serverengine (1.5.11)
sigdump (~> 0.2.2)
sidekiq (3.5.1)
celluloid (~> 0.17.2)
sidekiq (4.0.1)
concurrent-ruby (~> 1.0)
connection_pool (~> 2.2, >= 2.2.0)
json (~> 1.0)
redis (~> 3.2, >= 3.2.1)
redis-namespace (~> 1.5, >= 1.5.2)
sigdump (0.2.3)
sinatra (1.0)
rack (>= 1.0)
@ -298,7 +287,12 @@ GEM
serverengine (~> 1.5.11)
thor
thread (~> 0.1.7)
sprockets (3.5.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
sqlite3 (1.3.11)
sqlite3 (1.3.11-x64-mingw32)
sqlite3 (1.3.11-x86-mingw32)
stackprof (0.2.7)
sucker_punch (1.6.0)
celluloid (~> 0.17.2)
@ -364,12 +358,10 @@ DEPENDENCIES
resque
resque-scheduler
sass!
sass-rails!
sdoc (~> 0.4.0)
sequel
sidekiq
sneakers
sprockets (~> 4.0)!
sprockets-rails (~> 3.0.0.beta3)!
sqlite3 (~> 1.3.6)
stackprof
@ -380,4 +372,4 @@ DEPENDENCIES
w3c_validators
BUNDLED WITH
1.10.6
1.11.0

2
railties/lib/rails/generators/app_base.rb
View File

@ -218,8 +218,6 @@ module Rails
def rails_gemfile_entry
dev_edge_common = [
GemfileEntry.github('sprockets-rails', 'rails/sprockets-rails'),
GemfileEntry.github('sprockets', 'rails/sprockets'),
GemfileEntry.github('sass-rails', 'rails/sass-rails'),
GemfileEntry.github('arel', 'rails/arel'),
GemfileEntry.github('rack', 'rack/rack')
]

5
railties/test/application/asset_debugging_test.rb
View File

@ -58,7 +58,7 @@ module ApplicationTests
assert_no_match(/<script src="\/assets\/xmlhr-([0-z]+)\.js"><\/script>/, last_response.body)
end
test "assets are served with sourcemaps when compile is true and debug_assets params is true" do
test "assets aren't concatenated when compile is true is on and debug_assets params is true" do
add_to_env_config "production", "config.assets.compile = true"
# Load app env
@ -67,7 +67,8 @@ module ApplicationTests
class ::PostsController < ActionController::Base ; end
get '/posts?debug_assets=true'
assert_match(/<script src="\/assets\/application(\.debug)?-([0-z]+)\.js"><\/script>/, last_response.body)
assert_match(/<script src="\/assets\/application(\.self)?-([0-z]+)\.js\?body=1"><\/script>/, last_response.body)
assert_match(/<script src="\/assets\/xmlhr(\.self)?-([0-z]+)\.js\?body=1"><\/script>/, last_response.body)
end
end
end

8
railties/test/application/assets_test.rb
View File

@ -174,7 +174,7 @@ module ApplicationTests
precompile!
assert_file_exists("#{app_path}/public/assets/something-*.js")
assert_file_exists("#{app_path}/public/assets/something/index-*.js")
end
test 'precompile use assets defined in app env config' do
@ -410,7 +410,7 @@ module ApplicationTests
precompile!
assert_equal "Post\n;\n", File.read(Dir["#{app_path}/public/assets/application-*.js"].first)
assert_equal "Post;\n", File.read(Dir["#{app_path}/public/assets/application-*.js"].first)
end
test "initialization on the assets group should set assets_dir" do
@ -458,9 +458,9 @@ module ApplicationTests
class ::PostsController < ActionController::Base; end
get '/posts', {}, {'HTTPS'=>'off'}
assert_match('src="http://example.com/assets/application.debug.js', last_response.body)
assert_match('src="http://example.com/assets/application.self.js', last_response.body)
get '/posts', {}, {'HTTPS'=>'on'}
assert_match('src="https://example.com/assets/application.debug.js', last_response.body)
assert_match('src="https://example.com/assets/application.self.js', last_response.body)
end
test "asset urls should be protocol-relative if no request is in scope" do