jro_apps/redmine Commit - r12840:82fa2cf79a29

add patch for regression of Hash#reject in Ruby 2.1.1 (#16194)...

Toshi MARUYAMA -

r12840:82fa2cf79a29

parent child

Context file:

r12840:82fa2cf79a29

Collapse all files

config/initializers/10-patches.rb +24 0

              require 'active_record'
              module ActiveRecord
                class Base
                  include Redmine::I18n
                  # Translate attribute names for validation errors display
                  def self.human_attribute_name(attr, *args)
                    attr = attr.to_s.sub(/_id$/, '')
                    l("field_#{name.underscore.gsub('/', '_')}_#{attr}", :default => ["field_#{attr}".to_sym, attr])
                  end
                end
                # Undefines private Kernel#open method to allow using `open` scopes in models.
                # See Defect #11545 (http://www.redmine.org/issues/11545) for details.
                class Base
                  class << self
                    undef open
                  end
                end
                class Relation ; undef open ; end
              end
              module ActionView
                module Helpers
                  module DateHelper
                    # distance_of_time_in_words breaks when difference is greater than 30 years
                    def distance_of_date_in_words(from_date, to_date = 0, options = {})
                      from_date = from_date.to_date if from_date.respond_to?(:to_date)
                      to_date = to_date.to_date if to_date.respond_to?(:to_date)
                      distance_in_days = (to_date - from_date).abs
                      I18n.with_options :locale => options[:locale], :scope => :'datetime.distance_in_words' do |locale|
                        case distance_in_days
                          when 0..60     then locale.t :x_days,             :count => distance_in_days.round
                          when 61..720   then locale.t :about_x_months,     :count => (distance_in_days / 30).round
                          else                locale.t :over_x_years,       :count => (distance_in_days / 365).floor
                        end
                      end
                    end
                  end
                end
                class Resolver
                  def find_all(name, prefix=nil, partial=false, details={}, key=nil, locals=[])
                    cached(key, [name, prefix, partial], details, locals) do
                      if details[:formats] & [:xml, :json]
                        details = details.dup
                        details[:formats] = details[:formats].dup + [:api]
                      end
                      find_templates(name, prefix, partial, details)
                    end
                  end
                end
              end
              # Do not HTML escape text templates
              module ActionView
                class Template
                  module Handlers
                    class ERB
                      def call(template)
                        if template.source.encoding_aware?
                          # First, convert to BINARY, so in case the encoding is
                          # wrong, we can still find an encoding tag
                          # (<%# encoding %>) inside the String using a regular
                          # expression
                          template_source = template.source.dup.force_encoding("BINARY")
                          erb = template_source.gsub(ENCODING_TAG, '')
                          encoding = $2
                          erb.force_encoding valid_encoding(template.source.dup, encoding)
                          # Always make sure we return a String in the default_internal
                          erb.encode!
                        else
                          erb = template.source.dup
                        end
                        self.class.erb_implementation.new(
                          erb,
                          :trim => (self.class.erb_trim_mode == "-"),
                          :escape => template.identifier =~ /\.text/ # only escape HTML templates
                        ).src
                      end
                    end
                  end
                end
              end
              ActionView::Base.field_error_proc = Proc.new{ |html_tag, instance| html_tag || ''.html_safe }
              # HTML5: <option value=""></option> is invalid, use <option value="">&nbsp;</option> instead
              module ActionView
                module Helpers
                  class InstanceTag
                    private
                    def add_options_with_non_empty_blank_option(option_tags, options, value = nil)
                      if options[:include_blank] == true
                        options = options.dup
                        options[:include_blank] = '&nbsp;'.html_safe
                      end
                      add_options_without_non_empty_blank_option(option_tags, options, value)
                    end
                    alias_method_chain :add_options, :non_empty_blank_option
                  end
                  module FormTagHelper
                    def select_tag_with_non_empty_blank_option(name, option_tags = nil, options = {})
                      if options.delete(:include_blank)
                        options[:prompt] = '&nbsp;'.html_safe
                      end
                      select_tag_without_non_empty_blank_option(name, option_tags, options)
                    end
                    alias_method_chain :select_tag, :non_empty_blank_option
                  end
                  module FormOptionsHelper
                    def options_for_select_with_non_empty_blank_option(container, selected = nil)
                      if container.is_a?(Array)
                        container = container.map {|element| element.blank? ? ["&nbsp;".html_safe, ""] : element}
                      end
                      options_for_select_without_non_empty_blank_option(container, selected)
                    end
                    alias_method_chain :options_for_select, :non_empty_blank_option
                  end
                end
              end
              require 'mail'
              module DeliveryMethods
                class AsyncSMTP < ::Mail::SMTP
                  def deliver!(*args)
                    Thread.start do
                      super *args
                    end
                  end
                end
                class AsyncSendmail < ::Mail::Sendmail
                  def deliver!(*args)
                    Thread.start do
                      super *args
                    end
                  end
                end
                class TmpFile
                  def initialize(*args); end
                  def deliver!(mail)
                    dest_dir = File.join(Rails.root, 'tmp', 'emails')
                    Dir.mkdir(dest_dir) unless File.directory?(dest_dir)
                    File.open(File.join(dest_dir, mail.message_id.gsub(/[<>]/, '') + '.eml'), 'wb') {|f| f.write(mail.encoded) }
                  end
                end
              end
              ActionMailer::Base.add_delivery_method :async_smtp, DeliveryMethods::AsyncSMTP
              ActionMailer::Base.add_delivery_method :async_sendmail, DeliveryMethods::AsyncSendmail
              ActionMailer::Base.add_delivery_method :tmp_file, DeliveryMethods::TmpFile
              # Changes how sent emails are logged
              # Rails doesn't log cc and bcc which is misleading when using bcc only (#12090)
              module ActionMailer
                class LogSubscriber < ActiveSupport::LogSubscriber
                  def deliver(event)
                    recipients = [:to, :cc, :bcc].inject("") do |s, header|
                      r = Array.wrap(event.payload[header])
                      if r.any?
                        s << "\n  #{header}: #{r.join(', ')}"
                      end
                      s
                    end
                    info("\nSent email \"#{event.payload[:subject]}\" (%1.fms)#{recipients}" % event.duration)
                    debug(event.payload[:mail])
                  end
                end
              end
              module ActionController
                module MimeResponds
                  class Collector
                    def api(&block)
                      any(:xml, :json, &block)
                    end
                  end
                end
              end
              module ActionController
                class Base
                  # Displays an explicit message instead of a NoMethodError exception
                  # when trying to start Redmine with an old session_store.rb
                  # TODO: remove it in a later version
                  def self.session=(*args)
                    $stderr.puts "Please remove config/initializers/session_store.rb and run `rake generate_secret_token`.\n" +
                      "Setting the session secret with ActionController.session= is no longer supported in Rails 3."
                    exit 1
                  end
                end
              end
+             if Rails::VERSION::MAJOR < 4 && RUBY_VERSION >= "2.1"
+               module ActiveSupport
+                 class HashWithIndifferentAccess
+                   def select(*args, &block)
+                     dup.tap { |hash| hash.select!(*args, &block) }
+                   end
+                   def reject(*args, &block)
+                     dup.tap { |hash| hash.reject!(*args, &block) }
+                   end
+                 end
+                 class OrderedHash
+                   def select(*args, &block)
+                     dup.tap { |hash| hash.select!(*args, &block) }
+                   end
+                   def reject(*args, &block)
+                     dup.tap { |hash| hash.reject!(*args, &block) }
+                   end
+                 end
+               end
+             end
              require 'awesome_nested_set/version'
              module CollectiveIdea
                module Acts
                  module NestedSet
                    module Model
                      def leaf_with_new_record?
                        new_record? || leaf_without_new_record?
                      end
                      alias_method_chain :leaf?, :new_record
                      # Reload is needed because children may have updated
                      # their parent (self) during deletion.
                      if ::AwesomeNestedSet::VERSION > "2.1.6"
                        module Prunable
                          def destroy_descendants_with_reload
                            destroy_descendants_without_reload
                            reload
                          end
                          alias_method_chain :destroy_descendants, :reload
                        end
                      else
                        def destroy_descendants_with_reload
                          destroy_descendants_without_reload
                          reload
                        end
                        alias_method_chain :destroy_descendants, :reload
                      end
                    end
                  end
                end
              end

test/unit/initializers/patches_test.rb +61 0

              # Redmine - project management software
              # Copyright (C) 2006-2014  Jean-Philippe Lang
              #
              # This program is free software; you can redistribute it and/or
              # modify it under the terms of the GNU General Public License
              # as published by the Free Software Foundation; either version 2
              # of the License, or (at your option) any later version.
              #
              # This program is distributed in the hope that it will be useful,
              # but WITHOUT ANY WARRANTY; without even the implied warranty of
              # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
              # GNU General Public License for more details.
              #
              # You should have received a copy of the GNU General Public License
              # along with this program; if not, write to the Free Software
              # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
              require File.expand_path('../../../test_helper', __FILE__)
              class PatchesTest < ActiveSupport::TestCase
                include Redmine::I18n
                def setup
                  Setting.default_language = 'en'
+                 @symbols = { :a => 1, :b => 2 }
+                 @keys = %w( blue green red pink orange )
+                 @values = %w( 000099 009900 aa0000 cc0066 cc6633 )
+                 @hash = Hash.new
+                 @ordered_hash = ActiveSupport::OrderedHash.new
+                 @keys.each_with_index do |key, index|
+                   @hash[key] = @values[index]
+                   @ordered_hash[key] = @values[index]
+                 end
                end
                test "ActiveRecord::Base.human_attribute_name should transform name to field_name" do
                  assert_equal l('field_last_login_on'), ActiveRecord::Base.human_attribute_name('last_login_on')
                end
                test "ActiveRecord::Base.human_attribute_name should cut extra _id suffix for better validation" do
                  assert_equal l('field_last_login_on'), ActiveRecord::Base.human_attribute_name('last_login_on_id')
                end
                test "ActiveRecord::Base.human_attribute_name should default to humanized value if no translation has been found (useful for custom fields)" do
                  assert_equal 'Patch name', ActiveRecord::Base.human_attribute_name('Patch name')
                end
+               # https://github.com/rails/rails/pull/14198/files
+               if RUBY_VERSION >= "1.9"
+                 def test_indifferent_select
+                   hash = ActiveSupport::HashWithIndifferentAccess.new(@symbols).select { |_ ,v| v == 1 }
+                   assert_equal({ 'a' => 1 }, hash)
+                   assert_instance_of (RUBY_VERSION < "2.1" ?
+                                         Hash : ActiveSupport::HashWithIndifferentAccess),
+                                       hash
+                 end
+                 def test_indifferent_select_bang
+                   indifferent_strings = ActiveSupport::HashWithIndifferentAccess.new(@symbols)
+                   indifferent_strings.select! { |_, v| v == 1 }
+                   assert_equal({ 'a' => 1 }, indifferent_strings)
+                   assert_instance_of ActiveSupport::HashWithIndifferentAccess, indifferent_strings
+                 end
+               end
+               def test_indifferent_reject
+                 hash = ActiveSupport::HashWithIndifferentAccess.new(@symbols).reject { |_, v| v != 1 }
+                 assert_equal({ 'a' => 1 }, hash)
+                 assert_instance_of ActiveSupport::HashWithIndifferentAccess, hash
+               end
+               def test_indifferent_reject_bang
+                 indifferent_strings = ActiveSupport::HashWithIndifferentAccess.new(@symbols)
+                 indifferent_strings.reject! { |_, v| v != 1 }
+                 assert_equal({ 'a' => 1 }, indifferent_strings)
+                 assert_instance_of ActiveSupport::HashWithIndifferentAccess, indifferent_strings
+               end
+               if RUBY_VERSION >= "1.9"
+                 def test_select
+                   assert_equal @keys, @ordered_hash.select { true }.map(&:first)
+                   new_ordered_hash = @ordered_hash.select { true }
+                   assert_equal @keys, new_ordered_hash.map(&:first)
+                   assert_instance_of (RUBY_VERSION < "2.1" ?
+                                         Hash : ActiveSupport::OrderedHash),
+                                       new_ordered_hash
+                 end
+               end
+               def test_reject
+                 copy = @ordered_hash.dup
+                 new_ordered_hash = @ordered_hash.reject { |k, _| k == 'pink' }
+                 assert_equal copy, @ordered_hash
+                 assert !new_ordered_hash.keys.include?('pink')
+                 assert @ordered_hash.keys.include?('pink')
+                 assert_instance_of ActiveSupport::OrderedHash, new_ordered_hash
+               end
              end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages