aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make generated Metal bits a pure rack endpoint application (not middleware)Joshua Peek2008-12-173-19/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of calling super to pass the request on, return a 404. The modified app looks like this: # app/metal/poller.rb class Poller def self.call(env) if env["PATH_INFO"] =~ /^\/poller/ [200, {"Content-Type" => "text/html"}, "Hello, World!"] else [404, {"Content-Type" => "text/html"}, "Not Found"] end end end But you aren't locked in to just Rails: # app/metal/api.rb require 'sinatra' Sinatra::Application.default_options.merge!(:run => false, :env => :production) Api = Sinatra.application unless defined? Api get '/interesting/new/ideas' do 'Hello Sinatra!' end
* Decorate responses from Rack Middleware and Rails Metal for the purposes of ↵Jesse Newland2008-12-172-10/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | integration testing. A test for the following Metal: class Poller < Rails::Rack::Metal def call(env) if env["PATH_INFO"] =~ /^\/poller/ [200, {"Content-Type" => "text/plain"}, "Hello World!"] else super end end end might be tested like so: class PollerTest < ActionController::IntegrationTest test "poller returns hello world" do get "/poller" assert_response 200 assert_response :success assert_response :ok assert_equal "Hello World!", response.body end end [#1588 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* Remove set_cookie hack from rack response since we dont use cgi sessions anymoreJoshua Peek2008-12-162-5/+3
|
* Remove CGI::Session memory leak patchJoshua Peek2008-12-161-5/+0
|
* Session Fixation tests have been rolled into the session cookie testsJoshua Peek2008-12-161-84/+0
|
* Introduce Rails MetalJoshua Peek2008-12-166-0/+60
| | | | | | | | | | | | | | | | | | | # app/metal/poller.rb class Poller < Rails::Rack::Metal def call(env) if env["PATH_INFO"] =~ /^\/poller/ [200, {"Content-Type" => "application/json"}, Message.recent.to_json] else super end end end * There is a generator to help you get started `script/generate metal poller` * Also, metal bits can be ran standalone with rackup `rackup app/metal/poller.rb`
* Update documentation for default_scopeDaniel Luz2008-12-161-2/+2
| | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* normalize author names in changelogs [#1495 state:committed]Xavier Noria2008-12-166-1078/+1078
| | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* Do not output an ETag header if response body is blank or when sending files ↵Hongli Lai (Phusion2008-12-164-1/+17
| | | | | | with send_file(... :xsendfile => true) [#1578 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* Lazy load flash accessJoshua Peek2008-12-162-10/+14
|
* Don't write nil values to default session options hashJoshua Peek2008-12-161-3/+9
|
* Session objects are always a hash, so we need to ensure a flash hash is ↵Joshua Peek2008-12-151-35/+20
| | | | always assigned to the session
* Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-12-1534-1807/+1138
|\
| * Clear empty nil values in session hash before savingJoshua Peek2008-12-152-23/+6
| |
| * Switch to Rack based session stores.Joshua Peek2008-12-1531-1799/+1127
| |
| * Auto-load template handlers based on unmatched extensions [#1540 state:resolved]Nathan Weizenbaum2008-12-152-8/+27
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Require mocha >= 0.9.3, older versions don't work anymore [#1579 state:resolved]Hongli Lai (Phusion)2008-12-151-0/+1
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
* | Revert "Make constantize look into ancestors"Jeremy Kemper2008-12-152-40/+42
|/ | | | | | [#410 state:open] This reverts commit 262fef7ed57520b857605a0105fe7ba9265654f6.
* Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-12-155-5/+19
|\
| * Use Mime::JS in place of explicit 'text/javascript' [#1573 state:resolved]Seth Fitzsimmons2008-12-152-4/+2
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Implement Mime::Type.=~ to match all synonyms against arg [#1573 state:resolved]Seth Fitzsimmons2008-12-153-1/+17
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
* | Make constantize look into ancestorsFrederick Cheung2008-12-152-42/+40
|/ | | | | | [#410 state:resolved] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Properly parenthasize calls to defined?(Rails) in 75fa82418 [#1563 ↵Frederick Cheung2008-12-153-3/+3
| | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
* Fixed ActionView::TestCase current url context [#1561 state:resolved]Dan Pickett2008-12-152-1/+12
| | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
* Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-12-150-0/+0
|\
| * Make delete_if/reject faster and fix other mutatorsFrederick Cheung2008-12-122-13/+61
| | | | | | | | | | | | [#1559 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | Added gem backtrace pretty priting (Juan Lupión) [#1497 state:committed]David Heinemeier Hansson2008-12-151-0/+3
| |
* | Make delete_if/reject faster and fix other mutatorsFrederick Cheung2008-12-152-13/+61
|/ | | | | | [#1559 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Add :partial option to assert_template [#1550 state:resolved]mark2008-12-116-23/+75
| | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
* Fixed session related memory leak [#1558 state:resolved]Frederick Cheung2008-12-111-0/+3
| | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
* Fixed template lookups from outside the rails root [#1557 state:resolved]Joshua Peek2008-12-113-2/+6
|
* Fixed ActiveSupport::OrderedHash #delete_if, #reject!, and #reject, which ↵Eloy Duran2008-12-112-1/+46
| | | | | | | | did not sync the @keys after the operation. This probably holds true for other mutating methods as well. Signed-off-by: Michael Koziarski <michael@koziarski.com>
* Fix for Integration::Session follow_redirect! headers['location'] bug with ↵Christos Zisopoulos2008-12-102-9/+5
| | | | | | Rack [#1555 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
* Prefer Rails.logger over RAILS_DEFAULT_LOGGERJoshua Peek2008-12-104-7/+9
|
* Don't use the transaction instance method so that people with ↵Frederick Cheung2008-12-101-2/+2
| | | | | | | | has_one/belongs_to :transaction aren't fubared [#1551 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Squash memory leak when calling flush with an empty bufferFrederick Cheung2008-12-102-1/+10
| | | | | | [#1552 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-12-104-14/+43
|\
| * Added a :camelize option to ActiveRecord and Hash to_xml serialization and ↵Bruce Krysiak2008-12-104-14/+43
| | | | | | | | | | | | from_xml deserialization Signed-off-by: Michael Koziarski <michael@koziarski.com>
* | Revert "Fix: counter_cache should decrement on deleting associated records."Jeremy Kemper2008-12-103-37/+0
|/ | | | | | [#1196 state:open] This reverts commit 05f2183747c8e75c9e8bbaadb9573b4bdf41ecfc.
* Fix test names collision.Emilio Tagua2008-12-101-4/+4
| | | | | | [#1549 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Add ActiveRecord::VERSION autoloadJeremy Kemper2008-12-101-0/+2
|
* Fix ActionController autoloadsJeremy Kemper2008-12-101-2/+1
|
* Fix: counter_cache should decrement on deleting associated records.Emilio Tagua2008-12-103-0/+37
| | | | | | [#1195 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Rework ActiveSupport::OrderedHash to make lookups fasterFrederick Cheung2008-12-103-38/+36
| | | | | | [#1352 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Explicitly require ERB Utils extensions from TagHelperJoshua Peek2008-12-091-1/+1
|
* Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-12-093-223/+244
|\ | | | | | | | | Conflicts: activesupport/CHANGELOG
| * Updated included memcache-client to the 1.5.0.5 version which includes fixes ↵David Heinemeier Hansson2008-12-093-223/+244
| | | | | | | | | | | | from fiveruns and 37signals to deal with failover and timeouts (Joshua Sierles) [#1535 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* | Fix tests broken by switch to PathnameJeremy Kemper2008-12-091-3/+3
| |
* | Benchmark.msJeremy Kemper2008-12-099-34/+43
| |
* | How'd that sneak in there?Jeremy Kemper2008-12-091-1/+0
|/