nytimes-style 0.3.0 → 0.4.0

data/README.rdoc

@@ -16,9 +16,15 @@ Annotated source code: http://ascheink.github.com/nytimes-style
   >> nytimes_date Date.today
   # => "May 12, 2011"
 
+  >> nytimes_date Date.today, :hide_current_year => true, :day_of_week => true
+  # => "Wednesday, June 15"  
+
   >> nytimes_state_abbrev 'AZ'
   # => "Ariz."  
 
+  >> nytimes_state_name '55'
+  # => "Wisconsin"  
+
 == AUTHOR
 
 Andrei Scheinkman, andrei@nytimes.com

data/index.html

@@ -105,19 +105,25 @@ two-letter abbreviations; some are hard to tell apart on quick reading.)&rdquo;<
 
       </td>
       <td class=code>
-        <div class='highlight'><pre>    <span class="k">def</span> <span class="nf">nytimes_state_abbrev</span><span class="p">(</span><span class="n">postal_code_or_state_name</span><span class="p">)</span>
-      <span class="n">state</span> <span class="o">=</span> <span class="n">states</span><span class="o">[</span><span class="n">postal_code_or_state_name</span><span class="o">]</span>
-      <span class="k">raise</span> <span class="no">ArgumentError</span><span class="o">.</span><span class="n">new</span> <span class="s2">&quot;Unknown postal code or state name: </span><span class="si">#{</span><span class="n">postal_code_or_state_name</span><span class="si">}</span><span class="s2">&quot;</span> <span class="k">unless</span> <span class="n">state</span>
+        <div class='highlight'><pre>    <span class="k">def</span> <span class="nf">nytimes_state_abbrev</span><span class="p">(</span><span class="n">state_name_or_code</span><span class="p">)</span>
+      <span class="n">state</span> <span class="o">=</span> <span class="n">states</span><span class="o">[</span><span class="n">state_name_or_code</span><span class="o">]</span>
+      <span class="k">raise</span> <span class="no">ArgumentError</span><span class="o">.</span><span class="n">new</span> <span class="s2">&quot;Unknown postal code, state name or FIPS code: </span><span class="si">#{</span><span class="n">state_name_or_code</span><span class="si">}</span><span class="s2">&quot;</span> <span class="k">unless</span> <span class="n">state</span>
       <span class="n">state</span><span class="o">[</span><span class="s1">&#39;nytimes_abbrev&#39;</span><span class="o">]</span>
     <span class="k">end</span>
     
+    <span class="k">def</span> <span class="nf">nytimes_state_name</span><span class="p">(</span><span class="n">state_abbrev_or_code</span><span class="p">)</span>
+      <span class="n">state</span> <span class="o">=</span> <span class="n">states</span><span class="o">[</span><span class="n">state_abbrev_or_code</span><span class="o">]</span>
+      <span class="k">raise</span> <span class="no">ArgumentError</span><span class="o">.</span><span class="n">new</span> <span class="s2">&quot;Unknown postal code, abbreviation or FIPS code: </span><span class="si">#{</span><span class="n">state_abbrev_or_code</span><span class="si">}</span><span class="s2">&quot;</span> <span class="k">unless</span> <span class="n">state</span>
+      <span class="n">state</span><span class="o">[</span><span class="s1">&#39;name&#39;</span><span class="o">]</span>
+    <span class="k">end</span>
+    
     <span class="kp">private</span>
 
     <span class="no">STATE_DATA_FILE</span> <span class="o">=</span> <span class="no">File</span><span class="o">.</span><span class="n">join</span><span class="p">(</span><span class="no">File</span><span class="o">.</span><span class="n">dirname</span><span class="p">(</span><span class="bp">__FILE__</span><span class="p">),</span> <span class="s1">&#39;nytimes-style/states.yml&#39;</span><span class="p">)</span>
 
     <span class="k">def</span> <span class="nf">states</span>
       <span class="vi">@states</span> <span class="o">||=</span> <span class="no">YAML</span><span class="o">::</span><span class="nb">load</span><span class="p">(</span><span class="no">File</span><span class="o">.</span><span class="n">open</span><span class="p">(</span><span class="no">STATE_DATA_FILE</span><span class="p">))</span><span class="o">.</span><span class="n">inject</span><span class="p">({})</span> <span class="k">do</span> <span class="o">|</span><span class="n">h</span><span class="p">,</span> <span class="n">state</span><span class="o">|</span>
-        <span class="n">h</span><span class="o">.</span><span class="n">merge</span><span class="p">({</span> <span class="n">state</span><span class="o">[</span><span class="s1">&#39;postal_code&#39;</span><span class="o">]</span> <span class="o">=&gt;</span> <span class="n">state</span><span class="p">,</span> <span class="n">state</span><span class="o">[</span><span class="s1">&#39;name&#39;</span><span class="o">]</span> <span class="o">=&gt;</span> <span class="n">state</span> <span class="p">})</span>
+        <span class="n">h</span><span class="o">.</span><span class="n">merge</span><span class="p">({</span> <span class="n">state</span><span class="o">[</span><span class="s1">&#39;postal_code&#39;</span><span class="o">]</span> <span class="o">=&gt;</span> <span class="n">state</span><span class="p">,</span> <span class="n">state</span><span class="o">[</span><span class="s1">&#39;name&#39;</span><span class="o">]</span> <span class="o">=&gt;</span> <span class="n">state</span><span class="p">,</span> <span class="n">state</span><span class="o">[</span><span class="s1">&#39;fips_code&#39;</span><span class="o">]</span> <span class="o">=&gt;</span> <span class="n">state</span> <span class="p">})</span>
       <span class="k">end</span>
     <span class="k">end</span>
     

data/lib/nytimes-style.rb

@@ -45,19 +45,25 @@ module Nytimes
     # > spaces between initials like N.H. Do not abbreviate Alaska, Hawaii, Idaho,
     # > Iowa, Ohio and Utah. (Do not ordinarily use the Postal Service’s
     # > two-letter abbreviations; some are hard to tell apart on quick reading.)"
-    def nytimes_state_abbrev(postal_code_or_state_name)
-      state = states[postal_code_or_state_name]
-      raise ArgumentError.new "Unknown postal code or state name: #{postal_code_or_state_name}" unless state
+    def nytimes_state_abbrev(state_name_or_code)
+      state = states[state_name_or_code]
+      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')
 
     def states
       @states ||= YAML::load(File.open(STATE_DATA_FILE)).inject({}) do |h, state|
-        h.merge({ state['postal_code'] => state, state['name'] => state })
+        h.merge({ state['postal_code'] => state, state['name'] => state, state['fips_code'] => state })
       end
     end
     

data/lib/nytimes-style/states.yml

@@ -1,153 +1,200 @@
-- nytimes_abbrev: Ala.
-  postal_code: AL
+- fips_code: 1
   name: Alabama
-- nytimes_abbrev: Alaska
-  postal_code: AK
+  nytimes_abbrev: Ala.
+  postal_code: AL
+- fips_code: 2
   name: Alaska
-- nytimes_abbrev: Ariz.
-  postal_code: AZ
+  nytimes_abbrev: Alaska
+  postal_code: AK
+- fips_code: 4
   name: Arizona
-- nytimes_abbrev: Ark.
-  postal_code: AR
+  nytimes_abbrev: Ariz.
+  postal_code: AZ
+- fips_code: 5
   name: Arkansas
-- nytimes_abbrev: Calif.
-  postal_code: CA
+  nytimes_abbrev: Ark.
+  postal_code: AR
+- fips_code: 6
   name: California
-- nytimes_abbrev: Colo.
-  postal_code: CO
+  nytimes_abbrev: Calif.
+  postal_code: CA
+- fips_code: 8
   name: Colorado
-- nytimes_abbrev: Conn.
-  postal_code: CT
+  nytimes_abbrev: Colo.
+  postal_code: CO
+- fips_code: 9
   name: Connecticut
-- nytimes_abbrev: Del.
-  postal_code: DE
+  nytimes_abbrev: Conn.
+  postal_code: CT
+- fips_code: 10
   name: Delaware
-- nytimes_abbrev: D.C.
-  postal_code: DC
-  name: District of Columbia
-- nytimes_abbrev: Fla.
-  postal_code: FL
+  nytimes_abbrev: Del.
+  postal_code: DE
+- fips_code: 12
   name: Florida
-- nytimes_abbrev: Ga.
-  postal_code: GA
+  nytimes_abbrev: Fla.
+  postal_code: FL
+- fips_code: 13
   name: Georgia
-- nytimes_abbrev: Hawaii
-  postal_code: HI
+  nytimes_abbrev: Ga.
+  postal_code: GA
+- fips_code: 15
   name: Hawaii
-- nytimes_abbrev: Idaho
-  postal_code: ID
+  nytimes_abbrev: Hawaii
+  postal_code: HI
+- fips_code: 16
   name: Idaho
-- nytimes_abbrev: Ill.
-  postal_code: IL
+  nytimes_abbrev: Idaho
+  postal_code: ID
+- fips_code: 17
   name: Illinois
-- nytimes_abbrev: Ind.
-  postal_code: IN
+  nytimes_abbrev: Ill.
+  postal_code: IL
+- fips_code: 18
   name: Indiana
-- nytimes_abbrev: Iowa
-  postal_code: IA
+  nytimes_abbrev: Ind.
+  postal_code: IN
+- fips_code: 19
   name: Iowa
-- nytimes_abbrev: Kan.
-  postal_code: KS
+  nytimes_abbrev: Iowa
+  postal_code: IA
+- fips_code: 20
   name: Kansas
-- nytimes_abbrev: Ky.
-  postal_code: KY
+  nytimes_abbrev: Kan.
+  postal_code: KS
+- fips_code: 21
   name: Kentucky
-- nytimes_abbrev: La.
-  postal_code: LA
+  nytimes_abbrev: Ky.
+  postal_code: KY
+- fips_code: 22
   name: Louisiana
-- nytimes_abbrev: Me.
-  postal_code: ME
+  nytimes_abbrev: La.
+  postal_code: LA
+- fips_code: 23
   name: Maine
-- nytimes_abbrev: Md.
-  postal_code: MD
+  nytimes_abbrev: Me.
+  postal_code: ME
+- fips_code: 24
   name: Maryland
-- nytimes_abbrev: Mass.
-  postal_code: MA
+  nytimes_abbrev: Md.
+  postal_code: MD
+- fips_code: 25
   name: Massachusetts
-- nytimes_abbrev: Mich.
-  postal_code: MI
+  nytimes_abbrev: Mass.
+  postal_code: MA
+- fips_code: 26
   name: Michigan
-- nytimes_abbrev: Minn.
-  postal_code: MN
+  nytimes_abbrev: Mich.
+  postal_code: MI
+- fips_code: 27
   name: Minnesota
-- nytimes_abbrev: Miss.
-  postal_code: MS
+  nytimes_abbrev: Minn.
+  postal_code: MN
+- fips_code: 28
   name: Mississippi
-- nytimes_abbrev: Mo.
-  postal_code: MO
+  nytimes_abbrev: Miss.
+  postal_code: MS
+- fips_code: 29
   name: Missouri
-- nytimes_abbrev: Mont.
-  postal_code: MT
+  nytimes_abbrev: Mo.
+  postal_code: MO
+- fips_code: 30
   name: Montana
-- nytimes_abbrev: Neb.
-  postal_code: NE
+  nytimes_abbrev: Mont.
+  postal_code: MT
+- fips_code: 31
   name: Nebraska
-- nytimes_abbrev: Nev.
-  postal_code: NV
+  nytimes_abbrev: Neb.
+  postal_code: NE
+- fips_code: 32
   name: Nevada
-- nytimes_abbrev: N.H.
-  postal_code: NH
+  nytimes_abbrev: Nev.
+  postal_code: NV
+- fips_code: 33
   name: New Hampshire
-- nytimes_abbrev: N.J.
-  postal_code: NJ
+  nytimes_abbrev: N.H.
+  postal_code: NH
+- fips_code: 34
   name: New Jersey
-- nytimes_abbrev: N.M.
-  postal_code: NM
+  nytimes_abbrev: N.J.
+  postal_code: NJ
+- fips_code: 35
   name: New Mexico
-- nytimes_abbrev: N.Y.
-  postal_code: NY
+  nytimes_abbrev: N.M.
+  postal_code: NM
+- fips_code: 36
   name: New York
-- nytimes_abbrev: N.C.
-  postal_code: NC
+  nytimes_abbrev: N.Y.
+  postal_code: NY
+- fips_code: 37
   name: North Carolina
-- nytimes_abbrev: N.D.
-  postal_code: ND
+  nytimes_abbrev: N.C.
+  postal_code: NC
+- fips_code: 38
   name: North Dakota
-- nytimes_abbrev: Ohio
-  postal_code: OH
+  nytimes_abbrev: N.D.
+  postal_code: ND
+- fips_code: 39
   name: Ohio
-- nytimes_abbrev: Okla.
-  postal_code: OK
+  nytimes_abbrev: Ohio
+  postal_code: OH
+- fips_code: 40
   name: Oklahoma
-- nytimes_abbrev: Ore.
-  postal_code: OR
+  nytimes_abbrev: Okla.
+  postal_code: OK
+- fips_code: 41
   name: Oregon
-- nytimes_abbrev: Pa.
-  postal_code: PA
+  nytimes_abbrev: Ore.
+  postal_code: OR
+- fips_code: 42
   name: Pennsylvania
-- nytimes_abbrev: R.I.
-  postal_code: RI
+  nytimes_abbrev: Pa.
+  postal_code: PA
+- fips_code: 44
   name: Rhode Island
-- nytimes_abbrev: S.C.
-  postal_code: SC
+  nytimes_abbrev: R.I.
+  postal_code: RI
+- fips_code: 45
   name: South Carolina
-- nytimes_abbrev: S.D.
-  postal_code: SD
+  nytimes_abbrev: S.C.
+  postal_code: SC
+- fips_code: 46
   name: South Dakota
-- nytimes_abbrev: Tenn.
-  postal_code: TN
+  nytimes_abbrev: S.D.
+  postal_code: SD
+- fips_code: 47
   name: Tennessee
-- nytimes_abbrev: Tex.
-  postal_code: TX
+  nytimes_abbrev: Tenn.
+  postal_code: TN
+- fips_code: 48
   name: Texas
-- nytimes_abbrev: Utah
-  postal_code: UT
+  nytimes_abbrev: Tex.
+  postal_code: TX
+- fips_code: 49
   name: Utah
-- nytimes_abbrev: Vt.
-  postal_code: VT
+  nytimes_abbrev: Utah
+  postal_code: UT
+- fips_code: 50
   name: Vermont
-- nytimes_abbrev: Va.
-  postal_code: VA
+  nytimes_abbrev: Vt.
+  postal_code: VT
+- fips_code: 51
   name: Virginia
-- nytimes_abbrev: Wash.
-  postal_code: WA
+  nytimes_abbrev: Va.
+  postal_code: VA
+- fips_code: 53
   name: Washington
-- nytimes_abbrev: W.Va.
-  postal_code: WV
+  nytimes_abbrev: Wash.
+  postal_code: WA
+- fips_code: 54
   name: West Virginia
-- nytimes_abbrev: Wis.
-  postal_code: WI
+  nytimes_abbrev: W.Va.
+  postal_code: WV
+- fips_code: 55
   name: Wisconsin
-- nytimes_abbrev: Wyo.
-  postal_code: WY
+  nytimes_abbrev: Wis.
+  postal_code: WI
+- fips_code: 56
   name: Wyoming
+  nytimes_abbrev: Wyo.
+  postal_code: WY

data/lib/nytimes-style/version.rb

@@ -1,5 +1,5 @@
 module Nytimes
   module Style
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

data/test/test_nytimes_style.rb

@@ -21,10 +21,18 @@ class NytimesStyleTest < Test::Unit::TestCase
   
   def test_state_abbrevs
     assert_equal 'Ariz.', nytimes_state_abbrev('AZ')
-    assert_equal 'N.H.',  nytimes_state_abbrev('New Hampshire'), 
+    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)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: nytimes-style
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
+  hash: 15
+  prerelease: 
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Andrei Scheinkman
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-09 00:00:00 -04:00
-default_executable: 
+date: 2011-06-15 00:00:00 Z
 dependencies: []
 
 description: Format numbers and dates according to The New York Times Manual of Style
@@ -38,7 +37,6 @@ files:
 - lib/nytimes-style/version.rb
 - nytimes-style.gemspec
 - test/test_nytimes_style.rb
-has_rdoc: true
 homepage: http://github.com/ascheink/nytimes-style
 licenses: []
 
@@ -68,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: New York Times style