activesupport 3.2.22.5 → 4.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (214) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +364 -135
  3. data/MIT-LICENSE +1 -1
  4. data/README.rdoc +6 -4
  5. data/lib/active_support/backtrace_cleaner.rb +33 -25
  6. data/lib/active_support/basic_object.rb +7 -17
  7. data/lib/active_support/benchmarkable.rb +19 -15
  8. data/lib/active_support/buffered_logger.rb +9 -113
  9. data/lib/active_support/cache/file_store.rb +14 -14
  10. data/lib/active_support/cache/mem_cache_store.rb +24 -30
  11. data/lib/active_support/cache/memory_store.rb +2 -0
  12. data/lib/active_support/cache/strategy/local_cache.rb +48 -37
  13. data/lib/active_support/cache.rb +228 -183
  14. data/lib/active_support/callbacks.rb +201 -253
  15. data/lib/active_support/concern.rb +16 -23
  16. data/lib/active_support/concurrency/latch.rb +27 -0
  17. data/lib/active_support/configurable.rb +69 -12
  18. data/lib/active_support/core_ext/array/access.rb +17 -9
  19. data/lib/active_support/core_ext/array/conversions.rb +115 -55
  20. data/lib/active_support/core_ext/array/extract_options.rb +2 -2
  21. data/lib/active_support/core_ext/array/grouping.rb +21 -22
  22. data/lib/active_support/core_ext/array/uniq_by.rb +12 -9
  23. data/lib/active_support/core_ext/array/wrap.rb +13 -16
  24. data/lib/active_support/core_ext/array.rb +0 -1
  25. data/lib/active_support/core_ext/benchmark.rb +7 -0
  26. data/lib/active_support/core_ext/big_decimal/conversions.rb +8 -24
  27. data/lib/active_support/core_ext/class/attribute.rb +40 -32
  28. data/lib/active_support/core_ext/class/attribute_accessors.rb +14 -12
  29. data/lib/active_support/core_ext/class/delegating_attributes.rb +15 -19
  30. data/lib/active_support/core_ext/class/subclasses.rb +11 -5
  31. data/lib/active_support/core_ext/date/calculations.rb +44 -187
  32. data/lib/active_support/core_ext/date/conversions.rb +16 -38
  33. data/lib/active_support/core_ext/date/zones.rb +25 -2
  34. data/lib/active_support/core_ext/date.rb +5 -0
  35. data/lib/active_support/core_ext/date_and_time/calculations.rb +232 -0
  36. data/lib/active_support/core_ext/date_time/acts_like.rb +0 -1
  37. data/lib/active_support/core_ext/date_time/calculations.rb +77 -62
  38. data/lib/active_support/core_ext/date_time/conversions.rb +21 -33
  39. data/lib/active_support/core_ext/date_time/zones.rb +11 -8
  40. data/lib/active_support/core_ext/date_time.rb +4 -0
  41. data/lib/active_support/core_ext/enumerable.rb +26 -73
  42. data/lib/active_support/core_ext/file/atomic.rb +27 -11
  43. data/lib/active_support/core_ext/file.rb +0 -1
  44. data/lib/active_support/core_ext/hash/conversions.rb +145 -79
  45. data/lib/active_support/core_ext/hash/deep_merge.rb +14 -8
  46. data/lib/active_support/core_ext/hash/diff.rb +5 -4
  47. data/lib/active_support/core_ext/hash/except.rb +1 -9
  48. data/lib/active_support/core_ext/hash/indifferent_access.rb +4 -5
  49. data/lib/active_support/core_ext/hash/keys.rb +108 -24
  50. data/lib/active_support/core_ext/hash/reverse_merge.rb +2 -3
  51. data/lib/active_support/core_ext/hash/slice.rb +12 -12
  52. data/lib/active_support/core_ext/hash.rb +0 -1
  53. data/lib/active_support/core_ext/integer/inflections.rb +13 -1
  54. data/lib/active_support/core_ext/integer/time.rb +17 -12
  55. data/lib/active_support/core_ext/kernel/debugger.rb +2 -2
  56. data/lib/active_support/core_ext/kernel/reporting.rb +36 -22
  57. data/lib/active_support/core_ext/kernel/singleton_class.rb +0 -7
  58. data/lib/active_support/core_ext/load_error.rb +7 -5
  59. data/lib/active_support/core_ext/logger.rb +7 -23
  60. data/lib/active_support/core_ext/marshal.rb +21 -0
  61. data/lib/active_support/core_ext/module/aliasing.rb +8 -9
  62. data/lib/active_support/core_ext/module/anonymous.rb +2 -7
  63. data/lib/active_support/core_ext/module/attr_internal.rb +0 -1
  64. data/lib/active_support/core_ext/module/attribute_accessors.rb +12 -10
  65. data/lib/active_support/core_ext/module/delegation.rb +92 -49
  66. data/lib/active_support/core_ext/module/deprecation.rb +19 -3
  67. data/lib/active_support/core_ext/module/introspection.rb +17 -27
  68. data/lib/active_support/core_ext/module/qualified_const.rb +8 -20
  69. data/lib/active_support/core_ext/module/remove_method.rb +1 -5
  70. data/lib/active_support/core_ext/module.rb +1 -3
  71. data/lib/active_support/core_ext/numeric/conversions.rb +135 -0
  72. data/lib/active_support/core_ext/numeric/time.rb +6 -6
  73. data/lib/active_support/core_ext/numeric.rb +1 -0
  74. data/lib/active_support/core_ext/object/acts_like.rb +4 -4
  75. data/lib/active_support/core_ext/object/blank.rb +7 -23
  76. data/lib/active_support/core_ext/object/deep_dup.rb +46 -0
  77. data/lib/active_support/core_ext/object/duplicable.rb +1 -30
  78. data/lib/active_support/core_ext/object/inclusion.rb +8 -7
  79. data/lib/active_support/core_ext/object/instance_variables.rb +7 -12
  80. data/lib/active_support/core_ext/object/to_json.rb +8 -0
  81. data/lib/active_support/core_ext/object/to_param.rb +5 -2
  82. data/lib/active_support/core_ext/object/try.rb +46 -25
  83. data/lib/active_support/core_ext/object/with_options.rb +7 -8
  84. data/lib/active_support/core_ext/object.rb +1 -0
  85. data/lib/active_support/core_ext/proc.rb +3 -0
  86. data/lib/active_support/core_ext/range/conversions.rb +0 -2
  87. data/lib/active_support/core_ext/range/include_range.rb +3 -1
  88. data/lib/active_support/core_ext/range/overlaps.rb +1 -1
  89. data/lib/active_support/core_ext/range.rb +0 -2
  90. data/lib/active_support/core_ext/string/access.rb +95 -90
  91. data/lib/active_support/core_ext/string/conversions.rb +27 -38
  92. data/lib/active_support/core_ext/string/encoding.rb +6 -9
  93. data/lib/active_support/core_ext/string/filters.rb +24 -18
  94. data/lib/active_support/core_ext/string/indent.rb +43 -0
  95. data/lib/active_support/core_ext/string/inflections.rb +70 -60
  96. data/lib/active_support/core_ext/string/inquiry.rb +2 -2
  97. data/lib/active_support/core_ext/string/multibyte.rb +41 -64
  98. data/lib/active_support/core_ext/string/output_safety.rb +59 -51
  99. data/lib/active_support/core_ext/string/zones.rb +13 -0
  100. data/lib/active_support/core_ext/string.rb +2 -3
  101. data/lib/active_support/core_ext/struct.rb +6 -0
  102. data/lib/active_support/core_ext/thread.rb +74 -0
  103. data/lib/active_support/core_ext/time/calculations.rb +108 -184
  104. data/lib/active_support/core_ext/time/conversions.rb +27 -51
  105. data/lib/active_support/core_ext/time/marshal.rb +0 -27
  106. data/lib/active_support/core_ext/time/zones.rb +27 -17
  107. data/lib/active_support/core_ext/time.rb +5 -0
  108. data/lib/active_support/core_ext/uri.rb +13 -17
  109. data/lib/active_support/core_ext.rb +3 -2
  110. data/lib/active_support/dependencies/autoload.rb +47 -20
  111. data/lib/active_support/dependencies.rb +160 -141
  112. data/lib/active_support/deprecation/behaviors.rb +44 -30
  113. data/lib/active_support/deprecation/instance_delegator.rb +24 -0
  114. data/lib/active_support/deprecation/method_wrappers.rb +33 -18
  115. data/lib/active_support/deprecation/proxy_wrappers.rb +58 -13
  116. data/lib/active_support/deprecation/reporting.rb +40 -11
  117. data/lib/active_support/deprecation.rb +39 -14
  118. data/lib/active_support/descendants_tracker.rb +34 -19
  119. data/lib/active_support/duration.rb +6 -8
  120. data/lib/active_support/file_update_checker.rb +63 -47
  121. data/lib/active_support/gzip.rb +11 -5
  122. data/lib/active_support/hash_with_indifferent_access.rb +127 -42
  123. data/lib/active_support/i18n.rb +4 -0
  124. data/lib/active_support/i18n_railtie.rb +5 -22
  125. data/lib/active_support/inflections.rb +14 -12
  126. data/lib/active_support/inflector/inflections.rb +108 -71
  127. data/lib/active_support/inflector/methods.rb +181 -160
  128. data/lib/active_support/inflector/transliterate.rb +16 -17
  129. data/lib/active_support/json/decoding.rb +18 -17
  130. data/lib/active_support/json/encoding.rb +93 -39
  131. data/lib/active_support/json/variable.rb +10 -1
  132. data/lib/active_support/key_generator.rb +75 -0
  133. data/lib/active_support/lazy_load_hooks.rb +21 -19
  134. data/lib/active_support/locale/en.yml +100 -3
  135. data/lib/active_support/log_subscriber/test_helper.rb +18 -15
  136. data/lib/active_support/log_subscriber.rb +35 -52
  137. data/lib/active_support/logger.rb +57 -0
  138. data/lib/active_support/logger_silence.rb +24 -0
  139. data/lib/active_support/message_encryptor.rb +38 -35
  140. data/lib/active_support/message_verifier.rb +9 -15
  141. data/lib/active_support/multibyte/chars.rb +80 -333
  142. data/lib/active_support/multibyte/unicode.rb +74 -64
  143. data/lib/active_support/multibyte.rb +5 -28
  144. data/lib/active_support/notifications/fanout.rb +112 -18
  145. data/lib/active_support/notifications/instrumenter.rb +33 -14
  146. data/lib/active_support/notifications.rb +79 -26
  147. data/lib/active_support/number_helper.rb +637 -0
  148. data/lib/active_support/ordered_hash.rb +8 -190
  149. data/lib/active_support/ordered_options.rb +21 -23
  150. data/lib/active_support/per_thread_registry.rb +52 -0
  151. data/lib/active_support/proxy_object.rb +13 -0
  152. data/lib/active_support/rails.rb +27 -0
  153. data/lib/active_support/railtie.rb +12 -32
  154. data/lib/active_support/rescuable.rb +9 -4
  155. data/lib/active_support/string_inquirer.rb +13 -8
  156. data/lib/active_support/subscriber.rb +93 -0
  157. data/lib/active_support/tagged_logging.rb +51 -73
  158. data/lib/active_support/test_case.rb +46 -17
  159. data/lib/active_support/testing/assertions.rb +56 -26
  160. data/lib/active_support/testing/autorun.rb +5 -0
  161. data/lib/active_support/testing/constant_lookup.rb +54 -0
  162. data/lib/active_support/testing/declarative.rb +1 -1
  163. data/lib/active_support/testing/deprecation.rb +0 -19
  164. data/lib/active_support/testing/isolation.rb +29 -58
  165. data/lib/active_support/testing/pending.rb +5 -43
  166. data/lib/active_support/testing/setup_and_teardown.rb +6 -92
  167. data/lib/active_support/testing/tagged_logging.rb +25 -0
  168. data/lib/active_support/time.rb +6 -21
  169. data/lib/active_support/time_with_zone.rb +80 -43
  170. data/lib/active_support/values/time_zone.rb +81 -60
  171. data/lib/active_support/values/unicode_tables.dat +0 -0
  172. data/lib/active_support/version.rb +7 -6
  173. data/lib/active_support/xml_mini/jdom.rb +9 -11
  174. data/lib/active_support/xml_mini/libxml.rb +1 -2
  175. data/lib/active_support/xml_mini/libxmlsax.rb +2 -3
  176. data/lib/active_support/xml_mini/nokogiri.rb +1 -2
  177. data/lib/active_support/xml_mini/nokogirisax.rb +2 -3
  178. data/lib/active_support/xml_mini/rexml.rb +6 -8
  179. data/lib/active_support/xml_mini.rb +35 -17
  180. data/lib/active_support.rb +8 -21
  181. metadata +104 -72
  182. data/lib/active_support/base64.rb +0 -54
  183. data/lib/active_support/core_ext/array/random_access.rb +0 -30
  184. data/lib/active_support/core_ext/date/freeze.rb +0 -33
  185. data/lib/active_support/core_ext/exception.rb +0 -3
  186. data/lib/active_support/core_ext/file/path.rb +0 -5
  187. data/lib/active_support/core_ext/float/rounding.rb +0 -19
  188. data/lib/active_support/core_ext/float.rb +0 -1
  189. data/lib/active_support/core_ext/hash/deep_dup.rb +0 -18
  190. data/lib/active_support/core_ext/io.rb +0 -15
  191. data/lib/active_support/core_ext/module/method_names.rb +0 -14
  192. data/lib/active_support/core_ext/module/synchronization.rb +0 -45
  193. data/lib/active_support/core_ext/process/daemon.rb +0 -23
  194. data/lib/active_support/core_ext/process.rb +0 -1
  195. data/lib/active_support/core_ext/range/blockless_step.rb +0 -29
  196. data/lib/active_support/core_ext/range/cover.rb +0 -3
  197. data/lib/active_support/core_ext/rexml.rb +0 -46
  198. data/lib/active_support/core_ext/string/interpolation.rb +0 -2
  199. data/lib/active_support/core_ext/string/xchar.rb +0 -18
  200. data/lib/active_support/core_ext/time/publicize_conversion_methods.rb +0 -10
  201. data/lib/active_support/memoizable.rb +0 -116
  202. data/lib/active_support/multibyte/exceptions.rb +0 -8
  203. data/lib/active_support/multibyte/utils.rb +0 -60
  204. data/lib/active_support/ruby/shim.rb +0 -22
  205. data/lib/active_support/security_utils.rb +0 -27
  206. data/lib/active_support/testing/mochaing.rb +0 -7
  207. data/lib/active_support/testing/performance/jruby.rb +0 -115
  208. data/lib/active_support/testing/performance/rubinius.rb +0 -113
  209. data/lib/active_support/testing/performance/ruby/mri.rb +0 -57
  210. data/lib/active_support/testing/performance/ruby/yarv.rb +0 -57
  211. data/lib/active_support/testing/performance/ruby.rb +0 -152
  212. data/lib/active_support/testing/performance.rb +0 -317
  213. data/lib/active_support/time/autoload.rb +0 -5
  214. data/lib/active_support/whiny_nil.rb +0 -24
@@ -1,57 +1,71 @@
1
+ # encoding: utf-8
2
+
1
3
  require 'active_support/inflector/inflections'
2
4
  require 'active_support/inflections'
3
5
 
4
6
  module ActiveSupport
5
- # The Inflector transforms words from singular to plural, class names to table names, modularized class names to ones without,
6
- # and class names to foreign keys. The default inflections for pluralization, singularization, and uncountable words are kept
7
- # in inflections.rb.
7
+ # The Inflector transforms words from singular to plural, class names to table
8
+ # names, modularized class names to ones without, and class names to foreign
9
+ # keys. The default inflections for pluralization, singularization, and
10
+ # uncountable words are kept in inflections.rb.
8
11
  #
9
- # The Rails core team has stated patches for the inflections library will not be accepted
10
- # in order to avoid breaking legacy applications which may be relying on errant inflections.
11
- # If you discover an incorrect inflection and require it for your application, you'll need
12
- # to correct it yourself (explained below).
12
+ # The Rails core team has stated patches for the inflections library will not
13
+ # be accepted in order to avoid breaking legacy applications which may be
14
+ # relying on errant inflections. If you discover an incorrect inflection and
15
+ # require it for your application or wish to define rules for languages other
16
+ # than English, please correct or add them yourself (explained below).
13
17
  module Inflector
14
18
  extend self
15
19
 
16
20
  # Returns the plural form of the word in the string.
17
21
  #
18
- # Examples:
19
- # "post".pluralize # => "posts"
20
- # "octopus".pluralize # => "octopi"
21
- # "sheep".pluralize # => "sheep"
22
- # "words".pluralize # => "words"
23
- # "CamelOctopus".pluralize # => "CamelOctopi"
24
- def pluralize(word)
25
- apply_inflections(word, inflections.plurals)
22
+ # If passed an optional +locale+ parameter, the word will be
23
+ # pluralized using rules defined for that language. By default,
24
+ # this parameter is set to <tt>:en</tt>.
25
+ #
26
+ # 'post'.pluralize # => "posts"
27
+ # 'octopus'.pluralize # => "octopi"
28
+ # 'sheep'.pluralize # => "sheep"
29
+ # 'words'.pluralize # => "words"
30
+ # 'CamelOctopus'.pluralize # => "CamelOctopi"
31
+ # 'ley'.pluralize(:es) # => "leyes"
32
+ def pluralize(word, locale = :en)
33
+ apply_inflections(word, inflections(locale).plurals)
26
34
  end
27
35
 
28
- # The reverse of +pluralize+, returns the singular form of a word in a string.
29
- #
30
- # Examples:
31
- # "posts".singularize # => "post"
32
- # "octopi".singularize # => "octopus"
33
- # "sheep".singularize # => "sheep"
34
- # "word".singularize # => "word"
35
- # "CamelOctopi".singularize # => "CamelOctopus"
36
- def singularize(word)
37
- apply_inflections(word, inflections.singulars)
36
+ # The reverse of +pluralize+, returns the singular form of a word in a
37
+ # string.
38
+ #
39
+ # If passed an optional +locale+ parameter, the word will be
40
+ # pluralized using rules defined for that language. By default,
41
+ # this parameter is set to <tt>:en</tt>.
42
+ #
43
+ # 'posts'.singularize # => "post"
44
+ # 'octopi'.singularize # => "octopus"
45
+ # 'sheep'.singularize # => "sheep"
46
+ # 'word'.singularize # => "word"
47
+ # 'CamelOctopi'.singularize # => "CamelOctopus"
48
+ # 'leyes'.singularize(:es) # => "ley"
49
+ def singularize(word, locale = :en)
50
+ apply_inflections(word, inflections(locale).singulars)
38
51
  end
39
52
 
40
- # By default, +camelize+ converts strings to UpperCamelCase. If the argument to +camelize+
41
- # is set to <tt>:lower</tt> then +camelize+ produces lowerCamelCase.
53
+ # By default, +camelize+ converts strings to UpperCamelCase. If the argument
54
+ # to +camelize+ is set to <tt>:lower</tt> then +camelize+ produces
55
+ # lowerCamelCase.
42
56
  #
43
- # +camelize+ will also convert '/' to '::' which is useful for converting paths to namespaces.
57
+ # +camelize+ will also convert '/' to '::' which is useful for converting
58
+ # paths to namespaces.
44
59
  #
45
- # Examples:
46
- # "active_model".camelize # => "ActiveModel"
47
- # "active_model".camelize(:lower) # => "activeModel"
48
- # "active_model/errors".camelize # => "ActiveModel::Errors"
49
- # "active_model/errors".camelize(:lower) # => "activeModel::Errors"
60
+ # 'active_model'.camelize # => "ActiveModel"
61
+ # 'active_model'.camelize(:lower) # => "activeModel"
62
+ # 'active_model/errors'.camelize # => "ActiveModel::Errors"
63
+ # 'active_model/errors'.camelize(:lower) # => "activeModel::Errors"
50
64
  #
51
- # As a rule of thumb you can think of +camelize+ as the inverse of +underscore+,
52
- # though there are cases where that does not hold:
65
+ # As a rule of thumb you can think of +camelize+ as the inverse of
66
+ # +underscore+, though there are cases where that does not hold:
53
67
  #
54
- # "SSLError".underscore.camelize # => "SslError"
68
+ # 'SSLError'.underscore.camelize # => "SslError"
55
69
  def camelize(term, uppercase_first_letter = true)
56
70
  string = term.to_s
57
71
  if uppercase_first_letter
@@ -66,17 +80,16 @@ module ActiveSupport
66
80
  #
67
81
  # Changes '::' to '/' to convert namespaces to paths.
68
82
  #
69
- # Examples:
70
- # "ActiveModel".underscore # => "active_model"
71
- # "ActiveModel::Errors".underscore # => "active_model/errors"
83
+ # 'ActiveModel'.underscore # => "active_model"
84
+ # 'ActiveModel::Errors'.underscore # => "active_model/errors"
72
85
  #
73
- # As a rule of thumb you can think of +underscore+ as the inverse of +camelize+,
74
- # though there are cases where that does not hold:
86
+ # As a rule of thumb you can think of +underscore+ as the inverse of
87
+ # +camelize+, though there are cases where that does not hold:
75
88
  #
76
- # "SSLError".underscore.camelize # => "SslError"
89
+ # 'SSLError'.underscore.camelize # => "SslError"
77
90
  def underscore(camel_cased_word)
78
91
  word = camel_cased_word.to_s.dup
79
- word.gsub!(/::/, '/')
92
+ word.gsub!('::', '/')
80
93
  word.gsub!(/(?:([A-Za-z\d])|^)(#{inflections.acronym_regex})(?=\b|[^a-z])/) { "#{$1}#{$1 && '_'}#{$2.downcase}" }
81
94
  word.gsub!(/([A-Z\d]+)([A-Z][a-z])/,'\1_\2')
82
95
  word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
@@ -86,57 +99,55 @@ module ActiveSupport
86
99
  end
87
100
 
88
101
  # Capitalizes the first word and turns underscores into spaces and strips a
89
- # trailing "_id", if any. Like +titleize+, this is meant for creating pretty output.
102
+ # trailing "_id", if any. Like +titleize+, this is meant for creating pretty
103
+ # output.
90
104
  #
91
- # Examples:
92
- # "employee_salary" # => "Employee salary"
93
- # "author_id" # => "Author"
105
+ # 'employee_salary'.humanize # => "Employee salary"
106
+ # 'author_id'.humanize # => "Author"
94
107
  def humanize(lower_case_and_underscored_word)
95
108
  result = lower_case_and_underscored_word.to_s.dup
96
- inflections.humans.each { |(rule, replacement)| break if result.gsub!(rule, replacement) }
109
+ inflections.humans.each { |(rule, replacement)| break if result.sub!(rule, replacement) }
97
110
  result.gsub!(/_id$/, "")
98
- result.gsub!(/_/, ' ')
111
+ result.tr!('_', ' ')
99
112
  result.gsub(/([a-z\d]*)/i) { |match|
100
113
  "#{inflections.acronyms[match] || match.downcase}"
101
114
  }.gsub(/^\w/) { $&.upcase }
102
115
  end
103
116
 
104
- # Capitalizes all the words and replaces some characters in the string to create
105
- # a nicer looking title. +titleize+ is meant for creating pretty output. It is not
106
- # used in the Rails internals.
117
+ # Capitalizes all the words and replaces some characters in the string to
118
+ # create a nicer looking title. +titleize+ is meant for creating pretty
119
+ # output. It is not used in the Rails internals.
107
120
  #
108
- # +titleize+ is also aliased as as +titlecase+.
121
+ # +titleize+ is also aliased as +titlecase+.
109
122
  #
110
- # Examples:
111
- # "man from the boondocks".titleize # => "Man From The Boondocks"
112
- # "x-men: the last stand".titleize # => "X Men: The Last Stand"
113
- # "TheManWithoutAPast".titleize # => "The Man Without A Past"
114
- # "raiders_of_the_lost_ark".titleize # => "Raiders Of The Lost Ark"
123
+ # 'man from the boondocks'.titleize # => "Man From The Boondocks"
124
+ # 'x-men: the last stand'.titleize # => "X Men: The Last Stand"
125
+ # 'TheManWithoutAPast'.titleize # => "The Man Without A Past"
126
+ # 'raiders_of_the_lost_ark'.titleize # => "Raiders Of The Lost Ark"
115
127
  def titleize(word)
116
- humanize(underscore(word)).gsub(/\b('?[a-z])/) { $1.capitalize }
128
+ humanize(underscore(word)).gsub(/\b(?<!['’`])[a-z]/) { $&.capitalize }
117
129
  end
118
130
 
119
- # Create the name of a table like Rails does for models to table names. This method
120
- # uses the +pluralize+ method on the last word in the string.
131
+ # Create the name of a table like Rails does for models to table names. This
132
+ # method uses the +pluralize+ method on the last word in the string.
121
133
  #
122
- # Examples
123
- # "RawScaledScorer".tableize # => "raw_scaled_scorers"
124
- # "egg_and_ham".tableize # => "egg_and_hams"
125
- # "fancyCategory".tableize # => "fancy_categories"
134
+ # 'RawScaledScorer'.tableize # => "raw_scaled_scorers"
135
+ # 'egg_and_ham'.tableize # => "egg_and_hams"
136
+ # 'fancyCategory'.tableize # => "fancy_categories"
126
137
  def tableize(class_name)
127
138
  pluralize(underscore(class_name))
128
139
  end
129
140
 
130
- # Create a class name from a plural table name like Rails does for table names to models.
131
- # Note that this returns a string and not a Class. (To convert to an actual class
132
- # follow +classify+ with +constantize+.)
141
+ # Create a class name from a plural table name like Rails does for table
142
+ # names to models. Note that this returns a string and not a Class (To
143
+ # convert to an actual class follow +classify+ with +constantize+).
133
144
  #
134
- # Examples:
135
- # "egg_and_hams".classify # => "EggAndHam"
136
- # "posts".classify # => "Post"
145
+ # 'egg_and_hams'.classify # => "EggAndHam"
146
+ # 'posts'.classify # => "Post"
137
147
  #
138
148
  # Singular names are not handled correctly:
139
- # "business".classify # => "Busines"
149
+ #
150
+ # 'business'.classify # => "Busines"
140
151
  def classify(table_name)
141
152
  # strip out any leading schema name
142
153
  camelize(singularize(table_name.to_s.sub(/.*\./, '')))
@@ -144,16 +155,15 @@ module ActiveSupport
144
155
 
145
156
  # Replaces underscores with dashes in the string.
146
157
  #
147
- # Example:
148
- # "puni_puni" # => "puni-puni"
158
+ # 'puni_puni'.dasherize # => "puni-puni"
149
159
  def dasherize(underscored_word)
150
- underscored_word.gsub(/_/, '-')
160
+ underscored_word.tr('_', '-')
151
161
  end
152
162
 
153
- # Removes the module part from the expression in the string:
163
+ # Removes the module part from the expression in the string.
154
164
  #
155
- # "ActiveRecord::CoreExtensions::String::Inflections".demodulize # => "Inflections"
156
- # "Inflections".demodulize # => "Inflections"
165
+ # 'ActiveRecord::CoreExtensions::String::Inflections'.demodulize # => "Inflections"
166
+ # 'Inflections'.demodulize # => "Inflections"
157
167
  #
158
168
  # See also +deconstantize+.
159
169
  def demodulize(path)
@@ -165,13 +175,13 @@ module ActiveSupport
165
175
  end
166
176
  end
167
177
 
168
- # Removes the rightmost segment from the constant expression in the string:
178
+ # Removes the rightmost segment from the constant expression in the string.
169
179
  #
170
- # "Net::HTTP".deconstantize # => "Net"
171
- # "::Net::HTTP".deconstantize # => "::Net"
172
- # "String".deconstantize # => ""
173
- # "::String".deconstantize # => ""
174
- # "".deconstantize # => ""
180
+ # 'Net::HTTP'.deconstantize # => "Net"
181
+ # '::Net::HTTP'.deconstantize # => "::Net"
182
+ # 'String'.deconstantize # => ""
183
+ # '::String'.deconstantize # => ""
184
+ # ''.deconstantize # => ""
175
185
  #
176
186
  # See also +demodulize+.
177
187
  def deconstantize(path)
@@ -182,94 +192,115 @@ module ActiveSupport
182
192
  # +separate_class_name_and_id_with_underscore+ sets whether
183
193
  # the method should put '_' between the name and 'id'.
184
194
  #
185
- # Examples:
186
- # "Message".foreign_key # => "message_id"
187
- # "Message".foreign_key(false) # => "messageid"
188
- # "Admin::Post".foreign_key # => "post_id"
195
+ # 'Message'.foreign_key # => "message_id"
196
+ # 'Message'.foreign_key(false) # => "messageid"
197
+ # 'Admin::Post'.foreign_key # => "post_id"
189
198
  def foreign_key(class_name, separate_class_name_and_id_with_underscore = true)
190
199
  underscore(demodulize(class_name)) + (separate_class_name_and_id_with_underscore ? "_id" : "id")
191
200
  end
192
201
 
193
- # Ruby 1.9 introduces an inherit argument for Module#const_get and
194
- # #const_defined? and changes their default behavior.
195
- if Module.method(:const_get).arity == 1
196
- # Tries to find a constant with the name specified in the argument string:
197
- #
198
- # "Module".constantize # => Module
199
- # "Test::Unit".constantize # => Test::Unit
200
- #
201
- # The name is assumed to be the one of a top-level constant, no matter whether
202
- # it starts with "::" or not. No lexical context is taken into account:
203
- #
204
- # C = 'outside'
205
- # module M
206
- # C = 'inside'
207
- # C # => 'inside'
208
- # "C".constantize # => 'outside', same as ::C
209
- # end
210
- #
211
- # NameError is raised when the name is not in CamelCase or the constant is
212
- # unknown.
213
- def constantize(camel_cased_word)
214
- names = camel_cased_word.split('::')
215
- names.shift if names.empty? || names.first.empty?
202
+ # Tries to find a constant with the name specified in the argument string.
203
+ #
204
+ # 'Module'.constantize # => Module
205
+ # 'Test::Unit'.constantize # => Test::Unit
206
+ #
207
+ # The name is assumed to be the one of a top-level constant, no matter
208
+ # whether it starts with "::" or not. No lexical context is taken into
209
+ # account:
210
+ #
211
+ # C = 'outside'
212
+ # module M
213
+ # C = 'inside'
214
+ # C # => 'inside'
215
+ # 'C'.constantize # => 'outside', same as ::C
216
+ # end
217
+ #
218
+ # NameError is raised when the name is not in CamelCase or the constant is
219
+ # unknown.
220
+ def constantize(camel_cased_word)
221
+ names = camel_cased_word.split('::')
222
+ names.shift if names.empty? || names.first.empty?
223
+
224
+ names.inject(Object) do |constant, name|
225
+ if constant == Object
226
+ constant.const_get(name)
227
+ else
228
+ candidate = constant.const_get(name)
229
+ next candidate if constant.const_defined?(name, false)
230
+ next candidate unless Object.const_defined?(name)
216
231
 
217
- constant = Object
218
- names.each do |name|
219
- constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
220
- end
221
- constant
222
- end
223
- else
224
- def constantize(camel_cased_word) #:nodoc:
225
- names = camel_cased_word.split('::')
226
- names.shift if names.empty? || names.first.empty?
232
+ # Go down the ancestors to check it it's owned
233
+ # directly before we reach Object or the end of ancestors.
234
+ constant = constant.ancestors.inject do |const, ancestor|
235
+ break const if ancestor == Object
236
+ break ancestor if ancestor.const_defined?(name, false)
237
+ const
238
+ end
227
239
 
228
- constant = Object
229
- names.each do |name|
230
- constant = constant.const_defined?(name, false) ? constant.const_get(name) : constant.const_missing(name)
240
+ # owner is in Object, so raise
241
+ constant.const_get(name, false)
231
242
  end
232
- constant
233
243
  end
234
244
  end
235
245
 
236
- # Tries to find a constant with the name specified in the argument string:
246
+ # Tries to find a constant with the name specified in the argument string.
237
247
  #
238
- # "Module".safe_constantize # => Module
239
- # "Test::Unit".safe_constantize # => Test::Unit
248
+ # 'Module'.safe_constantize # => Module
249
+ # 'Test::Unit'.safe_constantize # => Test::Unit
240
250
  #
241
- # The name is assumed to be the one of a top-level constant, no matter whether
242
- # it starts with "::" or not. No lexical context is taken into account:
251
+ # The name is assumed to be the one of a top-level constant, no matter
252
+ # whether it starts with "::" or not. No lexical context is taken into
253
+ # account:
243
254
  #
244
255
  # C = 'outside'
245
256
  # module M
246
257
  # C = 'inside'
247
258
  # C # => 'inside'
248
- # "C".safe_constantize # => 'outside', same as ::C
259
+ # 'C'.safe_constantize # => 'outside', same as ::C
249
260
  # end
250
261
  #
251
- # nil is returned when the name is not in CamelCase or the constant (or part of it) is
252
- # unknown.
253
- #
254
- # "blargle".safe_constantize # => nil
255
- # "UnknownModule".safe_constantize # => nil
256
- # "UnknownModule::Foo::Bar".safe_constantize # => nil
262
+ # +nil+ is returned when the name is not in CamelCase or the constant (or
263
+ # part of it) is unknown.
257
264
  #
265
+ # 'blargle'.safe_constantize # => nil
266
+ # 'UnknownModule'.safe_constantize # => nil
267
+ # 'UnknownModule::Foo::Bar'.safe_constantize # => nil
258
268
  def safe_constantize(camel_cased_word)
259
- begin
260
- constantize(camel_cased_word)
261
- rescue NameError => e
262
- raise unless e.message =~ /(uninitialized constant|wrong constant name) #{const_regexp(camel_cased_word)}$/ ||
263
- e.name.to_s == camel_cased_word.to_s
264
- rescue ArgumentError => e
265
- raise unless e.message =~ /not missing constant #{const_regexp(camel_cased_word)}\!$/
269
+ constantize(camel_cased_word)
270
+ rescue NameError => e
271
+ raise unless e.message =~ /(uninitialized constant|wrong constant name) #{const_regexp(camel_cased_word)}$/ ||
272
+ e.name.to_s == camel_cased_word.to_s
273
+ rescue ArgumentError => e
274
+ raise unless e.message =~ /not missing constant #{const_regexp(camel_cased_word)}\!$/
275
+ end
276
+
277
+ # Returns the suffix that should be added to a number to denote the position
278
+ # in an ordered sequence such as 1st, 2nd, 3rd, 4th.
279
+ #
280
+ # ordinal(1) # => "st"
281
+ # ordinal(2) # => "nd"
282
+ # ordinal(1002) # => "nd"
283
+ # ordinal(1003) # => "rd"
284
+ # ordinal(-11) # => "th"
285
+ # ordinal(-1021) # => "st"
286
+ def ordinal(number)
287
+ abs_number = number.to_i.abs
288
+
289
+ if (11..13).include?(abs_number % 100)
290
+ "th"
291
+ else
292
+ case abs_number % 10
293
+ when 1; "st"
294
+ when 2; "nd"
295
+ when 3; "rd"
296
+ else "th"
297
+ end
266
298
  end
267
299
  end
268
300
 
269
301
  # Turns a number into an ordinal string used to denote the position in an
270
302
  # ordered sequence such as 1st, 2nd, 3rd, 4th.
271
303
  #
272
- # Examples:
273
304
  # ordinalize(1) # => "1st"
274
305
  # ordinalize(2) # => "2nd"
275
306
  # ordinalize(1002) # => "1002nd"
@@ -277,16 +308,7 @@ module ActiveSupport
277
308
  # ordinalize(-11) # => "-11th"
278
309
  # ordinalize(-1021) # => "-1021st"
279
310
  def ordinalize(number)
280
- if (11..13).include?(number.to_i.abs % 100)
281
- "#{number}th"
282
- else
283
- case number.to_i.abs % 10
284
- when 1; "#{number}st"
285
- when 2; "#{number}nd"
286
- when 3; "#{number}rd"
287
- else "#{number}th"
288
- end
289
- end
311
+ "#{number}#{ordinal(number)}"
290
312
  end
291
313
 
292
314
  private
@@ -304,16 +326,15 @@ module ActiveSupport
304
326
 
305
327
  # Applies inflection rules for +singularize+ and +pluralize+.
306
328
  #
307
- # Examples:
308
- # apply_inflections("post", inflections.plurals) # => "posts"
309
- # apply_inflections("posts", inflections.singulars) # => "post"
329
+ # apply_inflections('post', inflections.plurals) # => "posts"
330
+ # apply_inflections('posts', inflections.singulars) # => "post"
310
331
  def apply_inflections(word, rules)
311
332
  result = word.to_s.dup
312
333
 
313
- if word.empty? || inflections.uncountables.any? { |inflection| result =~ /\b#{inflection}\Z/i }
334
+ if word.empty? || inflections.uncountables.include?(result.downcase[/\b\w+\Z/])
314
335
  result
315
336
  else
316
- rules.each { |(rule, replacement)| break if result.gsub!(rule, replacement) }
337
+ rules.each { |(rule, replacement)| break if result.sub!(rule, replacement) }
317
338
  result
318
339
  end
319
340
  end
@@ -8,7 +8,7 @@ module ActiveSupport
8
8
  # Replaces non-ASCII characters with an ASCII approximation, or if none
9
9
  # exists, a replacement character which defaults to "?".
10
10
  #
11
- # transliterate("Ærøskøbing")
11
+ # transliterate('Ærøskøbing')
12
12
  # # => "AEroskobing"
13
13
  #
14
14
  # Default approximations are provided for Western/Latin characters,
@@ -30,33 +30,33 @@ module ActiveSupport
30
30
  # ö: "oe"
31
31
  #
32
32
  # # Or set them using Ruby
33
- # I18n.backend.store_translations(:de, :i18n => {
34
- # :transliterate => {
35
- # :rule => {
36
- # "ü" => "ue",
37
- # "ö" => "oe"
33
+ # I18n.backend.store_translations(:de, i18n: {
34
+ # transliterate: {
35
+ # rule: {
36
+ # 'ü' => 'ue',
37
+ # 'ö' => 'oe'
38
38
  # }
39
39
  # }
40
40
  # })
41
41
  #
42
- # The value for <tt>i18n.transliterate.rule</tt> can be a simple Hash that maps
43
- # characters to ASCII approximations as shown above, or, for more complex
44
- # requirements, a Proc:
42
+ # The value for <tt>i18n.transliterate.rule</tt> can be a simple Hash that
43
+ # maps characters to ASCII approximations as shown above, or, for more
44
+ # complex requirements, a Proc:
45
45
  #
46
- # I18n.backend.store_translations(:de, :i18n => {
47
- # :transliterate => {
48
- # :rule => lambda {|string| MyTransliterator.transliterate(string)}
46
+ # I18n.backend.store_translations(:de, i18n: {
47
+ # transliterate: {
48
+ # rule: ->(string) { MyTransliterator.transliterate(string) }
49
49
  # }
50
50
  # })
51
51
  #
52
52
  # Now you can have different transliterations for each locale:
53
53
  #
54
54
  # I18n.locale = :en
55
- # transliterate("Jürgen")
55
+ # transliterate('Jürgen')
56
56
  # # => "Jurgen"
57
57
  #
58
58
  # I18n.locale = :de
59
- # transliterate("Jürgen")
59
+ # transliterate('Jürgen')
60
60
  # # => "Juergen"
61
61
  def transliterate(string, replacement = "?")
62
62
  I18n.transliterate(ActiveSupport::Multibyte::Unicode.normalize(
@@ -64,9 +64,8 @@ module ActiveSupport
64
64
  :replacement => replacement)
65
65
  end
66
66
 
67
- # Replaces special characters in a string so that it may be used as part of a 'pretty' URL.
68
- #
69
- # ==== Examples
67
+ # Replaces special characters in a string so that it may be used as part of
68
+ # a 'pretty' URL.
70
69
  #
71
70
  # class Person
72
71
  # def to_param
@@ -8,14 +8,13 @@ module ActiveSupport
8
8
 
9
9
  module JSON
10
10
  class << self
11
+ # Parses a JSON string (JavaScript Object Notation) into a hash.
12
+ # See www.json.org for more info.
13
+ #
14
+ # ActiveSupport::JSON.decode("{\"team\":\"rails\",\"players\":\"36\"}")
15
+ # => {"team" => "rails", "players" => "36"}
11
16
  def decode(json, options ={})
12
- # Can't reliably detect whether MultiJson responds to load, since it's
13
- # a reserved word. Use adapter as a proxy for new features.
14
- data = if MultiJson.respond_to?(:adapter)
15
- MultiJson.load(json, options)
16
- else
17
- MultiJson.decode(json, options)
18
- end
17
+ data = MultiJson.load(json, options)
19
18
  if ActiveSupport.parse_json_times
20
19
  convert_dates_from(data)
21
20
  else
@@ -24,20 +23,12 @@ module ActiveSupport
24
23
  end
25
24
 
26
25
  def engine
27
- if MultiJson.respond_to?(:adapter)
28
- MultiJson.adapter
29
- else
30
- MultiJson.engine
31
- end
26
+ MultiJson.adapter
32
27
  end
33
28
  alias :backend :engine
34
29
 
35
30
  def engine=(name)
36
- if MultiJson.respond_to?(:use)
37
- MultiJson.use name
38
- else
39
- MultiJson.engine = name
40
- end
31
+ MultiJson.use(name)
41
32
  end
42
33
  alias :backend= :engine=
43
34
 
@@ -48,6 +39,16 @@ module ActiveSupport
48
39
  self.backend = old_backend
49
40
  end
50
41
 
42
+ # Returns the class of the error that will be raised when there is an
43
+ # error in decoding JSON. Using this method means you won't directly
44
+ # depend on the ActiveSupport's JSON implementation, in case it changes
45
+ # in the future.
46
+ #
47
+ # begin
48
+ # obj = ActiveSupport::JSON.decode(some_string)
49
+ # rescue ActiveSupport::JSON.parse_error
50
+ # Rails.logger.warn("Attempted to decode invalid JSON: #{some_string}")
51
+ # end
51
52
  def parse_error
52
53
  MultiJson::DecodeError
53
54
  end