clever_duration 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/clever_duration.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{clever_duration}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ilya Sabanin"]
-  s.date = %q{2010-04-02}
+  s.date = %q{2010-10-16}
   s.description = %q{A tiny Ruby lib for parsing human format of time duration to numbers.}
   s.email = %q{ilya.sabanin@gmail.com}
   s.extra_rdoc_files = [
@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/iSabanin/clever_duration}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Human format time duration parsing.}
   s.test_files = [
     "test/helper.rb",
@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<shoulda>, [">= 0"])
     else
       s.add_dependency(%q<shoulda>, [">= 0"])

data/lib/clever_duration/clever_duration.rb

@@ -17,6 +17,8 @@ class CleverDuration
   def seconds
     if colon_format?
       regular_format_to_seconds
+    elsif decimal_format?
+      decimal_format_to_seconds
     else
       tokens_to_seconds
     end
@@ -25,7 +27,11 @@ class CleverDuration
 private
 
   def colon_format?
-    !!(input =~ /[:\.]/)
+    !!(input =~ /:/)
+  end
+  
+  def decimal_format?
+    !!(input =~ /\./)
   end
   
   def tokens
@@ -33,9 +39,15 @@ private
   end
   
   def regular_format_to_seconds
-    hours, minutes = *input.scan(/(\d{0,2})[:\.](\d{0,2})/).flatten
+    hours, minutes = *input.scan(/(\d{0,2}):(\d{0,2})/).flatten
     (hours.to_i * 60 * 60) + (minutes.to_i * 60)
   end
+  
+  def decimal_format_to_seconds
+    hours, decimal = *input.scan(/(\d{0,2})\.(\d{0,2})/).flatten
+    minutes = ("0.#{decimal}".to_f * 60) / 1
+    (hours.to_i * 60 * 60) + (minutes * 60)
+  end
 
   def tokens_to_seconds
     seconds = 0

data/test/test_clever_duration.rb

@@ -49,12 +49,16 @@ class CleverDurationTest < Test::Unit::TestCase
       assert_equal 10, duration(":10").minutes
     end
     
-    should "translate dot" do
+    should "translate decimal" do
       assert_equal 3, duration("3.00").hours
       assert_equal 4, duration("04.00").hours
-      assert_equal 30, duration("0.30").minutes
-      assert_equal 2.5, duration("2.30").hours
-      assert_equal 10, duration(".10").minutes
+      assert_equal 18, duration("0.30").minutes
+      assert_equal 138, duration("2.30").minutes
+      assert_equal 2.3, duration("2.30").hours
+      assert_equal 6, duration(".10").minutes
+      assert_equal 30, duration(".50").minutes
+      assert_equal 1.5, duration("1.5").hours
+      assert_equal 90, duration("1.5").minutes
     end
     
     should "translate compounds" do

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: clever_duration
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  hash: 25
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Ilya Sabanin
@@ -9,19 +15,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-02 00:00:00 +08:00
+date: 2010-10-16 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id001
 description: A tiny Ruby lib for parsing human format of time duration to numbers.
 email: ilya.sabanin@gmail.com
 executables: []
@@ -53,21 +63,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Human format time duration parsing.