stamp 0.2.0 → 0.3.0

data/.travis.yml

@@ -5,4 +5,3 @@ rvm:
   - ree
   - rbx
   - jruby
-  - ruby-head

data/Gemfile

@@ -1,3 +1,8 @@
 source "http://rubygems.org"
 
 gemspec
+
+group :development do
+  gem 'cucumber'
+  gem 'rake'
+end

data/Gemfile.lock

@@ -1,19 +1,19 @@
 PATH
   remote: .
   specs:
-    stamp (0.2.0)
+    stamp (0.3.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    builder (3.0.0)
+    builder (3.1.4)
     cucumber (1.2.1)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.3)
       gherkin (~> 2.11.0)
       json (>= 1.4.6)
     diff-lcs (1.1.3)
-    gherkin (2.11.2)
+    gherkin (2.11.5)
       json (>= 1.4.6)
     json (1.7.5)
     rake (0.9.2.2)

data/README.md

@@ -3,7 +3,7 @@
 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)
+[![Build Status](https://secure.travis-ci.org/jeremyw/stamp.png)](http://travis-ci.org/jeremyw/stamp)
 
 ## Installation
 
@@ -13,6 +13,13 @@ Just `gem install stamp`, or add stamp to your Gemfile and `bundle install`.
 
 Your Ruby dates and times get a powerful new method: `stamp`.
 
+You might be concerned that "stamp" isn't descriptive enough for developers
+reading your code who aren't familiar with this gem. If that's the case, the
+following aliases are available:
+
+* `stamp_like`
+* `format_like`
+
 ### Dates
 
 Give `Date#stamp` an example date string with whatever month, day, year,
@@ -69,15 +76,6 @@ January 2009. More explicit examples include "12/31", "31/12", and "12/99".
 Using unambiguous values will also help people who read the code in the
 future understand your intent.
 
-### Aliases
-
-You might be concerned that the method name "stamp" isn't descriptive enough
-for developers reading your code who aren't familiar with this gem. If that's
-the case, the following aliases are available:
-
-* `stamp_like`
-* `format_like`
-
 ### Rails Integration
 
 Stamp makes it easy to configure your application's common date and time

data/features/stamp.feature

@@ -18,6 +18,8 @@ Feature: Stamping a date
       | Jan 01                   | Sep 08                       |
       | Jan 10                   | Sep 08                       |
       | Jan 1, 1999              | Sep  8, 2011                 |
+      | Jan 12, 1999             | Sep 08, 2011                 |
+      | 13 January 1999          | 08 September 2011            |
       | Monday                   | Thursday                     |
       | Tue, Jan 1               | Thu, Sep  8                  |
       | Tuesday, January 1, 1999 | Thursday, September  8, 2011 |

data/lib/stamp/translator.rb

@@ -19,22 +19,24 @@ module Stamp
     # Disambiguate based on value
     OBVIOUS_YEARS          = 60..99
     OBVIOUS_MONTHS         = 12
-    OBVIOUS_DAYS           = 24..31
+    OBVIOUS_DAYS           = 13..31
     OBVIOUS_24_HOUR        = 13..23
 
+    OBVIOUS_DATE_MAP = {
+      OBVIOUS_YEARS  => '%y',
+      OBVIOUS_MONTHS => '%m',
+      OBVIOUS_DAYS   => '%d'
+    }
+
     TWO_DIGIT_DATE_SUCCESSION = {
-      '%m' => '%d',
-      '%b' => '%d',
-      '%B' => '%d',
-      '%d' => '%y',
-      '%e' => '%y'
+      :month => '%d',
+      :day   => '%y',
+      :year  => '%m'
     }
 
     TWO_DIGIT_TIME_SUCCESSION = {
-      '%H' => '%M',
-      '%I' => '%M',
-      '%l' => '%M',
-      '%M' => '%S'
+      :hour   => '%M',
+      :minute => '%S'
     }
 
     def initialize(target_date_or_time)
@@ -60,15 +62,15 @@ module Stamp
       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)
+      words = strftime_directives(before.split(/\b/)) do |token, previous_part|
+        strftime_date_directive(token, previous_part)
       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)
+        words += strftime_directives(time_parts) do |token, previous_part|
+          strftime_time_directive(token, previous_part)
         end
       end
 
@@ -77,17 +79,35 @@ module Stamp
       words.join
     end
 
+    # Returns symbolic date part for given strftime directive.
+    def date_part(strftime_directive)
+      case strftime_directive
+      when '%b', '%B', '%m'
+        :month
+      when '%d', '%e'
+        :day
+      when '%y', '%Y'
+        :year
+      when '%H', '%I', '%l'
+        :hour
+      when '%M'
+        :minute
+      when '%S'
+        :second
+      end
+    end
+
     # Transforms tokens that look like date/time parts to strftime directives.
     def strftime_directives(tokens)
-      previous_directive = nil
+      previous_part = nil
       tokens.map do |token|
-        directive = yield(token, previous_directive)
-        previous_directive = directive unless directive.nil?
+        directive = yield(token, previous_part)
+        previous_part = date_part(directive) unless directive.nil?
         directive || token
       end
     end
 
-    def strftime_time_directive(token, previous_directive)
+    def strftime_time_directive(token, previous_part)
       case token
       when MERIDIAN_LOWER_REGEXP
         if RUBY_VERSION =~ /^1.8/ && @target.is_a?(Time)
@@ -101,7 +121,7 @@ module Stamp
         '%p'
 
       when TWO_DIGIT_REGEXP
-        TWO_DIGIT_TIME_SUCCESSION[previous_directive] ||
+        TWO_DIGIT_TIME_SUCCESSION[previous_part] ||
           case token.to_i
           when OBVIOUS_24_HOUR
             '%H' # 24-hour clock
@@ -114,7 +134,7 @@ module Stamp
       end
     end
 
-    def strftime_date_directive(token, previous_directive)
+    def strftime_date_directive(token, previous_part)
       case token
       when MONTHNAMES_REGEXP
         '%B'
@@ -135,20 +155,21 @@ module Stamp
         ordinalize(@target.day)
 
       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'
+        value = token.to_i
+
+        obvious_mappings =
+          OBVIOUS_DATE_MAP.reject { |k,v| date_part(v) == previous_part }
+
+        obvious_directive = obvious_mappings.find do |range, directive|
+          break directive if range === value
         end
 
+        # if the intent isn't obvious based on the example value, try to
+        # disambiguate based on context
+        obvious_directive ||
+          TWO_DIGIT_DATE_SUCCESSION[previous_part] ||
+          '%m'
+
       when ONE_DIGIT_REGEXP
         '%e' # day without leading zero
       end

data/lib/stamp/version.rb

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

data/stamp.gemspec

@@ -12,10 +12,7 @@ Gem::Specification.new do |s|
   s.description = %Q{Format dates and times based on human-friendly examples, not arcane strftime directives.}
 
   s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.test_files    = `git ls-files -- features/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
-
-  s.add_development_dependency "cucumber"
-  s.add_development_dependency "rake"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stamp
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,40 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-01 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    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
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+date: 2012-10-30 00:00:00.000000000 Z
+dependencies: []
 description: Format dates and times based on human-friendly examples, not arcane strftime
   directives.
 email:
@@ -79,15 +47,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3229657831275162604
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -3229657831275162604
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Date and time formatting for humans.
@@ -95,4 +69,3 @@ test_files:
 - features/stamp.feature
 - features/step_definitions/stamp_steps.rb
 - features/support/env.rb
-has_rdoc: