stamp 0.1.6 → 0.2.0

data/.travis.yml

@@ -1,8 +1,8 @@
 rvm:
   - 1.8.7
   - 1.9.2
+  - 1.9.3
   - ree
   - rbx
-  - rbx-2.0
   - jruby
   - ruby-head

data/Gemfile.lock

@@ -1,24 +1,22 @@
 PATH
   remote: .
   specs:
-    stamp (0.1.6)
+    stamp (0.2.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
     builder (3.0.0)
-    cucumber (1.0.0)
+    cucumber (1.2.1)
       builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      gherkin (~> 2.4.1)
+      diff-lcs (>= 1.1.3)
+      gherkin (~> 2.11.0)
       json (>= 1.4.6)
-      term-ansicolor (>= 1.0.5)
-    diff-lcs (1.1.2)
-    gherkin (2.4.1)
+    diff-lcs (1.1.3)
+    gherkin (2.11.2)
       json (>= 1.4.6)
-    json (1.5.3)
-    rake (0.9.2)
-    term-ansicolor (1.0.5)
+    json (1.7.5)
+    rake (0.9.2.2)
 
 PLATFORMS
   ruby

data/README.md

@@ -29,6 +29,13 @@ date.stamp("12/31/99")              #=> "06/09/11"
 date.stamp("DOB: 12/31/2000")       #=> "DOB: 06/09/2011"
 ```
 
+It even formats ordinal days!
+
+```ruby
+date.stamp("November 5th")          #=> "June 9th"
+date.stamp("1st of Jan")            #=> "9th of Jun"
+```
+
 ### Times
 
 `Time#stamp` supports the same kinds of examples as `Date`, but also formats
@@ -85,7 +92,7 @@ Time::DATE_FORMATS[:military] = Stamp.strftime_format("23:59")
 To use your formats:
 
 ```ruby
-Date.today.to_s_(:short)  #=> "Sat Jul 16"
+Date.today.to_s(:short)   #=> "Sat Jul 16"
 Time.now.to_s(:military)  #=> "15:35"
 ```
 
@@ -102,7 +109,7 @@ just be passed along:
 
 ```ruby
 Date.today.stamp("Week #%U, 1999") #=> "Week #23, 2011"
-````
+```
 
 Check out [http://strfti.me](http://strfti.me) for more ideas.
 

data/features/stamp.feature

@@ -9,7 +9,6 @@ Feature: Stamping a date
     Given the date September 8, 2011
     When I stamp the example "<example>"
     Then I produce "<output>"
-      And I like turtles
 
     Examples:
       | example                  | output                       |
@@ -34,12 +33,41 @@ Feature: Stamping a date
       | 1999-12-31               | 2011-09-08                   |
       | DOB: 12-31-1999          | DOB: 09-08-2011              |
 
+  @date
+  Scenario Outline: Formatting dates with ordinal days
+    Given the date <date>
+    When I stamp the example "<example>"
+    Then I produce "<output>"
+
+    Examples:
+      | date         | example           | output               |
+      | Jan 1, 1999  | July 4th          | January 1st          |
+      | Jan 2, 1999  | Dec 3rd           | Jan 2nd              |
+      | Jan 3, 1999  | Dec 2nd           | Jan 3rd              |
+      | Jan 4, 1999  | Jul 1st           | Jan 4th              |
+      | Jan 5, 1999  | Dec 1st           | Jan 5th              |
+      | Jan 6, 1999  | Dec 1st           | Jan 6th              |
+      | Jan 7, 1999  | Dec 1st           | Jan 7th              |
+      | Jan 8, 1999  | Dec 1st           | Jan 8th              |
+      | Jan 9, 1999  | Dec 1st           | Jan 9th              |
+      | Jan 10, 1999 | Dec 1st           | Jan 10th             |
+      | Jan 11, 1999 | Dec 1st           | Jan 11th             |
+      | Jan 12, 1999 | Dec 1st           | Jan 12th             |
+      | Jan 13, 1999 | Dec 1st           | Jan 13th             |
+      | Jan 14, 1999 | Dec 1st           | Jan 14th             |
+      | Jan 20, 1999 | Dec 1st           | Jan 20th             |
+      | Jan 21, 1999 | Dec 1st           | Jan 21st             |
+      | Jan 22, 1999 | Dec 1st           | Jan 22nd             |
+      | Jan 23, 1999 | Dec 1st           | Jan 23rd             |
+      | Jan 24, 1999 | Dec 1st           | Jan 24th             |
+      | Jan 1, 1999  | 4th of July       | 1st of January       |
+      | Jan 1, 1999  | 4th of July, 1999 | 1st of January, 1999 |
+
   @time
   Scenario Outline: Formatting times by example
     Given the time September 8, 2011 at 13:31:27
     When I stamp the example "<example>"
     Then I produce "<output>"
-      And I like turtles
 
     Examples:
       | example     | output      |
@@ -59,7 +87,6 @@ Feature: Stamping a date
     Given the time September 8, 2011 at 13:31:27
     When I stamp the example "<example>"
     Then I produce "<output>"
-      And I like turtles
 
     Examples:
       | example                         | output                            |

data/features/step_definitions/stamp_steps.rb

@@ -1,8 +1,6 @@
 module StampStepHelpers
   def month(month_name)
-    month = Date::MONTHNAMES.index(month_name) || Date::ABBR_MONTHNAMES.index(month_name)
-    assert (1..12).include?(month), "Invalid month: #{month_name}"
-    return month
+    Date::MONTHNAMES.index(month_name) || Date::ABBR_MONTHNAMES.index(month_name)
   end
 end
 World(StampStepHelpers)

data/lib/stamp/translator.rb

@@ -14,10 +14,12 @@ module Stamp
     MERIDIAN_LOWER_REGEXP  = /^(a|p)m$/
     MERIDIAN_UPPER_REGEXP  = /^(A|P)M$/
 
+    ORDINAL_DAY_REGEXP     = /^(\d{1,2})(st|nd|rd|th)$/
+
     # Disambiguate based on value
     OBVIOUS_YEARS          = 60..99
     OBVIOUS_MONTHS         = 12
-    OBVIOUS_DAYS           = 28..31
+    OBVIOUS_DAYS           = 24..31
     OBVIOUS_24_HOUR        = 13..23
 
     TWO_DIGIT_DATE_SUCCESSION = {
@@ -39,6 +41,20 @@ module Stamp
       @target = target_date_or_time
     end
 
+    # Cribbed from ActiveSupport to format ordinal days (1st, 2nd, 23rd etc).
+    def ordinalize(number)
+      if (11..13).include?(number.to_i % 100)
+        "#{number}th"
+      else
+        case number.to_i % 10
+        when 1; "#{number}st"
+        when 2; "#{number}nd"
+        when 3; "#{number}rd"
+        else    "#{number}th"
+        end
+      end
+    end
+
     def translate(example)
       # extract any substrings that look like times, like "23:59" or "8:37 am"
       before, time_example, after = example.partition(TIME_REGEXP)
@@ -115,6 +131,9 @@ module Stamp
       when FOUR_DIGIT_REGEXP
         '%Y'
 
+      when ORDINAL_DAY_REGEXP
+        ordinalize(@target.day)
+
       when TWO_DIGIT_REGEXP
         # try to discern obvious intent based on the example value
         case token.to_i

data/lib/stamp/version.rb

@@ -1,3 +1,3 @@
 module Stamp
-  VERSION = "0.1.6"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,60 +1,57 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: stamp
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 6
-  version: 0.1.6
+version: !ruby/object:Gem::Version
+  version: 0.2.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Jeremy Weiskotten
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-16 00:00:00 -04:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-09-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: cucumber
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-description: Format dates and times based on human-friendly examples, not arcane strftime directives.
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Format dates and times based on human-friendly examples, not arcane strftime
+  directives.
+email:
 - jeremy@weiskotten.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
-- .rvmrc
 - .travis.yml
 - .yardopts
 - Gemfile
@@ -65,46 +62,37 @@ files:
 - cucumber.yml
 - features/stamp.feature
 - features/step_definitions/stamp_steps.rb
-- features/step_definitions/turtle_steps.rb
 - features/support/env.rb
 - lib/stamp.rb
 - lib/stamp/translator.rb
 - lib/stamp/version.rb
 - stamp.gemspec
-has_rdoc: true
 homepage: https://github.com/jeremyw/stamp
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Date and time formatting for humans.
-test_files: 
+test_files:
 - features/stamp.feature
 - features/step_definitions/stamp_steps.rb
-- features/step_definitions/turtle_steps.rb
 - features/support/env.rb
+has_rdoc: 

data/.rvmrc

@@ -1 +0,0 @@
-rvm use 1.9.2@stamp

data/features/step_definitions/turtle_steps.rb

@@ -1,5 +0,0 @@
-# http://www.youtube.com/watch?v=CMNry4PE93Y
-Then /^I like turtles$/ do
-  turtles_are_awesome = true
-  assert turtles_are_awesome
-end