rails 0.14.2 → 0.14.3

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of rails might be problematic. Click here for more details.

Files changed (53) hide show
  1. data/CHANGELOG +83 -0
  2. data/README +16 -53
  3. data/Rakefile +10 -11
  4. data/bin/about +3 -0
  5. data/bin/plugin +3 -0
  6. data/configs/database.yml +65 -3
  7. data/configs/lighttpd.conf +40 -0
  8. data/environments/boot.rb +2 -2
  9. data/environments/environment.rb +3 -3
  10. data/environments/test.rb +1 -7
  11. data/helpers/test_helper.rb +19 -4
  12. data/html/javascripts/controls.js +18 -5
  13. data/html/javascripts/dragdrop.js +6 -3
  14. data/html/javascripts/effects.js +181 -290
  15. data/html/javascripts/prototype.js +13 -11
  16. data/lib/commands/about.rb +2 -0
  17. data/lib/commands/plugin.rb +823 -0
  18. data/lib/commands/process/reaper.rb +3 -3
  19. data/lib/commands/server.rb +23 -54
  20. data/lib/commands/servers/lighttpd.rb +56 -0
  21. data/lib/commands/servers/webrick.rb +59 -0
  22. data/lib/dispatcher.rb +30 -8
  23. data/lib/fcgi_handler.rb +6 -1
  24. data/lib/initializer.rb +107 -42
  25. data/lib/rails_generator/generators/applications/app/app_generator.rb +14 -12
  26. data/lib/rails_generator/generators/components/migration/migration_generator.rb +52 -5
  27. data/lib/rails_generator/generators/components/model/templates/fixtures.yml +2 -2
  28. data/lib/rails_generator/generators/components/model/templates/unit_test.rb +1 -5
  29. data/lib/rails_generator/generators/components/plugin/USAGE +33 -0
  30. data/lib/rails_generator/generators/components/plugin/plugin_generator.rb +33 -0
  31. data/lib/rails_generator/generators/components/plugin/templates/README +4 -0
  32. data/lib/rails_generator/generators/components/plugin/templates/Rakefile +22 -0
  33. data/lib/rails_generator/generators/components/plugin/templates/USAGE +8 -0
  34. data/lib/rails_generator/generators/components/plugin/templates/generator.rb +8 -0
  35. data/lib/rails_generator/generators/components/plugin/templates/init.rb +1 -0
  36. data/lib/rails_generator/generators/components/plugin/templates/plugin.rb +1 -0
  37. data/lib/rails_generator/generators/components/plugin/templates/tasks.rake +4 -0
  38. data/lib/rails_generator/generators/components/plugin/templates/unit_test.rb +8 -0
  39. data/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb +6 -1
  40. data/lib/rails_generator/generators/components/scaffold/templates/controller.rb +1 -1
  41. data/lib/rails_generator/generators/components/scaffold/templates/style.css +1 -1
  42. data/lib/rails_generator/lookup.rb +1 -0
  43. data/lib/rails_info.rb +94 -0
  44. data/lib/rails_version.rb +1 -1
  45. data/lib/tasks/databases.rake +8 -5
  46. data/lib/tasks/documentation.rake +34 -1
  47. data/lib/tasks/framework.rake +50 -12
  48. data/lib/tasks/misc.rake +5 -1
  49. data/lib/tasks/rails.rb +2 -2
  50. data/lib/tasks/testing.rake +14 -1
  51. metadata +28 -9
  52. data/html/javascripts/scriptaculous.js +0 -47
  53. data/html/javascripts/slider.js +0 -258
data/CHANGELOG CHANGED
@@ -1,3 +1,86 @@
1
+ *0.14.3 (RC4)* (November 7th, 2005)
2
+
3
+ * Add 'add_new_scripts' rake task for adding new rails scripts to script/* [Jamis Buck]
4
+
5
+ * Remove bogus hyphen from script/process/reaper calls to 'ps'. #2767 [anonymous]
6
+
7
+ * Copy lighttpd.conf when it is first needed, instead of on app creation [Jamis Buck]
8
+
9
+ * Use require_library_or_gem 'fcgi' in script/server [Sam Stephenson]
10
+
11
+ * Added default lighttpd config in config/lighttpd.conf and added a default runner for lighttpd in script/server (works like script/server, but using lighttpd and FastCGI). It will use lighttpd if available, otherwise WEBrick. You can force either or using 'script/server lighttpd' or 'script/server webrick' [DHH]
12
+
13
+ * New configuration option config.plugin_paths which may be a single path like the default 'vendor/plugins' or an array of paths: ['vendor/plugins', 'lib/plugins']. [Jeremy Kemper]
14
+
15
+ * Plugins are discovered in nested paths, so you can organize your plugins directory as you like. [Jeremy Kemper]
16
+
17
+ * Refactor load_plugin from load_plugins. #2757 [alex.r.moon@gmail.com]
18
+
19
+ * Make use of silence_stderr in script/lighttpd, script/plugin, and Rails::Info [Sam Stephenson]
20
+
21
+ * Enable HTTP installation of plugins when svn isn't avaialable. Closes #2661. [Chad Fowler]
22
+
23
+ * Added script/about to display formatted Rails::Info output [Sam Stephenson]
24
+
25
+ * Added Rails::Info to catalog assorted information about a Rails application's environment [Sam Stephenson]
26
+
27
+ * Tail the logfile when running script/server lighttpd in the foreground [Sam Stephenson]
28
+
29
+ * Try to guess the port number from config/lighttpd.conf in script/server lighttpd [Sam Stephenson]
30
+
31
+ * Don't reap spawn-fcgi. #2727 [matthew@walker.wattle.id.au]
32
+
33
+ * Reaper knows how to find processes even if the dispatch path is very long. #2711 [matthew@walker.wattle.id.au]
34
+
35
+ * Make fcgi handler respond to TERM signals with an explicit exit [Jamis Buck]
36
+
37
+ * Added demonstration of fixture use to the test case generated by the model generator [DHH]
38
+
39
+ * If specified, pass PostgreSQL client character encoding to createdb. #2703 [Kazuhiko <kazuhiko@fdiary.net>]
40
+
41
+ * Catch CGI multipart parse errors. Wrap dispatcher internals in a failsafe response handler. [Jeremy Kemper]
42
+
43
+ * The freeze_gems Rake task accepts the VERSION environment variable to decide which version of Rails to pull into vendor/rails. [Chad Fowler, Jeremy Kemper]
44
+
45
+ * Removed script.aculo.us.js, builder.js and slider.js (preperation for move of scriptaculous extensions to plugins, core scriptaculous will remain in Railties) [Thomas Fuchs]
46
+
47
+ * The freeze_edge Rake task does smarter svn detection and can export a specific revision by passing the REVISION environment variable. For example: rake freeze_edge REVISION=1234. #2663 [Rick Olson]
48
+
49
+ * Comment database.yml and include PostgreSQL and SQLite examples. [Jeremy Kemper]
50
+
51
+ * Improve script/plugin on Windows. #2646 [Chad Fowler]
52
+
53
+ * The *_plugindoc Rake tasks look deeper into the plugins' lib directories. #2652 [bellis@deepthought.org]
54
+
55
+ * The PostgreSQL :db_structure_dump Rake task limits its dump to the schema search path in database.yml. [Anatol Pomozov <anatol.pomozov@gmail.com>]
56
+
57
+ * Add task to generate rdoc for all installed plugins. [Marcel Molina]
58
+
59
+ * Update script.aculo.us to V1.5_rc4 [Thomas Fuchs]
60
+
61
+ * Add default Mac + DarwinPorts MySQL socket locations to the app generator. [Jeremy Kemper]
62
+
63
+ * Migrations may be destroyed: script/destroy migration foo. #2635 [Charles M. Gerungan <charles.gerungan@gmail.com>, Jamis Buck, Jeremy Kemper]
64
+
65
+ * Added that plugins can carry generators and that generator stub files can be created along with new plugins using script/generate plugin <name> --with-generator [DHH]
66
+
67
+ * Removed app/apis as a default empty dir since its automatically created when using script/generate web_service [DHH]
68
+
69
+ * Added script/plugin to manage plugins (install, remove, list, etc) [Ryan Tomayko]
70
+
71
+ * Added test_plugins task: Run the plugin tests in vendor/plugins/**/test (or specify with PLUGIN=name) [DHH]
72
+
73
+ * Added plugin generator to create a stub structure for a new plugin in vendor/plugins (see "script/generate plugin" for help) [DHH]
74
+
75
+ * Fixed scaffold generator when started with only 1 parameter #2609 [self@mattmower.com]
76
+
77
+ * rake should run functional tests even if the unit tests have failures [Jim Weirich]
78
+
79
+ * Back off cleanpath to be symlink friendly. Closes #2533 [Nicholas Seckar]
80
+
81
+ * Load rake task files in alphabetical order so you can build dependencies and count on them #2554 [Blair Zajac]
82
+
83
+
1
84
  *0.14.2 (RC3)* (October 26th, 2005)
2
85
 
3
86
  * Constants set in the development/test/production environment file are set in Object
data/README CHANGED
@@ -1,22 +1,22 @@
1
1
  == Welcome to Rails
2
2
 
3
- Rails is a web-application and persistance framework that includes everything
3
+ Rails is a web-application and persistence framework that includes everything
4
4
  needed to create database-backed web-applications according to the
5
5
  Model-View-Control pattern of separation. This pattern splits the view (also
6
6
  called the presentation) into "dumb" templates that are primarily responsible
7
- for inserting pre-build data in between HTML tags. The model contains the
7
+ for inserting pre-built data in between HTML tags. The model contains the
8
8
  "smart" domain objects (such as Account, Product, Person, Post) that holds all
9
9
  the business logic and knows how to persist themselves to a database. The
10
10
  controller handles the incoming requests (such as Save New Account, Update
11
11
  Product, Show Post) by manipulating the model and directing data to the view.
12
12
 
13
- In Rails, the model is handled by what's called a object-relational mapping
13
+ In Rails, the model is handled by what's called an object-relational mapping
14
14
  layer entitled Active Record. This layer allows you to present the data from
15
15
  database rows as objects and embellish these data objects with business logic
16
16
  methods. You can read more about Active Record in
17
17
  link:files/vendor/rails/activerecord/README.html.
18
18
 
19
- The controller and view is handled by the Action Pack, which handles both
19
+ The controller and view are handled by the Action Pack, which handles both
20
20
  layers by its two parts: Action View and Action Controller. These two layers
21
21
  are bundled in a single package due to their heavy interdependence. This is
22
22
  unlike the relationship between the Active Record and Action Pack that is much
@@ -25,21 +25,10 @@ Rails. You can read more about Action Pack in
25
25
  link:files/vendor/rails/actionpack/README.html.
26
26
 
27
27
 
28
- == Requirements
29
-
30
- * Database and driver (MySQL, PostgreSQL, or SQLite)
31
- * Rake[http://rake.rubyforge.org] for running tests and the generating documentation
32
-
33
- == Optionals
34
-
35
- * Apache 1.3.x or 2.x or lighttpd 1.3.11+ (or any FastCGI-capable webserver with a
36
- mod_rewrite-like module)
37
- * FastCGI (or mod_ruby) for better performance on Apache
38
-
39
28
  == Getting started
40
29
 
41
- 1. Run the WEBrick servlet: <tt>ruby script/server</tt>
42
- (run with --help for options)
30
+ 1. Run the WEBrick servlet: <tt>ruby script/server</tt> (run with --help for options)
31
+ ...or if you have lighttpd installed: <tt>ruby script/lighttpd</tt> (it's faster)
43
32
  2. Go to http://localhost:3000/ and get "Congratulations, you've put Ruby on Rails!"
44
33
  3. Follow the guidelines on the "Congratulations, you've put Ruby on Rails!" screen
45
34
 
@@ -60,37 +49,10 @@ link:files/vendor/rails/actionpack/README.html.
60
49
  </VirtualHost>
61
50
 
62
51
  NOTE: Be sure that CGIs can be executed in that directory as well. So ExecCGI
63
- should be on and ".cgi" should respond. All requests from 127.0.0.1 goes
52
+ should be on and ".cgi" should respond. All requests from 127.0.0.1 go
64
53
  through CGI, so no Apache restart is necessary for changes. All other requests
65
- goes through FCGI (or mod_ruby) that requires restart to show changes.
66
-
67
-
68
- == Example for lighttpd conf (with FastCGI)
54
+ go through FCGI (or mod_ruby), which requires a restart to show changes.
69
55
 
70
- server.port = 8080
71
- server.bind = "127.0.0.1"
72
- # server.event-handler = "freebsd-kqueue" # needed on OS X
73
-
74
- server.modules = ( "mod_rewrite", "mod_fastcgi" )
75
-
76
- url.rewrite = ( "^/$" => "index.html", "^([^.]+)$" => "$1.html" )
77
- server.error-handler-404 = "/dispatch.fcgi"
78
-
79
- server.document-root = "/path/application/public"
80
- server.errorlog = "/path/application/log/server.log"
81
-
82
- fastcgi.server = ( ".fcgi" =>
83
- ( "localhost" =>
84
- (
85
- "min-procs" => 1,
86
- "max-procs" => 5,
87
- "socket" => "/tmp/application.fcgi.socket",
88
- "bin-path" => "/path/application/public/dispatch.fcgi",
89
- "bin-environment" => ( "RAILS_ENV" => "development" )
90
- )
91
- )
92
- )
93
-
94
56
 
95
57
  == Debugging Rails
96
58
 
@@ -139,7 +101,7 @@ Finally, when you're ready to resume execution, you press CTRL-D
139
101
  You can interact with the domain model by starting the console through script/console.
140
102
  Here you'll have all parts of the application configured, just like it is when the
141
103
  application is running. You can inspect domain models, change values, and save to the
142
- database. Start the script without arguments will launch it in the development environment.
104
+ database. Starting the script without arguments will launch it in the development environment.
143
105
  Passing an argument will specify a different environment, like <tt>console production</tt>.
144
106
 
145
107
 
@@ -155,11 +117,11 @@ app/controllers
155
117
 
156
118
  app/models
157
119
  Holds models that should be named like post.rb.
158
- Most models will descent from ActiveRecord::Base.
120
+ Most models will descend from ActiveRecord::Base.
159
121
 
160
122
  app/views
161
123
  Holds the template files for the view that should be named like
162
- weblog/index.rhtml for the WeblogController#index action. All views uses eRuby
124
+ weblog/index.rhtml for the WeblogController#index action. All views use eRuby
163
125
  syntax. This directory can also be used to keep stylesheets, images, and so on
164
126
  that can be symlinked to public.
165
127
 
@@ -170,14 +132,14 @@ config
170
132
  Configuration files for the Rails environment, the routing map, the database, and other dependencies.
171
133
 
172
134
  components
173
- Self-contained mini-applications that can bundle controllers, models, and views together.
135
+ Self-contained mini-applications that can bundle together controllers, models, and views.
174
136
 
175
137
  lib
176
138
  Application specific libraries. Basically, any kind of custom code that doesn't
177
- belong controllers, models, or helpers. This directory is in the load path.
139
+ belong under controllers, models, or helpers. This directory is in the load path.
178
140
 
179
141
  public
180
- The directory available for the web server. Contains sub-directories for images, stylesheets,
142
+ The directory available for the web server. Contains subdirectories for images, stylesheets,
181
143
  and javascripts. Also contains the dispatchers and the default HTML files.
182
144
 
183
145
  script
@@ -187,4 +149,5 @@ test
187
149
  Unit and functional tests along with fixtures.
188
150
 
189
151
  vendor
190
- External libraries that the application depend on. This directory is in the load path.
152
+ External libraries that the application depends on. Also includes the plugins subdirectory.
153
+ This directory is in the load path.
data/Rakefile CHANGED
@@ -29,16 +29,15 @@ RUBY_FORGE_USER = "webster132"
29
29
 
30
30
 
31
31
  BASE_DIRS = %w( app config/environments components db doc log lib lib/tasks public script script/performance script/process test vendor vendor/plugins )
32
- APP_DIRS = %w( apis models controllers helpers views views/layouts )
32
+ APP_DIRS = %w( models controllers helpers views views/layouts )
33
33
  PUBLIC_DIRS = %w( images javascripts stylesheets )
34
34
  TEST_DIRS = %w( fixtures unit functional mocks mocks/development mocks/test )
35
35
 
36
36
  LOG_FILES = %w( server.log development.log test.log production.log )
37
37
  HTML_FILES = %w( 404.html 500.html index.html robots.txt favicon.ico
38
- javascripts/prototype.js javascripts/scriptaculous.js
39
- javascripts/effects.js javascripts/dragdrop.js javascripts/controls.js
40
- javascripts/slider.js )
41
- BIN_FILES = %w( breakpointer console destroy generate performance/benchmarker performance/profiler process/reaper process/spawner process/spinner runner server )
38
+ javascripts/prototype.js
39
+ javascripts/effects.js javascripts/dragdrop.js javascripts/controls.js )
40
+ BIN_FILES = %w( about breakpointer console destroy generate performance/benchmarker performance/profiler process/reaper process/spawner process/spinner runner server plugin )
42
41
 
43
42
  VENDOR_LIBS = %w( actionpack activerecord actionmailer activesupport actionwebservice railties )
44
43
 
@@ -159,7 +158,7 @@ task :copy_configs do
159
158
  app_name = "rails"
160
159
  socket = nil
161
160
  require 'erb'
162
- File.open("#{PKG_DESTINATION}/config/database.yml", 'w') {|f| f.write ERB.new(IO.read("configs/database.yml")).result(binding)}
161
+ File.open("#{PKG_DESTINATION}/config/database.yml", 'w') {|f| f.write ERB.new(IO.read("configs/database.yml"), nil, '-').result(binding)}
163
162
 
164
163
  cp "configs/routes.rb", "#{PKG_DESTINATION}/config/routes.rb"
165
164
 
@@ -273,11 +272,11 @@ spec = Gem::Specification.new do |s|
273
272
  EOF
274
273
 
275
274
  s.add_dependency('rake', '>= 0.6.2')
276
- s.add_dependency('activesupport', '= 1.2.2' + PKG_BUILD)
277
- s.add_dependency('activerecord', '= 1.12.2' + PKG_BUILD)
278
- s.add_dependency('actionpack', '= 1.10.2' + PKG_BUILD)
279
- s.add_dependency('actionmailer', '= 1.1.2' + PKG_BUILD)
280
- s.add_dependency('actionwebservice', '= 0.9.2' + PKG_BUILD)
275
+ s.add_dependency('activesupport', '= 1.2.3' + PKG_BUILD)
276
+ s.add_dependency('activerecord', '= 1.13.0' + PKG_BUILD)
277
+ s.add_dependency('actionpack', '= 1.11.0' + PKG_BUILD)
278
+ s.add_dependency('actionmailer', '= 1.1.3' + PKG_BUILD)
279
+ s.add_dependency('actionwebservice', '= 0.9.3' + PKG_BUILD)
281
280
 
282
281
  s.rdoc_options << '--exclude' << '.'
283
282
  s.has_rdoc = false
@@ -0,0 +1,3 @@
1
+ #!/usr/local/bin/ruby
2
+ require File.dirname(__FILE__) + '/../config/boot'
3
+ require 'commands/about'
@@ -0,0 +1,3 @@
1
+ #!/usr/local/bin/ruby
2
+ require File.dirname(__FILE__) + '/../config/boot'
3
+ require 'commands/plugin'
@@ -1,9 +1,21 @@
1
+ # MySQL (default setup). Versions 4.1 and 5.0 are recommended.
2
+ #
3
+ # Get the fast C bindings:
4
+ # gem install mysql
5
+ # (on OS X: gem install mysql -- --include=/usr/local/lib)
6
+ # And be sure to use new-style password hashing:
7
+ # http://dev.mysql.com/doc/refman/5.0/en/old-client.html
1
8
  development:
2
9
  adapter: mysql
3
10
  database: <%= app_name %>_development
4
- <%= "socket: #{socket}" if socket %>
5
11
  username: root
6
12
  password:
13
+ <%= " socket: #{socket}" if socket %>
14
+
15
+ # Connect on a TCP socket. If omitted, the adapter will connect on the
16
+ # domain socket given by socket instead.
17
+ #host: localhost
18
+ #port: 3306
7
19
 
8
20
  # Warning: The database defined as 'test' will be erased and
9
21
  # re-generated from your development database when you run 'rake'.
@@ -11,13 +23,63 @@ development:
11
23
  test:
12
24
  adapter: mysql
13
25
  database: <%= app_name %>_test
14
- <%= "socket: #{socket}" if socket %>
15
26
  username: root
16
27
  password:
28
+ <%= " socket: #{socket}" if socket %>
17
29
 
18
30
  production:
19
31
  adapter: mysql
20
32
  database: <%= app_name %>_production
21
- <%= "socket: #{socket}" if socket %>
22
33
  username: root
23
34
  password:
35
+ <%= " socket: #{socket}" if socket %>
36
+
37
+
38
+ # PostgreSQL versions 7.4 - 8.1
39
+ #
40
+ # Get the C bindings:
41
+ # gem install postgres
42
+ # or use the pure-Ruby bindings on Windows:
43
+ # gem install postgres-pr
44
+ postgresql_example:
45
+ adapter: postgresql
46
+ database: <%= app_name %>_development
47
+ username: <%= app_name %>
48
+ password:
49
+
50
+ # Connect on a TCP socket. Omitted by default since the client uses a
51
+ # domain socket that doesn't need configuration.
52
+ #host: remote-database
53
+ #port: 5432
54
+
55
+ # Schema search path. The server defaults to $user,public
56
+ #schema_search_path: myapp,sharedapp,public
57
+
58
+ # Character set encoding. The server defaults to sql_ascii.
59
+ #encoding: UTF8
60
+
61
+ # Minimum log levels, in increasing order:
62
+ # debug5, debug4, debug3, debug2, debug1,
63
+ # info, notice, warning, error, log, fatal, or panic
64
+ # The server defaults to notice.
65
+ #min_messages: warning
66
+
67
+
68
+ # SQLite version 2.x
69
+ # gem install sqlite-ruby
70
+ sqlite_example:
71
+ adapter: sqlite
72
+ database: db/development.sqlite2
73
+
74
+
75
+ # SQLite version 3.x
76
+ # gem install sqlite3-ruby
77
+ sqlite3_example:
78
+ adapter: sqlite3
79
+ database: db/development.sqlite3
80
+
81
+
82
+ # In-memory SQLite 3 database. Useful for tests.
83
+ sqlite3_in_memory_example:
84
+ adapter: sqlite3
85
+ database: ":memory:"
@@ -0,0 +1,40 @@
1
+ # Default configuration file for the lighttpd web server
2
+ # Start using ./script/server lighttpd
3
+
4
+ server.port = 3000
5
+
6
+ server.modules = ( "mod_rewrite", "mod_accesslog", "mod_fastcgi" )
7
+ server.error-handler-404 = "/dispatch.fcgi"
8
+ server.document-root = "public/"
9
+
10
+ server.errorlog = "log/lighttpd.error.log"
11
+ accesslog.filename = "log/lighttpd.access.log"
12
+
13
+ url.rewrite = ( "^/$" => "index.html", "^([^.]+)$" => "$1.html" )
14
+
15
+ # Change *-procs to 2 if you need to use Upload Progress or other tasks that
16
+ # *need* to execute a second request while the first is still pending.
17
+ fastcgi.server = ( ".fcgi" =>
18
+ ( "localhost" =>
19
+ (
20
+ "min-procs" => 1,
21
+ "max-procs" => 1,
22
+ "socket" => "log/fcgi.socket",
23
+ "bin-path" => "public/dispatch.fcgi",
24
+ "bin-environment" => ( "RAILS_ENV" => "development" )
25
+ )
26
+ )
27
+ )
28
+
29
+ mimetype.assign = (
30
+ ".css" => "text/css",
31
+ ".gif" => "image/gif",
32
+ ".htm" => "text/html",
33
+ ".html" => "text/html",
34
+ ".jpeg" => "image/jpeg",
35
+ ".jpg" => "image/jpeg",
36
+ ".js" => "text/javascript",
37
+ ".png" => "image/png",
38
+ ".swf" => "application/x-shockwave-flash",
39
+ ".txt" => "text/plain"
40
+ )
@@ -2,7 +2,7 @@ unless defined?(RAILS_ROOT)
2
2
  root_path = File.join(File.dirname(__FILE__), '..')
3
3
  unless RUBY_PLATFORM =~ /mswin32/
4
4
  require 'pathname'
5
- root_path = Pathname.new(root_path).cleanpath.to_s
5
+ root_path = Pathname.new(root_path).cleanpath(true).to_s
6
6
  end
7
7
  RAILS_ROOT = root_path
8
8
  end
@@ -14,4 +14,4 @@ else
14
14
  require 'initializer'
15
15
  end
16
16
 
17
- Rails::Initializer.run(:set_load_path)
17
+ Rails::Initializer.run(:set_load_path)
@@ -1,8 +1,8 @@
1
- # Be sure to restart your webserver when you modify this file.
1
+ # Be sure to restart your web server when you modify this file.
2
2
 
3
3
  # Uncomment below to force Rails into production mode
4
4
  # (Use only when you can't set environment variables through your web/app server)
5
- # ENV['RAILS_ENV'] = 'production'
5
+ # ENV['RAILS_ENV'] ||= 'production'
6
6
 
7
7
  # Bootstrap the Rails environment, frameworks, and default configuration
8
8
  require File.join(File.dirname(__FILE__), 'boot')
@@ -12,7 +12,7 @@ Rails::Initializer.run do |config|
12
12
  # config.frameworks -= [ :action_web_service, :action_mailer ]
13
13
 
14
14
  # Add additional load paths for your own custom dirs
15
- # config.load_paths += %W( #{RAILS_ROOT}/app/services )
15
+ # config.load_paths += %W( #{RAILS_ROOT}/extras )
16
16
 
17
17
  # Force all environments to use the same logger level
18
18
  # (by default production uses :info, the others :debug)
@@ -14,10 +14,4 @@ config.action_controller.perform_caching = false
14
14
  # Tell ActionMailer not to deliver emails to the real world.
15
15
  # The :test delivery method accumulates sent emails in the
16
16
  # ActionMailer::Base.deliveries array.
17
- config.action_mailer.delivery_method = :test
18
-
19
- # Overwrite the default settings for fixtures in tests. See Fixtures
20
- # for more details about these settings.
21
- # config.transactional_fixtures = true
22
- # config.instantiated_fixtures = false
23
- # config.pre_loaded_fixtures = false
17
+ config.action_mailer.delivery_method = :test