titleize 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d23bd4aaf4922bbfdbba7ad91b0bd57daa75168b
-  data.tar.gz: e93492421eb2d77d6c800a84fad3e48149d0f9f3
+  metadata.gz: a22d9670a598846e39d7c526c837f7cdce61c52f
+  data.tar.gz: b15abf18dc19969e8949f0e97a18c89b448c0828
 SHA512:
-  metadata.gz: 589bf779b36bc2054b8ff5f16fbd9143f9acd3fd09a554107c3148e148b638a811ee31d8c17ecc1f833408e9bb84e468454734aa09765bfb2f3a68f394442807
-  data.tar.gz: 225be00a67a79bd7e7a0a630e8af2794137dfef719c553c202502086e45fb68c10f4b14e68f02501b16a9c1a25b7be574d350f8f5b64e476bb56940bacb65b03
+  metadata.gz: a7485617fdce1fbca51b6d0805bd0de6eaf76659fcff39e31160e50e08a5be5e1e4805baf37915f61f21812f2d6f09c62c079f6ca687d832980c8ecd9bc3cb82
+  data.tar.gz: 2c58e24dd98c6607b964caaaabeb8ad77e52e7efc6ec9de1f7b014d12e0b2e9a33a4aaff7b617a8673c234d28b9746e5b006a15bf9a6951b6babb7d055d278a0

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.4.1 / 2016-09-16
+
+* fix capitalization of repeated small words
+* handle multiple punctuated small words ("v.", "vs.")
+
 === 1.4.0 / 2016-02-04
 
 * check for the presence of ActiveSupport::Inflector instead of just ActiveSupport [Connor Prussin]

data/lib/titleize.rb

@@ -23,7 +23,7 @@ module Titleize
 
     phrases(title).map do |phrase|
       words = phrase.split
-      words.map do |word|
+      words.map.with_index do |word, index|
         def word.capitalize
           # like String#capitalize, but it starts with the first letter
           self.sub(/[[:alpha:]].*/) {|subword| subword.capitalize}
@@ -40,10 +40,12 @@ module Titleize
           word
         when /^[[:digit:]]/  # first character is a number
           word
-        when words.first, words.last
-          word.capitalize
         when *(SMALL_WORDS + SMALL_WORDS.map {|small| small.capitalize })
-          word.downcase
+          if index == 0 || index == words.size - 1
+            word.capitalize
+          else
+            word.downcase
+          end
         else
           word.capitalize
         end
@@ -56,18 +58,22 @@ module Titleize
   #   "simple title"              # => ["simple title"]
   #   "more complicated: titling" # => ["more complicated:", "titling"]
   def phrases(title)
-    phrases = title.scan(/.+?(?:[:.;?!] |$)/).map {|phrase| phrase.strip }
-
-    # rejoin phrases that were split on the '.' from a small word
-    if phrases.size > 1
-      phrases[0..-2].each_with_index do |phrase, index|
-        if SMALL_WORDS.include?(phrase.split.last.downcase)
-          phrases[index] << " " + phrases.slice!(index + 1)
-        end
-      end
+    phrases = [[]]
+    title.split.each do |word|
+      phrases.last << word
+      phrases << [] if ends_with_punctuation?(word) && !small_word?(word)
     end
+    phrases.reject(&:empty?).map { |phrase| phrase.join " " }
+  end
+
+  private
+
+  def small_word?(word)
+    SMALL_WORDS.include? word.downcase
+  end
 
-    phrases
+  def ends_with_punctuation?(word)
+    word =~ /[:.;?!]$/
   end
 end
 

data/lib/titleize/version.rb

@@ -1,3 +1,3 @@
 module Titleize
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 end

data/spec/titleize_spec.rb

@@ -50,6 +50,7 @@ describe Titleize do
       phrases("this vs. that. no").should == ["this vs. that.", "no"]
       phrases("this: that vs. him. no. why?").should ==
         ["this:", "that vs. him.", "no.", "why?"]
+      phrases("this vs. that vs. what").should == ["this vs. that vs. what"]
     end
 
     it "should handle punctuation combined with a small word as the last word" do
@@ -89,6 +90,12 @@ describe Titleize do
       end
     end
 
+    it "does not capitalize later uses of the first small word" do
+      SMALL_WORDS.each do |word|
+        titleize("#{word} and #{word} are different").should == "#{word.capitalize} and #{word} Are Different"
+      end
+    end
+
     it "should capitalize a small word if it is the last word" do
       SMALL_WORDS.each do |word|
         titleize("small #{word}").should == "Small #{word.capitalize}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: titleize
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Grant Hollingworth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-05 00:00:00.000000000 Z
+date: 2016-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: titleize
-rubygems_version: 2.2.2
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Adds String#titleize for creating properly capitalized titles.