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

@@ -1,38 +1,99
1	# Redmine - project management software	1	# Redmine - project management software
2	# Copyright (C) 2006-2014 Jean-Philippe Lang	2	# Copyright (C) 2006-2014 Jean-Philippe Lang
3	#	3	#
4	# This program is free software; you can redistribute it and/or	4	# This program is free software; you can redistribute it and/or
5	# modify it under the terms of the GNU General Public License	5	# modify it under the terms of the GNU General Public License
6	# as published by the Free Software Foundation; either version 2	6	# as published by the Free Software Foundation; either version 2
7	# of the License, or (at your option) any later version.	7	# of the License, or (at your option) any later version.
8	#	8	#
9	# This program is distributed in the hope that it will be useful,	9	# This program is distributed in the hope that it will be useful,
10	# but WITHOUT ANY WARRANTY; without even the implied warranty of	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12	# GNU General Public License for more details.	12	# GNU General Public License for more details.
13	#	13	#
14	# You should have received a copy of the GNU General Public License	14	# You should have received a copy of the GNU General Public License
15	# along with this program; if not, write to the Free Software	15	# along with this program; if not, write to the Free Software
16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17		17
18	require File.expand_path('../../../test_helper', __FILE__)	18	require File.expand_path('../../../test_helper', __FILE__)
19		19
20	class PatchesTest < ActiveSupport::TestCase	20	class PatchesTest < ActiveSupport::TestCase
21	include Redmine::I18n	21	include Redmine::I18n
22		22
23	def setup	23	def setup
24	Setting.default_language = 'en'	24	Setting.default_language = 'en'
		25	@symbols = { :a => 1, :b => 2 }
		26	@keys = %w( blue green red pink orange )
		27	@values = %w( 000099 009900 aa0000 cc0066 cc6633 )
		28	@hash = Hash.new
		29	@ordered_hash = ActiveSupport::OrderedHash.new
		30
		31	@keys.each_with_index do \|key, index\|
		32	@hash[key] = @values[index]
		33	@ordered_hash[key] = @values[index]
		34	end
25	end	35	end
26		36
27	test "ActiveRecord::Base.human_attribute_name should transform name to field_name" do	37	test "ActiveRecord::Base.human_attribute_name should transform name to field_name" do
28	assert_equal l('field_last_login_on'), ActiveRecord::Base.human_attribute_name('last_login_on')	38	assert_equal l('field_last_login_on'), ActiveRecord::Base.human_attribute_name('last_login_on')
29	end	39	end
30		40
31	test "ActiveRecord::Base.human_attribute_name should cut extra _id suffix for better validation" do	41	test "ActiveRecord::Base.human_attribute_name should cut extra _id suffix for better validation" do
32	assert_equal l('field_last_login_on'), ActiveRecord::Base.human_attribute_name('last_login_on_id')	42	assert_equal l('field_last_login_on'), ActiveRecord::Base.human_attribute_name('last_login_on_id')
33	end	43	end
34		44
35	test "ActiveRecord::Base.human_attribute_name should default to humanized value if no translation has been found (useful for custom fields)" do	45	test "ActiveRecord::Base.human_attribute_name should default to humanized value if no translation has been found (useful for custom fields)" do
36	assert_equal 'Patch name', ActiveRecord::Base.human_attribute_name('Patch name')	46	assert_equal 'Patch name', ActiveRecord::Base.human_attribute_name('Patch name')
37	end	47	end
		48
		49	# https://github.com/rails/rails/pull/14198/files
		50	if RUBY_VERSION >= "1.9"
		51	def test_indifferent_select
		52	hash = ActiveSupport::HashWithIndifferentAccess.new(@symbols).select { \|_ ,v\| v == 1 }
		53	assert_equal({ 'a' => 1 }, hash)
		54	assert_instance_of (RUBY_VERSION < "2.1" ?
		55	Hash : ActiveSupport::HashWithIndifferentAccess),
		56	hash
		57	end
		58
		59	def test_indifferent_select_bang
		60	indifferent_strings = ActiveSupport::HashWithIndifferentAccess.new(@symbols)
		61	indifferent_strings.select! { \|_, v\| v == 1 }
		62	assert_equal({ 'a' => 1 }, indifferent_strings)
		63	assert_instance_of ActiveSupport::HashWithIndifferentAccess, indifferent_strings
		64	end
		65	end
		66
		67	def test_indifferent_reject
		68	hash = ActiveSupport::HashWithIndifferentAccess.new(@symbols).reject { \|_, v\| v != 1 }
		69	assert_equal({ 'a' => 1 }, hash)
		70	assert_instance_of ActiveSupport::HashWithIndifferentAccess, hash
		71	end
		72
		73	def test_indifferent_reject_bang
		74	indifferent_strings = ActiveSupport::HashWithIndifferentAccess.new(@symbols)
		75	indifferent_strings.reject! { \|_, v\| v != 1 }
		76	assert_equal({ 'a' => 1 }, indifferent_strings)
		77	assert_instance_of ActiveSupport::HashWithIndifferentAccess, indifferent_strings
		78	end
		79
		80	if RUBY_VERSION >= "1.9"
		81	def test_select
		82	assert_equal @keys, @ordered_hash.select { true }.map(&:first)
		83	new_ordered_hash = @ordered_hash.select { true }
		84	assert_equal @keys, new_ordered_hash.map(&:first)
		85	assert_instance_of (RUBY_VERSION < "2.1" ?
		86	Hash : ActiveSupport::OrderedHash),
		87	new_ordered_hash
		88	end
		89	end
		90
		91	def test_reject
		92	copy = @ordered_hash.dup
		93	new_ordered_hash = @ordered_hash.reject { \|k, _\| k == 'pink' }
		94	assert_equal copy, @ordered_hash
		95	assert !new_ordered_hash.keys.include?('pink')
		96	assert @ordered_hash.keys.include?('pink')
		97	assert_instance_of ActiveSupport::OrderedHash, new_ordered_hash
		98	end
38	end	99	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