activesupport 4.2.1.rc1 → 4.2.1.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f650b87b7119a5b7165a1e4f529d1c425e438f39
-  data.tar.gz: f5bf7949a9f940550e3767064dfba037267fc670
+  metadata.gz: a467c7d8f13b5570edec72c2f6eb94e92c0fde91
+  data.tar.gz: 45614ce99bd33c6b7403c532633fe909a98038e3
 SHA512:
-  metadata.gz: cff2bcb80b67ac0327843c5cecfc9fd0575b606c5be4c438b95bbfa2e46c2e7563c3737c16c931ab19b7268375b24257c2fa1c12acc2f8fa127f39fa49fcc2a7
-  data.tar.gz: 369e41edf6cc159e7f38b71bf6b754c989423884a3b80e7f6600f7dda96c98cb2ea6d2c59decd15b30612b6d85bf051edf5d2e102c6f8153f65bf971d1843a70
+  metadata.gz: a18e89ab76aabb39ca727619c4ca68c0d24909d1e09a5e23de225eb456a78932ae755308894462bf1047085c40df9a865487cfc4c5a6ee169b23865c5378818e
+  data.tar.gz: 5db0b2bbbe2f766a7371ea18e02c4809d816cbff220d3f602d85a31f280417343c66f8ac45c3aef697e5be5d1fa61047f263a337da81ef93151e38deb96d3660

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+*   Fixed a problem where String#truncate_words would get stuck with a complex
+    string.
+
+    *Henrik Nygren*
+
 *   Fixed a roundtrip problem with AS::SafeBuffer where primitive-like strings
     will be dumped as primitives:
 

data/lib/active_support/core_ext/string/filters.rb

@@ -93,7 +93,7 @@ class String
   def truncate_words(words_count, options = {})
     sep = options[:separator] || /\s+/
     sep = Regexp.escape(sep.to_s) unless Regexp === sep
-    if self =~ /\A((?:.+?#{sep}){#{words_count - 1}}.+?)#{sep}.*/m
+    if self =~ /\A((?>.+?#{sep}){#{words_count - 1}}.+?)#{sep}.*/m
       $1 + (options[:omission] || '...')
     else
       dup

data/lib/active_support/gem_version.rb

@@ -8,7 +8,7 @@ module ActiveSupport
     MAJOR = 4
     MINOR = 2
     TINY  = 1
-    PRE   = "rc1"
+    PRE   = "rc2"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activesupport
 version: !ruby/object:Gem::Version
-  version: 4.2.1.rc1
+  version: 4.2.1.rc2
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-20 00:00:00.000000000 Z
+date: 2015-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n