titleize 1.1.0 → 1.2.0

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.2.0 / 2010-07-22
+
+* Ruby 1.9 compatibility. [Jason Weathered]
+* Active Support's Inflector is under the ActiveSupport namespace. [Jason Weathered]
+* have String#titleize act like Inflector#titleize when ActiveSupport is loaded
+
 === 1.1.0 / 2010-03-18
 
 * fix all-caps titles

data/lib/titleize.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Adds String#titleize for creating properly capitalized titles.
 # It can be called as Titleize.titleize or "a string".titleize.
 #
@@ -5,7 +6,7 @@
 #
 # If loaded in a Rails environment, it modifies Inflector.titleize.
 module Titleize
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
   SMALL_WORDS = %w{a an and as at but by en for if in of on or the to v v. via vs vs.}
 
   extend self
@@ -82,13 +83,17 @@ class String
   #   "notes on a scandal" # => "Notes on a Scandal"
   #   "the good german"    # => "The Good German"
   def titleize
-    Titleize.titleize(self)
+    if defined? ActiveSupport
+      ActiveSupport::Inflector.titleize(self)
+    else
+      Titleize.titleize(self)
+    end
   end
   alias_method :titlecase, :titleize
 end
 
-if defined? Inflector
-  module Inflector
+if defined? ActiveSupport
+  module ActiveSupport::Inflector
     extend self
 
     # Capitalizes most words to create a nicer looking title string.
@@ -105,7 +110,7 @@ if defined? Inflector
     #   "notes on an active_record" # => "Notes on an Active Record"
     #   "the GoodGerman"            # => "The Good German"
     def titleize(title)
-      Titleize.titleize(Inflector.humanize(Inflector.underscore(title)))
+      Titleize.titleize(ActiveSupport::Inflector.humanize(ActiveSupport::Inflector.underscore(title)))
     end
     alias_method :titlecase, :titleize
   end

data/spec/spec.opts

@@ -1 +1,3 @@
 --format specdoc --colour
+--backtrace
+

data/spec/titleize_spec.rb

@@ -1,8 +1,14 @@
-module Inflector
-  #stub
+# -*- coding: utf-8 -*-
+
+module ActiveSupport
+  module Inflector
+    #stub
+    def underscore(string) string; end
+    def humanize(string)   string; end
+  end
 end
 
-require File.dirname(__FILE__) + "/spec_helper.rb"
+require 'spec_helper'
 
 SMALL_WORDS = %w{a an and as at but by en for if in of on or the to v v. via vs vs.}
 
@@ -215,12 +221,12 @@ describe Titleize do
   end
 
   it "should have titleize as a singleton method" do
-    Titleize.singleton_methods.should include("titleize")
+    Titleize.singleton_methods.map(&:to_sym).should include(:titleize)
   end
 end
 
-describe Inflector do
-  include Inflector
+describe ActiveSupport::Inflector do
+  include ActiveSupport::Inflector
 
   describe "titleize" do
     before(:each) do
@@ -230,30 +236,30 @@ describe Inflector do
     it "should call humanize and underscore like the default in Rails" do
       underscored_title = "active_record and active_resource"
       humanized_title = "Active record and active resource"
-      Inflector.should_receive(:underscore).with(@title).and_return(underscored_title)
-      Inflector.should_receive(:humanize).with(underscored_title).and_return(humanized_title)
+      ActiveSupport::Inflector.should_receive(:underscore).with(@title).and_return(underscored_title)
+      ActiveSupport::Inflector.should_receive(:humanize).with(underscored_title).and_return(humanized_title)
       titleize(@title).should == "Active Record and Active Resource"
     end
 
     it "should replace Inflector.titleize" do
       Titleize.should_receive(:titleize).with(@title)
-      Inflector.stub!(:underscore).and_return(@title)
-      Inflector.stub!(:humanize).and_return(@title)
-      Inflector.titleize(@title)
+      ActiveSupport::Inflector.stub!(:underscore).and_return(@title)
+      ActiveSupport::Inflector.stub!(:humanize).and_return(@title)
+      ActiveSupport::Inflector.titleize(@title)
     end
 
     it "should be aliased as titlecase" do
-      Inflector.singleton_methods.should include("titlecase")
-      Inflector.stub!(:titlecase).and_return("title")
-      Inflector.stub!(:titleize).and_return("title")
-      Inflector.titlecase("this").should == Inflector.titleize("this")
+      ActiveSupport::Inflector.singleton_methods.map(&:to_sym).should include(:titlecase)
+      ActiveSupport::Inflector.stub!(:titlecase).and_return("title")
+      ActiveSupport::Inflector.stub!(:titleize).and_return("title")
+      ActiveSupport::Inflector.titlecase("this").should == ActiveSupport::Inflector.titleize("this")
     end
   end
 end
 
 describe String do
   it "should have a titleize method" do
-    String.instance_methods.should include("titleize")
+    String.instance_methods.map(&:to_sym).should include(:titleize)
   end
 
   it "should work" do
@@ -261,8 +267,30 @@ describe String do
   end
 
   it "should be aliased as #titlecase" do
-    String.instance_methods.should include("titlecase")
+    String.instance_methods.map(&:to_sym).should include(:titlecase)
     title = "this is a pile of testing text"
     title.titlecase.should == title.titleize
   end
+
+  context "when ActiveSupport is loaded" do
+    it "should act the same as Inflector#titleize" do
+      ActiveSupport::Inflector.should_receive(:titleize).with("title")
+      "title".titleize
+    end
+  end
+
+  context "when ActiveSupport is not loaded" do
+    before(:all) do
+      Object.send :remove_const, :ActiveSupport
+    end
+
+    it "should work" do
+      lambda { "foo".titleize }.should_not raise_exception
+    end
+
+    it "should call Titleize#titleize" do
+      Titleize.should_receive(:titleize).with("title")
+      "title".titleize
+    end
+  end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: titleize
 version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: false
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Grant Hollingworth
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-18 00:00:00 -04:00
+date: 2010-07-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rubyforge
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
         - 2
         - 0
@@ -35,9 +38,11 @@ dependencies:
   name: gemcutter
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 0
         - 5
@@ -49,9 +54,11 @@ dependencies:
   name: hoe
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 2
         - 5
@@ -101,23 +108,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: titleize
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Adds String#titleize for creating properly capitalized titles