Skip to content
Commits on Jul 3, 2012
  1. @rafaelfranca

    Merge pull request #6934 from kennyj/fix_store

    Don't mark the store as changed if an attribute isn't changed.
    rafaelfranca committed Jul 2, 2012
  2. @kennyj
  3. @carlosantoniodasilva

    Update 4.0 Release Notes with changelogs [ci skip]

    Also fix some wrong formatting.
    
    Related discussion:
    rails@ab72040#commitcomment-1525256
    carlosantoniodasilva committed Jul 1, 2012
Commits on Jul 2, 2012
  1. @fxn

    explains why the file update checker ignores mtimes in the future, pl…

    …us a little refactor for the same price
    fxn committed Jul 2, 2012
  2. @tenderlove
  3. @carlosantoniodasilva

    Merge pull request #6919 from rahul100885/master

    Make file name and class name consistant
    
    Related to dbc43bc
    carlosantoniodasilva committed Jul 2, 2012
  4. @rahul100885
  5. @pixeltrix

    Improve performance of DateTime#seconds_since_unix_epoch

    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
    pixeltrix committed Jul 2, 2012
Commits on Jul 1, 2012
  1. @carlosantoniodasilva

    Fix failing test related to persist glob when replacing a path

    Introduced in pull request #6910, merged in 2ee3fa1
    carlosantoniodasilva committed Jul 1, 2012
  2. @rafaelfranca

    Use strings for the table names

    connection.tables returns an array of strings
    rafaelfranca committed Jul 1, 2012
  3. @pixeltrix

    Revert "Use strftime to convert DateTime to numeric"

    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 210cd75.
    pixeltrix committed Jul 1, 2012
  4. @rafaelfranca
  5. @rafaelfranca

    Merge pull request #6914 from lexmag/migration_tests

    Refactor migration test_helper
    rafaelfranca committed Jul 1, 2012
  6. @lexmag

    Refactor migration test_helper

    and create_join_table_test
    lexmag committed Jun 30, 2012
  7. @josevalim

    Merge pull request #6910 from mulder/fix_path_glob

    Persist glob when replacing a path
    josevalim committed Jul 1, 2012
  8. @pixeltrix

    Make Time#change work with offsets other than UTC or local

    Use Time.new to create times where the current offset is not zero or
    not in the local time zone - closes #4847 and #6651.
    pixeltrix committed Jul 1, 2012
  9. @pixeltrix

    Remove rescue clause from ActiveSupport::TimeZone#to_f

    Time#at no longer raises an error for large values so we can remove
    the rescue clause from ActiveSupport::TimeZone#to_f.
    pixeltrix committed Jul 1, 2012
  10. @pixeltrix

    Remove DateTime#to_time override

    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.
    pixeltrix committed Jul 1, 2012
  11. @pixeltrix

    Use strftime to convert DateTime to numeric

    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
    pixeltrix committed Jul 1, 2012
Commits on Jun 30, 2012
  1. @mulder

    Persist glob when replacing a path

    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"
    mulder committed Jun 29, 2012
  2. @carlosantoniodasilva
  3. @carlosantoniodasilva

    Merge pull request #6904 from guilleiguaran/remove-amo-dependency-in-ap

    Remove Active Model dependency from Action Pack
    carlosantoniodasilva committed Jun 30, 2012
  4. @carlosantoniodasilva

    Merge pull request #6913 from lexmag/column_exists_options

    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')
    carlosantoniodasilva committed Jun 30, 2012
  5. @lexmag

    Add more options to column_exists? method

    Also fix failures in check options for nil
    lexmag committed Jun 30, 2012
  6. @vijaydev

    Merge branch 'master' of github.com:lifo/docrails

    Conflicts:
    	activemodel/lib/active_model/errors.rb
    vijaydev committed Jun 30, 2012
  7. @carlosantoniodasilva
  8. @josevalim

    Merge pull request #6908 from apotonick/av-prepare2

    Av prepare2
    josevalim committed Jun 30, 2012
  9. @rafaelfranca

    Merge pull request #6906 from kennyj/extract_collation

    Extract collation tasks to database tasks.
    rafaelfranca committed Jun 30, 2012
  10. @guilleiguaran

    Remove ActiveModel dependency from ActionPack

    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).
    guilleiguaran committed Jun 28, 2012
  11. @kennyj
  12. @jonleighton

    Merge pull request #6869 from bcardarella/active_relation_inspect

    Remove ActiveRelation#inspect
    jonleighton committed Jun 30, 2012
Commits on Jun 29, 2012
  1. @bcardarella
  2. @fxn

    make sure the inflection rules are loaded when cherry-picking active_…

    …support/core_ext/string/inflections.rb [fixes #6884]
    fxn committed Jun 29, 2012
  3. @carlosantoniodasilva

    Fix failing test in file update checker

    Introduced in 1abe316
    
    The test was failing when running on isolation, because the extensions were
    not being loaded, thus 1.year.from_now was failing. Just use mktime
    instead, adding 1 year to Time.now.
    carlosantoniodasilva committed Jun 29, 2012
  4. @carlosantoniodasilva
Something went wrong with that request. Please try again.