diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 0fda4072..4b7f6580 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -2,14 +2,14 @@ name: Java CI on: push: - branches: [ "master", "*release*", "*stable*" ] + branches: [ "master", "*-stable" ] pull_request: - branches: [ "master", "*release*", "*stable*" ] + branches: [ "master", "*-stable" ] env: # Default versions for canonical release build DEFAULT_JAVA_VERSION: '8' - DEFAULT_JRUBY_VERSION: '9.4.12.1' # Should match pom.xml property (AND a version inside the test matrix) + DEFAULT_JRUBY_VERSION: '9.4.13.0' # Should match pom.xml property (AND a version inside the test matrix) jobs: build: @@ -18,15 +18,8 @@ jobs: strategy: matrix: - jruby_version: [ '9.3.15.0', '9.4.12.1' ] # , '10.0.0.1' + jruby_version: [ '9.3.15.0', '9.4.13.0' ] java_version: [ '8', '11', '17', '21' ] - exclude: - - jruby_version: '10.0.0.1' - java_version: '8' # JRuby 10 requires Java 21 - - jruby_version: '10.0.0.1' - java_version: '11' # JRuby 10 requires Java 21 - - jruby_version: '10.0.0.1' - java_version: '17' # JRuby 10 requires Java 21 fail-fast: false steps: @@ -54,7 +47,7 @@ jobs: strategy: matrix: - jruby_version: [ '9.3.15.0', '9.4.12.1' ] # , '10.0.0.1' + jruby_version: [ '9.3.15.0', '9.4.13.0' ] java_version: [ '8', '11', '17', '21' ] appraisal: [ 'rails50', 'rails52', 'rails60', 'rails61', 'rails70', 'rails71', 'rails72' ] exclude: @@ -64,12 +57,6 @@ jobs: appraisal: 'rails71' # Requires Ruby 2.7 compatibility, which JRuby 9.3 does not support - jruby_version: '9.3.15.0' appraisal: 'rails72' # Requires Ruby 3.1 compatibility, which JRuby 9.3 does not support - - jruby_version: '10.0.0.1' - java_version: '8' # JRuby 10 requires Java 21 - - jruby_version: '10.0.0.1' - java_version: '11' # JRuby 10 requires Java 21 - - jruby_version: '10.0.0.1' - java_version: '17' # JRuby 10 requires Java 21 fail-fast: false env: @@ -87,7 +74,7 @@ jobs: cache: maven - name: Setup JRuby - uses: ruby/setup-ruby@13e7a03dc3ac6c3798f4570bfead2aed4d96abfb # v1.244.0 + uses: ruby/setup-ruby@a4effe49ee8ee5b8b5091268c473a4628afb5651 # v1.245.0 with: ruby-version: jruby-${{ matrix.jruby_version }} bundler-cache: 'false' # Need to install later so we can vary from Gemfile.lock as required for JRuby version compatibility diff --git a/Gemfile.lock b/Gemfile.lock index cb645130..298fac96 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -6,13 +6,13 @@ GEM rake thor (>= 0.14.0) diff-lcs (1.6.2) - rack (2.2.16) + rack (2.2.17) rake (13.3.0) rspec (3.13.1) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) rspec-mocks (~> 3.13.0) - rspec-core (3.13.4) + rspec-core (3.13.5) rspec-support (~> 3.13.0) rspec-expectations (3.13.5) diff-lcs (>= 1.2.0, < 2.0) diff --git a/History.md b/History.md index 9233470f..47d2c15d 100644 --- a/History.md +++ b/History.md @@ -1,10 +1,11 @@ ## 1.2.4 (UNRELEASED) -- update (bundled) rack to 2.2.16 +- update (bundled) rack to 2.2.17 +- Fix Rails 7.1 CSRF protection when working with `JavaServletStore` sessions ## 1.2.3 -- avoid warnings due usage of `File.exists?` +- avoid warnings due to usage of `File.exists?` - Fix Rails 7.1 compatibility by ensuring active_support is required before railtie - Workaround logger require issues with concurrent-ruby 1.3.5 and older Rails versions - Workaround NameError frozen string literal issues with JRuby 9.3 and Rails 5.2/6.0 diff --git a/Rakefile b/Rakefile index e4ee9dbf..c80cb4da 100644 --- a/Rakefile +++ b/Rakefile @@ -143,7 +143,6 @@ module JRubyJars end require jruby_rack_jar_path if defined?(JRUBY_VERSION) end -require 'jruby/rack/version' # @deprecated to be removed in 1.2 } end end diff --git a/gemfiles/rails50.gemfile b/gemfiles/rails50.gemfile index 7bd0659e..09fffbb9 100644 --- a/gemfiles/rails50.gemfile +++ b/gemfiles/rails50.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "rake", "~> 13.2", group: :test, require: nil +gem "rake", "~> 13.3", group: :test, require: nil gem "rspec", group: :test gem "rails", "~> 5.0.0" diff --git a/gemfiles/rails50.gemfile.lock b/gemfiles/rails50.gemfile.lock index b1a74a08..1455a307 100644 --- a/gemfiles/rails50.gemfile.lock +++ b/gemfiles/rails50.gemfile.lock @@ -65,7 +65,7 @@ GEM method_source (1.1.0) mini_mime (1.1.5) minitest (5.25.5) - net-imap (0.5.8) + net-imap (0.5.9) date net-protocol net-pop (0.1.2) @@ -78,7 +78,7 @@ GEM nokogiri (1.18.8-java) racc (~> 1.4) racc (1.8.1-java) - rack (2.2.15) + rack (2.2.17) rack-test (0.6.3) rack (>= 1.0) rails (5.0.7.2) @@ -93,7 +93,7 @@ GEM bundler (>= 1.3.0) railties (= 5.0.7.2) sprockets-rails (>= 2.0.0) - rails-dom-testing (2.2.0) + rails-dom-testing (2.3.0) activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) @@ -106,20 +106,20 @@ GEM method_source rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (13.2.1) - rspec (3.13.0) + rake (13.3.0) + rspec (3.13.1) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) rspec-mocks (~> 3.13.0) - rspec-core (3.13.3) + rspec-core (3.13.5) rspec-support (~> 3.13.0) - rspec-expectations (3.13.4) + rspec-expectations (3.13.5) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-mocks (3.13.4) + rspec-mocks (3.13.5) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-support (3.13.3) + rspec-support (3.13.4) sprockets (4.2.2) concurrent-ruby (~> 1.0) logger @@ -147,8 +147,8 @@ DEPENDENCIES appraisal rack (~> 2.2) rails (~> 5.0.0) - rake (~> 13.2) + rake (~> 13.3) rspec BUNDLED WITH - 2.3.27 + 2.6.3 diff --git a/gemfiles/rails52.gemfile b/gemfiles/rails52.gemfile index 409d6f56..3f44ae91 100644 --- a/gemfiles/rails52.gemfile +++ b/gemfiles/rails52.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "rake", "~> 13.2", group: :test, require: nil +gem "rake", "~> 13.3", group: :test, require: nil gem "rspec", group: :test gem "rails", "~> 5.2.0" diff --git a/gemfiles/rails52.gemfile.lock b/gemfiles/rails52.gemfile.lock index 84ae5316..d7742fa0 100644 --- a/gemfiles/rails52.gemfile.lock +++ b/gemfiles/rails52.gemfile.lock @@ -47,7 +47,7 @@ GEM rake thor (>= 0.14.0) arel (9.0.0) - base64 (0.2.0) + base64 (0.3.0) builder (3.3.0) concurrent-ruby (1.3.5) crass (1.0.6) @@ -71,7 +71,7 @@ GEM method_source (1.1.0) mini_mime (1.1.5) minitest (5.25.5) - net-imap (0.5.8) + net-imap (0.5.9) date net-protocol net-pop (0.1.2) @@ -84,7 +84,7 @@ GEM nokogiri (1.18.8-java) racc (~> 1.4) racc (1.8.1-java) - rack (2.2.15) + rack (2.2.17) rack-test (2.2.0) rack (>= 1.3) rails (5.2.8.1) @@ -100,7 +100,7 @@ GEM bundler (>= 1.3.0) railties (= 5.2.8.1) sprockets-rails (>= 2.0.0) - rails-dom-testing (2.2.0) + rails-dom-testing (2.3.0) activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) @@ -113,20 +113,20 @@ GEM method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) - rake (13.2.1) - rspec (3.13.0) + rake (13.3.0) + rspec (3.13.1) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) rspec-mocks (~> 3.13.0) - rspec-core (3.13.3) + rspec-core (3.13.5) rspec-support (~> 3.13.0) - rspec-expectations (3.13.4) + rspec-expectations (3.13.5) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-mocks (3.13.4) + rspec-mocks (3.13.5) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-support (3.13.3) + rspec-support (3.13.4) sprockets (4.2.2) concurrent-ruby (~> 1.0) logger @@ -140,7 +140,7 @@ GEM timeout (0.4.3) tzinfo (1.2.11) thread_safe (~> 0.1) - websocket-driver (0.7.7-java) + websocket-driver (0.8.0-java) base64 websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) @@ -155,8 +155,8 @@ DEPENDENCIES appraisal rack (~> 2.2) rails (~> 5.2.0) - rake (~> 13.2) + rake (~> 13.3) rspec BUNDLED WITH - 2.3.27 + 2.6.3 diff --git a/gemfiles/rails60.gemfile b/gemfiles/rails60.gemfile index 5c85d1a5..5d0e9dbe 100644 --- a/gemfiles/rails60.gemfile +++ b/gemfiles/rails60.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "rake", "~> 13.2", group: :test, require: nil +gem "rake", "~> 13.3", group: :test, require: nil gem "rspec", group: :test gem "rails", "~> 6.0.0" diff --git a/gemfiles/rails60.gemfile.lock b/gemfiles/rails60.gemfile.lock index 3ae56ccf..d6da0963 100644 --- a/gemfiles/rails60.gemfile.lock +++ b/gemfiles/rails60.gemfile.lock @@ -60,7 +60,7 @@ GEM bundler rake thor (>= 0.14.0) - base64 (0.2.0) + base64 (0.3.0) builder (3.3.0) concurrent-ruby (1.3.5) crass (1.0.6) @@ -84,7 +84,7 @@ GEM method_source (1.1.0) mini_mime (1.1.5) minitest (5.25.5) - net-imap (0.5.8) + net-imap (0.5.9) date net-protocol net-pop (0.1.2) @@ -97,7 +97,7 @@ GEM nokogiri (1.18.8-java) racc (~> 1.4) racc (1.8.1-java) - rack (2.2.15) + rack (2.2.17) rack-test (2.2.0) rack (>= 1.3) rails (6.0.6.1) @@ -115,7 +115,7 @@ GEM bundler (>= 1.3.0) railties (= 6.0.6.1) sprockets-rails (>= 2.0.0) - rails-dom-testing (2.2.0) + rails-dom-testing (2.3.0) activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) @@ -128,20 +128,20 @@ GEM method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) - rake (13.2.1) - rspec (3.13.0) + rake (13.3.0) + rspec (3.13.1) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) rspec-mocks (~> 3.13.0) - rspec-core (3.13.3) + rspec-core (3.13.5) rspec-support (~> 3.13.0) - rspec-expectations (3.13.4) + rspec-expectations (3.13.5) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-mocks (3.13.4) + rspec-mocks (3.13.5) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-support (3.13.3) + rspec-support (3.13.4) sprockets (4.2.2) concurrent-ruby (~> 1.0) logger @@ -155,11 +155,11 @@ GEM timeout (0.4.3) tzinfo (1.2.11) thread_safe (~> 0.1) - websocket-driver (0.7.7-java) + websocket-driver (0.8.0-java) base64 websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - zeitwerk (2.7.2) + zeitwerk (2.6.18) PLATFORMS universal-java-1.8 @@ -171,8 +171,8 @@ DEPENDENCIES appraisal rack (~> 2.2) rails (~> 6.0.0) - rake (~> 13.2) + rake (~> 13.3) rspec BUNDLED WITH - 2.3.27 + 2.6.3 diff --git a/gemfiles/rails61.gemfile b/gemfiles/rails61.gemfile index 1b0e08e3..b6f80de8 100644 --- a/gemfiles/rails61.gemfile +++ b/gemfiles/rails61.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "rake", "~> 13.2", group: :test, require: nil +gem "rake", "~> 13.3", group: :test, require: nil gem "rspec", group: :test gem "rails", "~> 6.1.0" diff --git a/gemfiles/rails61.gemfile.lock b/gemfiles/rails61.gemfile.lock index 07ab6fbd..e03f4411 100644 --- a/gemfiles/rails61.gemfile.lock +++ b/gemfiles/rails61.gemfile.lock @@ -64,7 +64,7 @@ GEM bundler rake thor (>= 0.14.0) - base64 (0.2.0) + base64 (0.3.0) builder (3.3.0) concurrent-ruby (1.3.5) crass (1.0.6) @@ -88,7 +88,7 @@ GEM method_source (1.1.0) mini_mime (1.1.5) minitest (5.25.5) - net-imap (0.5.8) + net-imap (0.5.9) date net-protocol net-pop (0.1.2) @@ -101,7 +101,7 @@ GEM nokogiri (1.18.8-java) racc (~> 1.4) racc (1.8.1-java) - rack (2.2.15) + rack (2.2.17) rack-test (2.2.0) rack (>= 1.3) rails (6.1.7.10) @@ -119,7 +119,7 @@ GEM bundler (>= 1.15.0) railties (= 6.1.7.10) sprockets-rails (>= 2.0.0) - rails-dom-testing (2.2.0) + rails-dom-testing (2.3.0) activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) @@ -132,20 +132,20 @@ GEM method_source rake (>= 12.2) thor (~> 1.0) - rake (13.2.1) - rspec (3.13.0) + rake (13.3.0) + rspec (3.13.1) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) rspec-mocks (~> 3.13.0) - rspec-core (3.13.3) + rspec-core (3.13.5) rspec-support (~> 3.13.0) - rspec-expectations (3.13.4) + rspec-expectations (3.13.5) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-mocks (3.13.4) + rspec-mocks (3.13.5) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-support (3.13.3) + rspec-support (3.13.4) sprockets (4.2.2) concurrent-ruby (~> 1.0) logger @@ -158,11 +158,11 @@ GEM timeout (0.4.3) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - websocket-driver (0.7.7-java) + websocket-driver (0.8.0-java) base64 websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - zeitwerk (2.7.2) + zeitwerk (2.6.18) PLATFORMS universal-java-1.8 @@ -174,8 +174,8 @@ DEPENDENCIES appraisal rack (~> 2.2) rails (~> 6.1.0) - rake (~> 13.2) + rake (~> 13.3) rspec BUNDLED WITH - 2.3.27 + 2.6.3 diff --git a/gemfiles/rails70.gemfile b/gemfiles/rails70.gemfile index f275ebf7..f4f4a5e3 100644 --- a/gemfiles/rails70.gemfile +++ b/gemfiles/rails70.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "rake", "~> 13.2", group: :test, require: nil +gem "rake", "~> 13.3", group: :test, require: nil gem "rspec", group: :test gem "rails", "~> 7.0.0" diff --git a/gemfiles/rails70.gemfile.lock b/gemfiles/rails70.gemfile.lock index 9ef1d639..933c4986 100644 --- a/gemfiles/rails70.gemfile.lock +++ b/gemfiles/rails70.gemfile.lock @@ -70,7 +70,7 @@ GEM bundler rake thor (>= 0.14.0) - base64 (0.2.0) + base64 (0.3.0) builder (3.3.0) concurrent-ruby (1.3.5) crass (1.0.6) @@ -93,7 +93,7 @@ GEM method_source (1.1.0) mini_mime (1.1.5) minitest (5.25.5) - net-imap (0.5.8) + net-imap (0.5.9) date net-protocol net-pop (0.1.2) @@ -106,7 +106,7 @@ GEM nokogiri (1.18.8-java) racc (~> 1.4) racc (1.8.1-java) - rack (2.2.15) + rack (2.2.17) rack-test (2.2.0) rack (>= 1.3) rails (7.0.8.7) @@ -123,7 +123,7 @@ GEM activesupport (= 7.0.8.7) bundler (>= 1.15.0) railties (= 7.0.8.7) - rails-dom-testing (2.2.0) + rails-dom-testing (2.3.0) activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) @@ -137,29 +137,29 @@ GEM rake (>= 12.2) thor (~> 1.0) zeitwerk (~> 2.5) - rake (13.2.1) - rspec (3.13.0) + rake (13.3.0) + rspec (3.13.1) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) rspec-mocks (~> 3.13.0) - rspec-core (3.13.3) + rspec-core (3.13.5) rspec-support (~> 3.13.0) - rspec-expectations (3.13.4) + rspec-expectations (3.13.5) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-mocks (3.13.4) + rspec-mocks (3.13.5) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-support (3.13.3) + rspec-support (3.13.4) thor (1.3.2) timeout (0.4.3) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - websocket-driver (0.7.7-java) + websocket-driver (0.8.0-java) base64 websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - zeitwerk (2.7.2) + zeitwerk (2.6.18) PLATFORMS universal-java-1.8 @@ -171,7 +171,7 @@ DEPENDENCIES appraisal rack (~> 2.2) rails (~> 7.0.0) - rake (~> 13.2) + rake (~> 13.3) rspec BUNDLED WITH diff --git a/gemfiles/rails71.gemfile b/gemfiles/rails71.gemfile index 12c74436..dc989787 100644 --- a/gemfiles/rails71.gemfile +++ b/gemfiles/rails71.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "rake", "~> 13.2", group: :test, require: nil +gem "rake", "~> 13.3", group: :test, require: nil gem "rspec", group: :test gem "rails", "~> 7.1.0" diff --git a/gemfiles/rails71.gemfile.lock b/gemfiles/rails71.gemfile.lock index 7022dad1..5cca0132 100644 --- a/gemfiles/rails71.gemfile.lock +++ b/gemfiles/rails71.gemfile.lock @@ -82,16 +82,19 @@ GEM bundler rake thor (>= 0.14.0) - base64 (0.2.0) - benchmark (0.4.0) - bigdecimal (3.1.9-java) + base64 (0.3.0) + benchmark (0.4.1) + bigdecimal (3.2.2-java) builder (3.3.0) + cgi (0.5.0-java) concurrent-ruby (1.3.5) connection_pool (2.5.3) crass (1.0.6) date (3.4.1-java) diff-lcs (1.6.2) - drb (2.2.1) + drb (2.2.3) + erb (4.0.4-java) + cgi (>= 0.3.3) erubi (1.13.1) globalid (1.2.1) activesupport (>= 6.1) @@ -116,7 +119,7 @@ GEM mini_mime (1.1.5) minitest (5.25.5) mutex_m (0.3.0) - net-imap (0.5.8) + net-imap (0.5.9) date net-protocol net-pop (0.1.2) @@ -135,7 +138,7 @@ GEM date jar-dependencies (>= 0.1.7) racc (1.8.1-java) - rack (2.2.15) + rack (2.2.17) rack-session (1.0.2) rack (< 3) rack-test (2.2.0) @@ -157,7 +160,7 @@ GEM activesupport (= 7.1.5.1) bundler (>= 1.15.0) railties (= 7.1.5.1) - rails-dom-testing (2.2.0) + rails-dom-testing (2.3.0) activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) @@ -172,35 +175,36 @@ GEM rake (>= 12.2) thor (~> 1.0, >= 1.2.2) zeitwerk (~> 2.6) - rake (13.2.1) - rdoc (6.13.1) + rake (13.3.0) + rdoc (6.14.2) + erb psych (>= 4.0.0) reline (0.6.1) io-console (~> 0.5) - rspec (3.13.0) + rspec (3.13.1) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) rspec-mocks (~> 3.13.0) - rspec-core (3.13.3) + rspec-core (3.13.5) rspec-support (~> 3.13.0) - rspec-expectations (3.13.4) + rspec-expectations (3.13.5) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-mocks (3.13.4) + rspec-mocks (3.13.5) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-support (3.13.3) + rspec-support (3.13.4) securerandom (0.4.1) thor (1.3.2) timeout (0.4.3) tzinfo (2.0.6) concurrent-ruby (~> 1.0) webrick (1.9.1) - websocket-driver (0.7.7-java) + websocket-driver (0.8.0-java) base64 websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - zeitwerk (2.7.2) + zeitwerk (2.6.18) PLATFORMS universal-java-1.8 @@ -212,7 +216,7 @@ DEPENDENCIES appraisal rack (~> 2.2) rails (~> 7.1.0) - rake (~> 13.2) + rake (~> 13.3) rspec BUNDLED WITH diff --git a/gemfiles/rails72.gemfile b/gemfiles/rails72.gemfile index bf9f6c24..602c07f2 100644 --- a/gemfiles/rails72.gemfile +++ b/gemfiles/rails72.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "rake", "~> 13.2", group: :test, require: nil +gem "rake", "~> 13.3", group: :test, require: nil gem "rspec", group: :test gem "rails", "~> 7.2.0" diff --git a/gemfiles/rails72.gemfile.lock b/gemfiles/rails72.gemfile.lock index c6bcb461..a225de6c 100644 --- a/gemfiles/rails72.gemfile.lock +++ b/gemfiles/rails72.gemfile.lock @@ -76,16 +76,19 @@ GEM bundler rake thor (>= 0.14.0) - base64 (0.2.0) - benchmark (0.4.0) - bigdecimal (3.1.9-java) + base64 (0.3.0) + benchmark (0.4.1) + bigdecimal (3.2.2-java) builder (3.3.0) + cgi (0.5.0-java) concurrent-ruby (1.3.5) connection_pool (2.5.3) crass (1.0.6) date (3.4.1-java) diff-lcs (1.6.2) - drb (2.2.1) + drb (2.2.3) + erb (4.0.4-java) + cgi (>= 0.3.3) erubi (1.13.1) globalid (1.2.1) activesupport (>= 6.1) @@ -109,7 +112,7 @@ GEM marcel (1.0.4) mini_mime (1.1.5) minitest (5.25.5) - net-imap (0.5.8) + net-imap (0.5.9) date net-protocol net-pop (0.1.2) @@ -128,7 +131,7 @@ GEM date jar-dependencies (>= 0.1.7) racc (1.8.1-java) - rack (2.2.15) + rack (2.2.17) rack-session (1.0.2) rack (< 3) rack-test (2.2.0) @@ -150,7 +153,7 @@ GEM activesupport (= 7.2.2.1) bundler (>= 1.15.0) railties (= 7.2.2.1) - rails-dom-testing (2.2.0) + rails-dom-testing (2.3.0) activesupport (>= 5.0.0) minitest nokogiri (>= 1.6) @@ -165,24 +168,25 @@ GEM rake (>= 12.2) thor (~> 1.0, >= 1.2.2) zeitwerk (~> 2.6) - rake (13.2.1) - rdoc (6.13.1) + rake (13.3.0) + rdoc (6.14.2) + erb psych (>= 4.0.0) reline (0.6.1) io-console (~> 0.5) - rspec (3.13.0) + rspec (3.13.1) rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) rspec-mocks (~> 3.13.0) - rspec-core (3.13.3) + rspec-core (3.13.5) rspec-support (~> 3.13.0) - rspec-expectations (3.13.4) + rspec-expectations (3.13.5) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-mocks (3.13.4) + rspec-mocks (3.13.5) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-support (3.13.3) + rspec-support (3.13.4) securerandom (0.4.1) thor (1.3.2) timeout (0.4.3) @@ -190,11 +194,11 @@ GEM concurrent-ruby (~> 1.0) useragent (0.16.11) webrick (1.9.1) - websocket-driver (0.7.7-java) + websocket-driver (0.8.0-java) base64 websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) - zeitwerk (2.7.2) + zeitwerk (2.6.18) PLATFORMS universal-java-1.8 @@ -206,7 +210,7 @@ DEPENDENCIES appraisal rack (~> 2.2) rails (~> 7.2.0) - rake (~> 13.2) + rake (~> 13.3) rspec BUNDLED WITH diff --git a/pom.xml b/pom.xml index b1ffe421..97969f82 100644 --- a/pom.xml +++ b/pom.xml @@ -19,8 +19,8 @@ - 9.4.12.1 - 3.0.5 + 9.4.13.0 + 3.0.6 ${project.build.directory}/rubygems 2.0.17 4.3.30.RELEASE diff --git a/src/main/ruby/jruby/rack/rails/environment3.rb b/src/main/ruby/jruby/rack/rails/environment.rb similarity index 89% rename from src/main/ruby/jruby/rack/rails/environment3.rb rename to src/main/ruby/jruby/rack/rails/environment.rb index 32127df7..3d4764ac 100644 --- a/src/main/ruby/jruby/rack/rails/environment3.rb +++ b/src/main/ruby/jruby/rack/rails/environment.rb @@ -9,7 +9,7 @@ # Rails 3.x specific booter behavior. # @see JRuby::Rack::Railtie -module JRuby::Rack::RailsBooter::Rails3Environment +module JRuby::Rack::RailsBooter::RailsEnvironment # @return [Rails::Application] the (loaded) application instance def to_app @@ -23,7 +23,7 @@ def load_environment require expand_path('config/boot.rb') require 'jruby/rack/rails/railtie' require expand_path('config/environment.rb') - require 'jruby/rack/rails/extensions3' + require 'jruby/rack/rails/extensions' end protected diff --git a/src/main/ruby/jruby/rack/rails/environment2.rb b/src/main/ruby/jruby/rack/rails/environment2.rb deleted file mode 100644 index ee67b699..00000000 --- a/src/main/ruby/jruby/rack/rails/environment2.rb +++ /dev/null @@ -1,141 +0,0 @@ -#-- -# Copyright (c) 2010-2012 Engine Yard, Inc. -# Copyright (c) 2007-2009 Sun Microsystems, Inc. -# This source code is available under the MIT license. -# See the file LICENSE.txt for details. -#++ - -require 'jruby/rack/rails_booter' - -# Rails 2.x (JRuby-Rack >= 1.1.0 only supports 2.3) specific booter behavior. -module JRuby::Rack::RailsBooter::Rails2Environment - - # @return [::Rack::Adapter::Rails] a Rack compatible Rails application wrapper - def to_app - # backward "compatibility" calling #to_app without a #load_environment - load_environment unless @load_environment - require 'rack/adapter/rails' - rails_adapter = ::Rack::Adapter::Rails.new(:public => public_path, :root => app_path) - rack_based_sessions? ? rails_adapter : RailsRequestSetup.new(rails_adapter, session_options) - end - - # Loads the Rails 2.x environment. - def load_environment - require 'jruby/rack/rails/boot_hook' - load expand_path('config/environment.rb') # load File.join(app_path, 'config', 'environment.rb') - require 'dispatcher' - setup_sessions - setup_logger - setup_relative_url_root - @load_environment = true # prevent 2x load 'environment.rb' - end - - protected - - def set_public_root - silence_warnings { Object.const_set(:PUBLIC_ROOT, public_path) } - end - - public - - # This hook method is called back from within the mechanism installed - # by rails_boot above. We're setting appropriate defaults for the - # servlet environment here that can still be overridden (if desired) in - # the application's environment files. - def boot_for_servlet_environment(initializer) - initializer_class = initializer.class - initializer_class.module_eval do - alias_method :require_frameworks_without_servlet_env, :require_frameworks - def require_frameworks_with_servlet_env - JRuby::Rack.booter.before_require_frameworks - require_frameworks_without_servlet_env - JRuby::Rack.booter.setup_actionpack - require 'jruby/rack/rails/extensions2' - end - alias_method :require_frameworks, :require_frameworks_with_servlet_env - end - end - - def before_require_frameworks - Rails.public_path = PUBLIC_ROOT if defined?(Rails.public_path) - end - - def setup_actionpack - unless defined?(Rails.public_path) - ActionController::Base.page_cache_directory = PUBLIC_ROOT - silence_warnings do - asset_tag_helper = ActionView::Helpers::AssetTagHelper - asset_tag_helper.const_set("ASSETS_DIR", PUBLIC_ROOT) - asset_tag_helper.const_set("JAVASCRIPTS_DIR", "#{PUBLIC_ROOT}/javascripts") - asset_tag_helper.const_set("STYLESHEETS_DIR", "#{PUBLIC_ROOT}/stylesheets") - end - end - end - - def setup_relative_url_root - if ENV['RAILS_RELATIVE_URL_ROOT'] && ActionController::Base.respond_to?(:relative_url_root=) - ActionController::Base.relative_url_root = ENV['RAILS_RELATIVE_URL_ROOT'] - end - end - - def rack_based_sessions? - defined?(ActionController::Session::AbstractStore) - end - - def setup_sessions - unless rack_based_sessions? - if pstore_sessions? - require 'cgi/session/java_servlet_store' - session_options[:database_manager] = CGI::Session::JavaServletStore - end - # Turn off default cookies when using Java sessions - if java_sessions? - session_options[:no_cookies] = true - end - end - end - - def setup_logger - if logger = defined?(::RAILS_DEFAULT_LOGGER) && ::RAILS_DEFAULT_LOGGER - if defined?(ActiveSupport::BufferedLogger) && # we only support Rails 2.3 - logger.is_a?(ActiveSupport::BufferedLogger) - # since there's no way to detect whether this is a custom config.logger - # declaration or the (default) Rails configured logger we assume all - # ActiveSupport::BufferedLogger instances to be the default and patch : - old_dev = logger.send :instance_variable_get, "@log" - old_dev.close rescue nil - logger.send :instance_variable_set, "@log", JRuby::Rack.send(:logdev) - else # keep custom e.g. Logger instance setup as is ... - JRuby::Rack.context.log "keeping custom (config.logger) Rails logger instance" - end - end - end - - def session_options - @session_options ||= ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS - end - - def java_sessions? - session_options[:database_manager].to_s =~ /JavaServletStore$/ - end - - def pstore_sessions? - session_options[:database_manager] == (defined?(::CGI::Session::PStore) && ::CGI::Session::PStore) - end - - class RailsRequestSetup # :nodoc only used for (non-rack based) CGI sessions - - def initialize(app, session_options) - @app, @session_options = app, session_options - end - - def call(env) - options = @session_options.dup - options[:java_servlet_request] = env['java.servlet_request'] - env['rails.session_options'] = options - @app.call(env) - end - - end - -end \ No newline at end of file diff --git a/src/main/ruby/jruby/rack/rails/extensions2.rb b/src/main/ruby/jruby/rack/rails/extensions2.rb deleted file mode 100644 index 64781018..00000000 --- a/src/main/ruby/jruby/rack/rails/extensions2.rb +++ /dev/null @@ -1,62 +0,0 @@ -#-- -# Copyright (c) 2010-2012 Engine Yard, Inc. -# Copyright (c) 2007-2009 Sun Microsystems, Inc. -# This source code is available under the MIT license. -# See the file LICENSE.txt for details. -#++ - -require 'jruby/rack/rails/extensions' - -require 'action_controller' - -module ActionController - class CgiRequest #:nodoc: - # Replace session_options writer to merge session options - # With ones passed into request (so we can preserve the - # java servlet request) - def session_options=(opts) - if opts == false - @session_options = false - elsif @session_options - @session_options.update(opts) - else - @session_options = opts - end - end - - DEFAULT_SESSION_OPTIONS = {} unless defined?(DEFAULT_SESSION_OPTIONS) - end - - module Session - autoload :JavaServletStore, "action_controller/session/java_servlet_store" - end - - # These rescue module overrides should only be needed for pre-Rails 2.1 - unless defined?(::Rails.public_path) - module Rescue - # Rails 2.0 static rescue files - def render_optional_error_file(status_code) #:nodoc: - status = interpret_status(status_code) - path = "#{PUBLIC_ROOT}/#{status[0,3]}.html" - if File.exist?(path) - render :file => path, :status => status - else - head status - end - end - - def rescue_action_in_public(exception) #:nodoc: - if respond_to?(:render_optional_error_file) # Rails 2 - render_optional_error_file response_code_for_rescue(exception) - else # Rails 1 - case exception - when RoutingError, UnknownAction - render_text(IO.read(File.join(PUBLIC_ROOT, '404.html')), "404 Not Found") - else - render_text(IO.read(File.join(PUBLIC_ROOT, '500.html')), "500 Internal Error") - end - end - end - end - end -end diff --git a/src/main/ruby/jruby/rack/rails/extensions3.rb b/src/main/ruby/jruby/rack/rails/extensions3.rb deleted file mode 100644 index 4c1e174a..00000000 --- a/src/main/ruby/jruby/rack/rails/extensions3.rb +++ /dev/null @@ -1,8 +0,0 @@ -#-- -# Copyright (c) 2010-2012 Engine Yard, Inc. -# Copyright (c) 2007-2009 Sun Microsystems, Inc. -# This source code is available under the MIT license. -# See the file LICENSE.txt for details. -#++ - -require 'jruby/rack/rails/extensions' diff --git a/src/main/ruby/jruby/rack/rails_booter.rb b/src/main/ruby/jruby/rack/rails_booter.rb index 06de2e20..ead442f2 100644 --- a/src/main/ruby/jruby/rack/rails_booter.rb +++ b/src/main/ruby/jruby/rack/rails_booter.rb @@ -27,13 +27,8 @@ def boot! ENV['RAILS_ROOT'] = app_path ENV['RAILS_ENV'] = rails_env - if rails2? - require 'jruby/rack/rails/environment2' - extend Rails2Environment - else - require 'jruby/rack/rails/environment3' - extend Rails3Environment - end + require 'jruby/rack/rails/environment' + extend RailsEnvironment set_public_root self @@ -71,11 +66,6 @@ def run_boot_hooks private - def rails2? - app_path = real_path File.join(layout.app_uri, 'config/application.rb') - ! ( app_path && File.exist?(app_path) ) - end - class << self # @see #RailsRackApplicationFactory @@ -96,6 +86,5 @@ def rails_booter end end - end end diff --git a/src/main/ruby/jruby/rack/session_store.rb b/src/main/ruby/jruby/rack/session_store.rb index 9aeb3f47..eaa13f48 100644 --- a/src/main/ruby/jruby/rack/session_store.rb +++ b/src/main/ruby/jruby/rack/session_store.rb @@ -5,7 +5,7 @@ # See the file LICENSE.txt for details. #++ -require 'rack/session/abstract/id' unless defined?(::Rack::Session::Abstract::ID) +require 'rack/session/abstract/id' unless defined?(::Rack::Session::Abstract::Persisted) module JRuby::Rack module Session @@ -28,7 +28,7 @@ def method_missing(method, *args, &block) end # Rack based SessionStore implementation but compatible with (older) AbstractStore. - class SessionStore < ::Rack::Session::Abstract::ID + class SessionStore < ::Rack::Session::Abstract::Persisted ENV_SERVLET_SESSION_KEY = 'java.servlet_session'.freeze RAILS_SESSION_KEY = "__current_rails_session".freeze @@ -37,13 +37,6 @@ def initialize(app, options={}) super(app, options.merge!(:cookie_only => false, :defer => true)) end - def context(env, app = @app) - req = make_request env - prepare_session(req) - status, headers, body = app.call(req.env) - commit_session(req, status, headers, body) - end - # (public) servlet specific methods : def get_servlet_session(env, create = false) @@ -69,7 +62,7 @@ def get_servlet_session(env, create = false) servlet_session end - private # Rack::Session::Abstract::ID overrides : + private # Rack::Session::Abstract::Persisted overrides : def session_class ::JRuby::Rack::Session::SessionHash @@ -83,6 +76,7 @@ def generate_sid(secure = @sid_secure) nil # dummy method - no session id generation with servlet API end + # Alternative to overriding find_session(req) def load_session(req) # session_id arg for get_session alias session_id, session = false, {} if servlet_session = get_servlet_session(req.env) @@ -122,40 +116,49 @@ def loaded_session?(session) ! session.is_a?(::JRuby::Rack::Session::SessionHash) || session.loaded? end - def commit_session(req, status, headers, body) - session = req.env[::Rack::RACK_SESSION] - options = req.env[::Rack::RACK_SESSION_OPTIONS] + # Overridden from Rack, removing support for deferral and unnecessary cookie support when using Java Servlet sessions. + def commit_session(req, _res) + session = req.get_header ::Rack::RACK_SESSION + options = session.options if options[:drop] || options[:renew] - destroy_session(req.env, options[:id], options) + delete_session(req, session.id, options) end - return [status, headers, body] if options[:drop] || options[:skip] + return if options[:drop] || options[:skip] if loaded_session?(session) - session_id = session.respond_to?(:id=) ? session.id : options[:id] - session_data = session.to_hash.delete_if { |_,v| v.nil? } - unless set_session(req.env, session_id, session_data, options) - req.env["rack.errors"].puts("WARNING #{self.class.name} failed to save session. Content dropped.") + # Mirror behaviour of Rails ActionDispatch::Session::AbstractStore#commit_session for Rails 7.1+ compatibility + commit_csrf_token(req, session) + + session_id ||= session.id + session_data = session.to_hash.delete_if { |k, v| v.nil? } + + unless write_session(req, session_id, session_data, options) + req.get_header(::Rack::RACK_ERRORS).puts("Warning! #{self.class.name} failed to save session. Content dropped.") end end + end - [status, headers, body] + def commit_csrf_token(req, session_hash) + csrf_token = req.env[::ActionController::RequestForgeryProtection::CSRF_TOKEN] if defined?(::ActionController::RequestForgeryProtection::CSRF_TOKEN) + session_hash[:_csrf_token] = csrf_token if csrf_token end - def set_session(env, session_id, hash, options) - if session_id.nil? && hash.empty? - destroy_session(env) + def write_session(req, session_id, session_hash, _options) + if session_id.nil? && session_hash.empty? + delete_session(req) return true end - if servlet_session = get_servlet_session(env, true) + + if servlet_session = get_servlet_session(req.env, true) begin servlet_session.synchronized do keys = servlet_session.getAttributeNames - keys.select { |key| ! hash.has_key?(key) }.each do |key| + keys.select { |key| ! session_hash.has_key?(key) }.each do |key| servlet_session.removeAttribute(key) end - hash.delete_if do |key,value| + session_hash.delete_if do |key,value| if String === key case value when String, Numeric, true, false, nil @@ -171,8 +174,8 @@ def set_session(env, session_id, hash, options) end end end - if ! hash.empty? - marshalled_string = Marshal.dump(hash) + if ! session_hash.empty? + marshalled_string = Marshal.dump(session_hash) marshalled_bytes = marshalled_string.to_java_bytes servlet_session.setAttribute(RAILS_SESSION_KEY, marshalled_bytes) elsif servlet_session.getAttribute(RAILS_SESSION_KEY) @@ -188,9 +191,9 @@ def set_session(env, session_id, hash, options) end end - def destroy_session(env, session_id = nil, options = nil) - # session_id and options arg defaults for destory alias - (session = get_servlet_session(env)) && session.synchronized { session.invalidate } + def delete_session(req, _session_id = nil, _options = nil) + # session_id and options arg defaults for delete alias + (session = get_servlet_session(req.env)) && session.synchronized { session.invalidate } rescue java.lang.IllegalStateException # if session already invalid nil end diff --git a/src/spec/ruby/action_controller/session/java_servlet_store_spec.rb b/src/spec/ruby/action_controller/session/java_servlet_store_spec.rb index 444abf75..2d67be26 100644 --- a/src/spec/ruby/action_controller/session/java_servlet_store_spec.rb +++ b/src/spec/ruby/action_controller/session/java_servlet_store_spec.rb @@ -3,21 +3,10 @@ describe "ActionController::Session::JavaServletStore" do before :all do - require 'active_support' require 'action_controller' - begin # help Rails 3.0 up - require 'action_dispatch/middleware/session/abstract_store' - rescue LoadError - end - begin # a Rails 2.3 require - require 'action_controller/session/abstract_store' - rescue LoadError - end - - require 'jruby/rack/session_store' - require 'action_controller/session/java_servlet_store' + require 'jruby/rack/session_store' end before :each do @@ -283,6 +272,22 @@ expect( new_session.send(:getAttribute, "_csrf_token") ).to_not be nil end + it "propagates rails csrf token to session during commit" do + skip "Only runs on Rails 7.1+" unless defined? ::ActionController::RequestForgeryProtection::CSRF_TOKEN + session = double_http_session + @request.should_receive(:getSession).and_return(session) + + @app.should_receive(:call) do |env| + env['rack.session']['foo'] = 'bar' + env[::ActionController::RequestForgeryProtection::CSRF_TOKEN] = 'some_token' + end + @session_store.call(@env) + + # CSRF token propagated from env to underlying session + expect( session.send(:getAttribute, '_csrf_token') ).to eq 'some_token' + expect( session.send(:getAttribute, 'foo') ).to eq 'bar' + end + it "handles the skip session option" do @request.should_receive(:getSession).with(false).and_return @session @session.should_not_receive(:setAttribute) diff --git a/src/spec/ruby/jruby/rack/integration_spec.rb b/src/spec/ruby/jruby/rack/integration_spec.rb index 9464ebbb..137f1b02 100644 --- a/src/spec/ruby/jruby/rack/integration_spec.rb +++ b/src/spec/ruby/jruby/rack/integration_spec.rb @@ -123,285 +123,6 @@ end - describe 'rails 3.0', :lib => :rails30 do - - before(:all) { copy_gemfile("rails30") } - - def base_path; "file://#{STUB_DIR}/rails30" end - - it_should_behave_like 'a rails app' - - context "initialized" do - - before :all do - initialize_rails nil, base_path - end - after(:all) { restore_rails } - - it "loaded rack ~> 1.2" do - @runtime = @rack_factory.getApplication.getRuntime - should_eval_as_not_nil "defined?(Rack.release)" - should_eval_as_eql_to "Rack.release.to_s[0, 3]", '1.2' - end - - it "disables rack's chunked support (by default)" do - @runtime = @rack_factory.getApplication.getRuntime - expect_to_have_monkey_patched_chunked - end - - end - - context "initialized (custom)" do - - before :all do - initialize_rails 'custom', base_path - end - - it "booted a custom env with a custom logger" do - @runtime = @rack_factory.getApplication.getRuntime - should_eval_as_not_nil "defined?(Rails)" - should_eval_as_eql_to "Rails.env", 'custom' - should_eval_as_not_nil "Rails.logger" - should_eval_as_eql_to "Rails.logger.class.name", 'CustomLogger' - end - - end - - end - - describe 'rails 3.1', :lib => :rails31 do - - before(:all) { copy_gemfile("rails31") } - - def base_path; "file://#{STUB_DIR}/rails31" end - - it_should_behave_like 'a rails app' - - context "initialized" do - - before :all do - initialize_rails 'production', base_path - end - after(:all) { restore_rails } - - it "loaded META-INF/init.rb" do - @runtime = @rack_factory.getApplication.getRuntime - should_eval_as_not_nil "defined?(WARBLER_CONFIG)" - end - - it "loaded rack ~> 1.3" do - @runtime = @rack_factory.getApplication.getRuntime - should_eval_as_not_nil "defined?(Rack.release)" - should_eval_as_eql_to "Rack.release.to_s[0, 3]", '1.3' - end - - it "booted with a servlet logger" do - @runtime = @rack_factory.getApplication.getRuntime - should_eval_as_not_nil "defined?(Rails)" - should_eval_as_not_nil "Rails.logger" - should_eval_as_not_nil "Rails.logger.instance_variable_get(:'@logdev')" # Logger::LogDevice - should_eval_as_eql_to "Rails.logger.instance_variable_get(:'@logdev').dev.class.name", 'JRuby::Rack::ServletLog' - - should_eval_as_eql_to "Rails.logger.level", Logger::DEBUG - end - - it "disables rack's chunked support (by default)" do - @runtime = @rack_factory.getApplication.getRuntime - expect_to_have_monkey_patched_chunked - end - - end - - end - - describe 'rails 3.2', :lib => :rails32 do - - before(:all) { copy_gemfile("rails32") } - - def base_path; "file://#{STUB_DIR}/rails32" end - - it_should_behave_like 'a rails app' - - context "initialized" do - - before(:all) { initialize_rails 'production', base_path } - after(:all) { restore_rails } - - it "loaded rack ~> 1.4" do - @runtime = @rack_factory.getApplication.getRuntime - should_eval_as_not_nil "defined?(Rack.release)" - should_eval_as_eql_to "Rack.release.to_s[0, 3]", '1.4' - end - - it "booted with a servlet logger" do - @runtime = @rack_factory.getApplication.getRuntime - should_eval_as_not_nil "defined?(Rails)" - should_eval_as_not_nil "Rails.logger" - should_eval_as_eql_to "Rails.logger.class.name", 'ActiveSupport::TaggedLogging' - should_eval_as_not_nil "Rails.logger.instance_variable_get(:'@logger')" - should_eval_as_eql_to "logger = Rails.logger.instance_variable_get(:'@logger'); " + - "logger.instance_variable_get(:'@logdev').dev.class.name", 'JRuby::Rack::ServletLog' - - should_eval_as_eql_to "Rails.logger.level", Logger::INFO - end - - it "sets up public_path (as for a war)" do - @runtime = @rack_factory.getApplication.getRuntime - should_eval_as_eql_to "Rails.public_path", "#{STUB_DIR}/rails32" - # make sure it was set early on (before initializers run) : - should_eval_as_not_nil "defined? Rails32::Application::PUBLIC_PATH" - should_eval_as_eql_to "Rails32::Application::PUBLIC_PATH", "#{STUB_DIR}/rails32" - # check if image_tag resolves path to images correctly : - should_eval_as_eql_to %q{ - config = ActionController::Base.config; - asset_paths = ActionView::Helpers::AssetTagHelper::AssetPaths.new(config); - image_path = asset_paths.compute_public_path('image.jpg', 'images'); - image_path[0, 18] - }, '/images/image.jpg?' - end - - it "disables rack's chunked support (by default)" do - @runtime = @rack_factory.getApplication.getRuntime - expect_to_have_monkey_patched_chunked - end - - end - - end - - describe 'rails 4.0', :lib => :rails40 do - - before(:all) { copy_gemfile("rails40") } - - def base_path; "file://#{STUB_DIR}/rails40" end - - it_should_behave_like 'a rails app' - - context "initialized" do - - before(:all) { initialize_rails 'production', base_path } - after(:all) { restore_rails } - - it "loaded rack ~> 1.5" do - @runtime = @rack_factory.getApplication.getRuntime - should_eval_as_not_nil "defined?(Rack.release)" - should_eval_as_eql_to "Rack.release.to_s[0, 3]", '1.5' - end - - it "booted with a servlet logger" do - @runtime = @rack_factory.getApplication.getRuntime - should_eval_as_not_nil "defined?(Rails)" - should_eval_as_not_nil "Rails.logger" - # NOTE: TaggedLogging is a module that extends the instance now : - should_eval_as_eql_to "Rails.logger.is_a? ActiveSupport::TaggedLogging", true - should_eval_as_eql_to "Rails.logger.instance_variable_get(:'@logdev').dev.class.name", - 'JRuby::Rack::ServletLog' - should_eval_as_eql_to "Rails.logger.level", Logger::INFO - end - - it "sets up public_path (as for a war)" do - @runtime = @rack_factory.getApplication.getRuntime - should_eval_as_eql_to "Rails.public_path.to_s", "#{STUB_DIR}/rails40" # Pathname - # due config.assets.digest = true and since we're asset pre-compiled : - #should_eval_as_eql_to %q{ - # ActionController::Base.helpers.image_path('image.jpg')[0, 14]; - #}, '/assets/image-' - end - - end - - end - - describe 'rails 4.1', :lib => :rails41 do - - before(:all) do name = :rails41 # copy_gemfile : - FileUtils.cp File.join(GEMFILES_DIR, "#{name}.gemfile"), File.join(STUB_DIR, "#{name}/Gemfile") - FileUtils.cp File.join(GEMFILES_DIR, "#{name}.gemfile.lock"), File.join(STUB_DIR, "#{name}/Gemfile.lock") - Dir.chdir File.join(STUB_DIR, name.to_s) - end - - def prepare_servlet_context(servlet_context) - servlet_context.addInitParameter('rails.root', "#{STUB_DIR}/rails41") - servlet_context.addInitParameter('jruby.rack.layout_class', 'FileSystemLayout') - end - - def base_path; "file://#{STUB_DIR}/rails41" end - # let(:base_path) { "file://#{STUB_DIR}/rails41" } - - it_should_behave_like 'a rails app' - - context "initialized" do - - before(:all) { initialize_rails 'production', base_path } - after(:all) { restore_rails } - - it "loaded rack ~> 1.5" do - @runtime = @rack_factory.getApplication.getRuntime - should_eval_as_not_nil "defined?(Rack.release)" - should_eval_as_eql_to "Rack.release.to_s[0, 3]", '1.5' - end - - it "booted with a servlet logger" do - @runtime = @rack_factory.getApplication.getRuntime - should_eval_as_not_nil "defined?(Rails)" - should_eval_as_not_nil "Rails.logger" - # NOTE: TaggedLogging is a module that extends the instance now : - should_eval_as_eql_to "Rails.logger.is_a? ActiveSupport::TaggedLogging", true - should_eval_as_eql_to "Rails.logger.instance_variable_get(:'@logdev').dev.class.name", - 'JRuby::Rack::ServletLog' - should_eval_as_eql_to "Rails.logger.level", Logger::INFO - end - - it "sets up public_path (as for a war)" do - @runtime = @rack_factory.getApplication.getRuntime - should_eval_as_eql_to "Rails.public_path.to_s", "#{STUB_DIR}/rails41/public" - end - - end - - end - - describe 'rails 2.3', :lib => :rails23 do - - before(:all) do - copy_gemfile('rails23') - path = File.join(STUB_DIR, 'rails23/WEB-INF/init.rb') # hard-coded RAILS_GEM_VERSION - File.open(path, 'w') { |f| f << "RAILS_GEM_VERSION = '#{Rails::VERSION::STRING}'\n" } - end - - let(:base_path) { "file://#{STUB_DIR}/rails23" } - - it_should_behave_like 'a rails app' - - context "initialized" do - - before(:all) { initialize_rails 'production', base_path } - after(:all) { restore_rails } - - it "loaded rack ~> 1.1" do - @runtime = @rack_factory.getApplication.getRuntime - should_eval_as_not_nil "defined?(Rack.release)" - should_eval_as_eql_to "Rack.release.to_s[0, 3]", '1.1' - end - - it "booted with a servlet logger" do - @runtime = @rack_factory.getApplication.getRuntime - should_eval_as_not_nil "defined?(Rails)" - should_eval_as_not_nil "defined?(Rails.logger)" - - should_eval_as_not_nil "defined?(ActiveSupport::BufferedLogger) && Rails.logger.is_a?(ActiveSupport::BufferedLogger)" - should_eval_as_not_nil "Rails.logger.send(:instance_variable_get, '@log')" - should_eval_as_eql_to "log = Rails.logger.send(:instance_variable_get, '@log');" + - "log.class.name", 'JRuby::Rack::ServletLog' - should_eval_as_eql_to "Rails.logger.level", Logger::INFO - - @runtime.evalScriptlet "Rails.logger.debug 'logging works'" - end - - end - - end - def expect_to_have_monkey_patched_chunked @runtime.evalScriptlet "require 'rack/chunked'" script = %{ diff --git a/src/spec/ruby/jruby/rack/rails_booter_spec.rb b/src/spec/ruby/jruby/rack/rails_booter_spec.rb index 5d828e87..e8b23945 100644 --- a/src/spec/ruby/jruby/rack/rails_booter_spec.rb +++ b/src/spec/ruby/jruby/rack/rails_booter_spec.rb @@ -106,119 +106,6 @@ booter.logger.info 'hello-there' end - it "detects 2.3" do - root = File.expand_path('../../../rails23', __FILE__) - @rack_context.should_receive(:getInitParameter).with("rails.root").and_return root - booter.layout_class = JRuby::Rack::FileSystemLayout - expect( booter.send(:rails2?) ).to be true - end - - it "detects 3.x" do - root = File.expand_path('../../../rails3x', __FILE__) - @rack_context.should_receive(:getInitParameter).with("rails.root").and_return root - booter.layout_class = JRuby::Rack::FileSystemLayout - expect( booter.send(:rails2? ) ).to be false - end - - describe "Rails 2.3", :lib => :stub do - - RAILS23_ROOT_DIR = File.expand_path("../../../rails23", __FILE__) - - before do - booter.stub(:rails2?).and_return true - end - - it "sets up java servlet-based sessions if the session store is the default" do - - booter.boot! - booter.should_receive(:rack_based_sessions?).and_return false - - booter.session_options[:database_manager] = ::CGI::Session::PStore - booter.setup_sessions - booter.session_options[:database_manager].should == ::CGI::Session::JavaServletStore - end - - it "turns off Ruby CGI cookies if the java servlet store is used" do - - booter.boot! - booter.should_receive(:rack_based_sessions?).and_return false - - booter.session_options[:database_manager] = ::CGI::Session::JavaServletStore - booter.setup_sessions - booter.session_options[:no_cookies].should == true - end - - it "provides the servlet request in the session options if the java servlet store is used" do - - booter.boot! - booter.should_receive(:rack_based_sessions?).twice.and_return false - - booter.session_options[:database_manager] = ::CGI::Session::JavaServletStore - booter.setup_sessions - booter.instance_variable_set :@load_environment, true - - ::Rack::Adapter::Rails.should_receive(:new).and_return app = double("rails adapter") - app.should_receive(:call) - - env = { "java.servlet_request" => double("servlet request") } - booter.to_app.call(env) - env['rails.session_options'].should have_key(:java_servlet_request) - env['rails.session_options'][:java_servlet_request].should == env["java.servlet_request"] - end - - it "should set the PUBLIC_ROOT constant to the location of the public root", - :lib => [ :rails23, :stub ] do - - booter.app_path = RAILS23_ROOT_DIR - booter.boot! - expect( PUBLIC_ROOT ).to eql booter.public_path - end - - after(:each) do - #Object.send :remove_const, :RAILS_ROOT if Object.const_defined? :RAILS_ROOT - Object.send :remove_const, :PUBLIC_ROOT if Object.const_defined? :PUBLIC_ROOT - end - - context 'booted' do - - before :each do - $servlet_context = @servlet_context - @rack_context.should_receive(:getContextPath).and_return "/foo" - booter.app_path = RAILS23_ROOT_DIR - booter.boot! - silence_warnings { booter.load_environment } - end - - after(:all) { $servlet_context = nil } - - it "should default the page cache directory to the public root" do - ActionController::Base.page_cache_directory.should == booter.public_path - end - - it "should default the session store to the java servlet session store" do - ActionController::Base.session_store.should == CGI::Session::JavaServletStore - end - - it "should set the ActionView ASSETS_DIR constant to the public root" do - ActionView::Helpers::AssetTagHelper::ASSETS_DIR.should == booter.public_path - end - - it "should set the ActionView JAVASCRIPTS_DIR constant to the public root/javascripts" do - ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR.should == booter.public_path + "/javascripts" - end - - it "should set the ActionView STYLESHEETS_DIR constant to the public root/stylesheets" do - ActionView::Helpers::AssetTagHelper::STYLESHEETS_DIR.should == booter.public_path + "/stylesheets" - end - - it "should set the ActionController.relative_url_root to the servlet context path" do - ActionController::Base.relative_url_root.should == "/foo" - end - - end - - end if defined? Rails - RAILS_ROOT_DIR = File.expand_path("../../../rails3x", __FILE__) # NOTE: specs currently only test with a stubbed Rails::Railtie @@ -284,10 +171,6 @@ paths['public/stylesheets'].should ==[ File.join(public_path, "stylesheets") ] end - it "should not set the PUBLIC_ROOT constant" do - expect( PUBLIC_ROOT ).to eql "" - end - describe "logger" do before do diff --git a/src/spec/ruby/rails23/config/boot.rb b/src/spec/ruby/rails23/config/boot.rb deleted file mode 100644 index 7713bd40..00000000 --- a/src/spec/ruby/rails23/config/boot.rb +++ /dev/null @@ -1,35 +0,0 @@ - -# This is a fake Rails config/boot file to be used during testing. - -RAILS_ROOT = "#{ENV['RAILS_ROOT']}" - -def RAILS_ROOT.inspect; "#{super} set at: #{__FILE__}" end - -# Simulate the Rails 2.0 boot process here, to test our boot hook -module Rails - class << self - def boot! - unless booted? - pick_boot.run - end - end - - def booted? - defined? Rails::Initializer - end - - def pick_boot - Boot.new - end - end - - class Boot - def run - require 'initializer' - # @see #rails/stub/initializer.rb - Rails::Initializer.run(:set_load_path) - end - end -end - -Rails.boot! diff --git a/src/spec/ruby/rails23/config/environment.rb b/src/spec/ruby/rails23/config/environment.rb deleted file mode 100644 index d92a9c45..00000000 --- a/src/spec/ruby/rails23/config/environment.rb +++ /dev/null @@ -1,10 +0,0 @@ - -# This is a fake Rails config/environment file to be used during testing. - -# Specifies gem version of Rails to use when vendor/rails is not present -RAILS_GEM_VERSION = '2.3.18' # unless defined? RAILS_GEM_VERSION - -# Bootstrap the Rails environment, frameworks, and default configuration -require File.join(File.dirname(__FILE__), 'boot') - -Rails::Initializer.run { |config| config } diff --git a/src/spec/ruby/rails23/stub/action_controller.rb b/src/spec/ruby/rails23/stub/action_controller.rb deleted file mode 100644 index fc88a92a..00000000 --- a/src/spec/ruby/rails23/stub/action_controller.rb +++ /dev/null @@ -1,46 +0,0 @@ -#-- -# Copyright (c) 2010-2012 Engine Yard, Inc. -# Copyright (c) 2007-2009 Sun Microsystems, Inc. -# This source code is available under the MIT license. -# See the file LICENSE.txt for details. -#++ - -#-- -# Stubbed out Rails classes for testing -#++ - -require 'ostruct' - -module ActionController - class CgiRequest - DEFAULT_SESSION_OPTIONS = {} - end - - class Base - class << self - attr_accessor :page_cache_directory, :relative_url_root - def session_store - ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS[:database_manager] - end - def session_store=(store) - # Faking camelize so we don't have to have active_support installed - camelized_store = store.to_s.gsub(/(?:^|_)([a-z])/) {|match| match[-1,1].upcase} - ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS[:database_manager] = - store.is_a?(Symbol) ? CGI::Session.const_get(store == :drb_store ? "DRbStore" : camelized_store) : store - end - def config - @_config ||= OpenStruct.new - end - end - end -end - -module ActionView - module Helpers - module AssetTagHelper - ASSETS_DIR = "public" - JAVASCRIPTS_DIR = "#{ASSETS_DIR}/javascripts" - STYLESHEETS_DIR = "#{ASSETS_DIR}/stylesheets" - end - end -end diff --git a/src/spec/ruby/rails23/stub/action_dispatch.rb b/src/spec/ruby/rails23/stub/action_dispatch.rb deleted file mode 100644 index 29876a99..00000000 --- a/src/spec/ruby/rails23/stub/action_dispatch.rb +++ /dev/null @@ -1,10 +0,0 @@ -#-- -# Copyright (c) 2010-2012 Engine Yard, Inc. -# Copyright (c) 2007-2009 Sun Microsystems, Inc. -# This source code is available under the MIT license. -# See the file LICENSE.txt for details. -#++ - -# Dummy action_dispatch.rb for specs -module ActionDispatch -end diff --git a/src/spec/ruby/rails23/stub/active_record.rb b/src/spec/ruby/rails23/stub/active_record.rb deleted file mode 100644 index 68482c73..00000000 --- a/src/spec/ruby/rails23/stub/active_record.rb +++ /dev/null @@ -1,11 +0,0 @@ -#-- -# Copyright (c) 2010-2012 Engine Yard, Inc. -# Copyright (c) 2007-2009 Sun Microsystems, Inc. -# This source code is available under the MIT license. -# See the file LICENSE.txt for details. -#++ - -module ActiveRecord - class Base - end -end diff --git a/src/spec/ruby/rails23/stub/active_support.rb b/src/spec/ruby/rails23/stub/active_support.rb deleted file mode 100644 index 3012c894..00000000 --- a/src/spec/ruby/rails23/stub/active_support.rb +++ /dev/null @@ -1,9 +0,0 @@ -#-- -# Copyright (c) 2010-2012 Engine Yard, Inc. -# Copyright (c) 2007-2009 Sun Microsystems, Inc. -# This source code is available under the MIT license. -# See the file LICENSE.txt for details. -#++ - -module ActiveSupport -end \ No newline at end of file diff --git a/src/spec/ruby/rails23/stub/dispatcher.rb b/src/spec/ruby/rails23/stub/dispatcher.rb deleted file mode 100644 index 826295ac..00000000 --- a/src/spec/ruby/rails23/stub/dispatcher.rb +++ /dev/null @@ -1,10 +0,0 @@ -#-- -# Copyright (c) 2010-2012 Engine Yard, Inc. -# Copyright (c) 2007-2009 Sun Microsystems, Inc. -# This source code is available under the MIT license. -# See the file LICENSE.txt for details. -#++ - -class Dispatcher - # Dummy Rails like dispatcher for testing -end diff --git a/src/spec/ruby/rails23/stub/initializer.rb b/src/spec/ruby/rails23/stub/initializer.rb deleted file mode 100644 index 0f560066..00000000 --- a/src/spec/ruby/rails23/stub/initializer.rb +++ /dev/null @@ -1,27 +0,0 @@ -#-- -# Copyright (c) 2010-2012 Engine Yard, Inc. -# Copyright (c) 2007-2009 Sun Microsystems, Inc. -# This source code is available under the MIT license. -# See the file LICENSE.txt for details. -#++ - -module Rails - class Initializer - def self.run(method = :process) - initializer = new - initializer.send(method) - initializer - end - - def set_load_path - end - - def process - require_frameworks - end - - def require_frameworks - require 'action_controller' - end - end -end diff --git a/src/spec/stub/rails23/404.html b/src/spec/stub/rails23/404.html deleted file mode 100644 index eff660b9..00000000 --- a/src/spec/stub/rails23/404.html +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - The page you were looking for doesn't exist (404) - - - - - -
-

The page you were looking for doesn't exist.

-

You may have mistyped the address or the page may have moved.

-
- - \ No newline at end of file diff --git a/src/spec/stub/rails23/500.html b/src/spec/stub/rails23/500.html deleted file mode 100644 index ec3bbf02..00000000 --- a/src/spec/stub/rails23/500.html +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - We're sorry, but something went wrong (500) - - - - - -
-

We're sorry, but something went wrong.

-

We've been notified about this issue and we'll take a look at it shortly.

-
- - diff --git a/src/spec/stub/rails23/WEB-INF/.gitignore b/src/spec/stub/rails23/WEB-INF/.gitignore deleted file mode 100644 index a43dfe35..00000000 --- a/src/spec/stub/rails23/WEB-INF/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -Gemfile -Gemfile.lock -init.rb diff --git a/src/spec/stub/rails23/WEB-INF/app/controllers/application_controller.rb b/src/spec/stub/rails23/WEB-INF/app/controllers/application_controller.rb deleted file mode 100644 index 6635a3f4..00000000 --- a/src/spec/stub/rails23/WEB-INF/app/controllers/application_controller.rb +++ /dev/null @@ -1,10 +0,0 @@ -# Filters added to this controller apply to all controllers in the application. -# Likewise, all the methods added will be available for all controllers. - -class ApplicationController < ActionController::Base - helper :all # include all helpers, all the time - protect_from_forgery # See ActionController::RequestForgeryProtection for details - - # Scrub sensitive parameters from your log - # filter_parameter_logging :password -end diff --git a/src/spec/stub/rails23/WEB-INF/app/helpers/application_helper.rb b/src/spec/stub/rails23/WEB-INF/app/helpers/application_helper.rb deleted file mode 100644 index 22a7940e..00000000 --- a/src/spec/stub/rails23/WEB-INF/app/helpers/application_helper.rb +++ /dev/null @@ -1,3 +0,0 @@ -# Methods added to this helper will be available to all templates in the application. -module ApplicationHelper -end diff --git a/src/spec/stub/rails23/WEB-INF/config/boot.rb b/src/spec/stub/rails23/WEB-INF/config/boot.rb deleted file mode 100644 index 1285e575..00000000 --- a/src/spec/stub/rails23/WEB-INF/config/boot.rb +++ /dev/null @@ -1,130 +0,0 @@ -# Don't change this file! -# Configure your app in config/environment.rb and config/environments/*.rb - -RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT) - -module Rails - class << self - def boot! - unless booted? - preinitialize - pick_boot.run - end - end - - def booted? - defined? Rails::Initializer - end - - def pick_boot - (vendor_rails? ? VendorBoot : GemBoot).new - end - - def vendor_rails? - File.exist?("#{RAILS_ROOT}/vendor/rails") - end - - def preinitialize - load(preinitializer_path) if File.exist?(preinitializer_path) - end - - def preinitializer_path - "#{RAILS_ROOT}/config/preinitializer.rb" - end - end - - class Boot - def run - load_initializer - Rails::Initializer.run(:set_load_path) - end - end - - class VendorBoot < Boot - def load_initializer - require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer" - Rails::Initializer.run(:install_gem_spec_stubs) - Rails::GemDependency.add_frozen_gem_path - end - end - - class GemBoot < Boot - def load_initializer - self.class.load_rubygems - load_rails_gem - require 'initializer' - end - - def load_rails_gem - if version = self.class.gem_version - gem 'rails', version - else - gem 'rails' - end - rescue Gem::LoadError => load_error - if load_error.message =~ /Could not find RubyGem rails/ - STDERR.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.) - exit 1 - else - raise - end - end - - class << self - def rubygems_version - Gem::RubyGemsVersion rescue nil - end - - def gem_version - if defined? RAILS_GEM_VERSION - RAILS_GEM_VERSION - elsif ENV.include?('RAILS_GEM_VERSION') - ENV['RAILS_GEM_VERSION'] - else - parse_gem_version(read_environment_rb) - end - end - - def load_rubygems - min_version = '1.3.2' - require 'rubygems' - unless rubygems_version >= min_version - $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.) - exit 1 - end - - rescue LoadError - $stderr.puts %Q(Rails requires RubyGems >= #{min_version}. Please install RubyGems and try again: http://rubygems.rubyforge.org) - exit 1 - end - - def parse_gem_version(text) - $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/ - end - - private - def read_environment_rb - File.read("#{RAILS_ROOT}/config/environment.rb") - end - end - end -end - -## Bundler support : -class Rails::Boot - def run - load_initializer - - Rails::Initializer.class_eval do - def load_gems - @bundler_loaded ||= Bundler.require :default, Rails.env - end - end - - Rails::Initializer.run(:set_load_path) - end -end -## - -# All that for this: -Rails.boot! diff --git a/src/spec/stub/rails23/WEB-INF/config/environment.rb b/src/spec/stub/rails23/WEB-INF/config/environment.rb deleted file mode 100644 index 105ba967..00000000 --- a/src/spec/stub/rails23/WEB-INF/config/environment.rb +++ /dev/null @@ -1,58 +0,0 @@ -# Be sure to restart your server when you modify this file - -# Specifies gem version of Rails to use when vendor/rails is not present -RAILS_GEM_VERSION = '2.3.18' unless defined? RAILS_GEM_VERSION - -# Bootstrap the Rails environment, frameworks, and default configuration -require File.join(File.dirname(__FILE__), 'boot') - -# Monkey-Patch for RubyGems < 2.0 (will ignore vendor gems) -unless defined? Gem.source_index - module Gem - - def self.source_index - sources - end - - def self.cache - sources - end - - SourceIndex = Specification - - class SourceList # only needed for vendor gems - include Enumerable - def search( *args ); []; end - def each( &block ); end - end - - end -end - -Rails::Initializer.run do |config| - # Settings in config/environments/* take precedence over those specified here. - # Application configuration should go into files in config/initializers - # -- all .rb files in that directory are automatically loaded. - - # Add additional load paths for your own custom dirs - # config.autoload_paths += %W( #{RAILS_ROOT}/extras ) - - # Only load the plugins named here, in the order given (default is alphabetical). - # :all can be used as a placeholder for all plugins not explicitly named - # config.plugins = [ :exception_notification, :ssl_requirement, :all ] - - # Skip frameworks you're not going to use. To use Rails without a database, - # you must remove the Active Record framework. - config.frameworks -= [ :active_record, :active_resource, :action_mailer ] - - # Activate observers that should always be running - # config.active_record.observers = :cacher, :garbage_collector, :forum_observer - - # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. - # Run "rake -D time" for a list of tasks for finding time zone names. - config.time_zone = 'UTC' - - # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. - # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}')] - # config.i18n.default_locale = :de -end \ No newline at end of file diff --git a/src/spec/stub/rails23/WEB-INF/config/environments/development.rb b/src/spec/stub/rails23/WEB-INF/config/environments/development.rb deleted file mode 100644 index 85c9a608..00000000 --- a/src/spec/stub/rails23/WEB-INF/config/environments/development.rb +++ /dev/null @@ -1,17 +0,0 @@ -# Settings specified here will take precedence over those in config/environment.rb - -# In the development environment your application's code is reloaded on -# every request. This slows down response time but is perfect for development -# since you don't have to restart the webserver when you make code changes. -config.cache_classes = false - -# Log error messages when you accidentally call methods on nil. -config.whiny_nils = true - -# Show full error reports and disable caching -config.action_controller.consider_all_requests_local = true -config.action_view.debug_rjs = true -config.action_controller.perform_caching = false - -# Don't care if the mailer can't send -config.action_mailer.raise_delivery_errors = false \ No newline at end of file diff --git a/src/spec/stub/rails23/WEB-INF/config/environments/production.rb b/src/spec/stub/rails23/WEB-INF/config/environments/production.rb deleted file mode 100644 index 27119d2d..00000000 --- a/src/spec/stub/rails23/WEB-INF/config/environments/production.rb +++ /dev/null @@ -1,28 +0,0 @@ -# Settings specified here will take precedence over those in config/environment.rb - -# The production environment is meant for finished, "live" apps. -# Code is not reloaded between requests -config.cache_classes = true - -# Full error reports are disabled and caching is turned on -config.action_controller.consider_all_requests_local = false -config.action_controller.perform_caching = true -config.action_view.cache_template_loading = true - -# See everything in the log (default is :info) -# config.log_level = :debug - -# Use a different logger for distributed setups -# config.logger = SyslogLogger.new - -# Use a different cache store in production -# config.cache_store = :mem_cache_store - -# Enable serving of images, stylesheets, and javascripts from an asset server -# config.action_controller.asset_host = "http://assets.example.com" - -# Disable delivery errors, bad email addresses will be ignored -# config.action_mailer.raise_delivery_errors = false - -# Enable threaded mode -# config.threadsafe! \ No newline at end of file diff --git a/src/spec/stub/rails23/WEB-INF/config/environments/test.rb b/src/spec/stub/rails23/WEB-INF/config/environments/test.rb deleted file mode 100644 index d6f80a40..00000000 --- a/src/spec/stub/rails23/WEB-INF/config/environments/test.rb +++ /dev/null @@ -1,28 +0,0 @@ -# Settings specified here will take precedence over those in config/environment.rb - -# The test environment is used exclusively to run your application's -# test suite. You never need to work with it otherwise. Remember that -# your test database is "scratch space" for the test suite and is wiped -# and recreated between test runs. Don't rely on the data there! -config.cache_classes = true - -# Log error messages when you accidentally call methods on nil. -config.whiny_nils = true - -# Show full error reports and disable caching -config.action_controller.consider_all_requests_local = true -config.action_controller.perform_caching = false -config.action_view.cache_template_loading = true - -# Disable request forgery protection in test environment -config.action_controller.allow_forgery_protection = false - -# Tell Action Mailer not to deliver emails to the real world. -# The :test delivery method accumulates sent emails in the -# ActionMailer::Base.deliveries array. -config.action_mailer.delivery_method = :test - -# Use SQL instead of Active Record's schema dumper when creating the test database. -# This is necessary if your schema can't be completely dumped by the schema dumper, -# like if you have constraints or database-specific column types -# config.active_record.schema_format = :sql \ No newline at end of file diff --git a/src/spec/stub/rails23/WEB-INF/config/initializers/backtrace_silencers.rb b/src/spec/stub/rails23/WEB-INF/config/initializers/backtrace_silencers.rb deleted file mode 100644 index c2169ed0..00000000 --- a/src/spec/stub/rails23/WEB-INF/config/initializers/backtrace_silencers.rb +++ /dev/null @@ -1,7 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. -# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } - -# You can also remove all the silencers if you're trying do debug a problem that might steem from framework code. -# Rails.backtrace_cleaner.remove_silencers! \ No newline at end of file diff --git a/src/spec/stub/rails23/WEB-INF/config/initializers/cookie_verification_secret.rb b/src/spec/stub/rails23/WEB-INF/config/initializers/cookie_verification_secret.rb deleted file mode 100644 index a4de8c0d..00000000 --- a/src/spec/stub/rails23/WEB-INF/config/initializers/cookie_verification_secret.rb +++ /dev/null @@ -1,7 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Your secret key for verifying the integrity of signed cookies. -# If you change this key, all old signed cookies will become invalid! -# Make sure the secret is at least 30 characters and all random, -# no regular words or you'll be exposed to dictionary attacks. -ActionController::Base.cookie_verifier_secret = 'da316daecf9af0892ae14b52f48b8f3ab393e90310ca136fc3e5171e1fec4192c1dd99183033f5e3d6af1ccf6c3040ac213f26e6f45c2e0dbbad85f2d64a927e'; diff --git a/src/spec/stub/rails23/WEB-INF/config/initializers/new_rails_defaults.rb b/src/spec/stub/rails23/WEB-INF/config/initializers/new_rails_defaults.rb deleted file mode 100644 index c94db0a6..00000000 --- a/src/spec/stub/rails23/WEB-INF/config/initializers/new_rails_defaults.rb +++ /dev/null @@ -1,21 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# These settings change the behavior of Rails 2 apps and will be defaults -# for Rails 3. You can remove this initializer when Rails 3 is released. - -if defined?(ActiveRecord) - # Include Active Record class name as root for JSON serialized output. - ActiveRecord::Base.include_root_in_json = true - - # Store the full class name (including module namespace) in STI type column. - ActiveRecord::Base.store_full_sti_class = true -end - -ActionController::Routing.generate_best_match = false - -# Use ISO 8601 format for JSON serialized times and dates. -ActiveSupport.use_standard_json_time_format = true - -# Don't escape HTML entities in JSON, leave that for the #json_escape helper. -# if you're including raw json in an HTML page. -ActiveSupport.escape_html_entities_in_json = false \ No newline at end of file diff --git a/src/spec/stub/rails23/WEB-INF/config/initializers/session_store.rb b/src/spec/stub/rails23/WEB-INF/config/initializers/session_store.rb deleted file mode 100644 index e202bcb2..00000000 --- a/src/spec/stub/rails23/WEB-INF/config/initializers/session_store.rb +++ /dev/null @@ -1,15 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Your secret key for verifying cookie session data integrity. -# If you change this key, all old sessions will become invalid! -# Make sure the secret is at least 30 characters and all random, -# no regular words or you'll be exposed to dictionary attacks. -ActionController::Base.session = { - :key => '_rails23_session', - :secret => 'f33cbc3660754c4f3175ee448a7a85a6de740e98acba5f4b2ac29268d6c3698225ef72b84b5d13e56dac0c0555a78767874f4495171cb3725d22e7d2afdba0fc' -} - -# Use the database for sessions instead of the cookie-based default, -# which shouldn't be used to store highly confidential information -# (create the session table with "rake db:sessions:create") -# ActionController::Base.session_store = :active_record_store diff --git a/src/spec/stub/rails23/WEB-INF/config/locales/en.yml b/src/spec/stub/rails23/WEB-INF/config/locales/en.yml deleted file mode 100644 index f265c068..00000000 --- a/src/spec/stub/rails23/WEB-INF/config/locales/en.yml +++ /dev/null @@ -1,5 +0,0 @@ -# Sample localization file for English. Add more files in this directory for other locales. -# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points. - -en: - hello: "Hello world" \ No newline at end of file diff --git a/src/spec/stub/rails23/WEB-INF/config/preinitializer.rb b/src/spec/stub/rails23/WEB-INF/config/preinitializer.rb deleted file mode 100644 index 9b4fc7d8..00000000 --- a/src/spec/stub/rails23/WEB-INF/config/preinitializer.rb +++ /dev/null @@ -1,10 +0,0 @@ -begin - require 'bundler' -rescue LoadError => e - require('rubygems') && retry - puts "Could not load the bundler gem. Install it with `gem install bundler`." - raise e -end - -ENV["BUNDLE_GEMFILE"] = File.expand_path("../../Gemfile", __FILE__) -Bundler.setup \ No newline at end of file diff --git a/src/spec/stub/rails23/WEB-INF/config/routes.rb b/src/spec/stub/rails23/WEB-INF/config/routes.rb deleted file mode 100644 index ea14ce1b..00000000 --- a/src/spec/stub/rails23/WEB-INF/config/routes.rb +++ /dev/null @@ -1,43 +0,0 @@ -ActionController::Routing::Routes.draw do |map| - # The priority is based upon order of creation: first created -> highest priority. - - # Sample of regular route: - # map.connect 'products/:id', :controller => 'catalog', :action => 'view' - # Keep in mind you can assign values other than :controller and :action - - # Sample of named route: - # map.purchase 'products/:id/purchase', :controller => 'catalog', :action => 'purchase' - # This route can be invoked with purchase_url(:id => product.id) - - # Sample resource route (maps HTTP verbs to controller actions automatically): - # map.resources :products - - # Sample resource route with options: - # map.resources :products, :member => { :short => :get, :toggle => :post }, :collection => { :sold => :get } - - # Sample resource route with sub-resources: - # map.resources :products, :has_many => [ :comments, :sales ], :has_one => :seller - - # Sample resource route with more complex sub-resources - # map.resources :products do |products| - # products.resources :comments - # products.resources :sales, :collection => { :recent => :get } - # end - - # Sample resource route within a namespace: - # map.namespace :admin do |admin| - # # Directs /admin/products/* to Admin::ProductsController (app/controllers/admin/products_controller.rb) - # admin.resources :products - # end - - # You can have the root of your site routed with map.root -- just remember to delete public/index.html. - # map.root :controller => "welcome" - - # See how all your routes lay out with "rake routes" - - # Install the default routes as the lowest priority. - # Note: These default routes make all actions in every controller accessible via GET requests. You should - # consider removing or commenting them out if you're using named routes and resources. - map.connect ':controller/:action/:id' - map.connect ':controller/:action/:id.:format' -end diff --git a/src/spec/stub/rails23/images/rails.png b/src/spec/stub/rails23/images/rails.png deleted file mode 100644 index d5edc04e..00000000 Binary files a/src/spec/stub/rails23/images/rails.png and /dev/null differ diff --git a/src/spec/stub/rails30/WEB-INF/.gitignore b/src/spec/stub/rails30/WEB-INF/.gitignore deleted file mode 100644 index 65e0d93c..00000000 --- a/src/spec/stub/rails30/WEB-INF/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -Gemfile -Gemfile.lock diff --git a/src/spec/stub/rails30/WEB-INF/config/application.rb b/src/spec/stub/rails30/WEB-INF/config/application.rb deleted file mode 100644 index 49c17745..00000000 --- a/src/spec/stub/rails30/WEB-INF/config/application.rb +++ /dev/null @@ -1,42 +0,0 @@ -require File.expand_path('../boot', __FILE__) - -require 'rails/all' - -# If you have a Gemfile, require the gems listed there, including any gems -# you've limited to :test, :development, or :production. -Bundler.require(:default, Rails.env) if defined?(Bundler) - -module Rails30 - class Application < Rails::Application - # Settings in config/environments/* take precedence over those specified here. - # Application configuration should go into files in config/initializers - # -- all .rb files in that directory are automatically loaded. - - # Custom directories with classes and modules you want to be autoloadable. - # config.autoload_paths += %W(#{config.root}/extras) - - # Only load the plugins named here, in the order given (default is alphabetical). - # :all can be used as a placeholder for all plugins not explicitly named. - # config.plugins = [ :exception_notification, :ssl_requirement, :all ] - - # Activate observers that should always be running. - # config.active_record.observers = :cacher, :garbage_collector, :forum_observer - - # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. - # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC. - # config.time_zone = 'Central Time (US & Canada)' - - # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. - # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] - # config.i18n.default_locale = :de - - # JavaScript files you want as :defaults (application.js is always included). - # config.action_view.javascript_expansions[:defaults] = %w(jquery rails) - - # Configure the default encoding used in templates for Ruby 1.9. - config.encoding = "utf-8" - - # Configure sensitive parameters which will be filtered from the log file. - config.filter_parameters += [:password] - end -end diff --git a/src/spec/stub/rails30/WEB-INF/config/boot.rb b/src/spec/stub/rails30/WEB-INF/config/boot.rb deleted file mode 100644 index 5d41d5f8..00000000 --- a/src/spec/stub/rails30/WEB-INF/config/boot.rb +++ /dev/null @@ -1,6 +0,0 @@ -require 'rubygems' - -# Set up gems listed in the Gemfile. -ENV['BUNDLE_GEMFILE'] = File.expand_path('../../Gemfile', __FILE__) - -require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE']) diff --git a/src/spec/stub/rails30/WEB-INF/config/environment.rb b/src/spec/stub/rails30/WEB-INF/config/environment.rb deleted file mode 100644 index 9bdb43f4..00000000 --- a/src/spec/stub/rails30/WEB-INF/config/environment.rb +++ /dev/null @@ -1,5 +0,0 @@ -# Load the rails application -require File.expand_path('../application', __FILE__) - -# Initialize the rails application -Rails30::Application.initialize! diff --git a/src/spec/stub/rails30/WEB-INF/config/environments/custom.rb b/src/spec/stub/rails30/WEB-INF/config/environments/custom.rb deleted file mode 100644 index 02254401..00000000 --- a/src/spec/stub/rails30/WEB-INF/config/environments/custom.rb +++ /dev/null @@ -1,36 +0,0 @@ -require 'logger' -class CustomLogger < Logger; end - -Rails30::Application.configure do - - config.logger = CustomLogger.new "#{Rails.root}/log/custom.log" - - # Settings specified here will take precedence over those in config/application.rb - - # Code is not reloaded between requests - config.cache_classes = true - - # Full error reports are disabled and caching is turned on - config.consider_all_requests_local = false - config.action_controller.perform_caching = true - - # Disable Rails's static asset server - # In production, Apache or nginx will already do this - config.serve_static_assets = false - - # Enable serving of images, stylesheets, and javascripts from an asset server - # config.action_controller.asset_host = "http://assets.example.com" - - # Disable delivery errors, bad email addresses will be ignored - # config.action_mailer.raise_delivery_errors = false - - # Enable threaded mode - # config.threadsafe! - - # Enable locale fallbacks for I18n (makes lookups for any locale fall back to - # the I18n.default_locale when a translation can not be found) - config.i18n.fallbacks = true - - # Send deprecation notices to registered listeners - config.active_support.deprecation = :notify -end diff --git a/src/spec/stub/rails30/WEB-INF/config/environments/development.rb b/src/spec/stub/rails30/WEB-INF/config/environments/development.rb deleted file mode 100644 index 738d3bca..00000000 --- a/src/spec/stub/rails30/WEB-INF/config/environments/development.rb +++ /dev/null @@ -1,26 +0,0 @@ -Rails30::Application.configure do - # Settings specified here will take precedence over those in config/application.rb - - # In the development environment your application's code is reloaded on - # every request. This slows down response time but is perfect for development - # since you don't have to restart the webserver when you make code changes. - config.cache_classes = false - - # Log error messages when you accidentally call methods on nil. - config.whiny_nils = true - - # Show full error reports and disable caching - config.consider_all_requests_local = true - config.action_view.debug_rjs = true - config.action_controller.perform_caching = false - - # Don't care if the mailer can't send - config.action_mailer.raise_delivery_errors = false - - # Print deprecation notices to the Rails logger - config.active_support.deprecation = :log - - # Only use best-standards-support built into browsers - config.action_dispatch.best_standards_support = :builtin -end - diff --git a/src/spec/stub/rails30/WEB-INF/config/environments/production.rb b/src/spec/stub/rails30/WEB-INF/config/environments/production.rb deleted file mode 100644 index 05862678..00000000 --- a/src/spec/stub/rails30/WEB-INF/config/environments/production.rb +++ /dev/null @@ -1,49 +0,0 @@ -Rails30::Application.configure do - # Settings specified here will take precedence over those in config/application.rb - - # The production environment is meant for finished, "live" apps. - # Code is not reloaded between requests - config.cache_classes = true - - # Full error reports are disabled and caching is turned on - config.consider_all_requests_local = false - config.action_controller.perform_caching = true - - # Specifies the header that your server uses for sending files - config.action_dispatch.x_sendfile_header = "X-Sendfile" - - # For nginx: - # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' - - # If you have no front-end server that supports something like X-Sendfile, - # just comment this out and Rails will serve the files - - # See everything in the log (default is :info) - # config.log_level = :debug - - # Use a different logger for distributed setups - # config.logger = SyslogLogger.new - - # Use a different cache store in production - # config.cache_store = :mem_cache_store - - # Disable Rails's static asset server - # In production, Apache or nginx will already do this - config.serve_static_assets = false - - # Enable serving of images, stylesheets, and javascripts from an asset server - # config.action_controller.asset_host = "http://assets.example.com" - - # Disable delivery errors, bad email addresses will be ignored - # config.action_mailer.raise_delivery_errors = false - - # Enable threaded mode - # config.threadsafe! - - # Enable locale fallbacks for I18n (makes lookups for any locale fall back to - # the I18n.default_locale when a translation can not be found) - config.i18n.fallbacks = true - - # Send deprecation notices to registered listeners - config.active_support.deprecation = :notify -end diff --git a/src/spec/stub/rails30/WEB-INF/config/initializers/backtrace_silencers.rb b/src/spec/stub/rails30/WEB-INF/config/initializers/backtrace_silencers.rb deleted file mode 100644 index 59385cdf..00000000 --- a/src/spec/stub/rails30/WEB-INF/config/initializers/backtrace_silencers.rb +++ /dev/null @@ -1,7 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. -# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } - -# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. -# Rails.backtrace_cleaner.remove_silencers! diff --git a/src/spec/stub/rails30/WEB-INF/config/initializers/inflections.rb b/src/spec/stub/rails30/WEB-INF/config/initializers/inflections.rb deleted file mode 100644 index 9e8b0131..00000000 --- a/src/spec/stub/rails30/WEB-INF/config/initializers/inflections.rb +++ /dev/null @@ -1,10 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Add new inflection rules using the following format -# (all these examples are active by default): -# ActiveSupport::Inflector.inflections do |inflect| -# inflect.plural /^(ox)$/i, '\1en' -# inflect.singular /^(ox)en/i, '\1' -# inflect.irregular 'person', 'people' -# inflect.uncountable %w( fish sheep ) -# end diff --git a/src/spec/stub/rails30/WEB-INF/config/initializers/mime_types.rb b/src/spec/stub/rails30/WEB-INF/config/initializers/mime_types.rb deleted file mode 100644 index 72aca7e4..00000000 --- a/src/spec/stub/rails30/WEB-INF/config/initializers/mime_types.rb +++ /dev/null @@ -1,5 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Add new mime types for use in respond_to blocks: -# Mime::Type.register "text/richtext", :rtf -# Mime::Type.register_alias "text/html", :iphone diff --git a/src/spec/stub/rails30/WEB-INF/config/initializers/secret_token.rb b/src/spec/stub/rails30/WEB-INF/config/initializers/secret_token.rb deleted file mode 100644 index 9ee5e17b..00000000 --- a/src/spec/stub/rails30/WEB-INF/config/initializers/secret_token.rb +++ /dev/null @@ -1,7 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Your secret key for verifying the integrity of signed cookies. -# If you change this key, all old signed cookies will become invalid! -# Make sure the secret is at least 30 characters and all random, -# no regular words or you'll be exposed to dictionary attacks. -Rails30::Application.config.secret_token = 'b2dd33c6f858681811fb5eba6ba04d80efedbb179f8feb77367b071b7c114f9bce24dfdf7c5d8c18cdfb4125d951a094b3f0bb98a5462ba1c2f889919b1a233c' diff --git a/src/spec/stub/rails30/WEB-INF/config/initializers/session_store.rb b/src/spec/stub/rails30/WEB-INF/config/initializers/session_store.rb deleted file mode 100644 index f99ffc9c..00000000 --- a/src/spec/stub/rails30/WEB-INF/config/initializers/session_store.rb +++ /dev/null @@ -1,8 +0,0 @@ -# Be sure to restart your server when you modify this file. - -Rails30::Application.config.session_store :cookie_store, :key => '_rails30_session' - -# Use the database for sessions instead of the cookie-based default, -# which shouldn't be used to store highly confidential information -# (create the session table with "rails generate session_migration") -# Rails30::Application.config.session_store :active_record_store diff --git a/src/spec/stub/rails30/WEB-INF/config/locales/en.yml b/src/spec/stub/rails30/WEB-INF/config/locales/en.yml deleted file mode 100644 index a747bfa6..00000000 --- a/src/spec/stub/rails30/WEB-INF/config/locales/en.yml +++ /dev/null @@ -1,5 +0,0 @@ -# Sample localization file for English. Add more files in this directory for other locales. -# See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points. - -en: - hello: "Hello world" diff --git a/src/spec/stub/rails30/WEB-INF/config/routes.rb b/src/spec/stub/rails30/WEB-INF/config/routes.rb deleted file mode 100644 index 23f5b3a1..00000000 --- a/src/spec/stub/rails30/WEB-INF/config/routes.rb +++ /dev/null @@ -1,58 +0,0 @@ -Rails30::Application.routes.draw do - # 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)))' -end diff --git a/src/spec/stub/rails30/WEB-INF/log/.gitkeep b/src/spec/stub/rails30/WEB-INF/log/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/spec/stub/rails31/META-INF/init.rb b/src/spec/stub/rails31/META-INF/init.rb deleted file mode 100644 index 22603c01..00000000 --- a/src/spec/stub/rails31/META-INF/init.rb +++ /dev/null @@ -1,6 +0,0 @@ -WARBLER_CONFIG = {"public.root"=>"/", "rails.env"=>"production", "jruby.min.runtimes"=>"1", "jruby.max.runtimes"=>"2"} -ENV['GEM_HOME'] ||= $servlet_context.getRealPath('/WEB-INF/gems') -ENV['BUNDLE_WITHOUT'] = 'development:test' -ENV['BUNDLE_GEMFILE'] = 'Gemfile' - -ENV['RAILS_ENV'] = 'production' diff --git a/src/spec/stub/rails31/WEB-INF/.gitignore b/src/spec/stub/rails31/WEB-INF/.gitignore deleted file mode 100644 index 45f86d5a..00000000 --- a/src/spec/stub/rails31/WEB-INF/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -Gemfile -Gemfile.lock \ No newline at end of file diff --git a/src/spec/stub/rails31/WEB-INF/config/application.rb b/src/spec/stub/rails31/WEB-INF/config/application.rb deleted file mode 100644 index a8e5e51f..00000000 --- a/src/spec/stub/rails31/WEB-INF/config/application.rb +++ /dev/null @@ -1,48 +0,0 @@ -require File.expand_path('../boot', __FILE__) - -require 'rails/all' - -if defined?(Bundler) - # If you precompile assets before deploying to production, use this line - Bundler.require(*Rails.groups(:assets => %w(development test))) - # If you want your assets lazily compiled in production, use this line - # Bundler.require(:default, :assets, Rails.env) -end - -module Rails31 - class Application < Rails::Application - # Settings in config/environments/* take precedence over those specified here. - # Application configuration should go into files in config/initializers - # -- all .rb files in that directory are automatically loaded. - - # Custom directories with classes and modules you want to be autoloadable. - # config.autoload_paths += %W(#{config.root}/extras) - - # Only load the plugins named here, in the order given (default is alphabetical). - # :all can be used as a placeholder for all plugins not explicitly named. - # config.plugins = [ :exception_notification, :ssl_requirement, :all ] - - # Activate observers that should always be running. - # config.active_record.observers = :cacher, :garbage_collector, :forum_observer - - # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. - # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC. - # config.time_zone = 'Central Time (US & Canada)' - - # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. - # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] - # config.i18n.default_locale = :de - - # Configure the default encoding used in templates for Ruby 1.9. - config.encoding = "utf-8" - - # Configure sensitive parameters which will be filtered from the log file. - config.filter_parameters += [:password] - - # Enable the asset pipeline - config.assets.enabled = true - - # Version of your assets, change this if you want to expire all your assets - config.assets.version = '1.0' - end -end diff --git a/src/spec/stub/rails31/WEB-INF/config/boot.rb b/src/spec/stub/rails31/WEB-INF/config/boot.rb deleted file mode 100644 index 5d41d5f8..00000000 --- a/src/spec/stub/rails31/WEB-INF/config/boot.rb +++ /dev/null @@ -1,6 +0,0 @@ -require 'rubygems' - -# Set up gems listed in the Gemfile. -ENV['BUNDLE_GEMFILE'] = File.expand_path('../../Gemfile', __FILE__) - -require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE']) diff --git a/src/spec/stub/rails31/WEB-INF/config/environment.rb b/src/spec/stub/rails31/WEB-INF/config/environment.rb deleted file mode 100644 index dd9ed025..00000000 --- a/src/spec/stub/rails31/WEB-INF/config/environment.rb +++ /dev/null @@ -1,5 +0,0 @@ -# Load the rails application -require File.expand_path('../application', __FILE__) - -# Initialize the rails application -Rails31::Application.initialize! diff --git a/src/spec/stub/rails31/WEB-INF/config/environments/development.rb b/src/spec/stub/rails31/WEB-INF/config/environments/development.rb deleted file mode 100644 index 4e4a3e2b..00000000 --- a/src/spec/stub/rails31/WEB-INF/config/environments/development.rb +++ /dev/null @@ -1,30 +0,0 @@ -Rails31::Application.configure do - # Settings specified here will take precedence over those in config/application.rb - - # In the development environment your application's code is reloaded on - # every request. This slows down response time but is perfect for development - # since you don't have to restart the web server when you make code changes. - config.cache_classes = false - - # Log error messages when you accidentally call methods on nil. - config.whiny_nils = true - - # Show full error reports and disable caching - config.consider_all_requests_local = true - config.action_controller.perform_caching = false - - # Don't care if the mailer can't send - config.action_mailer.raise_delivery_errors = false - - # Print deprecation notices to the Rails logger - config.active_support.deprecation = :stderr - - # Only use best-standards-support built into browsers - config.action_dispatch.best_standards_support = :builtin - - # Do not compress assets - config.assets.compress = false - - # Expands the lines which load the assets - config.assets.debug = true -end diff --git a/src/spec/stub/rails31/WEB-INF/config/environments/production.rb b/src/spec/stub/rails31/WEB-INF/config/environments/production.rb deleted file mode 100644 index 9b27db3b..00000000 --- a/src/spec/stub/rails31/WEB-INF/config/environments/production.rb +++ /dev/null @@ -1,61 +0,0 @@ -Rails31::Application.configure do - # Settings specified here will take precedence over those in config/application.rb - - # Code is not reloaded between requests - config.cache_classes = true - - # Full error reports are disabled and caching is turned on - config.consider_all_requests_local = false - config.action_controller.perform_caching = true - - # Disable Rails's static asset server (Apache or nginx will already do this) - config.serve_static_assets = false - - # Compress JavaScripts and CSS - config.assets.compress = true - - # Don't fallback to assets pipeline if a precompiled asset is missed - config.assets.compile = false - - # Generate digests for assets URLs - config.assets.digest = true - - # Defaults to Rails.root.join("public/assets") - # config.assets.manifest = YOUR_PATH - - # Specifies the header that your server uses for sending files - # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache - # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx - - # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. - # config.force_ssl = true - - # See everything in the log (default is :info) - config.log_level = :debug - - # Use a different logger for distributed setups - # config.logger = SyslogLogger.new - - # Use a different cache store in production - # config.cache_store = :mem_cache_store - - # Enable serving of images, stylesheets, and JavaScripts from an asset server - # config.action_controller.asset_host = "http://assets.example.com" - - # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added) - # config.assets.precompile += %w( search.js ) - - # Disable delivery errors, bad email addresses will be ignored - # config.action_mailer.raise_delivery_errors = false - - # Enable threaded mode - # config.threadsafe! - - # Enable locale fallbacks for I18n (makes lookups for any locale fall back to - # the I18n.default_locale when a translation can not be found) - config.i18n.fallbacks = true - - # Send deprecation notices to registered listeners - # config.active_support.deprecation = :notify - config.active_support.deprecation = :stderr -end diff --git a/src/spec/stub/rails31/WEB-INF/config/initializers/backtrace_silencers.rb b/src/spec/stub/rails31/WEB-INF/config/initializers/backtrace_silencers.rb deleted file mode 100644 index 59385cdf..00000000 --- a/src/spec/stub/rails31/WEB-INF/config/initializers/backtrace_silencers.rb +++ /dev/null @@ -1,7 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. -# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } - -# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. -# Rails.backtrace_cleaner.remove_silencers! diff --git a/src/spec/stub/rails31/WEB-INF/config/initializers/inflections.rb b/src/spec/stub/rails31/WEB-INF/config/initializers/inflections.rb deleted file mode 100644 index 9e8b0131..00000000 --- a/src/spec/stub/rails31/WEB-INF/config/initializers/inflections.rb +++ /dev/null @@ -1,10 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Add new inflection rules using the following format -# (all these examples are active by default): -# ActiveSupport::Inflector.inflections do |inflect| -# inflect.plural /^(ox)$/i, '\1en' -# inflect.singular /^(ox)en/i, '\1' -# inflect.irregular 'person', 'people' -# inflect.uncountable %w( fish sheep ) -# end diff --git a/src/spec/stub/rails31/WEB-INF/config/initializers/mime_types.rb b/src/spec/stub/rails31/WEB-INF/config/initializers/mime_types.rb deleted file mode 100644 index 72aca7e4..00000000 --- a/src/spec/stub/rails31/WEB-INF/config/initializers/mime_types.rb +++ /dev/null @@ -1,5 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Add new mime types for use in respond_to blocks: -# Mime::Type.register "text/richtext", :rtf -# Mime::Type.register_alias "text/html", :iphone diff --git a/src/spec/stub/rails31/WEB-INF/config/initializers/secret_token.rb b/src/spec/stub/rails31/WEB-INF/config/initializers/secret_token.rb deleted file mode 100644 index 858d48fa..00000000 --- a/src/spec/stub/rails31/WEB-INF/config/initializers/secret_token.rb +++ /dev/null @@ -1,7 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Your secret key for verifying the integrity of signed cookies. -# If you change this key, all old signed cookies will become invalid! -# Make sure the secret is at least 30 characters and all random, -# no regular words or you'll be exposed to dictionary attacks. -Rails31::Application.config.secret_token = 'cbb82869240754463f7772c5095a3e7865939b282f2623c308a0baa223f993772d9c45c1292bd14561e3e88a776fb9be925564756ca409edf8883b7e9cf55b27' diff --git a/src/spec/stub/rails31/WEB-INF/config/initializers/session_store.rb b/src/spec/stub/rails31/WEB-INF/config/initializers/session_store.rb deleted file mode 100644 index 6e835336..00000000 --- a/src/spec/stub/rails31/WEB-INF/config/initializers/session_store.rb +++ /dev/null @@ -1,8 +0,0 @@ -# Be sure to restart your server when you modify this file. - -Rails31::Application.config.session_store :cookie_store, :key => '_rails31_session' - -# Use the database for sessions instead of the cookie-based default, -# which shouldn't be used to store highly confidential information -# (create the session table with "rails generate session_migration") -# Rails31::Application.config.session_store :active_record_store diff --git a/src/spec/stub/rails31/WEB-INF/config/initializers/wrap_parameters.rb b/src/spec/stub/rails31/WEB-INF/config/initializers/wrap_parameters.rb deleted file mode 100644 index da4fb076..00000000 --- a/src/spec/stub/rails31/WEB-INF/config/initializers/wrap_parameters.rb +++ /dev/null @@ -1,14 +0,0 @@ -# Be sure to restart your server when you modify this file. -# -# This file contains settings for ActionController::ParamsWrapper which -# is enabled by default. - -# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. -ActiveSupport.on_load(:action_controller) do - wrap_parameters :format => [:json] -end - -# Disable root element in JSON by default. -ActiveSupport.on_load(:active_record) do - self.include_root_in_json = false -end diff --git a/src/spec/stub/rails31/WEB-INF/config/locales/en.yml b/src/spec/stub/rails31/WEB-INF/config/locales/en.yml deleted file mode 100644 index 179c14ca..00000000 --- a/src/spec/stub/rails31/WEB-INF/config/locales/en.yml +++ /dev/null @@ -1,5 +0,0 @@ -# Sample localization file for English. Add more files in this directory for other locales. -# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points. - -en: - hello: "Hello world" diff --git a/src/spec/stub/rails31/WEB-INF/config/routes.rb b/src/spec/stub/rails31/WEB-INF/config/routes.rb deleted file mode 100644 index f39581e2..00000000 --- a/src/spec/stub/rails31/WEB-INF/config/routes.rb +++ /dev/null @@ -1,58 +0,0 @@ -Rails31::Application.routes.draw do - # 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)))' -end diff --git a/src/spec/stub/rails31/WEB-INF/log/.gitkeep b/src/spec/stub/rails31/WEB-INF/log/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/spec/stub/rails32/WEB-INF/.gitignore b/src/spec/stub/rails32/WEB-INF/.gitignore deleted file mode 100644 index 45f86d5a..00000000 --- a/src/spec/stub/rails32/WEB-INF/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -Gemfile -Gemfile.lock \ No newline at end of file diff --git a/src/spec/stub/rails32/WEB-INF/config/application.rb b/src/spec/stub/rails32/WEB-INF/config/application.rb deleted file mode 100644 index 99f2980e..00000000 --- a/src/spec/stub/rails32/WEB-INF/config/application.rb +++ /dev/null @@ -1,64 +0,0 @@ -require File.expand_path('../boot', __FILE__) - -require 'rails/all' - -if defined?(Bundler) - # If you precompile assets before deploying to production, use this line - Bundler.require(*Rails.groups(:assets => %w(development test))) - # If you want your assets lazily compiled in production, use this line - # Bundler.require(:default, :assets, Rails.env) -end - -module Rails32 - class Application < Rails::Application - - # Settings in config/environments/* take precedence over those specified here. - # Application configuration should go into files in config/initializers - # -- all .rb files in that directory are automatically loaded. - - # Custom directories with classes and modules you want to be autoloadable. - # config.autoload_paths += %W(#{config.root}/extras) - - # Only load the plugins named here, in the order given (default is alphabetical). - # :all can be used as a placeholder for all plugins not explicitly named. - # config.plugins = [ :exception_notification, :ssl_requirement, :all ] - - # Activate observers that should always be running. - # config.active_record.observers = :cacher, :garbage_collector, :forum_observer - - # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. - # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC. - # config.time_zone = 'Central Time (US & Canada)' - - # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. - # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] - # config.i18n.default_locale = :de - - # Configure the default encoding used in templates for Ruby 1.9. - config.encoding = "utf-8" - - # Configure sensitive parameters which will be filtered from the log file. - config.filter_parameters += [:password] - - # Use SQL instead of Active Record's schema dumper when creating the database. - # This is necessary if your schema can't be completely dumped by the schema dumper, - # like if you have constraints or database-specific column types - # config.active_record.schema_format = :sql - - # Enforce whitelist mode for mass assignment. - # This will create an empty whitelist of attributes available for mass-assignment for all models - # in your app. As such, your models will need to explicitly whitelist or blacklist accessible - # parameters by using an attr_accessible or attr_protected declaration. - # config.active_record.whitelist_attributes = true - - # Enable the asset pipeline - config.assets.enabled = true - - # Version of your assets, change this if you want to expire all your assets - config.assets.version = '1.0' - - # testing out public_path early initialization : - PUBLIC_PATH = Rails.public_path.dup.freeze - - end -end diff --git a/src/spec/stub/rails32/WEB-INF/config/boot.rb b/src/spec/stub/rails32/WEB-INF/config/boot.rb deleted file mode 100644 index 5d41d5f8..00000000 --- a/src/spec/stub/rails32/WEB-INF/config/boot.rb +++ /dev/null @@ -1,6 +0,0 @@ -require 'rubygems' - -# Set up gems listed in the Gemfile. -ENV['BUNDLE_GEMFILE'] = File.expand_path('../../Gemfile', __FILE__) - -require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE']) diff --git a/src/spec/stub/rails32/WEB-INF/config/environment.rb b/src/spec/stub/rails32/WEB-INF/config/environment.rb deleted file mode 100644 index d9d29cd7..00000000 --- a/src/spec/stub/rails32/WEB-INF/config/environment.rb +++ /dev/null @@ -1,5 +0,0 @@ -# Load the rails application -require File.expand_path('../application', __FILE__) - -# Initialize the rails application -Rails32::Application.initialize! diff --git a/src/spec/stub/rails32/WEB-INF/config/environments/development.rb b/src/spec/stub/rails32/WEB-INF/config/environments/development.rb deleted file mode 100644 index 6dae73d7..00000000 --- a/src/spec/stub/rails32/WEB-INF/config/environments/development.rb +++ /dev/null @@ -1,38 +0,0 @@ -Rails32::Application.configure do - # Settings specified here will take precedence over those in config/application.rb - - # In the development environment your application's code is reloaded on - # every request. This slows down response time but is perfect for development - # since you don't have to restart the web server when you make code changes. - config.cache_classes = false - - # Log error messages when you accidentally call methods on nil. - config.whiny_nils = true - - # Show full error reports and disable caching - config.consider_all_requests_local = true - config.action_controller.perform_caching = false - - # Don't care if the mailer can't send - config.action_mailer.raise_delivery_errors = false - - # Print deprecation notices to the Rails logger - # config.active_support.deprecation = :log - config.active_support.deprecation = :stderr - - # Only use best-standards-support built into browsers - config.action_dispatch.best_standards_support = :builtin - - # Raise exception on mass assignment protection for Active Record models - config.active_record.mass_assignment_sanitizer = :strict - - # Log the query plan for queries taking more than this (works - # with SQLite, MySQL, and PostgreSQL) - config.active_record.auto_explain_threshold_in_seconds = 0.5 - - # Do not compress assets - config.assets.compress = false - - # Expands the lines which load the assets - config.assets.debug = true -end diff --git a/src/spec/stub/rails32/WEB-INF/config/environments/production.rb b/src/spec/stub/rails32/WEB-INF/config/environments/production.rb deleted file mode 100644 index 5ec9e513..00000000 --- a/src/spec/stub/rails32/WEB-INF/config/environments/production.rb +++ /dev/null @@ -1,68 +0,0 @@ -Rails32::Application.configure do - # Settings specified here will take precedence over those in config/application.rb - - # Code is not reloaded between requests - config.cache_classes = true - - # Full error reports are disabled and caching is turned on - config.consider_all_requests_local = false - config.action_controller.perform_caching = true - - # Disable Rails's static asset server (Apache or nginx will already do this) - config.serve_static_assets = false - - # Compress JavaScripts and CSS - config.assets.compress = true - - # Don't fallback to assets pipeline if a precompiled asset is missed - config.assets.compile = false - - # Generate digests for assets URLs - config.assets.digest = true - - # Defaults to Rails.root.join("public/assets") - # config.assets.manifest = YOUR_PATH - - # Specifies the header that your server uses for sending files - # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache - # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx - - # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. - # config.force_ssl = true - - # See everything in the log (default is :info) - # config.log_level = :debug - - # Prepend all log lines with the following tags - # config.log_tags = [ :subdomain, :uuid ] - - # Use a different logger for distributed setups - # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new) - - # Use a different cache store in production - # config.cache_store = :mem_cache_store - - # Enable serving of images, stylesheets, and JavaScripts from an asset server - # config.action_controller.asset_host = "http://assets.example.com" - - # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added) - # config.assets.precompile += %w( search.js ) - - # Disable delivery errors, bad email addresses will be ignored - # config.action_mailer.raise_delivery_errors = false - - # Enable threaded mode - config.threadsafe! - - # Enable locale fallbacks for I18n (makes lookups for any locale fall back to - # the I18n.default_locale when a translation can not be found) - config.i18n.fallbacks = true - - # Send deprecation notices to registered listeners - # config.active_support.deprecation = :notify - config.active_support.deprecation = :stderr - - # Log the query plan for queries taking more than this (works - # with SQLite, MySQL, and PostgreSQL) - # config.active_record.auto_explain_threshold_in_seconds = 0.5 -end diff --git a/src/spec/stub/rails32/WEB-INF/config/initializers/backtrace_silencers.rb b/src/spec/stub/rails32/WEB-INF/config/initializers/backtrace_silencers.rb deleted file mode 100644 index 59385cdf..00000000 --- a/src/spec/stub/rails32/WEB-INF/config/initializers/backtrace_silencers.rb +++ /dev/null @@ -1,7 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. -# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } - -# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. -# Rails.backtrace_cleaner.remove_silencers! diff --git a/src/spec/stub/rails32/WEB-INF/config/initializers/inflections.rb b/src/spec/stub/rails32/WEB-INF/config/initializers/inflections.rb deleted file mode 100644 index 5d8d9be2..00000000 --- a/src/spec/stub/rails32/WEB-INF/config/initializers/inflections.rb +++ /dev/null @@ -1,15 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Add new inflection rules using the following format -# (all these examples are active by default): -# ActiveSupport::Inflector.inflections do |inflect| -# inflect.plural /^(ox)$/i, '\1en' -# inflect.singular /^(ox)en/i, '\1' -# inflect.irregular 'person', 'people' -# inflect.uncountable %w( fish sheep ) -# end -# -# These inflection rules are supported but not enabled by default: -# ActiveSupport::Inflector.inflections do |inflect| -# inflect.acronym 'RESTful' -# end diff --git a/src/spec/stub/rails32/WEB-INF/config/initializers/mime_types.rb b/src/spec/stub/rails32/WEB-INF/config/initializers/mime_types.rb deleted file mode 100644 index 72aca7e4..00000000 --- a/src/spec/stub/rails32/WEB-INF/config/initializers/mime_types.rb +++ /dev/null @@ -1,5 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Add new mime types for use in respond_to blocks: -# Mime::Type.register "text/richtext", :rtf -# Mime::Type.register_alias "text/html", :iphone diff --git a/src/spec/stub/rails32/WEB-INF/config/initializers/secret_token.rb b/src/spec/stub/rails32/WEB-INF/config/initializers/secret_token.rb deleted file mode 100644 index f3652e11..00000000 --- a/src/spec/stub/rails32/WEB-INF/config/initializers/secret_token.rb +++ /dev/null @@ -1,7 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Your secret key for verifying the integrity of signed cookies. -# If you change this key, all old signed cookies will become invalid! -# Make sure the secret is at least 30 characters and all random, -# no regular words or you'll be exposed to dictionary attacks. -Rails32::Application.config.secret_token = 'bdd004d4bc0c030d37777c5d2ddbfe78ef0b5dca757893a0d2eec525a4d4a6418ad195064a505e3d94bc71a66509a87c57752bddcdc2fa41bff8f7fefb74b030' diff --git a/src/spec/stub/rails32/WEB-INF/config/initializers/session_store.rb b/src/spec/stub/rails32/WEB-INF/config/initializers/session_store.rb deleted file mode 100644 index 68684c2e..00000000 --- a/src/spec/stub/rails32/WEB-INF/config/initializers/session_store.rb +++ /dev/null @@ -1,8 +0,0 @@ -# Be sure to restart your server when you modify this file. - -Rails32::Application.config.session_store :cookie_store, :key => '_rails32_session' - -# Use the database for sessions instead of the cookie-based default, -# which shouldn't be used to store highly confidential information -# (create the session table with "rails generate session_migration") -# Rails32::Application.config.session_store :active_record_store diff --git a/src/spec/stub/rails32/WEB-INF/config/initializers/wrap_parameters.rb b/src/spec/stub/rails32/WEB-INF/config/initializers/wrap_parameters.rb deleted file mode 100644 index da4fb076..00000000 --- a/src/spec/stub/rails32/WEB-INF/config/initializers/wrap_parameters.rb +++ /dev/null @@ -1,14 +0,0 @@ -# Be sure to restart your server when you modify this file. -# -# This file contains settings for ActionController::ParamsWrapper which -# is enabled by default. - -# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. -ActiveSupport.on_load(:action_controller) do - wrap_parameters :format => [:json] -end - -# Disable root element in JSON by default. -ActiveSupport.on_load(:active_record) do - self.include_root_in_json = false -end diff --git a/src/spec/stub/rails32/WEB-INF/config/locales/en.yml b/src/spec/stub/rails32/WEB-INF/config/locales/en.yml deleted file mode 100644 index 179c14ca..00000000 --- a/src/spec/stub/rails32/WEB-INF/config/locales/en.yml +++ /dev/null @@ -1,5 +0,0 @@ -# Sample localization file for English. Add more files in this directory for other locales. -# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points. - -en: - hello: "Hello world" diff --git a/src/spec/stub/rails32/WEB-INF/config/routes.rb b/src/spec/stub/rails32/WEB-INF/config/routes.rb deleted file mode 100644 index f0c69081..00000000 --- a/src/spec/stub/rails32/WEB-INF/config/routes.rb +++ /dev/null @@ -1,58 +0,0 @@ -Rails32::Application.routes.draw do - # 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)' -end diff --git a/src/spec/stub/rails32/WEB-INF/log/.gitkeep b/src/spec/stub/rails32/WEB-INF/log/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/spec/stub/rails32/images/image.jpg b/src/spec/stub/rails32/images/image.jpg deleted file mode 100644 index 933e1c62..00000000 Binary files a/src/spec/stub/rails32/images/image.jpg and /dev/null differ diff --git a/src/spec/stub/rails40/404.html b/src/spec/stub/rails40/404.html deleted file mode 100644 index a0daa0c1..00000000 --- a/src/spec/stub/rails40/404.html +++ /dev/null @@ -1,58 +0,0 @@ - - - - The page you were looking for doesn't exist (404) - - - - - -
-

The page you were looking for doesn't exist.

-

You may have mistyped the address or the page may have moved.

-
-

If you are the application owner check the logs for more information.

- - diff --git a/src/spec/stub/rails40/422.html b/src/spec/stub/rails40/422.html deleted file mode 100644 index fbb4b84d..00000000 --- a/src/spec/stub/rails40/422.html +++ /dev/null @@ -1,58 +0,0 @@ - - - - The change you wanted was rejected (422) - - - - - -
-

The change you wanted was rejected.

-

Maybe you tried to change something you didn't have access to.

-
-

If you are the application owner check the logs for more information.

- - diff --git a/src/spec/stub/rails40/500.html b/src/spec/stub/rails40/500.html deleted file mode 100644 index e9052d35..00000000 --- a/src/spec/stub/rails40/500.html +++ /dev/null @@ -1,57 +0,0 @@ - - - - We're sorry, but something went wrong (500) - - - - - -
-

We're sorry, but something went wrong.

-
-

If you are the application owner check the logs for more information.

- - diff --git a/src/spec/stub/rails40/WEB-INF/.gitignore b/src/spec/stub/rails40/WEB-INF/.gitignore deleted file mode 100644 index 45f86d5a..00000000 --- a/src/spec/stub/rails40/WEB-INF/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -Gemfile -Gemfile.lock \ No newline at end of file diff --git a/src/spec/stub/rails40/WEB-INF/Rakefile b/src/spec/stub/rails40/WEB-INF/Rakefile deleted file mode 100644 index e378bc7f..00000000 --- a/src/spec/stub/rails40/WEB-INF/Rakefile +++ /dev/null @@ -1,6 +0,0 @@ -# Add your own tasks in files placed in lib/tasks ending in .rake, -# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. - -require File.expand_path('../config/application', __FILE__) - -Rails40::Application.load_tasks diff --git a/src/spec/stub/rails40/WEB-INF/app/assets/images/.keep b/src/spec/stub/rails40/WEB-INF/app/assets/images/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/spec/stub/rails40/WEB-INF/app/assets/images/image.jpg b/src/spec/stub/rails40/WEB-INF/app/assets/images/image.jpg deleted file mode 100644 index 933e1c62..00000000 Binary files a/src/spec/stub/rails40/WEB-INF/app/assets/images/image.jpg and /dev/null differ diff --git a/src/spec/stub/rails40/WEB-INF/app/assets/javascripts/.keep b/src/spec/stub/rails40/WEB-INF/app/assets/javascripts/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/spec/stub/rails40/WEB-INF/app/assets/javascripts/application.js b/src/spec/stub/rails40/WEB-INF/app/assets/javascripts/application.js deleted file mode 100644 index d6925fa4..00000000 --- a/src/spec/stub/rails40/WEB-INF/app/assets/javascripts/application.js +++ /dev/null @@ -1,16 +0,0 @@ -// This is a manifest file that'll be compiled into application.js, which will include all the files -// listed below. -// -// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts, -// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path. -// -// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the -// compiled file. -// -// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details -// about supported directives. -// -//= require jquery -//= require jquery_ujs -//= require turbolinks -//= require_tree . diff --git a/src/spec/stub/rails40/WEB-INF/app/assets/stylesheets/application.css b/src/spec/stub/rails40/WEB-INF/app/assets/stylesheets/application.css deleted file mode 100644 index 3192ec89..00000000 --- a/src/spec/stub/rails40/WEB-INF/app/assets/stylesheets/application.css +++ /dev/null @@ -1,13 +0,0 @@ -/* - * This is a manifest file that'll be compiled into application.css, which will include all the files - * listed below. - * - * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, - * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path. - * - * You're free to add application-wide styles to this file and they'll appear at the top of the - * compiled file, but it's generally better to create a new file per style scope. - * - *= require_self - *= require_tree . - */ diff --git a/src/spec/stub/rails40/WEB-INF/app/controllers/application_controller.rb b/src/spec/stub/rails40/WEB-INF/app/controllers/application_controller.rb deleted file mode 100644 index d83690e1..00000000 --- a/src/spec/stub/rails40/WEB-INF/app/controllers/application_controller.rb +++ /dev/null @@ -1,5 +0,0 @@ -class ApplicationController < ActionController::Base - # Prevent CSRF attacks by raising an exception. - # For APIs, you may want to use :null_session instead. - protect_from_forgery with: :exception -end diff --git a/src/spec/stub/rails40/WEB-INF/app/controllers/concerns/.keep b/src/spec/stub/rails40/WEB-INF/app/controllers/concerns/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/spec/stub/rails40/WEB-INF/app/helpers/application_helper.rb b/src/spec/stub/rails40/WEB-INF/app/helpers/application_helper.rb deleted file mode 100644 index de6be794..00000000 --- a/src/spec/stub/rails40/WEB-INF/app/helpers/application_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module ApplicationHelper -end diff --git a/src/spec/stub/rails40/WEB-INF/app/mailers/.keep b/src/spec/stub/rails40/WEB-INF/app/mailers/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/spec/stub/rails40/WEB-INF/app/models/.keep b/src/spec/stub/rails40/WEB-INF/app/models/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/spec/stub/rails40/WEB-INF/app/models/concerns/.keep b/src/spec/stub/rails40/WEB-INF/app/models/concerns/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/spec/stub/rails40/WEB-INF/app/views/layouts/application.html.erb b/src/spec/stub/rails40/WEB-INF/app/views/layouts/application.html.erb deleted file mode 100644 index 65bb5ddb..00000000 --- a/src/spec/stub/rails40/WEB-INF/app/views/layouts/application.html.erb +++ /dev/null @@ -1,14 +0,0 @@ - - - - Rails40 - <%= stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true %> - <%= javascript_include_tag "application", "data-turbolinks-track" => true %> - <%= csrf_meta_tags %> - - - -<%= yield %> - - - diff --git a/src/spec/stub/rails40/WEB-INF/bin/bundle b/src/spec/stub/rails40/WEB-INF/bin/bundle deleted file mode 100755 index 66e9889e..00000000 --- a/src/spec/stub/rails40/WEB-INF/bin/bundle +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env ruby -ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__) -load Gem.bin_path('bundler', 'bundle') diff --git a/src/spec/stub/rails40/WEB-INF/bin/rails b/src/spec/stub/rails40/WEB-INF/bin/rails deleted file mode 100755 index 728cd85a..00000000 --- a/src/spec/stub/rails40/WEB-INF/bin/rails +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env ruby -APP_PATH = File.expand_path('../../config/application', __FILE__) -require_relative '../config/boot' -require 'rails/commands' diff --git a/src/spec/stub/rails40/WEB-INF/bin/rake b/src/spec/stub/rails40/WEB-INF/bin/rake deleted file mode 100755 index 17240489..00000000 --- a/src/spec/stub/rails40/WEB-INF/bin/rake +++ /dev/null @@ -1,4 +0,0 @@ -#!/usr/bin/env ruby -require_relative '../config/boot' -require 'rake' -Rake.application.run diff --git a/src/spec/stub/rails40/WEB-INF/config/application.rb b/src/spec/stub/rails40/WEB-INF/config/application.rb deleted file mode 100644 index aec2968c..00000000 --- a/src/spec/stub/rails40/WEB-INF/config/application.rb +++ /dev/null @@ -1,25 +0,0 @@ -require File.expand_path('../boot', __FILE__) - -require 'rails/all' - -# Require the gems listed in Gemfile, including any gems -# you've limited to :test, :development, or :production. -Bundler.require(:default, Rails.env) - -module Rails40 - class Application < Rails::Application - # Settings in config/environments/* take precedence over those specified here. - # Application configuration should go into files in config/initializers - # -- all .rb files in that directory are automatically loaded. - - # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. - # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC. - # config.time_zone = 'Central Time (US & Canada)' - - # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. - # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] - # config.i18n.default_locale = :de - # Configure the default encoding used in templates for Ruby 1.9. - #config.encoding = "utf-8" - end -end diff --git a/src/spec/stub/rails40/WEB-INF/config/boot.rb b/src/spec/stub/rails40/WEB-INF/config/boot.rb deleted file mode 100644 index 20fa9d80..00000000 --- a/src/spec/stub/rails40/WEB-INF/config/boot.rb +++ /dev/null @@ -1,4 +0,0 @@ -# Set up gems listed in the Gemfile. -ENV['BUNDLE_GEMFILE'] = File.expand_path('../../Gemfile', __FILE__) - -require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE']) diff --git a/src/spec/stub/rails40/WEB-INF/config/database.yml b/src/spec/stub/rails40/WEB-INF/config/database.yml deleted file mode 100644 index 175f3eb3..00000000 --- a/src/spec/stub/rails40/WEB-INF/config/database.yml +++ /dev/null @@ -1,20 +0,0 @@ -# SQLite version 3.x -# gem 'activerecord-jdbcsqlite3-adapter' -# -# Configure Using Gemfile -# gem 'activerecord-jdbcsqlite3-adapter' -# -development: - adapter: sqlite3 - database: db/development.sqlite3 - -# Warning: The database defined as "test" will be erased and -# re-generated from your development database when you run "rake". -# Do not set this db to the same as development or production. -test: - adapter: sqlite3 - database: db/test.sqlite3 - -production: - adapter: sqlite3 - database: db/production.sqlite3 diff --git a/src/spec/stub/rails40/WEB-INF/config/environment.rb b/src/spec/stub/rails40/WEB-INF/config/environment.rb deleted file mode 100644 index b2cb1248..00000000 --- a/src/spec/stub/rails40/WEB-INF/config/environment.rb +++ /dev/null @@ -1,5 +0,0 @@ -# Load the Rails application. -require File.expand_path('../application', __FILE__) - -# Initialize the Rails application. -Rails40::Application.initialize! diff --git a/src/spec/stub/rails40/WEB-INF/config/environments/development.rb b/src/spec/stub/rails40/WEB-INF/config/environments/development.rb deleted file mode 100644 index 1fd7006a..00000000 --- a/src/spec/stub/rails40/WEB-INF/config/environments/development.rb +++ /dev/null @@ -1,29 +0,0 @@ -Rails40::Application.configure do - # Settings specified here will take precedence over those in config/application.rb. - - # In the development environment your application's code is reloaded on - # every request. This slows down response time but is perfect for development - # since you don't have to restart the web server when you make code changes. - config.cache_classes = false - - # Do not eager load code on boot. - config.eager_load = false - - # Show full error reports and disable caching. - config.consider_all_requests_local = true - config.action_controller.perform_caching = false - - # Don't care if the mailer can't send. - #config.action_mailer.raise_delivery_errors = false - - # Print deprecation notices to the Rails logger. - config.active_support.deprecation = :log - - # Raise an error on page load if there are pending migrations - #config.active_record.migration_error = :page_load - - # Debug mode disables concatenation and preprocessing of assets. - # This option may cause significant delays in view rendering with a large - # number of complex assets. - config.assets.debug = true -end diff --git a/src/spec/stub/rails40/WEB-INF/config/environments/production.rb b/src/spec/stub/rails40/WEB-INF/config/environments/production.rb deleted file mode 100644 index 8a3e8514..00000000 --- a/src/spec/stub/rails40/WEB-INF/config/environments/production.rb +++ /dev/null @@ -1,80 +0,0 @@ -Rails40::Application.configure do - # Settings specified here will take precedence over those in config/application.rb. - - # Code is not reloaded between requests. - config.cache_classes = true - - # Eager load code on boot. This eager loads most of Rails and - # your application in memory, allowing both thread web servers - # and those relying on copy on write to perform better. - # Rake tasks automatically ignore this option for performance. - config.eager_load = true - - # Full error reports are disabled and caching is turned on. - config.consider_all_requests_local = false - config.action_controller.perform_caching = true - - # Enable Rack::Cache to put a simple HTTP cache in front of your application - # Add `rack-cache` to your Gemfile before enabling this. - # For large-scale production use, consider using a caching reverse proxy like nginx, varnish or squid. - # config.action_dispatch.rack_cache = true - - # Disable Rails's static asset server (Apache or nginx will already do this). - config.serve_static_assets = false - - # Compress JavaScripts and CSS. - config.assets.js_compressor = :uglifier - # config.assets.css_compressor = :sass - - # Do not fallback to assets pipeline if a precompiled asset is missed. - config.assets.compile = false - - # Generate digests for assets URLs. - config.assets.digest = true - - # Version of your assets, change this if you want to expire all your assets. - config.assets.version = '1.0' - - # Specifies the header that your server uses for sending files. - # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache - # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx - - # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. - # config.force_ssl = true - - # Set to :debug to see everything in the log. - config.log_level = :info - - # Prepend all log lines with the following tags. - # config.log_tags = [ :subdomain, :uuid ] - - # Use a different logger for distributed setups. - # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new) - - # Use a different cache store in production. - # config.cache_store = :mem_cache_store - - # Enable serving of images, stylesheets, and JavaScripts from an asset server. - # config.action_controller.asset_host = "http://assets.example.com" - - # Precompile additional assets. - # application.js, application.css, and all non-JS/CSS in app/assets folder are already added. - # config.assets.precompile += %w( search.js ) - - # Ignore bad email addresses and do not raise email delivery errors. - # Set this to true and configure the email server for immediate delivery to raise delivery errors. - # config.action_mailer.raise_delivery_errors = false - - # Enable locale fallbacks for I18n (makes lookups for any locale fall back to - # the I18n.default_locale when a translation can not be found). - config.i18n.fallbacks = true - - # Send deprecation notices to registered listeners. - config.active_support.deprecation = :notify - - # Disable automatic flushing of the log to improve performance. - # config.autoflush_log = false - - # Use default logging formatter so that PID and timestamp are not suppressed. - config.log_formatter = ::Logger::Formatter.new -end diff --git a/src/spec/stub/rails40/WEB-INF/config/initializers/backtrace_silencers.rb b/src/spec/stub/rails40/WEB-INF/config/initializers/backtrace_silencers.rb deleted file mode 100644 index 59385cdf..00000000 --- a/src/spec/stub/rails40/WEB-INF/config/initializers/backtrace_silencers.rb +++ /dev/null @@ -1,7 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. -# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } - -# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. -# Rails.backtrace_cleaner.remove_silencers! diff --git a/src/spec/stub/rails40/WEB-INF/config/initializers/filter_parameter_logging.rb b/src/spec/stub/rails40/WEB-INF/config/initializers/filter_parameter_logging.rb deleted file mode 100644 index 4a994e1e..00000000 --- a/src/spec/stub/rails40/WEB-INF/config/initializers/filter_parameter_logging.rb +++ /dev/null @@ -1,4 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Configure sensitive parameters which will be filtered from the log file. -Rails.application.config.filter_parameters += [:password] diff --git a/src/spec/stub/rails40/WEB-INF/config/initializers/inflections.rb b/src/spec/stub/rails40/WEB-INF/config/initializers/inflections.rb deleted file mode 100644 index ac033bf9..00000000 --- a/src/spec/stub/rails40/WEB-INF/config/initializers/inflections.rb +++ /dev/null @@ -1,16 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Add new inflection rules using the following format. Inflections -# are locale specific, and you may define rules for as many different -# locales as you wish. All of these examples are active by default: -# ActiveSupport::Inflector.inflections(:en) do |inflect| -# inflect.plural /^(ox)$/i, '\1en' -# inflect.singular /^(ox)en/i, '\1' -# inflect.irregular 'person', 'people' -# inflect.uncountable %w( fish sheep ) -# end - -# These inflection rules are supported but not enabled by default: -# ActiveSupport::Inflector.inflections(:en) do |inflect| -# inflect.acronym 'RESTful' -# end diff --git a/src/spec/stub/rails40/WEB-INF/config/initializers/mime_types.rb b/src/spec/stub/rails40/WEB-INF/config/initializers/mime_types.rb deleted file mode 100644 index 72aca7e4..00000000 --- a/src/spec/stub/rails40/WEB-INF/config/initializers/mime_types.rb +++ /dev/null @@ -1,5 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Add new mime types for use in respond_to blocks: -# Mime::Type.register "text/richtext", :rtf -# Mime::Type.register_alias "text/html", :iphone diff --git a/src/spec/stub/rails40/WEB-INF/config/initializers/secret_token.rb b/src/spec/stub/rails40/WEB-INF/config/initializers/secret_token.rb deleted file mode 100644 index 2e737d0d..00000000 --- a/src/spec/stub/rails40/WEB-INF/config/initializers/secret_token.rb +++ /dev/null @@ -1,12 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Your secret key is used for verifying the integrity of signed cookies. -# If you change this key, all old signed cookies will become invalid! - -# Make sure the secret is at least 30 characters and all random, -# no regular words or you'll be exposed to dictionary attacks. -# You can use `rake secret` to generate a secure secret key. - -# Make sure your secret_key_base is kept private -# if you're sharing your code publicly. -Rails40::Application.config.secret_key_base = 'e9457e09566e8a054de4dd8be7b0195c63c829248d08e0933a8c1ea9be0f2659b5f5a5d5487e7d9fa2b934eb6dbe16a74b6bcf47daa9b73f1641493d827b780d' diff --git a/src/spec/stub/rails40/WEB-INF/config/initializers/session_store.rb b/src/spec/stub/rails40/WEB-INF/config/initializers/session_store.rb deleted file mode 100644 index be304b25..00000000 --- a/src/spec/stub/rails40/WEB-INF/config/initializers/session_store.rb +++ /dev/null @@ -1,3 +0,0 @@ -# Be sure to restart your server when you modify this file. - -Rails40::Application.config.session_store :cookie_store, key: '_rails40_session' diff --git a/src/spec/stub/rails40/WEB-INF/config/initializers/wrap_parameters.rb b/src/spec/stub/rails40/WEB-INF/config/initializers/wrap_parameters.rb deleted file mode 100644 index 33725e95..00000000 --- a/src/spec/stub/rails40/WEB-INF/config/initializers/wrap_parameters.rb +++ /dev/null @@ -1,14 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# This file contains settings for ActionController::ParamsWrapper which -# is enabled by default. - -# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. -ActiveSupport.on_load(:action_controller) do - wrap_parameters format: [:json] if respond_to?(:wrap_parameters) -end - -# To enable root element in JSON for ActiveRecord objects. -# ActiveSupport.on_load(:active_record) do -# self.include_root_in_json = true -# end diff --git a/src/spec/stub/rails40/WEB-INF/config/locales/en.yml b/src/spec/stub/rails40/WEB-INF/config/locales/en.yml deleted file mode 100644 index 06539571..00000000 --- a/src/spec/stub/rails40/WEB-INF/config/locales/en.yml +++ /dev/null @@ -1,23 +0,0 @@ -# Files in the config/locales directory are used for internationalization -# and are automatically loaded by Rails. If you want to use locales other -# than English, add the necessary files in this directory. -# -# To use the locales, use `I18n.t`: -# -# I18n.t 'hello' -# -# In views, this is aliased to just `t`: -# -# <%= t('hello') %> -# -# To use a different locale, set it with `I18n.locale`: -# -# I18n.locale = :es -# -# This would use the information in config/locales/es.yml. -# -# To learn more, please read the Rails Internationalization guide -# available at http://guides.rubyonrails.org/i18n.html. - -en: - hello: "Hello world" diff --git a/src/spec/stub/rails40/WEB-INF/config/routes.rb b/src/spec/stub/rails40/WEB-INF/config/routes.rb deleted file mode 100644 index 567cff0b..00000000 --- a/src/spec/stub/rails40/WEB-INF/config/routes.rb +++ /dev/null @@ -1,56 +0,0 @@ -Rails40::Application.routes.draw do - # The priority is based upon order of creation: first created -> highest priority. - # See how all your routes lay out with "rake routes". - - # You can have the root of your site routed with "root" - # root 'welcome#index' - - # Example of regular route: - # get 'products/:id' => 'catalog#view' - - # Example of named route that can be invoked with purchase_url(id: product.id) - # get 'products/:id/purchase' => 'catalog#purchase', as: :purchase - - # Example resource route (maps HTTP verbs to controller actions automatically): - # resources :products - - # Example resource route with options: - # resources :products do - # member do - # get 'short' - # post 'toggle' - # end - # - # collection do - # get 'sold' - # end - # end - - # Example resource route with sub-resources: - # resources :products do - # resources :comments, :sales - # resource :seller - # end - - # Example resource route with more complex sub-resources: - # resources :products do - # resources :comments - # resources :sales do - # get 'recent', on: :collection - # end - # end - - # Example resource route with concerns: - # concern :toggleable do - # post 'toggle' - # end - # resources :posts, concerns: :toggleable - # resources :photos, concerns: :toggleable - - # Example resource route within a namespace: - # namespace :admin do - # # Directs /admin/products/* to Admin::ProductsController - # # (app/controllers/admin/products_controller.rb) - # resources :products - # end -end diff --git a/src/spec/stub/rails40/WEB-INF/db/.gitignore b/src/spec/stub/rails40/WEB-INF/db/.gitignore deleted file mode 100644 index 60615839..00000000 --- a/src/spec/stub/rails40/WEB-INF/db/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*.sqlite3 diff --git a/src/spec/stub/rails40/WEB-INF/db/seeds.rb b/src/spec/stub/rails40/WEB-INF/db/seeds.rb deleted file mode 100644 index 4edb1e85..00000000 --- a/src/spec/stub/rails40/WEB-INF/db/seeds.rb +++ /dev/null @@ -1,7 +0,0 @@ -# This file should contain all the record creation needed to seed the database with its default values. -# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup). -# -# Examples: -# -# cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }]) -# Mayor.create(name: 'Emanuel', city: cities.first) diff --git a/src/spec/stub/rails40/WEB-INF/vendor/assets/javascripts/.keep b/src/spec/stub/rails40/WEB-INF/vendor/assets/javascripts/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/spec/stub/rails40/WEB-INF/vendor/assets/stylesheets/.keep b/src/spec/stub/rails40/WEB-INF/vendor/assets/stylesheets/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/spec/stub/rails40/assets/application-bb7646d9ffeacfd960a576001feb8b35.css b/src/spec/stub/rails40/assets/application-bb7646d9ffeacfd960a576001feb8b35.css deleted file mode 100644 index 29b794dc..00000000 --- a/src/spec/stub/rails40/assets/application-bb7646d9ffeacfd960a576001feb8b35.css +++ /dev/null @@ -1,14 +0,0 @@ -/* - * This is a manifest file that'll be compiled into application.css, which will include all the files - * listed below. - * - * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, - * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path. - * - * You're free to add application-wide styles to this file and they'll appear at the top of the - * compiled file, but it's generally better to create a new file per style scope. - * - - - */ - diff --git a/src/spec/stub/rails40/assets/image-e2ae83881286c0e0e9e6ba508f6d4ae7.jpg b/src/spec/stub/rails40/assets/image-e2ae83881286c0e0e9e6ba508f6d4ae7.jpg deleted file mode 100644 index 933e1c62..00000000 Binary files a/src/spec/stub/rails40/assets/image-e2ae83881286c0e0e9e6ba508f6d4ae7.jpg and /dev/null differ diff --git a/src/spec/stub/rails40/assets/manifest-bf4e733de9c1aebca1f5e3466adad6b4.json b/src/spec/stub/rails40/assets/manifest-bf4e733de9c1aebca1f5e3466adad6b4.json deleted file mode 100644 index d2fee47b..00000000 --- a/src/spec/stub/rails40/assets/manifest-bf4e733de9c1aebca1f5e3466adad6b4.json +++ /dev/null @@ -1 +0,0 @@ -{"files":{"image-e2ae83881286c0e0e9e6ba508f6d4ae7.jpg":{"logical_path":"image.jpg","mtime":"2012-09-21T13:38:39+02:00","size":4278,"digest":"e2ae83881286c0e0e9e6ba508f6d4ae7"},"application-bb7646d9ffeacfd960a576001feb8b35.css":{"logical_path":"application.css","mtime":"2014-02-07T08:14:58+01:00","size":513,"digest":"bb7646d9ffeacfd960a576001feb8b35"}},"assets":{"image.jpg":"image-e2ae83881286c0e0e9e6ba508f6d4ae7.jpg","application.css":"application-bb7646d9ffeacfd960a576001feb8b35.css"}} \ No newline at end of file diff --git a/src/spec/stub/rails40/robots.txt b/src/spec/stub/rails40/robots.txt deleted file mode 100644 index 1a3a5e4d..00000000 --- a/src/spec/stub/rails40/robots.txt +++ /dev/null @@ -1,5 +0,0 @@ -# See http://www.robotstxt.org/wc/norobots.html for documentation on how to use the robots.txt file -# -# To ban all spiders from the entire site uncomment the next two lines: -# User-agent: * -# Disallow: / diff --git a/src/spec/stub/rails41/.gitignore b/src/spec/stub/rails41/.gitignore deleted file mode 100644 index 65e0d93c..00000000 --- a/src/spec/stub/rails41/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -Gemfile -Gemfile.lock diff --git a/src/spec/stub/rails41/Rakefile b/src/spec/stub/rails41/Rakefile deleted file mode 100644 index ba6b733d..00000000 --- a/src/spec/stub/rails41/Rakefile +++ /dev/null @@ -1,6 +0,0 @@ -# Add your own tasks in files placed in lib/tasks ending in .rake, -# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake. - -require File.expand_path('../config/application', __FILE__) - -Rails.application.load_tasks diff --git a/src/spec/stub/rails41/app/assets/images/.keep b/src/spec/stub/rails41/app/assets/images/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/spec/stub/rails41/app/assets/javascripts/application.js b/src/spec/stub/rails41/app/assets/javascripts/application.js deleted file mode 100644 index d6925fa4..00000000 --- a/src/spec/stub/rails41/app/assets/javascripts/application.js +++ /dev/null @@ -1,16 +0,0 @@ -// This is a manifest file that'll be compiled into application.js, which will include all the files -// listed below. -// -// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts, -// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path. -// -// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the -// compiled file. -// -// Read Sprockets README (https://github.com/sstephenson/sprockets#sprockets-directives) for details -// about supported directives. -// -//= require jquery -//= require jquery_ujs -//= require turbolinks -//= require_tree . diff --git a/src/spec/stub/rails41/app/assets/stylesheets/application.css b/src/spec/stub/rails41/app/assets/stylesheets/application.css deleted file mode 100644 index a443db34..00000000 --- a/src/spec/stub/rails41/app/assets/stylesheets/application.css +++ /dev/null @@ -1,15 +0,0 @@ -/* - * This is a manifest file that'll be compiled into application.css, which will include all the files - * listed below. - * - * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets, - * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path. - * - * You're free to add application-wide styles to this file and they'll appear at the bottom of the - * compiled file so the styles you add here take precedence over styles defined in any styles - * defined in the other CSS/SCSS files in this directory. It is generally better to create a new - * file per style scope. - * - *= require_tree . - *= require_self - */ diff --git a/src/spec/stub/rails41/app/controllers/application_controller.rb b/src/spec/stub/rails41/app/controllers/application_controller.rb deleted file mode 100644 index d83690e1..00000000 --- a/src/spec/stub/rails41/app/controllers/application_controller.rb +++ /dev/null @@ -1,5 +0,0 @@ -class ApplicationController < ActionController::Base - # Prevent CSRF attacks by raising an exception. - # For APIs, you may want to use :null_session instead. - protect_from_forgery with: :exception -end diff --git a/src/spec/stub/rails41/app/controllers/concerns/.keep b/src/spec/stub/rails41/app/controllers/concerns/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/spec/stub/rails41/app/helpers/application_helper.rb b/src/spec/stub/rails41/app/helpers/application_helper.rb deleted file mode 100644 index de6be794..00000000 --- a/src/spec/stub/rails41/app/helpers/application_helper.rb +++ /dev/null @@ -1,2 +0,0 @@ -module ApplicationHelper -end diff --git a/src/spec/stub/rails41/app/mailers/.keep b/src/spec/stub/rails41/app/mailers/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/spec/stub/rails41/app/models/.keep b/src/spec/stub/rails41/app/models/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/spec/stub/rails41/app/models/concerns/.keep b/src/spec/stub/rails41/app/models/concerns/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/spec/stub/rails41/app/views/layouts/application.html.erb b/src/spec/stub/rails41/app/views/layouts/application.html.erb deleted file mode 100644 index 191ac3c1..00000000 --- a/src/spec/stub/rails41/app/views/layouts/application.html.erb +++ /dev/null @@ -1,14 +0,0 @@ - - - - Rails41 - <%= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true %> - <%= javascript_include_tag 'application', 'data-turbolinks-track' => true %> - <%= csrf_meta_tags %> - - - -<%= yield %> - - - diff --git a/src/spec/stub/rails41/config/application.rb b/src/spec/stub/rails41/config/application.rb deleted file mode 100644 index 73c653f4..00000000 --- a/src/spec/stub/rails41/config/application.rb +++ /dev/null @@ -1,26 +0,0 @@ -require File.expand_path('../boot', __FILE__) - -#require 'rails/all' -require 'action_controller/railtie' -require 'action_mailer/railtie' -require 'sprockets/railtie' - -# Require the gems listed in Gemfile, including any gems -# you've limited to :test, :development, or :production. -Bundler.require(*Rails.groups) - -module Rails41 - class Application < Rails::Application - # Settings in config/environments/* take precedence over those specified here. - # Application configuration should go into files in config/initializers - # -- all .rb files in that directory are automatically loaded. - - # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone. - # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC. - # config.time_zone = 'Central Time (US & Canada)' - - # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded. - # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] - # config.i18n.default_locale = :de - end -end diff --git a/src/spec/stub/rails41/config/boot.rb b/src/spec/stub/rails41/config/boot.rb deleted file mode 100644 index 20fa9d80..00000000 --- a/src/spec/stub/rails41/config/boot.rb +++ /dev/null @@ -1,4 +0,0 @@ -# Set up gems listed in the Gemfile. -ENV['BUNDLE_GEMFILE'] = File.expand_path('../../Gemfile', __FILE__) - -require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE']) diff --git a/src/spec/stub/rails41/config/environment.rb b/src/spec/stub/rails41/config/environment.rb deleted file mode 100644 index 052dd73a..00000000 --- a/src/spec/stub/rails41/config/environment.rb +++ /dev/null @@ -1,5 +0,0 @@ -# Load the Rails application. -require File.expand_path('../application', __FILE__) - -# Initialize the Rails application. -Rails.application.initialize! \ No newline at end of file diff --git a/src/spec/stub/rails41/config/environments/development.rb b/src/spec/stub/rails41/config/environments/development.rb deleted file mode 100644 index c8203c1a..00000000 --- a/src/spec/stub/rails41/config/environments/development.rb +++ /dev/null @@ -1,37 +0,0 @@ -Rails.application.configure do - # Settings specified here will take precedence over those in config/application.rb. - - # In the development environment your application's code is reloaded on - # every request. This slows down response time but is perfect for development - # since you don't have to restart the web server when you make code changes. - config.cache_classes = false - - # Do not eager load code on boot. - config.eager_load = false - - # Show full error reports and disable caching. - config.consider_all_requests_local = true - config.action_controller.perform_caching = false - - # Don't care if the mailer can't send. - config.action_mailer.raise_delivery_errors = false - - # Print deprecation notices to the Rails logger. - config.active_support.deprecation = :log - - # Raise an error on page load if there are pending migrations. - config.active_record.migration_error = :page_load if config.respond_to?(:active_record) - - # Debug mode disables concatenation and preprocessing of assets. - # This option may cause significant delays in view rendering with a large - # number of complex assets. - config.assets.debug = true - - # Adds additional error checking when serving assets at runtime. - # Checks for improperly declared sprockets dependencies. - # Raises helpful error messages. - config.assets.raise_runtime_errors = true - - # Raises error for missing translations - # config.action_view.raise_on_missing_translations = true -end diff --git a/src/spec/stub/rails41/config/environments/production.rb b/src/spec/stub/rails41/config/environments/production.rb deleted file mode 100644 index b6f70024..00000000 --- a/src/spec/stub/rails41/config/environments/production.rb +++ /dev/null @@ -1,82 +0,0 @@ -Rails.application.configure do - # Settings specified here will take precedence over those in config/application.rb. - - # Code is not reloaded between requests. - config.cache_classes = true - - # Eager load code on boot. This eager loads most of Rails and - # your application in memory, allowing both threaded web servers - # and those relying on copy on write to perform better. - # Rake tasks automatically ignore this option for performance. - config.eager_load = true - - # Full error reports are disabled and caching is turned on. - config.consider_all_requests_local = false - config.action_controller.perform_caching = true - - # Enable Rack::Cache to put a simple HTTP cache in front of your application - # Add `rack-cache` to your Gemfile before enabling this. - # For large-scale production use, consider using a caching reverse proxy like nginx, varnish or squid. - # config.action_dispatch.rack_cache = true - - # Disable Rails's static asset server (Apache or nginx will already do this). - config.serve_static_assets = false - - # Compress JavaScripts and CSS. - config.assets.js_compressor = :uglifier - # config.assets.css_compressor = :sass - - # Do not fallback to assets pipeline if a precompiled asset is missed. - config.assets.compile = false - - # Generate digests for assets URLs. - config.assets.digest = true - - # `config.assets.precompile` has moved to config/initializers/assets.rb - - # Specifies the header that your server uses for sending files. - # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache - # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx - - # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies. - # config.force_ssl = true - - # Set to :debug to see everything in the log. - #config.log_level = :info - - # Prepend all log lines with the following tags. - # config.log_tags = [ :subdomain, :uuid ] - - # Use a different logger for distributed setups. - # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new) - - # Use a different cache store in production. - # config.cache_store = :mem_cache_store - - # Enable serving of images, stylesheets, and JavaScripts from an asset server. - # config.action_controller.asset_host = "http://assets.example.com" - - # Precompile additional assets. - # application.js, application.css, and all non-JS/CSS in app/assets folder are already added. - # config.assets.precompile += %w( search.js ) - - # Ignore bad email addresses and do not raise email delivery errors. - # Set this to true and configure the email server for immediate delivery to raise delivery errors. - # config.action_mailer.raise_delivery_errors = false - - # Enable locale fallbacks for I18n (makes lookups for any locale fall back to - # the I18n.default_locale when a translation cannot be found). - config.i18n.fallbacks = true - - # Send deprecation notices to registered listeners. - config.active_support.deprecation = :notify - - # Disable automatic flushing of the log to improve performance. - # config.autoflush_log = false - - # Use default logging formatter so that PID and timestamp are not suppressed. - #config.log_formatter = ::Logger::Formatter.new - - # Do not dump schema after migrations. - config.active_record.dump_schema_after_migration = false if config.respond_to?(:active_record) -end diff --git a/src/spec/stub/rails41/config/initializers/assets.rb b/src/spec/stub/rails41/config/initializers/assets.rb deleted file mode 100644 index d2f4ec33..00000000 --- a/src/spec/stub/rails41/config/initializers/assets.rb +++ /dev/null @@ -1,8 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Version of your assets, change this if you want to expire all your assets. -Rails.application.config.assets.version = '1.0' - -# Precompile additional assets. -# application.js, application.css, and all non-JS/CSS in app/assets folder are already added. -# Rails.application.config.assets.precompile += %w( search.js ) diff --git a/src/spec/stub/rails41/config/initializers/backtrace_silencers.rb b/src/spec/stub/rails41/config/initializers/backtrace_silencers.rb deleted file mode 100644 index 59385cdf..00000000 --- a/src/spec/stub/rails41/config/initializers/backtrace_silencers.rb +++ /dev/null @@ -1,7 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces. -# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ } - -# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code. -# Rails.backtrace_cleaner.remove_silencers! diff --git a/src/spec/stub/rails41/config/initializers/cookies_serializer.rb b/src/spec/stub/rails41/config/initializers/cookies_serializer.rb deleted file mode 100644 index 7a06a89f..00000000 --- a/src/spec/stub/rails41/config/initializers/cookies_serializer.rb +++ /dev/null @@ -1,3 +0,0 @@ -# Be sure to restart your server when you modify this file. - -Rails.application.config.action_dispatch.cookies_serializer = :json \ No newline at end of file diff --git a/src/spec/stub/rails41/config/initializers/filter_parameter_logging.rb b/src/spec/stub/rails41/config/initializers/filter_parameter_logging.rb deleted file mode 100644 index 4a994e1e..00000000 --- a/src/spec/stub/rails41/config/initializers/filter_parameter_logging.rb +++ /dev/null @@ -1,4 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Configure sensitive parameters which will be filtered from the log file. -Rails.application.config.filter_parameters += [:password] diff --git a/src/spec/stub/rails41/config/initializers/inflections.rb b/src/spec/stub/rails41/config/initializers/inflections.rb deleted file mode 100644 index ac033bf9..00000000 --- a/src/spec/stub/rails41/config/initializers/inflections.rb +++ /dev/null @@ -1,16 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Add new inflection rules using the following format. Inflections -# are locale specific, and you may define rules for as many different -# locales as you wish. All of these examples are active by default: -# ActiveSupport::Inflector.inflections(:en) do |inflect| -# inflect.plural /^(ox)$/i, '\1en' -# inflect.singular /^(ox)en/i, '\1' -# inflect.irregular 'person', 'people' -# inflect.uncountable %w( fish sheep ) -# end - -# These inflection rules are supported but not enabled by default: -# ActiveSupport::Inflector.inflections(:en) do |inflect| -# inflect.acronym 'RESTful' -# end diff --git a/src/spec/stub/rails41/config/initializers/mime_types.rb b/src/spec/stub/rails41/config/initializers/mime_types.rb deleted file mode 100644 index dc189968..00000000 --- a/src/spec/stub/rails41/config/initializers/mime_types.rb +++ /dev/null @@ -1,4 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Add new mime types for use in respond_to blocks: -# Mime::Type.register "text/richtext", :rtf diff --git a/src/spec/stub/rails41/config/initializers/session_store.rb b/src/spec/stub/rails41/config/initializers/session_store.rb deleted file mode 100644 index 080bcea9..00000000 --- a/src/spec/stub/rails41/config/initializers/session_store.rb +++ /dev/null @@ -1,3 +0,0 @@ -# Be sure to restart your server when you modify this file. - -Rails.application.config.session_store :cookie_store, key: '_rails41_session' diff --git a/src/spec/stub/rails41/config/initializers/wrap_parameters.rb b/src/spec/stub/rails41/config/initializers/wrap_parameters.rb deleted file mode 100644 index 33725e95..00000000 --- a/src/spec/stub/rails41/config/initializers/wrap_parameters.rb +++ /dev/null @@ -1,14 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# This file contains settings for ActionController::ParamsWrapper which -# is enabled by default. - -# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array. -ActiveSupport.on_load(:action_controller) do - wrap_parameters format: [:json] if respond_to?(:wrap_parameters) -end - -# To enable root element in JSON for ActiveRecord objects. -# ActiveSupport.on_load(:active_record) do -# self.include_root_in_json = true -# end diff --git a/src/spec/stub/rails41/config/locales/en.yml b/src/spec/stub/rails41/config/locales/en.yml deleted file mode 100644 index 06539571..00000000 --- a/src/spec/stub/rails41/config/locales/en.yml +++ /dev/null @@ -1,23 +0,0 @@ -# Files in the config/locales directory are used for internationalization -# and are automatically loaded by Rails. If you want to use locales other -# than English, add the necessary files in this directory. -# -# To use the locales, use `I18n.t`: -# -# I18n.t 'hello' -# -# In views, this is aliased to just `t`: -# -# <%= t('hello') %> -# -# To use a different locale, set it with `I18n.locale`: -# -# I18n.locale = :es -# -# This would use the information in config/locales/es.yml. -# -# To learn more, please read the Rails Internationalization guide -# available at http://guides.rubyonrails.org/i18n.html. - -en: - hello: "Hello world" diff --git a/src/spec/stub/rails41/config/routes.rb b/src/spec/stub/rails41/config/routes.rb deleted file mode 100644 index 3f66539d..00000000 --- a/src/spec/stub/rails41/config/routes.rb +++ /dev/null @@ -1,56 +0,0 @@ -Rails.application.routes.draw do - # The priority is based upon order of creation: first created -> highest priority. - # See how all your routes lay out with "rake routes". - - # You can have the root of your site routed with "root" - # root 'welcome#index' - - # Example of regular route: - # get 'products/:id' => 'catalog#view' - - # Example of named route that can be invoked with purchase_url(id: product.id) - # get 'products/:id/purchase' => 'catalog#purchase', as: :purchase - - # Example resource route (maps HTTP verbs to controller actions automatically): - # resources :products - - # Example resource route with options: - # resources :products do - # member do - # get 'short' - # post 'toggle' - # end - # - # collection do - # get 'sold' - # end - # end - - # Example resource route with sub-resources: - # resources :products do - # resources :comments, :sales - # resource :seller - # end - - # Example resource route with more complex sub-resources: - # resources :products do - # resources :comments - # resources :sales do - # get 'recent', on: :collection - # end - # end - - # Example resource route with concerns: - # concern :toggleable do - # post 'toggle' - # end - # resources :posts, concerns: :toggleable - # resources :photos, concerns: :toggleable - - # Example resource route within a namespace: - # namespace :admin do - # # Directs /admin/products/* to Admin::ProductsController - # # (app/controllers/admin/products_controller.rb) - # resources :products - # end -end diff --git a/src/spec/stub/rails41/config/secrets.yml b/src/spec/stub/rails41/config/secrets.yml deleted file mode 100644 index fd32b050..00000000 --- a/src/spec/stub/rails41/config/secrets.yml +++ /dev/null @@ -1,23 +0,0 @@ -# Be sure to restart your server when you modify this file. - -# Your secret key is used for verifying the integrity of signed cookies. -# If you change this key, all old signed cookies will become invalid! - -# Make sure the secret is at least 30 characters and all random, -# no regular words or you'll be exposed to dictionary attacks. -# You can use `rake secret` to generate a secure secret key. - -# Make sure the secrets in this file are kept private -# if you're sharing your code publicly. - -development: - secret_key_base: a9f5a1ab3bfafbb54440df7a8ae935c708164c069e96564617ed1aa4667478afea1ac0e4af1eba9b178820ab56c4caa317d9816e0ecbb0fecdee55946e64e3d3 - -<% if ENV["SECRET_KEY_BASE"] %> -# Do not keep production secrets in the repository, -# instead read values from the environment. -production: - secret_key_base: <%= ENV["SECRET_KEY_BASE"] %> -<% else %> - -<% end %> diff --git a/src/spec/stub/rails41/db/seeds.rb b/src/spec/stub/rails41/db/seeds.rb deleted file mode 100644 index 4edb1e85..00000000 --- a/src/spec/stub/rails41/db/seeds.rb +++ /dev/null @@ -1,7 +0,0 @@ -# This file should contain all the record creation needed to seed the database with its default values. -# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup). -# -# Examples: -# -# cities = City.create([{ name: 'Chicago' }, { name: 'Copenhagen' }]) -# Mayor.create(name: 'Emanuel', city: cities.first) diff --git a/src/spec/stub/rails41/lib/assets/.keep b/src/spec/stub/rails41/lib/assets/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/spec/stub/rails41/lib/tasks/.keep b/src/spec/stub/rails41/lib/tasks/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/spec/stub/rails41/public/404.html b/src/spec/stub/rails41/public/404.html deleted file mode 100644 index b612547f..00000000 --- a/src/spec/stub/rails41/public/404.html +++ /dev/null @@ -1,67 +0,0 @@ - - - - The page you were looking for doesn't exist (404) - - - - - - -
-
-

The page you were looking for doesn't exist.

-

You may have mistyped the address or the page may have moved.

-
-

If you are the application owner check the logs for more information.

-
- - diff --git a/src/spec/stub/rails41/public/422.html b/src/spec/stub/rails41/public/422.html deleted file mode 100644 index a21f82b3..00000000 --- a/src/spec/stub/rails41/public/422.html +++ /dev/null @@ -1,67 +0,0 @@ - - - - The change you wanted was rejected (422) - - - - - - -
-
-

The change you wanted was rejected.

-

Maybe you tried to change something you didn't have access to.

-
-

If you are the application owner check the logs for more information.

-
- - diff --git a/src/spec/stub/rails41/public/500.html b/src/spec/stub/rails41/public/500.html deleted file mode 100644 index 061abc58..00000000 --- a/src/spec/stub/rails41/public/500.html +++ /dev/null @@ -1,66 +0,0 @@ - - - - We're sorry, but something went wrong (500) - - - - - - -
-
-

We're sorry, but something went wrong.

-
-

If you are the application owner check the logs for more information.

-
- - diff --git a/src/spec/stub/rails41/public/robots.txt b/src/spec/stub/rails41/public/robots.txt deleted file mode 100644 index 3c9c7c01..00000000 --- a/src/spec/stub/rails41/public/robots.txt +++ /dev/null @@ -1,5 +0,0 @@ -# See http://www.robotstxt.org/robotstxt.html for documentation on how to use the robots.txt file -# -# To ban all spiders from the entire site uncomment the next two lines: -# User-agent: * -# Disallow: / diff --git a/src/spec/stub/rails41/vendor/assets/javascripts/.keep b/src/spec/stub/rails41/vendor/assets/javascripts/.keep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/spec/stub/rails41/vendor/assets/stylesheets/.keep b/src/spec/stub/rails41/vendor/assets/stylesheets/.keep deleted file mode 100644 index e69de29b..00000000