rails 0.9.3 → 0.9.4

data/CHANGELOG

@@ -1,3 +1,29 @@
+*0.9.4* (January 17th, 2005)
+
+* Added that ApplicationController will catch a ControllerNotFound exception if someone attempts to access a url pointing to an unexisting controller [Tobias Luetke]
+
+* Flipped code-to-test ratio around to be more readable #468 [Scott Baron]
+
+* Fixed log file permissions to be 666 instead of 777 (so they're not executable) #471 [Lucas Carlson]
+
+* Fixed that auto reloading would some times not work or would reload the models twice #475 [Tobias Luetke]
+
+* Added rewrite rules to deal with caching to public/.htaccess
+
+* Added the option to specify a controller name to "generate scaffold" and made the default controller name the plural form of the model.
+
+* Added that rake clone_structure_to_test, db_structure_dump, and purge_test_database tasks now pick up the source database to use from
+  RAILS_ENV instead of just forcing development #424 [Tobias Luetke]
+
+* Fixed script/console to work with Windows (that requires the use of irb.bat) #418 [octopod]
+
+* Fixed WEBrick servlet slowdown over time by restricting the load path reloading to mod_ruby
+
+* Removed Fancy Indexing as a default option on the WEBrick servlet as it made it harder to use various caching schemes
+
+* Upgraded to Active Record 1.5, Action Pack 1.3, Action Mailer 0.6
+
+
 *0.9.3* (January 4th, 2005)
 
 * Added support for SQLite in the auto-dumping/importing of schemas for development -> test #416
@@ -31,6 +57,8 @@
 
 * Fixed that generated action_mailers doesnt need to require the action_mailer since thats already done in the environment #382 [Lucas Carlson]
 
+* Upgraded to Action Pack 1.2.0 and Active Record 1.4.0
+
 
 *0.9.2*
 

data/Rakefile

@@ -9,7 +9,7 @@ require 'rbconfig'
 
 PKG_BUILD       = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME        = 'rails'
-PKG_VERSION     = '0.9.3' + PKG_BUILD
+PKG_VERSION     = '0.9.4' + PKG_BUILD
 PKG_FILE_NAME   = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_DESTINATION = ENV["RAILS_PKG_DESTINATION"] || "../#{PKG_NAME}"
 
@@ -39,6 +39,9 @@ task :fresh_gem_rails => [ :clean, :make_dir_structure, :initialize_file_stubs,
 desc "Generates a fresh Rails package without documentation (faster)"
 task :fresh_rails_without_docs => [ :clean, :make_dir_structure, :initialize_file_stubs, :copy_vendor_libraries, :copy_ties_content ]
 
+desc "Generates a fresh Rails package without documentation (faster)"
+task :fresh_rails_without_docs_using_links => [ :clean, :make_dir_structure, :initialize_file_stubs, :link_vendor_libraries, :copy_ties_content ]
+
 desc "Packages the fresh Rails package with documentation"
 task :package => [ :clean, :fresh_rails ] do
   system %{cd ..; tar -czvf #{PKG_NAME}-#{PKG_VERSION}.tgz #{PKG_NAME}}
@@ -76,7 +79,7 @@ task :initialize_log_files do
   LOG_FILES.each do |log_file|
     log_path = File.join(log_dir, log_file)
     touch log_path
-    chmod 0777, log_path
+    chmod 0666, log_path
   end
 end
 
@@ -89,6 +92,14 @@ task :copy_vendor_libraries do
        File.join(PKG_DESTINATION, 'vendor')
 end
 
+desc "Link in all the Rails packages to vendor"
+task :link_vendor_libraries do
+  return_dir = File.dirname(File.expand_path(__FILE__))
+  cd File.join(PKG_DESTINATION, 'vendor')
+  VENDOR_LIBS.each { |dir| ln_s File.dirname(__FILE__) + "/../../#{dir}", "." }
+  cd return_dir
+end
+
 
 # Copy Ties Content -----------------------------------------------------------------------
 
@@ -234,9 +245,9 @@ spec = Gem::Specification.new do |s|
   EOF
 
   s.add_dependency('rake', '>= 0.4.15')
-  s.add_dependency('activerecord', '>= 1.4.0')
-  s.add_dependency('actionpack', '>= 1.2.0')
-  s.add_dependency('actionmailer', '>= 0.5.0')
+  s.add_dependency('activerecord', '>= 1.5.0')
+  s.add_dependency('actionpack', '>= 1.3.0')
+  s.add_dependency('actionmailer', '>= 0.6.0')
 
   s.has_rdoc = false
 

data/bin/console

@@ -3,7 +3,12 @@
 if ARGV[0]
   ENV['RAILS_ENV'] = ARGV[0]
   puts "Loading environment..."
-  exec "irb -r config/environment.rb -r irb/completion --noinspect"
+  if RUBY_PLATFORM =~ /mswin32/
+    irb_name = "irb.bat"
+  else
+    irb_name = 'irb'
+  end
+  exec "#{irb_name} -r config/environment.rb -r irb/completion --noinspect"
 else
   puts <<-HELP
 
@@ -27,4 +32,4 @@ EXAMPLE
      and config/environments/production.rb). You would now be ready to start requiring
      models using require_dependency.
 HELP
-end
+end

data/configs/apache.conf

@@ -12,6 +12,38 @@ RewriteBase /dispatch.cgi
 # Enable this rewrite rule to point to the controller/action that should serve root.
 # RewriteRule ^$ /controller/action [R]
 
+# <caching>
+# no query string?
+RewriteCond %{QUERY_STRING} ^$
+
+# no POST method? 
+RewriteCond %{REQUEST_METHOD} !^POST$ [NC]
+
+# Request filename is a directory?
+RewriteCond %{REQUEST_FILENAME} -d
+
+# Request filename + '/index' is a file?
+RewriteCond %{REQUEST_FILENAME}/index -f
+
+# Rewrite to request filename + '/index' and finish
+RewriteRule ^(.*)/?$ $1/index [QSA,L]
+
+# no query string?
+RewriteCond %{QUERY_STRING} ^$
+
+# no POST method?
+RewriteCond %{REQUEST_METHOD} !^POST$ [NC]
+
+# Request filename is a file?
+RewriteCond %{REQUEST_FILENAME} -f
+
+# Finish rewriting
+RewriteRule .* - [L]
+
+# Set default type of cached files to text/html
+DefaultType text/html
+# </caching>
+
 # Add missing slash
 RewriteRule ^([-_a-zA-Z0-9]+)$                                            /$1/ [R]
 

data/dispatches/dispatch.rb

@@ -6,5 +6,5 @@ require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_
 # "/usr/local/lib/ruby/gems/1.8/gems/rails-0.8.0/lib/dispatcher" -- otherwise performance is severely impaired
 require "dispatcher"
 
-ADDITIONAL_LOAD_PATHS.reverse.each { |dir| $:.unshift(dir) if File.directory?(dir) }
+ADDITIONAL_LOAD_PATHS.reverse.each { |dir| $:.unshift(dir) if File.directory?(dir) } if defined?(Apache::RubyRun)
 Dispatcher.dispatch

data/doc/index.html

@@ -32,7 +32,7 @@
 <p><b>Before you move on</b>, verify that the following conditions have been met:</p>
 
 <ol>
-  <li>The log directory and the empty log files must be writable to the web server (<code>chmod -R 777 log</code>).
+  <li>The log directory and the empty log files must be writable to the web server (<code>chmod -R 666 log/*</code>).
   <li>
     The shebang line in the public/dispatch* files must reference your Ruby installation. <br/>
     You might need to change it to <code>#!/usr/bin/env ruby</code> or point directly at the installation.
@@ -67,4 +67,4 @@
 </p>
 
 </body>
-</html>
+</html>

data/environments/development.rb

@@ -1,3 +1,4 @@
 Dependencies.mechanism                             = :load
 ActionController::Base.consider_all_requests_local = true
+ActionController::Base.perform_caching             = false
 BREAKPOINT_SERVER_PORT = 42531

data/environments/production.rb

@@ -1,2 +1,3 @@
 Dependencies.mechanism                             = :require
 ActionController::Base.consider_all_requests_local = false
+ActionController::Base.perform_caching             = true

data/environments/shared.rb

@@ -47,7 +47,7 @@ rescue StandardError
   RAILS_DEFAULT_LOGGER = Logger.new(STDERR)
   RAILS_DEFAULT_LOGGER.level = Logger::WARN
   RAILS_DEFAULT_LOGGER.warn(
-    "Rails Error: Unable to access log file. Please ensure that log/#{RAILS_ENV}.log exists and is chmod 0777. " +
+    "Rails Error: Unable to access log file. Please ensure that log/#{RAILS_ENV}.log exists and is chmod 0666. " +
     "The log level has been raised to WARN and the output directed to STDERR until the problem is fixed."
   )
 end

data/environments/shared_for_gem.rb

@@ -44,7 +44,7 @@ rescue StandardError
   RAILS_DEFAULT_LOGGER = Logger.new(STDERR)
   RAILS_DEFAULT_LOGGER.level = Logger::WARN
   RAILS_DEFAULT_LOGGER.warn(
-    "Rails Error: Unable to access log file. Please ensure that log/#{RAILS_ENV}.log exists and is chmod 0777. " +
+    "Rails Error: Unable to access log file. Please ensure that log/#{RAILS_ENV}.log exists and is chmod 0666. " +
     "The log level has been raised to WARN and the output directed to STDERR until the problem is fixed."
   )
 end

data/environments/test.rb

@@ -1,3 +1,4 @@
 Dependencies.mechanism                             = :require
 ActionController::Base.consider_all_requests_local = true
+ActionController::Base.perform_caching             = false
 ActionMailer::Base.delivery_method                 = :test

data/fresh_rakefile

@@ -8,7 +8,7 @@ require File.dirname(__FILE__) + '/config/environment'
 require 'code_statistics'
 
 desc "Run all the tests on a fresh test database"
-task :default => [ :clone_development_structure_to_test, :test_units, :test_functional ]
+task :default => [ :clone_structure_to_test, :test_units, :test_functional ]
 
 desc "Generate API documentatio, show coding stats"
 task :doc => [ :appdoc, :stats ]
@@ -72,36 +72,36 @@ task :stats do
 end
 
 desc "Recreate the test databases from the development structure"
-task :clone_development_structure_to_test => [ :db_structure_dump, :purge_test_database ] do
+task :clone_structure_to_test => [ :db_structure_dump, :purge_test_database ] do
   if ActiveRecord::Base.configurations["test"]["adapter"] == "mysql"
     ActiveRecord::Base.establish_connection(:test)
     ActiveRecord::Base.connection.execute('SET foreign_key_checks = 0')
-    IO.readlines("db/development_structure.sql").join.split("\n\n").each do |table|
+    IO.readlines("db/#{RAILS_ENV}_structure.sql").join.split("\n\n").each do |table|
       ActiveRecord::Base.connection.execute(table)
     end
   elsif ActiveRecord::Base.configurations["test"]["adapter"] == "postgresql"
-    `psql -U #{ActiveRecord::Base.configurations["test"]["username"]} -f db/development_structure.sql #{ActiveRecord::Base.configurations["test"]["database"]}`
+    `psql -U #{ActiveRecord::Base.configurations["test"]["username"]} -f db/#{RAILS_ENV}_structure.sql #{ActiveRecord::Base.configurations["test"]["database"]}`
   elsif ActiveRecord::Base.configurations["test"]["adapter"] == "sqlite"
-    `sqlite #{ActiveRecord::Base.configurations["test"]["dbfile"]} < db/development_structure.sql`
+    `sqlite #{ActiveRecord::Base.configurations["test"]["dbfile"]} < db/#{RAILS_ENV}_structure.sql`
   end
 end
 
 desc "Dump the database structure to a SQL file"
 task :db_structure_dump do
-  if ActiveRecord::Base.configurations["development"]["adapter"] == "mysql"
-    ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations["development"])
-    File.open("db/development_structure.sql", "w+") { |f| f << ActiveRecord::Base.connection.structure_dump }
-  elsif ActiveRecord::Base.configurations["development"]["adapter"] == "postgresql"
-    `pg_dump -U #{ActiveRecord::Base.configurations["development"]["username"]} -s -f db/development_structure.sql #{ActiveRecord::Base.configurations["development"]["database"]}`
-  elsif ActiveRecord::Base.configurations["development"]["adapter"] == "sqlite"
-    `sqlite #{ActiveRecord::Base.configurations["development"]["dbfile"]} .schema > db/development_structure.sql`
+  if ActiveRecord::Base.configurations[RAILS_ENV]["adapter"] == "mysql"
+    ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations[RAILS_ENV])
+    File.open("db/#{RAILS_ENV}_structure.sql", "w+") { |f| f << ActiveRecord::Base.connection.structure_dump }
+  elsif ActiveRecord::Base.configurations[RAILS_ENV]["adapter"] == "postgresql"
+    `pg_dump -U #{ActiveRecord::Base.configurations[RAILS_ENV]["username"]} -s -f db/#{RAILS_ENV}_structure.sql #{ActiveRecord::Base.configurations[RAILS_ENV]["database"]}`
+  elsif ActiveRecord::Base.configurations[RAILS_ENV]["adapter"] == "sqlite"
+    `sqlite #{ActiveRecord::Base.configurations[RAILS_ENV]["dbfile"]} .schema > db/#{RAILS_ENV}_structure.sql`
   end
 end
 
 desc "Drop the test database and bring it back again"
 task :purge_test_database do
   if ActiveRecord::Base.configurations["test"]["adapter"] == "mysql"
-    ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations["development"])
+    ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations[RAILS_ENV])
     ActiveRecord::Base.connection.recreate_database(ActiveRecord::Base.configurations["test"]["database"])
   elsif ActiveRecord::Base.configurations["test"]["adapter"] == "postgresql"
     `dropdb -U #{ActiveRecord::Base.configurations["test"]["username"]} #{ActiveRecord::Base.configurations["test"]["database"]}`

data/generators/scaffold/USAGE

@@ -2,12 +2,14 @@ GENERATOR
      scaffold - create a model and basic controller
 
 SYNOPSIS
-     generate scaffold ModelName [action ...]
+     generate scaffold ModelName [ControllerName] [action ...]
 
 DESCRIPTION
      The scaffold generator takes the name of the new model as the
-     first argument and an optional list of controller actions as the
-     subsequent arguments.  Any actions with scaffolding code available
+     first argument, an optional controller name as the second, and
+     an optional list of controller actions as the subsequent arguments.
+     If the controller name is not specified, the plural form of the model
+     name will be used. Any actions with scaffolding code available
      will be generated in your controller; others will be left as stubs.
 
      The generated controller has the same code that "scaffold :model"
@@ -15,11 +17,11 @@ DESCRIPTION
      your controller.
 
 EXAMPLE
-     ./script/generate scaffold Account debit credit
+     ./script/generate scaffold Account Bank debit credit
 
      This will generate the Account model with unit tests and fixtures,
-     the AccountController controller with actions, views, and tests for
+     the BankController controller with actions, views, and tests for
      index, list, show, new, create, edit, update, and destroy.
 
      Now create the accounts table in your database and browse to
-     http://localhost/account/ -- voila, you're on Rails!
+     http://localhost/bank/ -- voila, you're on Rails!

data/generators/scaffold/scaffold_generator.rb

@@ -8,14 +8,17 @@ class ScaffoldGenerator < Rails::Generator::Base
     # Fixtures.
     template "fixtures.yml", "test/fixtures/#{table_name}.yml"
 
+    @controller_class_name = args.empty? ? Inflector.pluralize(class_name) : args.shift.sub(/^[a-z]?/) { |m| m.capitalize }
+    controller_name        = Inflector.underscore(@controller_class_name)
+
     # Controller class, functional test, helper, and views.
-    template "controller.rb", "app/controllers/#{file_name}_controller.rb"
-    template "functional_test.rb", "test/functional/#{file_name}_controller_test.rb"
-    template "controller/helper.rb", "app/helpers/#{file_name}_helper.rb"
+    template "controller.rb", "app/controllers/#{controller_name}_controller.rb"
+    template "functional_test.rb", "test/functional/#{controller_name}_controller_test.rb"
+    template "controller/helper.rb", "app/helpers/#{controller_name}_helper.rb"
 
     # Layout and stylesheet.
-    unless File.file?("app/views/layouts/scaffold.rhtml")
-      template "layout.rhtml", "app/views/layouts/scaffold.rhtml"
+    unless File.file?("app/views/layouts/#{controller_name}.rhtml")
+      template "layout.rhtml", "app/views/layouts/#{controller_name}.rhtml"
     end
     unless File.file?("public/stylesheets/scaffold.css")
       template "style.css", "public/stylesheets/scaffold.css"
@@ -23,13 +26,13 @@ class ScaffoldGenerator < Rails::Generator::Base
 
     # Scaffolded views.
     scaffold_views.each do |action|
-      template "view_#{action}.rhtml", "app/views/#{file_name}/#{action}.rhtml"
+      template "view_#{action}.rhtml", "app/views/#{controller_name}/#{action}.rhtml"
     end
 
     # Unscaffolded views.
     unscaffolded_actions.each do |action|
       template "controller/view.rhtml",
-               "app/views/#{file_name}/#{action}.rhtml",
+               "app/views/#{controller_name}/#{action}.rhtml",
                binding
     end
   end

data/generators/scaffold/templates/controller.rb

@@ -1,6 +1,4 @@
-class <%= class_name %>Controller < ApplicationController
-  layout 'scaffold'
-
+class <%= @controller_class_name %>Controller < ApplicationController
 <% unless suffix -%>
   def index
     list
@@ -41,8 +39,7 @@ class <%= class_name %>Controller < ApplicationController
 
   def update
     @<%= singular_name %> = <%= class_name %>.find(@params['<%= singular_name %>']['id'])
-    @<%= singular_name %>.attributes = @params['<%= singular_name %>']
-    if @<%= singular_name %>.save
+    if @<%= singular_name %>.update_attributes(@params['<%= singular_name %>'])
       flash['notice'] = '<%= class_name %> was successfully updated.'
       redirect_to :action => 'show<%= suffix %>', :id => @<%= singular_name %>.id
     else

data/generators/scaffold/templates/view_show.rhtml

@@ -1,6 +1,6 @@
 <%% for column in <%= class_name %>.content_columns %>
 <p>
-  <b><%%= column.human_name %>:</b> <%%= @<%= singular_name %>[column.name] %>
+  <b><%%= column.human_name %>:</b> <%%= @<%= singular_name %>.send(column.name) %>
 </p>
 <%% end %>
 

data/helpers/test_helper.rb

@@ -1,4 +1,4 @@
-ENV["RAILS_ENV"] ||= "test"
+ENV["RAILS_ENV"] = "test"
 require File.dirname(__FILE__) + "/../config/environment"
 require 'application'
 

data/lib/code_statistics.rb

@@ -98,7 +98,7 @@ class CodeStatistics
       code  = calculate_code
       tests = calculate_tests
 
-      puts "  Code LOC: #{code}     Test LOC: #{tests}     Code to Test Ratio: #{sprintf("%.1f", code/tests.to_f)}:1"
+      puts "  Code LOC: #{code}     Test LOC: #{tests}     Code to Test Ratio: 1:#{sprintf("%.1f", tests.to_f/code)}"
       puts ""
     end
   end

data/lib/dispatcher.rb

@@ -24,60 +24,64 @@
 require 'breakpoint'
 
 class Dispatcher
-  def self.dispatch(cgi = CGI.new, session_options = ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS)
-    Breakpoint.activate_drb("druby://localhost:#{BREAKPOINT_SERVER_PORT}", nil, !defined?(FastCGI)) if defined?(BREAKPOINT_SERVER_PORT)
+  class <<self
+    def dispatch(cgi = CGI.new, session_options = ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS)
+      begin
+        Breakpoint.activate_drb("druby://localhost:#{BREAKPOINT_SERVER_PORT}", nil, !defined?(FastCGI)) if defined?(BREAKPOINT_SERVER_PORT)
 
-    begin
-      request  = ActionController::CgiRequest.new(cgi, session_options)
-      response = ActionController::CgiResponse.new(cgi)
-      
-      controller_name, module_name = controller_name(request.parameters), module_name(request.parameters)
+        request  = ActionController::CgiRequest.new(cgi, session_options)
+        response = ActionController::CgiResponse.new(cgi)
+    
+        controller_name, module_name = controller_name(request.parameters), module_name(request.parameters)
 
-      require_dependency("application")
-      require_dependency(controller_path(controller_name, module_name))
+        require_dependency("application")
+        require_dependency(controller_path(controller_name, module_name))
 
-      controller_class(controller_name).process(request, response).out
-    rescue Object => exception
-      ActionController::Base.process_with_exception(request, response, exception).out
-    ensure
-      if Dependencies.mechanism == :load
+        controller_class(controller_name).process(request, response).out
+      rescue Object => exception
+        ActionController::Base.process_with_exception(request, response, exception).out
+      ensure
+        reset_application(controller_name) if Dependencies.mechanism == :load
+        Breakpoint.deactivate_drb if defined?(BREAKPOINT_SERVER_PORT)
+      end
+    end
+    
+    private
+      def reset_application(controller_name)
         ActiveRecord::Base.reset_column_information_and_inheritable_attributes_for_all_subclasses
-        Dependencies.reload rescue nil # Ignore out of order reloading errors for Controllers
+        Dependencies.clear
         remove_class_hierarchy(controller_class(controller_name), ActionController::Base)
       end
-      
-      Breakpoint.deactivate_drb if defined?(BREAKPOINT_SERVER_PORT)
-    end
-  end
-  
-  def self.controller_path(controller_name, module_name = nil)
-    if module_name
-      "#{module_name}/#{Inflector.underscore(controller_name)}_controller"
-    else
-      "#{Inflector.underscore(controller_name)}_controller"
-    end
-  end
-  
-  def self.controller_class(controller_name)
-    Object.const_get(controller_class_name(controller_name))
-  end
-  
-  def self.controller_class_name(controller_name)
-    "#{Inflector.camelize(controller_name)}Controller"
-  end
-  
-  def self.controller_name(parameters)
-    parameters["controller"].gsub(/[^_a-zA-Z0-9]/, "").untaint
-  end
-  
-  def self.module_name(parameters)
-    parameters["module"].gsub(/[^_a-zA-Z0-9]/, "").untaint if parameters["module"]
-  end
 
-  def self.remove_class_hierarchy(klass, until_superclass)
-    while klass
-      Object.send(:remove_const, "#{klass}".intern)
-      klass = (klass.superclass unless until_superclass == klass.superclass)
-    end
+      def controller_path(controller_name, module_name = nil)
+        if module_name
+          "#{module_name}/#{Inflector.underscore(controller_name)}_controller"
+        else
+          "#{Inflector.underscore(controller_name)}_controller"
+        end
+      end
+
+      def controller_class(controller_name)
+        Object.const_get(controller_class_name(controller_name))
+      end
+
+      def controller_class_name(controller_name)
+        "#{Inflector.camelize(controller_name)}Controller"
+      end
+
+      def controller_name(parameters)
+        parameters["controller"].gsub(/[^_a-zA-Z0-9]/, "").untaint
+      end
+
+      def module_name(parameters)
+        parameters["module"].gsub(/[^_a-zA-Z0-9]/, "").untaint if parameters["module"]
+      end
+
+      def remove_class_hierarchy(klass, until_superclass)
+        while klass
+          Object.send(:remove_const, "#{klass}".intern)
+          klass = (klass.superclass unless until_superclass == klass.superclass)
+        end
+      end
   end
 end

data/lib/webrick_server.rb

@@ -21,7 +21,7 @@ class DispatchServlet < WEBrick::HTTPServlet::AbstractServlet
 
   def initialize(server, options)
     @server_options = options
-    @file_handler = WEBrick::HTTPServlet::FileHandler.new(server, options[:server_root], {:FancyIndexing => true })
+    @file_handler = WEBrick::HTTPServlet::FileHandler.new(server, options[:server_root])
     super
   end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.4
 specification_version: 1
 name: rails
 version: !ruby/object:Gem::Version 
-  version: 0.9.3
-date: 2005-01-04
+  version: 0.9.4
+date: 2005-01-17
 summary: "Web-application framework with template engine, control-flow layer, and ORM."
 require_paths: 
   - lib
@@ -138,7 +138,7 @@ dependencies:
         - 
           - ">="
           - !ruby/object:Gem::Version 
-            version: 1.4.0
+            version: 1.5.0
       version: 
   - !ruby/object:Gem::Dependency 
     name: actionpack
@@ -148,7 +148,7 @@ dependencies:
         - 
           - ">="
           - !ruby/object:Gem::Version 
-            version: 1.2.0
+            version: 1.3.0
       version: 
   - !ruby/object:Gem::Dependency 
     name: actionmailer
@@ -158,5 +158,5 @@ dependencies:
         - 
           - ">="
           - !ruby/object:Gem::Version 
-            version: 0.5.0
+            version: 0.6.0
       version: