pretty_time 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/pretty_time/pretty_time.rb

@@ -37,14 +37,14 @@ class PrettyTime
 
   # Creates a new configuration instance
   def self.config
-    @config ||= PrettyTime::Configuration.new    
+    @config ||= PrettyTime::Configuration.new
   end
-  
+
   # Parent Class for unit's of time
   # for exaple: Hours, Minutes and Seconds
   class UnitOfTime
     attr_accessor :value
-    
+
     def initialize(value)
       @value = value
     end
@@ -212,15 +212,16 @@ class PrettyTime
       #   match_it("4 hrs 1 min")
       #
       def match_it(time_as_pretty_string)
-        /^(\d+) (hours?) (\d+) (minutes?) (\d+) (seconds?)/.match(time_as_pretty_string) ||
-        /^(\d+) (hours?) (\d+) (minutes?)/.match(time_as_pretty_string) ||
-        /^(\d+) (minutes?) (\d+) (seconds?)/.match(time_as_pretty_string) ||
-        /^(\d+) (hours?) (\d+) (seconds?)/.match(time_as_pretty_string) ||
+        /^(\d+) (hours?|hrs?|h) (\d+) (minutes?|mins?|m) (\d+) (seconds?|secs?|s)/.match(time_as_pretty_string) ||
+        /^(\d+) (hours?|hrs?|h) (\d+) (minutes?|mins?|m)/.match(time_as_pretty_string) ||
+        /^(\d+) (minutes?|mins?|m) (\d+) (seconds?|secs?|s)/.match(time_as_pretty_string) ||
+        /^(\d+) (hours?|hrs?|h) (\d+) (seconds?|secs?|s)/.match(time_as_pretty_string) ||
+
         /^(\d+)( h| m| s)/.match(time_as_pretty_string) ||
         /^(\d+)( hours?| minutes?| seconds?)/.match(time_as_pretty_string)  ||
         /^(\d+)( hrs?| mins?| secs?)/.match(time_as_pretty_string)
       end
-      
+
     alias :has_hours? :non_zero?
     alias :has_minutes? :non_zero?
     alias :has_seconds? :non_zero?

data/pretty_time.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pretty_time}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Anuj Dutta"]
-  s.date = %q{2011-05-15}
+  s.date = %q{2011-05-29}
   s.description = %q{Serializes time to pretty time string and vica-versa}
   s.email = %q{anuj@andhapp.com}
   s.extra_rdoc_files = [

data/spec/pretty_time/pretty_time_spec.rb

@@ -4,108 +4,216 @@ describe "PrettyTime" do
 
   context "On request to #dump" do
 
-    it 'should convert A hours to X seconds' do
-      PrettyTime.dump("4 hours").should == 4.hours.to_i
-    end
+    context "with hours, minutes and seconds as suffixes" do
+      it 'should convert A hours to X seconds' do
+        PrettyTime.dump("4 hours").should == 4.hours.to_i
+      end
 
-    it 'should convert B minutes to X seconds' do
-      PrettyTime.dump("40 minutes").should == 40.minutes.to_i
-    end
+      it 'should convert B minutes to X seconds' do
+        PrettyTime.dump("40 minutes").should == 40.minutes.to_i
+      end
 
-    it 'should return X seconds as X seconds' do
-      PrettyTime.dump("40 seconds").should == 40
-    end
+      it 'should return X seconds as X seconds' do
+        PrettyTime.dump("40 seconds").should == 40
+      end
 
-    it 'should convert A hours B minutes to X seconds' do
-      PrettyTime.dump("4 hours 40 minutes").should == 4.hours.to_i + 40.minutes.to_i
-    end
+      it 'should convert A hours B minutes to X seconds' do
+        PrettyTime.dump("4 hours 40 minutes").should == 4.hours.to_i + 40.minutes.to_i
+      end
 
-    it 'should convert B minutes C seconds to X seconds' do
-      PrettyTime.dump("40 minutes 30 seconds").should == 40.minutes.to_i + 30
-    end
+      it 'should convert B minutes C seconds to X seconds' do
+        PrettyTime.dump("40 minutes 30 seconds").should == 40.minutes.to_i + 30
+      end
 
-    it 'should convert A hours C seconds to X seconds' do
-      PrettyTime.dump("4 hours 30 seconds").should == 4.hours.to_i + 30
-    end
+      it 'should convert A hours C seconds to X seconds' do
+        PrettyTime.dump("4 hours 30 seconds").should == 4.hours.to_i + 30
+      end
 
-    it 'should convert A hours B minutes C seconds to X seconds' do
-      PrettyTime.dump("4 hours 40 minutes 30 seconds").should == 4.hours.to_i + 40.minutes.to_i + 30
+      it 'should convert A hours B minutes C seconds to X seconds' do
+        PrettyTime.dump("4 hours 40 minutes 30 seconds").should == 4.hours.to_i + 40.minutes.to_i + 30
+      end
     end
 
-    it 'should convert A hrs to X seconds' do
-      PrettyTime.dump("4 hrs").should == 4.hours.to_i    
-    end
+    context "with hrs, mins and secs as suffixes" do
+      it 'should convert A hrs to X seconds' do
+        PrettyTime.dump("4 hrs").should == 4.hours.to_i    
+      end
 
-    it 'should convert B mins to X seconds' do
-      PrettyTime.dump("4 mins").should == 4.minutes.to_i
-    end
-    
-    it 'should convert C secs to X seconds' do
-      PrettyTime.dump("4 secs").should == 4
-    end
+      it 'should convert B mins to X seconds' do
+        PrettyTime.dump("4 mins").should == 4.minutes.to_i
+      end
 
-    it 'should convert A h to X seconds' do
-      PrettyTime.dump("4 h").should == 4.hours.to_i    
-    end
+      it 'should convert C secs to X seconds' do
+        PrettyTime.dump("4 secs").should == 4
+      end
 
-    it 'should convert B m to X seconds' do
-      PrettyTime.dump("4 m").should == 4.minutes.to_i
-    end
-    
-    it 'should convert C s to X seconds' do
-      PrettyTime.dump("4 s").should == 4
+      it 'should convert A hrs B mins to X seconds' do
+        PrettyTime.dump("4 hrs 40 mins").should == 4.hours.to_i + 40.minutes.to_i
+      end
+
+      it 'should convert B mins C secs to X seconds' do
+        PrettyTime.dump("4 mins 40 secs").should == 4.minutes.to_i + 40
+      end
+
+      it 'should convert A hrs C secs to X seconds' do
+        PrettyTime.dump("4 hrs 40 secs").should == 4.hours.to_i + 40
+      end
+
+      it 'should convert A hrs B mins C secs to X seconds' do
+        PrettyTime.dump("4 hrs 40 mins 30 secs").should == 4.hours.to_i + 40.minutes.to_i + 30
+      end
     end
-    
-    context "with fence post cases" do
 
-      it 'should convert 1 hour to 3600 seconds' do
-        PrettyTime.dump("1 hour").should == 3600
+    context "with h, m and s as suffixes" do
+      it 'should convert A h to X seconds' do
+        PrettyTime.dump("4 h").should == 4.hours.to_i
       end
 
-      it 'should convert 1 minute to 60 seconds' do
-        PrettyTime.dump("1 minute").should == 60
+      it 'should convert B m to X seconds' do
+        PrettyTime.dump("4 m").should == 4.minutes.to_i
       end
 
-      it 'should return 1 second as 1 second' do
-        PrettyTime.dump("1 second").should == 1
+      it 'should convert C s to X seconds' do
+        PrettyTime.dump("4 s").should == 4
       end
 
-      it 'should convert 1 hour 1 minute to 3660 seconds' do
-        PrettyTime.dump("1 hour 1 minute").should == 3660
+      it 'should convert A h B m to X seconds' do
+        PrettyTime.dump("4 h 40 m").should == 4.hours.to_i + 40.minutes.to_i
       end
 
-      it 'should convert 1 minute 1 second to 61 seconds' do
-        PrettyTime.dump("1 minute 1 second").should == 61
+      it 'should convert B m C s to X seconds' do
+        PrettyTime.dump("4 m 40 s").should == 4.minutes.to_i + 40
       end
 
-      it 'should convert 1 hour 1 minute 1 second to 3661 seconds' do
-        PrettyTime.dump("1 hour 1 minute 1 second").should == 3661
+      it 'should convert A h C s to X seconds' do
+        PrettyTime.dump("4 h 40 s").should == 4.hours.to_i + 40
       end
 
-      it 'should convert 1 hr to 3600 seconds' do
-        PrettyTime.dump("1 hr").should == 1.hours.to_i    
+      it 'should convert A h B m C s to X seconds' do
+        PrettyTime.dump("4 h 40 m 30 s").should == 4.hours.to_i + 40.minutes.to_i + 30
       end
+    end
 
-      it 'should convert 1 min to 60 seconds' do
-        PrettyTime.dump("1 min").should == 1.minutes.to_i
+    context "with mix-n-match suffixes like A hours B mins | A hrs B minutes" do
+      it 'should convert A hrs B minutes to X seconds' do
+        PrettyTime.dump("4 hrs 40 minutes").should == 4.hours.to_i + 40.minutes.to_i
       end
-      
-      it 'should convert 1 sec to 1 second' do
-        PrettyTime.dump("1 sec").should == 1
+
+      it 'should convert A hrs B m to X seconds' do
+        PrettyTime.dump("4 hrs 40 m").should == 4.hours.to_i + 40.minutes.to_i
       end
 
-      it 'should convert 1 hr to 3600 seconds' do
-        PrettyTime.dump("1 h").should == 1.hours.to_i    
+      it 'should convert A h B minutes to X seconds' do
+        PrettyTime.dump("4 h 40 minutes").should == 4.hours.to_i + 40.minutes.to_i
       end
+    end
+
+    context "with fence post cases" do
+
+      context "with hour, minute and second as suffixes" do
+        it 'should convert 1 hour to 3600 seconds' do
+          PrettyTime.dump("1 hour").should == 3600
+        end
 
-      it 'should convert 1 min to 60 seconds' do
-        PrettyTime.dump("1 m").should == 1.minutes.to_i
+        it 'should convert 1 minute to 60 seconds' do
+          PrettyTime.dump("1 minute").should == 60
+        end
+
+        it 'should return 1 second as 1 second' do
+          PrettyTime.dump("1 second").should == 1
+        end
+
+        it 'should convert 1 hour 1 minute to 3660 seconds' do
+          PrettyTime.dump("1 hour 1 minute").should == 3660
+        end
+
+        it 'should convert 1 minute 1 second to 61 seconds' do
+          PrettyTime.dump("1 minute 1 second").should == 61
+        end
+
+        it 'should convert 1 hour 1 second to 3601 seconds' do
+          PrettyTime.dump("1 hour 1 second").should == 3601
+        end
+
+        it 'should convert 1 hour 1 minute 1 second to 3661 seconds' do
+          PrettyTime.dump("1 hour 1 minute 1 second").should == 3661
+        end
       end
       
-      it 'should convert 1 sec to 1 second' do
-        PrettyTime.dump("1 s").should == 1
+      context "with hr, min and sec as suffixes" do
+        it 'should convert 1 hr to 3600 seconds' do
+          PrettyTime.dump("1 hr").should == 1.hours.to_i    
+        end
+
+        it 'should convert 1 min to 60 seconds' do
+          PrettyTime.dump("1 min").should == 1.minutes.to_i
+        end
+      
+        it 'should convert 1 sec to 1 second' do
+          PrettyTime.dump("1 sec").should == 1
+        end
+
+        it 'should convert 1 hr 1 min to 3660 seconds' do
+          PrettyTime.dump("1 hr 1 min").should == 3660
+        end
+
+        it 'should convert 1 min 1 sec to 61 seconds' do
+          PrettyTime.dump("1 min 1 sec").should == 61
+        end
+
+        it 'should convert 1 hr 1 sec to 3601 seconds' do
+          PrettyTime.dump("1 hr 1 sec").should == 3601
+        end
+
+        it 'should convert 1 hr 1 min 1 sec to 3661 seconds' do
+          PrettyTime.dump("1 hr 1 min 1 sec").should == 3661
+        end
       end
+
+      context "with h, m and s as suffixes" do
+        it 'should convert 1 h to 3600 seconds' do
+          PrettyTime.dump("1 h").should == 1.hours.to_i    
+        end
+
+        it 'should convert 1 m to 60 seconds' do
+          PrettyTime.dump("1 m").should == 1.minutes.to_i
+        end
       
+        it 'should convert 1 s to 1 second' do
+          PrettyTime.dump("1 s").should == 1
+        end
+
+        it 'should convert 1 h 1 m to 3660 seconds' do
+          PrettyTime.dump("1 h 1 m").should == 3660
+        end
+
+        it 'should convert 1 m 1 s to 61 seconds' do
+          PrettyTime.dump("1 m 1 s").should == 61
+        end
+
+        it 'should convert 1 h 1 s to 3601 seconds' do
+          PrettyTime.dump("1 h 1 s").should == 3601
+        end
+
+        it 'should convert 1 h 1 m 1 s to 3661 seconds' do
+          PrettyTime.dump("1 h 1 m 1 s").should == 3661
+        end
+      end
+
+      context "with mix-n-match suffixes like A hours B mins | A hrs B minutes" do
+        it 'should convert 1 hr 10 minutes to 4200 seconds' do
+          PrettyTime.dump("1 hr 10 minutes").should == 1.hours.to_i + 10.minutes.to_i
+        end
+
+        it 'should convert 1 hrs 1 m to X seconds' do
+          PrettyTime.dump("1 hrs 1 m").should == 1.hour.to_i + 1.minute.to_i
+        end
+
+        it 'should convert 1 h 1 minutes to X seconds' do
+          PrettyTime.dump("1 h 1 minutes").should == 1.hour.to_i + 1.minute.to_i
+        end
+      end
+
     end
   end
 
@@ -206,7 +314,7 @@ describe "PrettyTime" do
       end
 
       context "with configuration defined" do
-        
+
         it 'with hours_suffix as hrs and minutes and seconds as default should convert 3610 seconds to 1 hr 10 minutes' do
           PrettyTime.configuration do |config|
             config.hours_suffix = "hrs"
@@ -230,9 +338,9 @@ describe "PrettyTime" do
           end
           PrettyTime.load(2.hours.to_i + 10.minutes.to_i + 1).should == "2 hours 10 minutes 1 sec"
         end
-        
+
       end
-      
+
     end
 
   end

metadata

@@ -2,7 +2,7 @@
 name: pretty_time
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Anuj Dutta
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-15 00:00:00 +01:00
+date: 2011-05-29 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -116,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 423849249
+      hash: -716218381
       segments: 
       - 0
       version: "0"