Permalink
Browse files

Version 2.0.0

  • Loading branch information...
1 parent 6864a9b commit 7f7221e140f58bc90e340bb3bf98742e9a41869e @cavalle committed Jun 14, 2011
Showing with 18,690 additions and 297 deletions.
  1. +1 −1 Gemfile
  2. +53 −74 Gemfile.lock
  3. +2 −2 README.md
  4. +1 −1 lib/steak/version.rb
  5. +0 −1 spec/fixtures/rails_project/.gitignore
  6. +17 −14 spec/fixtures/rails_project/Gemfile
  7. +7 −12 spec/fixtures/rails_project/README
  8. +1 −1 spec/fixtures/rails_project/Rakefile
  9. +0 −9 spec/fixtures/rails_project/app/assets/javascripts/application.js
  10. +0 −7 spec/fixtures/rails_project/app/assets/stylesheets/application.css
  11. 0 spec/fixtures/rails_project/app/mailers/.gitkeep
  12. 0 spec/fixtures/rails_project/app/models/.gitkeep
  13. +3 −3 spec/fixtures/rails_project/app/views/layouts/application.html.erb
  14. +3 −3 spec/fixtures/rails_project/config/application.rb
  15. +0 −3 spec/fixtures/rails_project/config/database.yml
  16. +3 −4 spec/fixtures/rails_project/config/environments/development.rb
  17. +12 −17 spec/fixtures/rails_project/config/environments/production.rb
  18. +1 −5 spec/fixtures/rails_project/config/environments/test.rb
  19. +1 −1 spec/fixtures/rails_project/config/initializers/secret_token.rb
  20. +0 −12 spec/fixtures/rails_project/config/initializers/wrap_parameters.rb
  21. +1 −1 spec/fixtures/rails_project/config/locales/en.yml
  22. +1 −1 spec/fixtures/rails_project/config/routes.rb
  23. +1 −1 spec/fixtures/rails_project/db/seeds.rb
  24. 0 spec/fixtures/rails_project/log/.gitkeep
  25. BIN spec/fixtures/{rails_project_with_steak/app/assets → rails_project/public}/images/rails.png
  26. +8 −10 spec/fixtures/rails_project/public/index.html
  27. +2 −0 spec/fixtures/rails_project/public/javascripts/application.js
  28. +965 −0 spec/fixtures/rails_project/public/javascripts/controls.js
  29. +974 −0 spec/fixtures/rails_project/public/javascripts/dragdrop.js
  30. +1,123 −0 spec/fixtures/rails_project/public/javascripts/effects.js
  31. +6,001 −0 spec/fixtures/rails_project/public/javascripts/prototype.js
  32. +191 −0 spec/fixtures/rails_project/public/javascripts/rails.js
  33. 0 spec/fixtures/{rails_project_with_steak/vendor/assets → rails_project/public}/stylesheets/.gitkeep
  34. 0 spec/fixtures/rails_project/test/fixtures/.gitkeep
  35. 0 spec/fixtures/rails_project/test/functional/.gitkeep
  36. 0 spec/fixtures/rails_project/test/integration/.gitkeep
  37. +1 −4 spec/fixtures/rails_project/test/performance/browsing_test.rb
  38. 0 spec/fixtures/rails_project/test/unit/.gitkeep
  39. 0 spec/fixtures/rails_project/vendor/assets/stylesheets/.gitkeep
  40. +0 −1 spec/fixtures/rails_project_with_steak/.gitignore
  41. +17 −14 spec/fixtures/rails_project_with_steak/Gemfile
  42. +7 −12 spec/fixtures/rails_project_with_steak/README
  43. +1 −1 spec/fixtures/rails_project_with_steak/Rakefile
  44. +0 −9 spec/fixtures/rails_project_with_steak/app/assets/javascripts/application.js
  45. +0 −7 spec/fixtures/rails_project_with_steak/app/assets/stylesheets/application.css
  46. 0 spec/fixtures/rails_project_with_steak/app/mailers/.gitkeep
  47. 0 spec/fixtures/rails_project_with_steak/app/models/.gitkeep
  48. +3 −3 spec/fixtures/rails_project_with_steak/app/views/layouts/application.html.erb
  49. +3 −3 spec/fixtures/rails_project_with_steak/config/application.rb
  50. +0 −3 spec/fixtures/rails_project_with_steak/config/database.yml
  51. +3 −4 spec/fixtures/rails_project_with_steak/config/environments/development.rb
  52. +12 −17 spec/fixtures/rails_project_with_steak/config/environments/production.rb
  53. +1 −5 spec/fixtures/rails_project_with_steak/config/environments/test.rb
  54. +1 −1 spec/fixtures/rails_project_with_steak/config/initializers/secret_token.rb
  55. +0 −12 spec/fixtures/rails_project_with_steak/config/initializers/wrap_parameters.rb
  56. +1 −1 spec/fixtures/rails_project_with_steak/config/locales/en.yml
  57. +1 −1 spec/fixtures/rails_project_with_steak/config/routes.rb
  58. +1 −1 spec/fixtures/rails_project_with_steak/db/seeds.rb
  59. 0 spec/fixtures/rails_project_with_steak/log/.gitkeep
  60. BIN spec/fixtures/{rails_project/app/assets → rails_project_with_steak/public}/images/rails.png
  61. +8 −10 spec/fixtures/rails_project_with_steak/public/index.html
  62. +2 −0 spec/fixtures/rails_project_with_steak/public/javascripts/application.js
  63. +965 −0 spec/fixtures/rails_project_with_steak/public/javascripts/controls.js
  64. +974 −0 spec/fixtures/rails_project_with_steak/public/javascripts/dragdrop.js
  65. +1,123 −0 spec/fixtures/rails_project_with_steak/public/javascripts/effects.js
  66. +6,001 −0 spec/fixtures/rails_project_with_steak/public/javascripts/prototype.js
  67. +191 −0 spec/fixtures/rails_project_with_steak/public/javascripts/rails.js
  68. 0 spec/fixtures/rails_project_with_steak/{test/unit → public/stylesheets}/.gitkeep
  69. 0 spec/fixtures/rails_project_with_steak/test/fixtures/.gitkeep
  70. 0 spec/fixtures/rails_project_with_steak/test/functional/.gitkeep
  71. 0 spec/fixtures/rails_project_with_steak/test/integration/.gitkeep
  72. +1 −4 spec/fixtures/rails_project_with_steak/test/performance/browsing_test.rb
  73. +1 −1 steak.gemspec
View
@@ -1,7 +1,7 @@
source 'http://rubygems.org'
gemspec
-gem 'rails', '>= 3.1.0.rc4'
+gem 'rails', '~> 3.0.0'
gem 'sqlite3', :platforms => :ruby
gem 'jdbc-sqlite3', :platforms => :jruby
View
@@ -1,49 +1,44 @@
PATH
remote: .
specs:
- steak (2.0.0.beta1)
- capybara (>= 1.0.0.rc1)
+ steak (2.0.0)
+ capybara (>= 1.0.0)
rspec-rails (>= 2.5.0)
GEM
remote: http://rubygems.org/
specs:
- actionmailer (3.1.0.rc4)
- actionpack (= 3.1.0.rc4)
- mail (~> 2.3.0)
- actionpack (3.1.0.rc4)
- activemodel (= 3.1.0.rc4)
- activesupport (= 3.1.0.rc4)
- builder (~> 3.0.0)
- erubis (~> 2.7.0)
- i18n (~> 0.6)
- rack (~> 1.3.0)
- rack-cache (~> 1.0.1)
- rack-mount (~> 0.8.1)
- rack-test (~> 0.6.0)
- sprockets (~> 2.0.0.beta.10)
- tzinfo (~> 0.3.27)
- activemodel (3.1.0.rc4)
- activesupport (= 3.1.0.rc4)
- bcrypt-ruby (~> 2.1.4)
- builder (~> 3.0.0)
- i18n (~> 0.6)
- activerecord (3.1.0.rc4)
- activemodel (= 3.1.0.rc4)
- activesupport (= 3.1.0.rc4)
- arel (~> 2.1.1)
- tzinfo (~> 0.3.27)
+ abstract (1.0.0)
+ actionmailer (3.0.8)
+ actionpack (= 3.0.8)
+ mail (~> 2.2.19)
+ actionpack (3.0.8)
+ activemodel (= 3.0.8)
+ activesupport (= 3.0.8)
+ builder (~> 2.1.2)
+ erubis (~> 2.6.6)
+ i18n (~> 0.5.0)
+ rack (~> 1.2.1)
+ rack-mount (~> 0.6.14)
+ rack-test (~> 0.5.7)
+ tzinfo (~> 0.3.23)
+ activemodel (3.0.8)
+ activesupport (= 3.0.8)
+ builder (~> 2.1.2)
+ i18n (~> 0.5.0)
+ activerecord (3.0.8)
+ activemodel (= 3.0.8)
+ activesupport (= 3.0.8)
+ arel (~> 2.0.10)
+ tzinfo (~> 0.3.23)
activerecord-jdbc-adapter (1.1.1)
- activeresource (3.1.0.rc4)
- activemodel (= 3.1.0.rc4)
- activesupport (= 3.1.0.rc4)
- activesupport (3.1.0.rc4)
- multi_json (~> 1.0)
- arel (2.1.1)
- bcrypt-ruby (2.1.4)
- bcrypt-ruby (2.1.4-java)
- builder (3.0.0)
- capybara (1.0.0.rc1)
+ activeresource (3.0.8)
+ activemodel (= 3.0.8)
+ activesupport (= 3.0.8)
+ activesupport (3.0.8)
+ arel (2.0.10)
+ builder (2.1.2)
+ capybara (1.0.0)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
@@ -54,50 +49,40 @@ GEM
ffi (~> 1.0.6)
columnize (0.3.2)
diff-lcs (1.1.2)
- erubis (2.7.0)
+ erubis (2.6.6)
+ abstract (>= 1.0.0)
ffi (1.0.9)
- ffi (1.0.9-java)
- hike (1.0.0)
- i18n (0.6.0)
+ i18n (0.5.0)
jdbc-sqlite3 (3.6.14.2.056-java)
json_pure (1.5.1)
linecache (0.43)
- mail (2.3.0)
+ mail (2.2.19)
+ activesupport (>= 2.3.6)
i18n (>= 0.4.0)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.16)
- multi_json (1.0.3)
nokogiri (1.4.4)
- nokogiri (1.4.4-java)
- weakling (>= 0.0.3)
polyglot (0.3.1)
- rack (1.3.0)
- rack-cache (1.0.2)
- rack (>= 0.4)
- rack-mount (0.8.1)
+ rack (1.2.3)
+ rack-mount (0.6.14)
rack (>= 1.0.0)
- rack-ssl (1.3.2)
- rack
- rack-test (0.6.0)
+ rack-test (0.5.7)
rack (>= 1.0)
- rails (3.1.0.rc4)
- actionmailer (= 3.1.0.rc4)
- actionpack (= 3.1.0.rc4)
- activerecord (= 3.1.0.rc4)
- activeresource (= 3.1.0.rc4)
- activesupport (= 3.1.0.rc4)
+ rails (3.0.8)
+ actionmailer (= 3.0.8)
+ actionpack (= 3.0.8)
+ activerecord (= 3.0.8)
+ activeresource (= 3.0.8)
+ activesupport (= 3.0.8)
bundler (~> 1.0)
- railties (= 3.1.0.rc4)
- railties (3.1.0.rc4)
- actionpack (= 3.1.0.rc4)
- activesupport (= 3.1.0.rc4)
- rack-ssl (~> 1.3.2)
+ railties (= 3.0.8)
+ railties (3.0.8)
+ actionpack (= 3.0.8)
+ activesupport (= 3.0.8)
rake (>= 0.8.7)
- rdoc (~> 3.4)
- thor (~> 0.14.6)
+ thor (~> 0.14.4)
rake (0.9.2)
- rdoc (3.6.1)
rspec (2.6.0)
rspec-core (~> 2.6.0)
rspec-expectations (~> 2.6.0)
@@ -122,17 +107,11 @@ GEM
ffi (>= 1.0.7)
json_pure
rubyzip
- sprockets (2.0.0.beta.10)
- hike (~> 1.0)
- rack (~> 1.0)
- tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.3)
thor (0.14.6)
- tilt (1.3.2)
treetop (1.4.9)
polyglot (>= 0.3.1)
- tzinfo (0.3.27)
- weakling (0.0.4-java)
+ tzinfo (0.3.28)
xpath (0.1.4)
nokogiri (~> 1.3)
@@ -143,7 +122,7 @@ PLATFORMS
DEPENDENCIES
activerecord-jdbc-adapter
jdbc-sqlite3
- rails (>= 3.1.0.rc4)
+ rails (~> 3.0.0)
ruby-debug
sqlite3
steak!
View
@@ -43,12 +43,12 @@ Basically Steak exists for three reasons:
## Getting Started
-_NOTE: The following instructions refer to the development version of Steak which only works for Rails 3, RSpec 2 and Capybara 1.0. The [stable version](https://github.com/cavalle/steak/tree/steak-1), also works for Rails 2, RSpec 1 or Webrat_
+_NOTE: The current version of Steak (2.0) assumes that you're testing a Rails 3 application, with RSpec 2 and Capybara. For Rails 2, RSpec 1 or Webrat you should use [Steak 1](https://github.com/cavalle/steak/tree/steak-1) (or consider upgrading to non-obsolete technologies ;P)_
It's super-easy to get you started. Just add the gem to your `Gemfile`
group :test, :development do
- gem 'steak', '>= 2.0.0.beta1'
+ gem 'steak'
# ...
…and then install the gem and run the generator:
@@ -1,3 +1,3 @@
module Steak
- VERSION = '2.0.0.beta2'
+ VERSION = '2.0.0'
end
@@ -2,4 +2,3 @@
db/*.sqlite3
log/*.log
tmp/
-.sass-cache/
@@ -1,17 +1,15 @@
source 'http://rubygems.org'
-gem 'rails', '3.1.0.rc4'
+gem 'rails', '3.0.8'
# Bundle edge Rails instead:
-# gem 'rails', :git => 'git://github.com/rails/rails.git'
+# gem 'rails', :git => 'git://github.com/rails/rails.git'
platforms :ruby do
gem 'sqlite3'
end
platforms :jruby do
- # the javascript engine for execjs gem
- gem 'therubyrhino'
gem 'activerecord-jdbc-adapter'
@@ -39,20 +37,25 @@ platforms :jruby do
end
-# Asset template engines
-gem 'json'
-gem 'sass-rails', "~> 3.1.0.rc"
-gem 'coffee-script'
-gem 'uglifier'
-
-gem 'jquery-rails'
-
# Use unicorn as the web server
# gem 'unicorn'
# Deploy with Capistrano
# gem 'capistrano'
-# To use debugger
+# To use debugger (ruby-debug for Ruby 1.8.7+, ruby-debug19 for Ruby 1.9.2+)
# gem 'ruby-debug'
-
+# gem 'ruby-debug19', :require => 'ruby-debug'
+
+# Bundle the extra gems:
+# gem 'bj'
+# gem 'nokogiri'
+# gem 'sqlite3-ruby', :require => 'sqlite3'
+# gem 'aws-s3', :require => 'aws/s3'
+
+# Bundle gems for the local environment. Make sure to
+# put test-only gems in this group so their generators
+# and rake tasks are available in development mode:
+# group :development, :test do
+# gem 'webrat'
+# end
@@ -91,7 +91,7 @@ mode. With gems, use <tt>sudo gem install ruby-debug</tt>. Example:
class WeblogController < ActionController::Base
def index
- @posts = Post.all
+ @posts = Post.find(:all)
debugger
end
end
@@ -139,7 +139,7 @@ To reload your controllers and models after launching the console run
<tt>reload!</tt>
More information about irb can be found at:
-link:http://www.rubycentral.org/pickaxe/irb.html
+link:http://www.rubycentral.com/pickaxe/irb.html
== dbconsole
@@ -156,10 +156,6 @@ PostgreSQL and SQLite 3.
The default directory structure of a generated Ruby on Rails application:
|-- app
- | |-- assets
- | |-- images
- | |-- javascripts
- | `-- stylesheets
| |-- controllers
| |-- helpers
| |-- mailers
@@ -176,6 +172,9 @@ The default directory structure of a generated Ruby on Rails application:
| `-- tasks
|-- log
|-- public
+ | |-- images
+ | |-- javascripts
+ | `-- stylesheets
|-- script
|-- test
| |-- fixtures
@@ -189,16 +188,11 @@ The default directory structure of a generated Ruby on Rails application:
| |-- sessions
| `-- sockets
`-- vendor
- |-- assets
- `-- stylesheets
`-- plugins
app
Holds all the code that's specific to this particular application.
-app/assets
- Contains subdirectories for images, stylesheets, and JavaScript files.
-
app/controllers
Holds controllers that should be named like weblogs_controller.rb for
automated URL mapping. All controllers should descend from
@@ -243,7 +237,8 @@ lib
the load path.
public
- The directory available for the web server. Also contains the dispatchers and the
+ The directory available for the web server. Contains subdirectories for
+ images, stylesheets, and javascripts. Also contains the dispatchers and the
default HTML files. This should be set as the DOCUMENT_ROOT of your web
server.
@@ -1,7 +1,7 @@
-#!/usr/bin/env rake
# 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__)
+require 'rake'
RailsProject::Application.load_tasks
@@ -1,9 +0,0 @@
-// This is a manifest file that'll be compiled into including all the files listed below.
-// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
-// be included in the compiled file accessible from http://example.com/assets/application.js
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
-//
-//= require jquery
-//= require jquery_ujs
-//= require_tree .
@@ -1,7 +0,0 @@
-/*
- * This is a manifest file that'll automatically include all the stylesheets available in this directory
- * and any sub-directories. 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 .
-*/
@@ -2,9 +2,9 @@
<html>
<head>
<title>RailsProject</title>
- <%= stylesheet_link_tag "application" %>
- <%= javascript_include_tag "application" %>
- <%= csrf_meta_tags %>
+ <%= stylesheet_link_tag :all %>
+ <%= javascript_include_tag :defaults %>
+ <%= csrf_meta_tag %>
</head>
<body>
@@ -30,13 +30,13 @@ class Application < Rails::Application
# 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]
-
- # Enable the asset pipeline
- config.assets.enabled = true
end
end
Oops, something went wrong.

0 comments on commit 7f7221e

Please sign in to comment.