stamp 0.0.3 → 0.1.0

data/.travis.yml

@@ -0,0 +1,9 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - ree
+  - rbx
+  - rbx-2.0
+  - jruby
+  - ruby-head
+  - 1.8.6

data/Gemfile.lock

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

data/features/stamp.feature

@@ -1,8 +1,10 @@
+@stamp
 Feature: Stamping a date
   In order to format dates in a more programmer-friendly way
   the stamp method
   formats a date given a human-readable example.
 
+  @date
   Scenario Outline: Formatting dates by example
     Given the date October 9, 2011
     When I stamp the example "<example>"
@@ -33,15 +35,24 @@ Feature: Stamping a date
       | 1999-12-31               | 2011-10-09               |
       | DOB: 12-31-1999          | DOB: 10-09-2011          |
 
-  @wip
-  Scenario Outline: Examples that aren't supported quite yet
-    Given the date October 9, 2011
+  @time
+  Scenario Outline: Formatting times by example
+    Given the time October 9, 2011 at 13:31:27
     When I stamp the example "<example>"
     Then I produce "<output>"
+    And I like turtles
 
     Examples:
-      | example | output |
-      |         |        |
+      | example     | output      |
+      | 8:59 am     | 1:31 pm     |
+      | 8:59am      | 1:31pm      |
+      | 08:59 AM    | 01:31 PM    |
+      | 08:59 PM    | 01:31 PM    |
+      | 23:59       | 13:31       |
+      | 8:59:59 am  | 1:31:27 pm  |
+      | 08:59:59 AM | 01:31:27 PM |
+      | 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
@@ -52,3 +63,16 @@ Feature: Stamping a date
     Given the date December 9, 2011
     When I stamp the example "Just some plain old text."
     Then I produce "Just some plain old text."
+
+
+  @wip
+  Scenario Outline: Examples that aren't supported yet
+    Given the date October 9, 2011
+    When I stamp the example "<example>"
+    Then I produce "<output>"
+
+    Examples:
+      | example | output |
+      | 8 am    | 1 pm   |
+      | 8am     | 1pm    |
+      | 8AM     | 1PM    |

data/features/step_definitions/stamp_steps.rb

@@ -1,13 +1,24 @@
+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
+  end
+end
+World(StampStepHelpers)
+
 Given /^the date (\w+) (\d+), (\d{4})$/ do |month_name, day, year|
-  month = Date::MONTHNAMES.index(month_name) || Date::ABBR_MONTHNAMES.index(month_name)
-  assert (1..12).include?(month), "Invalid month: #{month_name}"
-  @date = Date.new(year.to_i, month, day.to_i)
+  @target = Date.new(year.to_i, month(month_name), day.to_i)
+end
+
+Given /^the time (\w+) (\d+), (\d+) at (\d{2}):(\d{2}):(\d{2})$/ do |month_name, day, year, hours, minutes, seconds|
+  @target = Time.new(year.to_i, month(month_name), day.to_i, hours.to_i, minutes.to_i, seconds.to_i)
 end
 
 When /^I stamp the example "([^"]*)"$/ do |example|
-  @formatted_date = @date.stamp(example)
+  @stamped = @target.stamp(example)
 end
 
 Then /^I produce "([^"]*)"$/ do |expected|
-  assert_equal expected, @formatted_date
+  assert_equal expected.strip, @stamped.strip
 end

data/lib/stamp.rb

@@ -1,17 +1,14 @@
 require "stamp/version"
 require "date"
+require "time"
 
 module Stamp
   def self.included(klass)
     klass.class_eval do
-      # extend ClassMethods
       include InstanceMethods
     end
   end
 
-  # module ClassMethods
-  # end
-
   module InstanceMethods
 
     MONTHNAMES_REGEXP      = /(#{Date::MONTHNAMES.compact.join('|')})/i
@@ -23,39 +20,98 @@ module Stamp
     TWO_DIGIT_REGEXP       = /\d{2}/
     FOUR_DIGIT_REGEXP      = /\d{4}/
 
-    # DATE_DELIMITER_REGEXP  = /(\/|\-)/ # forward slash or dash
+    TIME_REGEXP            = /(\d{1,2})(:)(\d{2})(\s*)(:)?(\d{2})?(\s*)?([ap]m)?/i
 
-    # OBVIOUS_MINUTES        = 32..59
-    # OBVIOUS_HOURS
-    # OBVIOUS_SECONDS
+    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_directives(example))
+      strftime(strftime_format(example))
     end
 
-    def strftime_directives(example)
-      directives = []
-      previous_directive = nil
 
-      terms = example.split(/\b/)
+    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)
 
-      terms.each_with_index do |term, index|
-        directive = strftime_directive(term, previous_directive)
-        directives << (directive || term)
+      # transform any date tokens to strftime directives
+      words = strftime_directives(before.split(/\b/)) do |token, previous_directive|
+        strftime_date_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
+    end
+
+    def strftime_time_directive(token, previous_directive)
+      case token
+      when MERIDIAN_LOWER_REGEXP
+        '%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
 
-      directives.join
+      when ONE_DIGIT_REGEXP
+        '%l' # hour without leading zero
+      end
     end
-    private :strftime_directives
 
-    def strftime_directive(term, previous_directive=nil)
-      case term
+    def strftime_date_directive(token, previous_directive)
+      case token
       when MONTHNAMES_REGEXP
         '%B'
 
@@ -73,7 +129,7 @@ module Stamp
 
       when TWO_DIGIT_REGEXP
         # try to discern obvious intent based on the example value
-        case term.to_i
+        case token.to_i
         when OBVIOUS_YEARS
           '%y'
         when OBVIOUS_MONTHS
@@ -83,22 +139,16 @@ module Stamp
         else
           # the intent isn't obvious based on the example value, so try to
           # disambiguate based on context
-          case previous_directive
-          when '%m', '%b', '%B' # a month
-            '%d' # day with leading zero
-          when '%d', '%e'       # a day
-            '%y' # two-digit year
-          else
-            '%m' # month
-          end
+          TWO_DIGIT_DATE_SUCCESSION[previous_directive] || '%m'
         end
 
       when ONE_DIGIT_REGEXP
         '%e' # day without leading zero
       end
     end
-    private :strftime_directive
   end
 end
 
-Date.send(:include, ::Stamp)
+
+Date.send(:include, ::Stamp)
+Time.send(:include, ::Stamp)

data/lib/stamp/version.rb

@@ -1,3 +1,3 @@
 module Stamp
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 3
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - Jeremy Weiskotten
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-30 00:00:00 -04:00
+date: 2011-07-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -55,6 +55,7 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - .rvmrc
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt