github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity
8,795 Commits 34 Branches 105 Tags
7276128fb47d5997437eb5452b4e9a82ee54f4a8
Commit Graph

8795 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Roman Shterenzon
7276128fb4 Fix HasManyAssociation#create ignoring the :primary_key option [#1633 state:resolved] 
Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com>
 2009-01-01 00:13:10 -08:00
Frederick Cheung
27cfeb7cbc Fix :include of has_one with :primary_key option 2009-01-01 00:13:10 -08:00
Frederick Cheung
3825f173d9 Fix :include of has_many associations with :primary_key option 2009-01-01 00:13:10 -08:00
Jeremy Kemper
15702104a5 Don't construct object deprecation proxy if unneeded 2009-01-01 00:13:09 -08:00
Michael S. Klishin
31fb733bae It was decided that Multibyte does not belong to as/mini. 2008-12-29 23:31:57 +03:00
Michael S. Klishin
069534af4f Sync with rails/rails/master 2008-12-29 00:50:18 +03:00
Joshua Peek
c20c72e3d9 Use rack namespace for routing args 2008-12-28 15:34:59 -06:00
Joshua Peek
5d89605c11 Make router and controller classes better rack citizens 2008-12-28 15:31:03 -06:00
Michael S. Klishin
19208e7422 Pull up some other changes from rails/rails/master 2008-12-29 00:16:42 +03:00
Joshua Peek
45dee3842d HTTP Digest authentication [#1230 state:resolved] 2008-12-28 15:13:16 -06:00
Joshua Peek
1f0aecd931 Allow custom rails generators to pass in their own binding to Create command so that the corresponding erb templates get rendered with the proper binding [#1493 state:resolved] 2008-12-28 15:10:41 -06:00
Joshua Peek
1e45818a62 Allow multiple conditions for callbacks [#1627 state:resolved] 2008-12-28 15:07:17 -06:00
Michael S. Klishin
bdba0b9a7a Sync i18n update from rails/rails/master 2008-12-28 23:48:18 +03:00
Michael S. Klishin
2b8750eba4 Sync with rails/rails/master, merge two metaprogramming annotation efforts 2008-12-28 23:47:29 +03:00
Yaroslav Markin
3b92b141fd Fix 'i18n' require broken by 0.0.1 -> 0.1.1 commit [#1658 state:committed] 
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
 2008-12-28 21:34:57 +01:00
Yaroslav Markin
1648df79b7 Update i18n gem to version 0.1.1 (Rails' changes were backported) [#1635 state:committed] 
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
 2008-12-28 21:19:27 +01:00
David Heinemeier Hansson
0efec64520 Merge branch 'master' of git@github.com:rails/rails 2008-12-28 20:53:58 +01:00
Yaroslav Markin
66ee5890c5 Introduce dynamic scopes for ActiveRecord: you can now use class methods like scoped_by_user_name(user_name) and scoped_by_user_name_and_password(user_name, password) that will use the scoped method with attributes you supply. [#1648 state:committed] 
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
 2008-12-28 20:52:46 +01:00
Xavier Noria
a2270ef259 Inline code comments for class_eval/module_eval [#1657 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2008-12-28 19:49:28 +00:00
Michael S. Klishin
e523b43e20 Use active_support/mini instead of active_support/minimalistic 2008-12-28 22:18:03 +03:00
Michael S. Klishin
12bff2af40 Sync with wycats/rails/master 2008-12-28 22:05:43 +03:00
Michael S. Klishin
89e98955c7 active_support/minimalistic.rb => active_support/mini.rb 2008-12-28 21:41:48 +03:00
Mike Gunderloy
1fb275541a Ensure template runner tests don't depend on hash ordering [#1654 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2008-12-28 17:49:58 +00:00
Pratik Naik
fec0ea9d6d Request#env['SERVER_NAME'] does not contain port number 2008-12-28 17:07:13 +00:00
Aaron Quint
c0c79f779c Use SimpleLogger for Rails::TemplateRunner outside of the Generator context [#1618 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2008-12-28 16:49:19 +00:00
Michael S. Klishin
d77deb89d5 Annotated metaprogramming code across ActiveSupport 2008-12-28 13:21:10 +03:00
Michael S. Klishin
133925804f Introduce minimalistic package for ActiveSupport. 
To simplify using of ActiveSupport in 3rd party libraries,
a simple way to require only minimum of commonly used extensions
(multibyte, inflections, array and hash extensions, #blank?, and a few
others) is needed. For exactly this reason some out-of-Rails-space
libraries adopted Extlib, originally from DataMapper.

To keep it 2067% backwards compatible, and still available
to everyone even in 2.x releases, active_support/minimalistic.rb
was added.

Use it like this:

gem 'active_support', '>=2.3'
require 'active_support/minimalistic'

instead of

require 'activesupport'

Right now this package with RubyGems uses about 10 megs of RAM
(10.01 or so). It can be further slimmed down though, once we simplify
multibyte implementation that right now uses advanced accessors
from Module extensions.

To compare RAM usage with previous ActiveSupport versions and Extlib,
at the time of writing, see http://gist.github.com/40401.
 2008-12-28 11:26:57 +03:00
Aaron Quint
9fd35fc2d8 Adding test coverage and better logging to Rails::TemplateRunner [#1618 state:resolved] 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2008-12-27 21:03:44 +00:00
Yaroslav Markin
fdaa9ed033 Fix ActionPack build on Windows: we really should not test anything regarding symlinks on Windows. 
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
 2008-12-27 17:33:13 +00:00
Yaroslav Markin
28347d889b Refactor ActiveRecord::Base#new_record? [#1647 state:committed] 
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
 2008-12-27 15:25:39 +01:00
Yaroslav Markin
6e98adfc8e ActiveRecord::Base#new_record? now returns false for existing records (was nil) [#1219 state:committed] 
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
 2008-12-27 14:36:11 +01:00
Yehuda Katz
4f043a4838 More optimizations on respond_to after a profile and benching: 
App with simple respond_to:
  def index
    respond_to do |format|
      format.html
      format.xml
      format.json
    end
  end

On JRuby (after complete hotspot warmup) -- 8% improvement:
  550 requests per second after this commit
  510 requests per second with old method_missing technique

On MRI (8% improvement):
  430 requests per second after this commit
  400 requests per second with old method_missing technique
 2008-12-27 00:06:57 -08:00
Yehuda Katz
5da3ba1215 Merge commit 'rails/master' 2008-12-26 23:16:52 -08:00
Pratik Naik
f4f8923cf0 Merge commit 'fred/pullable' 2008-12-26 21:56:21 +00:00
Yehuda Katz
6dc1288111 Remove method missing use in respond_to 2008-12-26 13:41:02 -08:00
Yehuda Katz
9b2da52914 Merge commit 'rails/master' 2008-12-26 12:29:44 -08:00
Frederick Cheung
5cebe69e74 Preload uses exclusive scope [#643 state:resolved] 
With self referential associations, the scope for the the top level should not affect fetching of associations, for example
when doing

Person.male.find :all, :include => :friends

we should load all of the friends for each male, not just the male friends.
 2008-12-26 18:25:55 +00:00
Pivotal Labs
eb457ceee1 Association preloading no longer stops if it hits a nil object [#1630 state:resolved] 
Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com>
 2008-12-26 18:25:50 +00:00
trans
c9d4335418 MaKe Hash#slice! return removed values, akin to Array [#971 state:resolved] 
Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com>
 2008-12-26 18:25:42 +00:00
Frederick Cheung
dce0da77e7 Fix assert_select_rjs not checking id for inserts [#540 state:resolved] 2008-12-26 18:25:32 +00:00
Frederick Cheung
d7b6e48c70 Fix randomly failing cookie store tests 
Marshal.dump(Marshal.load(marshaled_hash)) is not guarenteed to be equal to marshaled_hash
because of the lack of ordering of hash
 2008-12-26 18:25:03 +00:00
Pratik Naik
db5a98e6cb Merge docrails 2008-12-26 17:19:59 +00:00
Pratik Naik
07298fd092 Don't recurse when ActionController#render is called without any arguments 2008-12-26 01:49:14 +00:00
Michael S. Klishin
e4314d4362 Inline the only call site of Mime::Type#browser_generated? 
Signed-off-by: Michael S. Klishin <michael@novemberain.com>
 2008-12-26 04:13:16 +03:00
Yehuda Katz
69e349f1bb Initial work to merge several places with similar logic 2008-12-25 17:12:33 -08:00
Pratik Naik
80307c8b0a Make ActionController#render(symbol) behave same as ActionController#render(string) [#1435] 2008-12-26 01:12:11 +00:00
Pratik Naik
cd1d6e8768 Make ActionController#render(string) work as a shortcut for render :action => string. [#1435] 
Examples:
  # Instead of render(:action => 'other_action')
  render('other_action')

Note : Argument must not have any '/'
 2008-12-25 23:05:34 +00:00
Pratik Naik
d67e03871e Make ActionController#render(string) work as a shortcut for render :template => string. [#1435] 
Examples:
  # Instead of render(:template => 'controller/action')
  render('controller/action')

Note : Argument must not begin with a '/', but have at least one '/'
 2008-12-25 22:26:03 +00:00
Pratik Naik
061952392a Make ActionController#render(string) work as a shortcut for render :file => string. [#1435] 
Examples:
  # Instead of render(:file => '/Users/lifo/home.html.erb')
  render('/Users/lifo/home.html.erb')

Note : Filename must begin with a forward slash ('/')
 2008-12-25 21:43:07 +00:00
Pratik Naik
dd0753458f Move ActionController::Base#render arguments validation to a separate method 2008-12-25 20:49:31 +00:00