chronic_duration 0.9.5 → 0.9.6

data/README.rdoc

@@ -50,7 +50,7 @@ ChronicDuration.raise_exceptions can be set to true to raise exceptions when the
     
 == Contributors
 
-brianjlandau, jduff, olauzon, roboman
+brianjlandau, jduff, olauzon, roboman, ianlevesque
     
 == TODO
 

data/VERSION

@@ -1 +1 @@
-0.9.5
+0.9.6

data/chronic_duration.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{chronic_duration}
-  s.version = "0.9.5"
+  s.version = "0.9.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["hpoydar"]
-  s.date = %q{2011-05-20}
+  s.date = %q{2011-06-04}
   s.description = %q{A simple Ruby natural language parser for elapsed time. (For example, 4 hours and 30 minutes, 6 minutes 4 seconds, 3 days, etc.) Returns all results in seconds. Will return an integer unless you get tricky and need a float. (4 minutes and 13.47 seconds, for example.) The reverse can also be performed via the output method.}
   s.email = %q{hpoydar@gmail.com}
   s.extra_rdoc_files = [
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/hpoydar/chronic_duration}
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.6.2}
+  s.rubygems_version = %q{1.5.2}
   s.summary = %q{A Ruby natural language parser for elapsed time}
   s.test_files = [
     "spec/chronic_duration_spec.rb"

data/lib/chronic_duration.rb

@@ -18,8 +18,8 @@ module ChronicDuration
   # Given a string representation of elapsed time,
   # return an integer (or float, if fractions of a
   # second are input)
-  def parse(string)
-    result = calculate_from_words(cleanup(string))
+  def parse(string, opts = {})
+    result = calculate_from_words(cleanup(string), opts)
     result == 0 ? nil : result
   end  
   
@@ -113,12 +113,12 @@ private
     res
   end
   
-  def calculate_from_words(string)
+  def calculate_from_words(string, opts)
     val = 0
     words = string.split(' ')
     words.each_with_index do |v, k|
       if v =~ float_matcher
-        val += (convert_to_number(v) * duration_units_seconds_multiplier(words[k + 1] || 'seconds'))
+        val += (convert_to_number(v) * duration_units_seconds_multiplier(words[k + 1] || (opts[:default_unit] || 'seconds')))
       end
     end
     val

data/spec/chronic_duration_spec.rb

@@ -43,6 +43,10 @@ describe ChronicDuration, '.parse' do
     ChronicDuration.parse('12 mins 3 seconds').is_a?(Integer).should be_true
   end
   
+  it "should be able to parse minutes by default" do
+    ChronicDuration.parse('5', :default_unit => "minutes").should == 300
+  end
+  
   @exemplars.each do |k, v|
     it "should properly parse a duration like #{k}" do
       ChronicDuration.parse(k).should == v

metadata

@@ -2,7 +2,7 @@
 name: chronic_duration
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors: 
 - hpoydar
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-20 00:00:00 -04:00
+date: 2011-06-04 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -100,7 +100,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1174044456786451054
+      hash: 2762452318022251891
       segments: 
       - 0
       version: "0"
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: A Ruby natural language parser for elapsed time