stamp 0.1.2 → 0.1.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    stamp (0.1.2)
+    stamp (0.1.3)
 
 GEM
   remote: http://rubygems.org/

data/README.md

@@ -1,6 +1,6 @@
 # stamp
 
-Format dates (and times, soon) based on human-friendly examples, not arcane
+Format dates and times based on human-friendly examples, not arcane
 strftime directives.
 
 [![Build Status](http://travis-ci.org/jeremyw/stamp.png)](http://travis-ci.org/jeremyw/stamp)
@@ -65,7 +65,9 @@ future understand your intent.
 ### Limitations
 
 * Time zone support hasn't been implemented. Patches welcome!
-* DateTime support hasn't been implemented. Patches welcome!
+* DateTime should inherit stamp behavior from Date, but it hasn't been thoroughly tested. Patches welcome!
+
+### Advanced Usage
 
 If you need more obscure formatting options, you can include any valid
 [strftime](http://strfti.me) directives in your example string, and they'll
@@ -75,7 +77,7 @@ just be passed along:
 Date.today.stamp("Week #%U, 1999")         # "Week #23, 2011"
 ````
 
-[Check out http://strfti.me](http://strfti.me) for more ideas.
+Check out [http://strfti.me](http://strfti.me) for more ideas.
 
 ## Contributing to stamp
 

data/features/stamp.feature

@@ -6,34 +6,33 @@ Feature: Stamping a date
 
   @date
   Scenario Outline: Formatting dates by example
-    Given the date October 9, 2011
+    Given the date September 8, 2011
     When I stamp the example "<example>"
     Then I produce "<output>"
     And I like turtles
 
     Examples:
       | example                  | output                   |
-      | January                  | October                  |
-      | Jan                      | Oct                      |
-      | Jan 1                    | Oct  9                   |
-      | Jan 01                   | Oct 09                   |
-      | Jan 10                   | Oct 09                   |
-      | Jan 1, 1999              | Oct  9, 2011             |
-      | Monday                   | Sunday                   |
-      | Mon                      | Sun                      |
-      | Tue, Jan 1               | Sun, Oct  9              |
-      | Tuesday, January 1, 1999 | Sunday, October  9, 2011 |
-      | 01/1999                  | 10/2011                  |
-      | 01/01                    | 10/09                    |
-      | 01/31                    | 10/09                    |
-      | 01/99                    | 10/11                    |
-      | 01/01/1999               | 10/09/2011               |
-      | 12/31/99                 | 10/09/11                 |
-      | 31/12                    | 09/10                    |
-      | 31/12/99                 | 09/10/11                 |
-      | 31-Jan-1999              | 09-Oct-2011              |
-      | 1999-12-31               | 2011-10-09               |
-      | DOB: 12-31-1999          | DOB: 10-09-2011          |
+      | January                  | September                |
+      | Jan                      | Sep                      |
+      | Jan 1                    | Sep  8                   |
+      | Jan 01                   | Sep 08                   |
+      | Jan 10                   | Sep 08                   |
+      | Jan 1, 1999              | Sep  8, 2011             |
+      | Monday                   | Thursday                 |
+      | Tue, Jan 1               | Thu, Sep  8              |
+      | Tuesday, January 1, 1999 | Thursday, September  8, 2011 |
+      | 01/1999                  | 09/2011                  |
+      | 01/01                    | 09/08                    |
+      | 01/31                    | 09/08                    |
+      | 01/99                    | 09/11                    |
+      | 01/01/1999               | 09/08/2011               |
+      | 12/31/99                 | 09/08/11                 |
+      | 31/12                    | 08/09                    |
+      | 31/12/99                 | 08/09/11                 |
+      | 31-Jan-1999              | 08-Sep-2011              |
+      | 1999-12-31               | 2011-09-08               |
+      | DOB: 12-31-1999          | DOB: 09-08-2011          |
 
   @time
   Scenario Outline: Formatting times by example
@@ -54,15 +53,17 @@ Feature: Stamping a date
       | 08:59:59 PM | 01:31:27 PM |
       | 23:59:59    | 13:31:27    |
 
+
   Scenario: strftime directives just get passed through
     Given the date December 21, 2012
     When I stamp the example "John Cusack was in a movie about %b %d, %Y, but it wasn't very good."
     Then I produce "John Cusack was in a movie about Dec 21, 2012, but it wasn't very good."
 
+
   Scenario: Plain text just gets passed through
-    Given the date December 9, 2011
-    When I stamp the example "Just some plain old text."
-    Then I produce "Just some plain old text."
+    Given the date June 1, 1926
+    When I stamp the example "Marilyn Monroe was born on January 1, 1999."
+    Then I produce "Marilyn Monroe was born on June  1, 1926."
 
 
   @wip

data/lib/stamp.rb

@@ -3,148 +3,144 @@ require "date"
 require "time"
 
 module Stamp
-  def self.included(klass)
-    klass.class_eval do
-      include InstanceMethods
-    end
+  MONTHNAMES_REGEXP      = /^(#{Date::MONTHNAMES.compact.join('|')})$/i
+  ABBR_MONTHNAMES_REGEXP = /^(#{Date::ABBR_MONTHNAMES.compact.join('|')})$/i
+  DAYNAMES_REGEXP        = /^(#{Date::DAYNAMES.join('|')})$/i
+  ABBR_DAYNAMES_REGEXP   = /^(#{Date::ABBR_DAYNAMES.join('|')})$/i
+
+  ONE_DIGIT_REGEXP       = /^\d{1}$/
+  TWO_DIGIT_REGEXP       = /^\d{2}$/
+  FOUR_DIGIT_REGEXP      = /^\d{4}$/
+
+  TIME_REGEXP            = /^(\d{1,2})(:)(\d{2})(\s*)(:)?(\d{2})?(\s*)?([ap]m)?$/i
+
+  MERIDIAN_LOWER_REGEXP  = /^(a|p)m$/
+  MERIDIAN_UPPER_REGEXP  = /^(A|P)M$/
+
+  # Disambiguate based on value
+  OBVIOUS_YEARS          = 60..99
+  OBVIOUS_MONTHS         = 12
+  OBVIOUS_DAYS           = 28..31
+  OBVIOUS_24_HOUR        = 13..23
+
+  TWO_DIGIT_DATE_SUCCESSION = {
+    '%m' => '%d',
+    '%b' => '%d',
+    '%B' => '%d',
+    '%d' => '%y',
+    '%e' => '%y'
+  }
+
+  TWO_DIGIT_TIME_SUCCESSION = {
+    '%H' => '%M',
+    '%I' => '%M',
+    '%l' => '%M',
+    '%M' => '%S'
+  }
+
+
+  def stamp(example)
+    strftime(strftime_format(example))
   end
 
-  module InstanceMethods
-
-    MONTHNAMES_REGEXP      = /(#{Date::MONTHNAMES.compact.join('|')})/i
-    ABBR_MONTHNAMES_REGEXP = /(#{Date::ABBR_MONTHNAMES.compact.join('|')})/i
-    DAYNAMES_REGEXP        = /(#{Date::DAYNAMES.join('|')})/i
-    ABBR_DAYNAMES_REGEXP   = /(#{Date::ABBR_DAYNAMES.join('|')})/i
-
-    ONE_DIGIT_REGEXP       = /\d{1}/
-    TWO_DIGIT_REGEXP       = /\d{2}/
-    FOUR_DIGIT_REGEXP      = /\d{4}/
-
-    TIME_REGEXP            = /(\d{1,2})(:)(\d{2})(\s*)(:)?(\d{2})?(\s*)?([ap]m)?/i
 
-    MERIDIAN_LOWER_REGEXP  = /(a|p)m/
-    MERIDIAN_UPPER_REGEXP  = /(A|P)M/
+  private
 
-    # Disambiguate based on value
-    OBVIOUS_YEARS          = 60..99
-    OBVIOUS_MONTHS         = 12
-    OBVIOUS_DAYS           = 28..31
-    OBVIOUS_24_HOUR        = 13..23
+  # Transforms the given string with example dates/times to a format string
+  # suitable for strftime.
+  def strftime_format(example)
+    # extract any substrings that look like times, like "23:59" or "8:37 am"
+    before, time_example, after = example.partition(TIME_REGEXP)
 
-    TWO_DIGIT_DATE_SUCCESSION = {
-      '%m' => '%d',
-      '%b' => '%d',
-      '%B' => '%d',
-      '%d' => '%y',
-      '%e' => '%y'
-    }
-
-    TWO_DIGIT_TIME_SUCCESSION = {
-      '%H' => '%M',
-      '%I' => '%M',
-      '%l' => '%M',
-      '%M' => '%S'
-    }
-
-
-    def stamp(example)
-      strftime(strftime_format(example))
+    # transform any date tokens to strftime directives
+    words = strftime_directives(before.split(/\b/)) do |token, previous_directive|
+      strftime_date_directive(token, previous_directive)
     end
 
-
-    private
-
-    # Transforms the given string with example dates/times to a format string
-    # suitable for strftime.
-    def strftime_format(example)
-      # extract any substrings that look like times, like "23:59" or "8:37 am"
-      before, time_example, after = example.partition(TIME_REGEXP)
-
-      # transform any date tokens to strftime directives
-      words = strftime_directives(before.split(/\b/)) do |token, previous_directive|
-        strftime_date_directive(token, previous_directive)
+    # transform the example time string to strftime directives
+    unless time_example.empty?
+      time_parts = time_example.scan(TIME_REGEXP).first
+      words += strftime_directives(time_parts) do |token, previous_directive|
+        strftime_time_directive(token, previous_directive)
       end
-
-      # transform the example time string to strftime directives
-      unless time_example.empty?
-        time_parts = time_example.scan(TIME_REGEXP).first
-        words += strftime_directives(time_parts) do |token, previous_directive|
-          strftime_time_directive(token, previous_directive)
-        end
-      end
-
-      # recursively process any remaining text
-      words << strftime_format(after) unless after.empty?
-      words.join
     end
 
-    # Transforms tokens that look like date/time parts to strftime directives.
-    def strftime_directives(tokens)
-      previous_directive = nil
-      tokens.map do |token|
-        directive = yield(token, previous_directive)
-        previous_directive = directive unless directive.nil?
-        directive || token
-      end
+    # recursively process any remaining text
+    words << strftime_format(after) unless after.empty?
+    words.join
+  end
+
+  # Transforms tokens that look like date/time parts to strftime directives.
+  def strftime_directives(tokens)
+    previous_directive = nil
+    tokens.map do |token|
+      directive = yield(token, previous_directive)
+      previous_directive = directive unless directive.nil?
+      directive || token
     end
+  end
 
-    def strftime_time_directive(token, previous_directive)
-      case token
-      when MERIDIAN_LOWER_REGEXP
+  def strftime_time_directive(token, previous_directive)
+    case token
+    when MERIDIAN_LOWER_REGEXP
+      if RUBY_VERSION =~ /^1.8/ && self.is_a?(Time)
+        # 1.8.7 doesn't implement %P
+        self.strftime("%p").downcase
+      else
         '%P'
-
-      when MERIDIAN_UPPER_REGEXP
-        '%p'
-
-      when TWO_DIGIT_REGEXP
-        TWO_DIGIT_TIME_SUCCESSION[previous_directive] ||
-          case token.to_i
-          when OBVIOUS_24_HOUR
-            '%H' # 24-hour clock
-          else
-            '%I' # 12-hour clock with leading zero
-          end
-
-      when ONE_DIGIT_REGEXP
-        '%l' # hour without leading zero
       end
-    end
-
-    def strftime_date_directive(token, previous_directive)
-      case token
-      when MONTHNAMES_REGEXP
-        '%B'
 
-      when ABBR_MONTHNAMES_REGEXP
-        '%b'
+    when MERIDIAN_UPPER_REGEXP
+      '%p'
 
-      when DAYNAMES_REGEXP
-        '%A'
-
-      when ABBR_DAYNAMES_REGEXP
-        '%a'
-
-      when FOUR_DIGIT_REGEXP
-        '%Y'
-
-      when TWO_DIGIT_REGEXP
-        # try to discern obvious intent based on the example value
+    when TWO_DIGIT_REGEXP
+      TWO_DIGIT_TIME_SUCCESSION[previous_directive] ||
         case token.to_i
-        when OBVIOUS_YEARS
-          '%y'
-        when OBVIOUS_MONTHS
-          '%m'
-        when OBVIOUS_DAYS
-          '%d'
+        when OBVIOUS_24_HOUR
+          '%H' # 24-hour clock
         else
-          # the intent isn't obvious based on the example value, so try to
-          # disambiguate based on context
-          TWO_DIGIT_DATE_SUCCESSION[previous_directive] || '%m'
+          '%I' # 12-hour clock with leading zero
         end
 
-      when ONE_DIGIT_REGEXP
-        '%e' # day without leading zero
+    when ONE_DIGIT_REGEXP
+      '%l' # hour without leading zero
+    end
+  end
+
+  def strftime_date_directive(token, previous_directive)
+    case token
+    when MONTHNAMES_REGEXP
+      '%B'
+
+    when ABBR_MONTHNAMES_REGEXP
+      '%b'
+
+    when DAYNAMES_REGEXP
+      '%A'
+
+    when ABBR_DAYNAMES_REGEXP
+      '%a'
+
+    when FOUR_DIGIT_REGEXP
+      '%Y'
+
+    when TWO_DIGIT_REGEXP
+      # try to discern obvious intent based on the example value
+      case token.to_i
+      when OBVIOUS_YEARS
+        '%y'
+      when OBVIOUS_MONTHS
+        '%m'
+      when OBVIOUS_DAYS
+        '%d'
+      else
+        # the intent isn't obvious based on the example value, so try to
+        # disambiguate based on context
+        TWO_DIGIT_DATE_SUCCESSION[previous_directive] || '%m'
       end
+
+    when ONE_DIGIT_REGEXP
+      '%e' # day without leading zero
     end
   end
 end

data/lib/stamp/version.rb

@@ -1,3 +1,3 @@
 module Stamp
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: stamp
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 29
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Jeremy Weiskotten
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-05 00:00:00 -04:00
+date: 2011-07-14 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -38,6 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -83,6 +86,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -91,13 +95,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Date and time formatting for humans.