aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | remove the runner method copied from minitestAaron Patterson2012-07-031-20/+7
| | | | |
* | | | | hook mocha in through m/t before_setup, after_teardown hooksAaron Patterson2012-07-034-9/+26
| | | | |
* | | | | Merge pull request #6948 from frodsan/plugin_skip_ignoreRafael Mendonça França2012-07-032-1/+9
|\ \ \ \ \ | | | | | | | | | | | | remove test/dummy from gitignore when "plugin new -T"
| * | | | | remove test/dummy from gitignore when "plugin new -T"Francesco Rodriguez2012-07-032-1/+9
| | | | | |
* | | | | | Merge branch 'lexmag-reference_statements'Rafael Mendonça França2012-07-038-40/+226
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | Closes #6920
| * | | | | Don't need to use delete in the options hashRafael Mendonça França2012-07-032-3/+2
| | | | | |
| * | | | | Add changelog entry for references statementsAleksey Magusev2012-07-031-0/+13
| | | | | |
| * | | | | Refactor references schema definitionsAleksey Magusev2012-07-032-34/+24
| | | | | |
| * | | | | Make references statements reversibleAleksey Magusev2012-07-032-4/+40
| | | | | |
| * | | | | Add references schema statementsAleksey Magusev2012-07-033-1/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Examples: add_reference :products, :supplier, polymorphic: true, index: true remove_reference :products, :user `add_belongs_to` and `remove_belongs_to` are acceptable.
* | | | | | Merge pull request #6946 from threedaymonk/queue-refsAaron Patterson2012-07-033-45/+132
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Ensure that queued jobs are marshallable
| * | | | | Make TestQueueTest work with marshalling queuePaul Battley2012-07-031-25/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This requires all jobs to be instances of named classes, without block implementations of methods.
| * | | | | Ensure jobs do not refer to the queuePaul Battley2012-07-031-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Jobs pushed to the queue should not contain a reference to it. As the queue itself cannot be marshalled, and as a consequence of checking the marshallability of all jobs in the test environment, we can now guarantee this to be the case in the test environment when using the default TestQueue implementation.
| * | | | | Ensure test jobs are marshallablePaul Battley2012-07-032-8/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By marshalling and unmarshalling jobs when adding them to the test queue, we can ensure that jobs created during test runs are valid candidates for marshalling, and, thus, that they can be used with queueing backends other than the default simple in-process implementation. This will also be used in a subsequent commit to ensure that jobs pushed to the queue do not contain a reference to the queue itself.
| * | | | | Track queue threading with named classesPaul Battley2012-07-031-14/+24
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Using an anonymous class prevented marshalling: we're not doing that yet, but the next commit will introduce this. This also provided an opportunity to improve the expressivity of the tests and to make the assertion failure messages clearer.
* | | | | Merge pull request #6940 from acapilleri/observer_updateCarlos Antonio da Silva2012-07-031-2/+1
|\ \ \ \ \ | |/ / / / |/| | | | Observer #update refactoring
| * | | | observer update refactoringAngelo Capilleri2012-07-031-2/+1
| | | | |
* | | | | Merge pull request #6934 from kennyj/fix_storeRafael Mendonça França2012-07-022-2/+10
|\ \ \ \ \ | | | | | | | | | | | | Don't mark the store as changed if an attribute isn't changed.
| * | | | | Don't mark the store as changed if an attribute isn't changed.kennyj2012-07-032-2/+10
|/ / / / /
* | | | | Update 4.0 Release Notes with changelogs [ci skip]Carlos Antonio da Silva2012-07-024-23/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix some wrong formatting. Related discussion: https://github.com/rails/rails/commit/ab72040b74f742b6676b2d2a5dd029bfdca25a7a#commitcomment-1525256
* | | | | explains why the file update checker ignores mtimes in the future, plus a ↵Xavier Noria2012-07-021-2/+12
|/ / / / | | | | | | | | | | | | little refactor for the same price
* | | | push response creation down since third param is never used.Aaron Patterson2012-07-021-3/+3
| | | |
* | | | Merge pull request #6919 from rahul100885/masterCarlos Antonio da Silva2012-07-021-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Make file name and class name consistant Related to dbc43bcce69aa4aaf0ae309bf410e2b786c4e3f6
| * | | | Made file name and class name consistantRahul P. Chaudhari2012-07-021-1/+1
| |/ / /
* / / / Improve performance of DateTime#seconds_since_unix_epochAndrew White2012-07-022-2/+6
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calculate the seconds since the UNIX epoch using the difference in Julian day numbers from the epoch date. By reducing the Rational math to just the offset component this gives a significant improvement. Benchmark: Calculating -------------------------------------------- new 27733 i/100ms current 15031 i/100ms new 27737 i/100ms current 15549 i/100ms -------------------------------------------------------- new 548182.1 (±0.9%) i/s - 2745567 in 5.008943s current 216380.9 (±1.6%) i/s - 1082232 in 5.002781s new 510281.9 (±1.2%) i/s - 2551804 in 5.001525s current 219858.3 (±1.8%) i/s - 1103979 in 5.023039s
* | | Fix failing test related to persist glob when replacing a pathCarlos Antonio da Silva2012-07-011-1/+1
| | | | | | | | | | | | Introduced in pull request #6910, merged in 2ee3fa1a48513a2c42833e2e1f60fe03769bc295
* | | Use strings for the table namesRafael Mendonça França2012-07-011-1/+1
| | | | | | | | | | | | connection.tables returns an array of strings
* | | Revert "Use strftime to convert DateTime to numeric"Andrew White2012-07-011-1/+2
| | | | | | | | | | | | | | | | | | | | | There appears to be a bug with DateTime#strftime("%s") on 32-bit platforms. Bug report: http://bugs.ruby-lang.org/issues/6683 This reverts commit 210cd756a628cc19c0d6e44bee8c33dfb2d9d598.
* | | Unify the collation API for the database adptersRafael Mendonça França2012-07-016-15/+15
| | |
* | | Merge pull request #6914 from lexmag/migration_testsRafael Mendonça França2012-07-012-37/+11
|\ \ \ | | | | | | | | Refactor migration test_helper
| * | | Refactor migration test_helperAleksey Magusev2012-07-012-37/+11
| | | | | | | | | | | | | | | | and create_join_table_test
* | | | Merge pull request #6910 from mulder/fix_path_globJosé Valim2012-07-012-1/+9
|\ \ \ \ | | | | | | | | | | Persist glob when replacing a path
| * | | | Persist glob when replacing a pathNicholas Mulder2012-06-302-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Rails::Paths::Root's []= is used to replace a path it should persist the previous path's glob. Without passing the glob along we get gnarly bugs when trying to wire up things like engines. module FooEngine class Engine < ::Rails::Engine isolate_namespace FooEngine config.paths['config/initializers'] = "lib/foo_engine/initializers" end end ## Example of behaviour before this commit. # # Before the initializer override: >> FooEngine::Engine.config.paths["config/initializers"].glob => "**/*.rb" # After the initializer override: >> FooEngine::Engine.config.paths["config/initializers"].glob => nil ## Example of behaviour after this commit. # # Before the initializer override: >> FooEngine::Engine.config.paths["config/initializers"].glob => "**/*.rb" # After the initializer override: >> FooEngine::Engine.config.paths["config/initializers"].glob => "**/*.rb"
* | | | | Make Time#change work with offsets other than UTC or localAndrew White2012-07-013-10/+48
| | | | | | | | | | | | | | | | | | | | | | | | | Use Time.new to create times where the current offset is not zero or not in the local time zone - closes #4847 and #6651.
* | | | | Remove rescue clause from ActiveSupport::TimeZone#to_fAndrew White2012-07-011-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Time#at no longer raises an error for large values so we can remove the rescue clause from ActiveSupport::TimeZone#to_f.
* | | | | Remove DateTime#to_time overrideAndrew White2012-07-011-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently if the offset is not zero then to_time returns self which can lead to errors where a developer assumes that the value is a Time. To solve this we can use the native implementation of DateTime#to_time in Ruby 1.9.3 as it handles offsets properly and is faster than our override.
* | | | | Use strftime to convert DateTime to numericAndrew White2012-07-011-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The native implementation of the seconds since the UNIX epoch in strftime is significantly faster than our method. Benchmark: ---------- require 'benchmark/ips' require 'date' require 'time' date = DateTime.civil(1253,7,6,20,4,0) Benchmark.ips do |x| x.report("strftime.to_i") { date.strftime('%s').to_i } x.report("ssue.to_i") { ((date - DateTime.civil(1970)) * 86400).to_i } x.report("strftime.to_f") { date.strftime('%s').to_f } x.report("ssue.to_f") { ((date - DateTime.civil(1970)) * 86400).to_f } end Output: ------- Calculating ------------------------------------- strftime.to_i 26480 i/100ms ssue.to_i 13818 i/100ms strftime.to_f 26561 i/100ms ssue.to_f 14479 i/100ms ------------------------------------------------- strftime.to_i 616937.3 (±2.4%) i/s - 3098160 in 5.024749s ssue.to_i 200108.8 (±6.9%) i/s - 994896 in 4.999278s strftime.to_f 553581.3 (±2.2%) i/s - 2788905 in 5.040397s ssue.to_f 204260.3 (±4.3%) i/s - 1028009 in 5.043072s
* | | | | Update AR and AP changelogs [ci skip]Carlos Antonio da Silva2012-06-302-1/+15
| | | | |
* | | | | Merge pull request #6904 from guilleiguaran/remove-amo-dependency-in-apCarlos Antonio da Silva2012-06-305-24/+33
|\ \ \ \ \ | | | | | | | | | | | | Remove Active Model dependency from Action Pack
| * | | | | Remove ActiveModel dependency from ActionPackGuillermo Iguaran2012-06-305-24/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActiveModel is used in ActionPack for ActiveModel::Naming for a few, mostly optional aspects of ActionPack related to automatically converting an ActiveModel compliant object into a key for params and routing. It uses only three methods of ActiveModel (ActiveModel::Naming.route_key, ActiveModel::Naming.singular_route_key and ActiveModel::Naming.param_key).
* | | | | | Merge pull request #6913 from lexmag/column_exists_optionsCarlos Antonio da Silva2012-06-302-10/+18
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add :default and :null options to column_exists? method Examples: column_exists?(:testings, :taggable_id, :integer, null: false) column_exists?(:testings, :taggable_type, :string, default: 'Photo')
| * | | | | Add more options to column_exists? methodAleksey Magusev2012-06-302-10/+18
| | |_|/ / | |/| | | | | | | | | | | | | Also fix failures in check options for nil
* | | | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2012-06-3013-137/+385
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activemodel/lib/active_model/errors.rb
| * | | | | Remove mention of `convert_key` now that it's been taken out in ↵Alex Nisnevich2012-06-281-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | 1eecd9483b0439ab4913beea36f0d0e2aa0518c7
| * | | | | Rails now uses the ActiveSupport BufferedLogger classChris Adams2012-06-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Instead of the standard Ruby logger
| * | | | | update AR::FinderMethods#exists?(false) example [ci skip]Francesco Rodriguez2012-06-281-5/+7
| | | | | |
| * | | | | Mention effect of accepts_nested_attributes_for on association autosave ↵Chris Gunther2012-06-271-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | option [ci skip]
| * | | | | corrected URLs and controller benchmark method callEric Carty-Fickes2012-06-261-3/+3
| | | | | |
| * | | | | update ActiveModel::Name documentation [ci skip]Francesco Rodriguez2012-06-251-1/+133
| | | | | |
| * | | | | fix punctuation in activemodel/errors [ci skip]Francesco Rodriguez2012-06-251-1/+1
| | | | | |