nytimes-style 0.6.0 → 0.7.0

data/lib/nytimes-style.rb

@@ -5,11 +5,11 @@ require 'yaml'
 # hosted on [Github](https://github.com/ascheink/nytimes-style).
 module Nytimes
   module Style
-    
-    # > "In general, spell out the first nine cardinal and 
+
+    # > "In general, spell out the first nine cardinal and
     # > ordinal numbers [but] spell any number that begins a sentence..."
-    # Exceptions include "ages of people 
-    # and animals," "sums of money," "degrees of temperature" and "mentions of the Twelve 
+    # Exceptions include "ages of people
+    # and animals," "sums of money," "degrees of temperature" and "mentions of the Twelve
     # Apostles and the Ten Commandments."
     def nytimes_number(n)
       if n < 10
@@ -30,21 +30,21 @@ module Nytimes
       str << ", #{date.year}" unless opts[:hide_current_year] && date.year == Date.today.year
       return str
     end
-    
+
     def nytimes_month_and_day(date)
       "#{nytimes_month date.month} #{date.day}"
     end
-    
+
     def nytimes_month(month)
       raise ArgumentError.new "Unknown month: #{month}" unless (1..12).include? month
       %w(Jan. Feb. March April May June July Aug. Sept. Oct. Nov. Dec.)[month - 1]
     end
-    
+
     # > "Use numerals in giving clock time: 10:30 a.m.; 10:30.
     # > Do not use half-past 10 except in a direct quotation.
     # > Also avoid the redundant 10:30 a.m. yesterday morning and Monday afternoon at 2 p.m."
     def nytimes_time(time, opts={})
-      raise ArgumentError.new "Time or DateTime required" unless time.class == DateTime || time.class == Time
+      raise ArgumentError.new "Time or DateTime required" unless time.is_a?(DateTime) || time.is_a?(Time)
       str = ""
       str << time.strftime("%l:%M").strip
       str << time.strftime(" %p").sub('PM','p.m.').sub('AM','a.m.') unless opts[:hide_abbreviation]
@@ -61,13 +61,13 @@ module Nytimes
       raise ArgumentError.new "Unknown postal code, state name or FIPS code: #{state_name_or_code}" unless state
       state['nytimes_abbrev']
     end
-    
+
     def nytimes_state_name(state_abbrev_or_code)
       state = states[state_abbrev_or_code]
       raise ArgumentError.new "Unknown postal code, abbreviation or FIPS code: #{state_abbrev_or_code}" unless state
       state['name']
     end
-    
+
     private
 
     STATE_DATA_FILE = File.join(File.dirname(__FILE__), 'nytimes-style/states.yml')
@@ -77,7 +77,7 @@ module Nytimes
         h.merge({ state['postal_code'] => state, state['name'] => state, state['fips_code'] => state })
       end
     end
-    
+
 
   end
 end

data/lib/nytimes-style/states.yml

@@ -202,3 +202,7 @@
   name: Wyoming
   nytimes_abbrev: Wyo.
   postal_code: WY
+- fips_code: 72
+  name: Puerto Rico
+  nytimes_abbrev: P.R.
+  postal_code: PR

data/lib/nytimes-style/version.rb

@@ -1,5 +1,5 @@
 module Nytimes
   module Style
-    VERSION = "0.6.0"
+    VERSION = "0.7.0"
   end
 end

data/test/test_nytimes_style.rb

@@ -1,5 +1,9 @@
 require './lib/nytimes-style'
 
+
+class InheritedDateTime < DateTime; end
+class InheritedTime < Time; end
+
 class NytimesStyleTest < Test::Unit::TestCase
   include Nytimes::Style
 
@@ -9,7 +13,7 @@ class NytimesStyleTest < Test::Unit::TestCase
     assert_equal "Sept. 11, 2001", nytimes_date(date)
     assert_raise(ArgumentError) { nytimes_month(0) }
   end
-  
+
   def test_date_options
     date = Date.civil(2001, 9, 11)
     assert_equal "Tuesday, Sept. 11, 2001", nytimes_date(date, :day_of_week => true)
@@ -18,31 +22,33 @@ class NytimesStyleTest < Test::Unit::TestCase
     recent_date = Date.civil(this_year, 2, 12)
     assert_equal "Feb. 12", nytimes_date(recent_date, :hide_current_year => true)
   end
-  
+
   def test_time
     time = Time.local(2011, 7, 12, 14, 30, 30)
     assert_equal "2:30 p.m.", nytimes_time(time)
     assert_equal "2:30", nytimes_time(time, :hide_abbreviation => true)
     assert_raise(ArgumentError) { nytimes_time(Date.today) }
+    assert_nothing_raised { nytimes_time(InheritedDateTime.new) }
+    assert_nothing_raised { nytimes_time(InheritedTime.new) }
   end
-  
+
   def test_state_abbrevs
     assert_equal 'Ariz.', nytimes_state_abbrev('AZ')
     assert_equal 'N.H.',  nytimes_state_abbrev('New Hampshire')
     assert_equal 'Wis.',  nytimes_state_abbrev(55)
     assert_raise(ArgumentError) { nytimes_state_abbrev('Canada') }
   end
-  
+
   def test_state_names
     assert_equal 'Arizona', nytimes_state_name('AZ')
     assert_equal 'New Hampshire',  nytimes_state_name('New Hampshire')
     assert_equal 'Wisconsin',  nytimes_state_name(55)
     assert_raise(ArgumentError) { nytimes_state_name(242) }
   end
-  
+
   def test_numbers
     assert_equal 'five', nytimes_number(5)
     assert_equal '12', nytimes_number(12)
   end
-  
-end
+
+end

metadata

@@ -1,26 +1,32 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: nytimes-style
-version: !ruby/object:Gem::Version
-  version: 0.6.0
+version: !ruby/object:Gem::Version 
+  prerelease: 
+  version: 0.7.0
 platform: ruby
-authors:
+authors: 
 - Andrei Scheinkman
 - Tyson Evans
 - Derek Willis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-14 00:00:00.000000000 Z
+
+date: 2013-05-17 00:00:00 Z
 dependencies: []
+
 description: Format numbers and dates according to The New York Times Manual of Style
-email:
+email: 
 - andrei@nytimes.com
 - tyson.evans@nytimes.com
 - dwillis@nytimes.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - README.rdoc
 - Rakefile
@@ -33,26 +39,30 @@ files:
 - test/test_nytimes_style.rb
 homepage: http://github.com/ascheink/nytimes-style
 licenses: []
-metadata: {}
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.5
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: New York Times style
-test_files:
+test_files: 
 - test/test_nytimes_style.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: d67b63a72e3be7cea0a78c9f14c5eb80a81de678
-  data.tar.gz: c03fce233caa03365e035c779fcb390ae61c63ab
-SHA512:
-  metadata.gz: e8aa049e66431b3cadca8f5d9cf2b408687a67c94d35964bb67ea9ecd7a7acd0f58b8a9910cfae36c790689a60bbd8fe01538d65f9783e1db5fc2bb64012bce5
-  data.tar.gz: bd48ab48f850f70bf99a0c26acf8ffd3b92bd1a5d6e5180649e7f2474c8f830d11734f796ebc6481f3d0ee9e0ecbd11efdb4add9945ddb4f098972f8625f061d