booster-time_parser 0.0.6 → 0.0.7

data/lib/time_parser.rb

@@ -1,7 +1,7 @@
 require 'time_parser/core_ext'
 
 module TimeParser
-  VERSION = '0.0.6'
+  VERSION = '0.0.7'
 
   MULTIPLIERS = [['seconds',       1],
                  ['minutes',      60],
@@ -22,7 +22,7 @@ module TimeParser
   end
 
   def self.to_days(string = nil)
-    parse(string).to_hours
+    parse(string).to_days
   end
 
   def self.to_weeks(string = nil)
@@ -30,7 +30,7 @@ module TimeParser
   end
 
   def self.parse(string)
-    string ||= ''
+    return if string.nil?
     string.scan(/([\d.]+)\s+(hour|min|sec|day|week)/).collect { 
       |amt, multiplier| multiply(amt, multiplier) }.inject(0.0) { |total, val| total += val; total }
   end

data/tests/time_parser_test.rb

@@ -3,67 +3,67 @@ require File.dirname(__FILE__) + '/test_helper'
 class TimeParserTest < Test::Unit::TestCase
   context "TimeParser Module" do
     test "respond to #to_seconds" do
-      TimeParser.respond_to?(:to_seconds) == true
+      assert TimeParser.respond_to?(:to_seconds) == true
     end
     
     test "respond to #to_minutes" do
-      TimeParser.respond_to?(:to_minutes) == true
+      assert TimeParser.respond_to?(:to_minutes) == true
     end
     
     test "respond to #to_hours" do
-      TimeParser.respond_to?(:to_hours) == true
+      assert TimeParser.respond_to?(:to_hours) == true
     end
     
     test "respond to #to_days" do
-      TimeParser.respond_to?(:to_days) == true
+      assert TimeParser.respond_to?(:to_days) == true
     end
     
     test "respond to #to_weeks" do
-      TimeParser.respond_to?(:to_weeks) == true
+      assert TimeParser.respond_to?(:to_weeks) == true
     end
   end
 
   context "Invalid/Blank Data" do
-    test "invalid should return zero seconds as a float" do
-      TimeParser.to_seconds('2 coconuts') == 0.0
+    test "invalid input should return 0 seconds" do
+      assert TimeParser.to_seconds('2 coconuts') == 0.0
     end 
 
     test "mix of invalid and valid input should return 3600 seconds as a float" do
-      TimeParser.to_seconds('1 hour and 30 coconuts')
+      assert TimeParser.to_seconds('1 hour and 30 coconuts') == 3600.0
     end
 
-    test "no input should return zero seconds as a float" do
-      TimeParser.to_seconds() == 0.0
+    test "no input should return nil" do
+      assert TimeParser.to_seconds() == nil
     end 
   end
 
   context "Conversions" do
     test "'2 hours' should equal '120.0'" do
-      TimeParser.to_minutes('2 hours') == 120.0
+      assert TimeParser.to_minutes('2 hours') == 120.0
     end
 
-    test "'2 hours' should equal '0.08'" do
-      TimeParser.to_days('2 hours') == 0.08
+    test "'24 hours' should equal '1.0'" do
+      assert TimeParser.to_days('24 hours') == 1.0
     end
 
-    test "'2 hours' should equal '0.01'" do
-      TimeParser.to_weeks('2 hours') == 0.01
+    test "'84 hours' should equal '0.5'" do
+      assert TimeParser.to_weeks('84 hours') == 0.5
     end 
 
-    test "'2 hours' should equal '3600.0'" do
-      TimeParser.to_seconds('2 hours') == 3600.0
+    test "'2 hours' should equal '7200.0'" do
+      assert TimeParser.to_seconds('2 hours') == 7200.0
     end
 
     test "'2 hours' should equal '2.0'" do
-      TimeParser.to_hours('2 hours') == 2.0
+      assert TimeParser.to_hours('2 hours') == 2.0
     end
 
     test "'1 hour and 30 minutes' should equal '5400.0'" do
-      TimeParser.to_seconds('1 hour and 30 minutes') == 5400.0
+      assert TimeParser.to_seconds('1 hour and 30 minutes') == 5400.0
     end
 
     test "'1 hour and 30 minutes' should equal '1.5'" do
-      TimeParser.to_hours('1 hour and 30 minutes') == 1.5
+      assert TimeParser.to_hours('1 hour and 30 minutes') == 1.5
     end
   end
 end

data/time_parser.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{time_parser}
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cameron Cox"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: booster-time_parser
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Cameron Cox