1. 04 7月, 2012 9 次提交
  2. 03 7月, 2012 12 次提交
  3. 02 7月, 2012 6 次提交
  4. 01 7月, 2012 13 次提交
    • R
      aafa00f4
    • R
      Merge pull request #6914 from lexmag/migration_tests · 36938b41
      Rafael Mendonça França 提交于
      Refactor migration test_helper
      36938b41
    • A
      Refactor migration test_helper · 0fb13277
      Aleksey Magusev 提交于
      and create_join_table_test
      0fb13277
    • J
      Merge pull request #6910 from mulder/fix_path_glob · 2ee3fa1a
      José Valim 提交于
      Persist glob when replacing a path
      2ee3fa1a
    • A
      Make Time#change work with offsets other than UTC or local · 98b46bf5
      Andrew White 提交于
      Use Time.new to create times where the current offset is not zero or
      not in the local time zone - closes #4847 and #6651.
      98b46bf5
    • A
      Remove rescue clause from ActiveSupport::TimeZone#to_f · 73bddd12
      Andrew White 提交于
      Time#at no longer raises an error for large values so we can remove
      the rescue clause from ActiveSupport::TimeZone#to_f.
      73bddd12
    • A
      Remove DateTime#to_time override · c685d12c
      Andrew White 提交于
      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.
      c685d12c
    • A
      Use strftime to convert DateTime to numeric · 210cd756
      Andrew White 提交于
      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
      210cd756
    • N
      Persist glob when replacing a path · 0f4d0055
      Nicholas Mulder 提交于
      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"
      0f4d0055
    • C
      Update AR and AP changelogs [ci skip] · ab72040b
      Carlos Antonio da Silva 提交于
      ab72040b
    • C
      Merge pull request #6904 from guilleiguaran/remove-amo-dependency-in-ap · 49d069d7
      Carlos Antonio da Silva 提交于
      Remove Active Model dependency from Action Pack
      49d069d7
    • C
      Merge pull request #6913 from lexmag/column_exists_options · 4d9be13a
      Carlos Antonio da Silva 提交于
      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')
      4d9be13a
    • A
      Add more options to column_exists? method · 59e23e2f
      Aleksey Magusev 提交于
      Also fix failures in check options for nil
      59e23e2f