spanner 0.0.1 → 0.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/lib/spanner.rb

@@ -1,17 +1,19 @@
+require 'date'
+
 class Spanner
 
   ParseError = Class.new(RuntimeError)
 
   def self.parse(str, opts = nil)
-    Spanner.new(str, opts).parse
+    Spanner.new(opts).parse(str)
   end
   
   attr_reader :value, :raise_on_error, :from
   
-  def initialize(value, opts)
+  def initialize(opts)
     @value = value
     @on_error = opts && opts.key?(:on_error) ? opts[:on_error] : :raise
-    
+    @length_of_month = opts && opts[:length_of_month]
     
     @from = if opts && opts.key?(:from)
       case opts[:from]
@@ -25,13 +27,21 @@ class Spanner
     end
   end
   
+  def self.days_in_month(year, month)
+    (Date.new(year, 12, 31) << (12-month)).day
+  end
+  
+  def length_of_month
+    @length_of_month ||= Spanner.parse("#{Spanner.days_in_month(Time.new.year, Time.new.month)} days")
+  end
+  
   def error(err)
     if on_error == :raise
       raise ParseError.new(err)
     end
   end
   
-  def parse
+  def parse(value)
     parts = []
     part_contextualized = nil
     value.scan(/[\+\-]?(?:\d*\.\d+|\d+)|[a-z]+/i).each do |part|
@@ -56,13 +66,13 @@ class Spanner
         when 'm', 'min', 'minutes'  then 60
         when 'd', 'days'            then 86_400
         when 'w', 'wks', 'weeks'    then 604_800
-        when 'months', 'month', 'm' then 2_629_743.83
+        when 'months', 'month', 'M' then length_of_month
         when 'years', 'y'           then 31_556_926
         when /\As/                  then 1
         when /\Am/                  then 60
         when /\Ah/                  then 86_400
         when /\Aw/                  then 604_800
-        when /\Am/                  then 2_629_743.83
+        when /\AM/                  then length_of_month
         when /\Ay/                  then 31_556_926
         end
         

data/spec/spanner_spec.rb

@@ -11,7 +11,7 @@ describe Spanner do
   end
 
   #simple
-  { '.5s' => 0.5, '1s' => 1, '1.5s' => 1.5, '1m' => 60, '1.5m' => 90, '1d' => 86400, '1.7233312d' => 148895.81568 }.each do |input, output|
+  { '.5s' => 0.5, '1s' => 1, '1.5s' => 1.5, '1m' => 60, '1.5m' => 90, '1d' => 86400, '1.7233312d' => 148895.81568, '1M' => Spanner.days_in_month(Time.new.year, Time.new.month) * 24 * 60 * 60 }.each do |input, output|
     it "should parse #{input} and return #{output}" do
       Spanner.parse(input).should == output
     end
@@ -24,6 +24,10 @@ describe Spanner do
     end
   end
   
+  it "should let you set the length of a month" do
+    Spanner.parse("4 months", :length_of_month => 1234).should == 4936
+  end
+  
   it "should accept time as from option" do
     now = Time.new
     Spanner.parse('23s', :from => now).should == now.to_i + 23

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: spanner
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Joshua Hull
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-16 00:00:00 -04:00
+date: 2010-05-03 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -42,18 +47,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Natural language time span parsing