spanner-lfittl 0.0.4 → 0.0.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spanner-lfittl (0.0.3)
+    spanner-lfittl (0.0.4)
       activesupport
       spanner-lfittl
 

data/README.rdoc

@@ -2,6 +2,14 @@
 
 Easy way to parse natural language time spans as periods expressed in seconds. Supports float point notions of spans as well.
 
+== Installation
+
+  gem install spanner-lfittl
+  
+or add this to your Gemfile:
+  
+  gem 'spanner-lfittl', :require => 'spanner'
+
 == Usage
 
   require 'spanner'
@@ -15,6 +23,9 @@ Easy way to parse natural language time spans as periods expressed in seconds. S
   Spanner.format(83520)
   => '23 hours 12 minutes'
   
+  Spanner.format(83520, :biggest_unit => :minutes)
+  => '1392 minutes'
+  
 == Authors
 
 Original author:

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/spanner.rb

@@ -19,6 +19,7 @@ class Spanner
     @value = value
     @on_error = opts && opts.key?(:on_error) ? opts[:on_error] : :raise
     @length_of_month = opts && opts[:length_of_month]
+    @biggest_unit = ((opts && opts[:biggest_unit]) || "years").to_s.downcase.to_sym
     
     @from = if opts && opts.key?(:from)
       case opts[:from]
@@ -98,13 +99,16 @@ class Spanner
   def format(distance)
     distance = distance.to_i
     
+    units = [:years, :months, :weeks, :days, :hours, :minutes]
+    biggest_unit = units.index(@biggest_unit) || 0
+    
     parts = {}
-    parts[:years], distance = distance.divmod(31_556_926)
-    parts[:months], distance = distance.divmod(length_of_month)
-    parts[:weeks], distance = distance.divmod(604_800)
-    parts[:days], distance = distance.divmod(86_400)
-    parts[:hours], distance = distance.divmod(3600)
-    parts[:minutes], parts[:seconds] = distance.divmod(60)
+    parts[:years], distance = distance.divmod(31_556_926) unless biggest_unit > units.index(:years)
+    parts[:months], distance = distance.divmod(length_of_month) unless biggest_unit > units.index(:months)
+    parts[:weeks], distance = distance.divmod(604_800) unless biggest_unit > units.index(:weeks)
+    parts[:days], distance = distance.divmod(86_400) unless biggest_unit > units.index(:days)
+    parts[:hours], distance = distance.divmod(3600) unless biggest_unit > units.index(:hours)
+    parts[:minutes], parts[:seconds] = distance.divmod(60) unless biggest_unit > units.index(:minutes)
     
     output = []
     parts.each do |name, value|

data/spec/spanner_spec.rb

@@ -55,4 +55,13 @@ describe Spanner, "format" do
       Spanner.format(input).should == output
     end
   end
+  
+  it "should be possible to restrict the biggest unit" do
+    Spanner.format(3600*24*50).should == "1 month 2 weeks 5 days"
+    Spanner.format(3600*24*50, :biggest_unit => :days).should == "50 days"
+  end
+  
+  it "should default to no restriction if invalid biggest unit is supplied" do
+    Spanner.format(3600*24*14, :biggest_unit => "LALA").should == "2 weeks"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spanner-lfittl
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2012-08-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spanner-lfittl
-  requirement: &2156119100 !ruby/object:Gem::Requirement
+  requirement: &2156930980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156119100
+  version_requirements: *2156930980
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2156117700 !ruby/object:Gem::Requirement
+  requirement: &2156930480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156117700
+  version_requirements: *2156930480
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2155997880 !ruby/object:Gem::Requirement
+  requirement: &2156930000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155997880
+  version_requirements: *2156930000
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2155964700 !ruby/object:Gem::Requirement
+  requirement: &2156929520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155964700
+  version_requirements: *2156929520
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2155946780 !ruby/object:Gem::Requirement
+  requirement: &2156929040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155946780
+  version_requirements: *2156929040
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2155945760 !ruby/object:Gem::Requirement
+  requirement: &2156928540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155945760
+  version_requirements: *2156928540
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2155944920 !ruby/object:Gem::Requirement
+  requirement: &2156847620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155944920
+  version_requirements: *2156847620
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2155944280 !ruby/object:Gem::Requirement
+  requirement: &2156847020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155944280
+  version_requirements: *2156847020
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2155943560 !ruby/object:Gem::Requirement
+  requirement: &2156846420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155943560
+  version_requirements: *2156846420
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2155943000 !ruby/object:Gem::Requirement
+  requirement: &2156845820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,43 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155943000
+  version_requirements: *2156845820
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &2156845220 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2156845220
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2156844640 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2156844640
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2156844040 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2156844040
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2155942480 !ruby/object:Gem::Requirement
+  requirement: &2156843500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +165,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2155942480
+  version_requirements: *2156843500
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2155941920 !ruby/object:Gem::Requirement
+  requirement: &2156842980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +176,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155941920
+  version_requirements: *2156842980
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2155941220 !ruby/object:Gem::Requirement
+  requirement: &2156842380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +187,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155941220
+  version_requirements: *2156842380
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2155940360 !ruby/object:Gem::Requirement
+  requirement: &2156841800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,7 +198,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2155940360
+  version_requirements: *2156841800
 description: Natural language time span parsing & formatting
 email: lukas@fittl.com
 executables: []