place 0.1.0 → 0.1.1

data/lib/place.rb

@@ -5,7 +5,6 @@ require 'nokogiri'
 require 'json'
 require 'logger'
 
-
 require File.join(File.dirname(__FILE__), 'place', 'project')
 require File.join(File.dirname(__FILE__), 'place', 'time_point')
 require File.join(File.dirname(__FILE__), 'place', 'user')
@@ -17,7 +16,7 @@ require File.join(File.dirname(__FILE__), 'place', 'participation')
 
 
 module Place
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 
   @conf = {}
   
@@ -89,24 +88,38 @@ module Place
   # from duration to number of hours (1d == 8h)
   def to_hours(duration)
     return nil if duration.nil?
-	# TODO with a case statement or another regexp?
-    if duration =~ /(\d+)d\s(\d+)h/
-      days, hours = $1.to_f, $2.to_f
-	elsif duration =~ /(\d+)\/(\d+)d/
-	  days = $1.to_f / $2.to_f
-	  hours = 0
-	elsif duration =~ /(\d+)\/(\d+)h/
-	  days = 0
-	  hours = $1.to_f / $2.to_f
-    elsif duration =~ /(\d+)d/
-	  days, hours = $1.to_f, 0
-    elsif duration =~ /(\d+)h/
-	  days, hours =  0, $1.to_f
+
+    case duration
+      when /([\d\/\s]*)d\s*([\d\/\s]*)h/
+	    days  = normalize($1)
+	    hours = normalize($2)
+	  when /([\d\/\s]*)d/
+	    days  = normalize($1)
+	    hours = 0.0
+	  when /([\d\/\s]*)h/
+  	    days  = 0.0
+	    hours = normalize($1)
     else
-	  days, hours =  0, 0
+      days  = 0
+      hours = 0
     end
-
-    (8*days + hours)
+	
+	  8*days.to_f + hours.to_f
+  end
+ 
+ private
+ 
+  def normalize(e)
+    case e
+	  when /(\d+)\s+(\d+)\/(\d+)/
+	    # 1 1/2 -> 1.5
+	    $1.to_f + $2.to_f / $3.to_f
+	  when /(\d+)\/(\d+)/
+  	  # 1/2 -> 0.5
+	    $1.to_f / $2.to_f
+    when /(\d+)/
+      # 3 -> 3
+	    $1.to_f
+    end 
   end
-
 end

data/place.gemspec

@@ -1,15 +1,15 @@
 
 Gem::Specification.new do |s|
   s.name              = "place"
-  s.version           = "0.1.0"
-  s.summary           = "Polarion LACE: Polarion items access in Ruby"
+  s.version           = "0.1.1"
+  s.summary           = "Polarion Lace: Polarion items access in Ruby"
   s.description		  = <<-EOF
     Extract information from Polarion and turns it into easy manageable ruby objects.
 	
 	Those objects are stored via Redis.
   EOF
   s.authors           = ["Carlo Pecchia"]
-  s.email             = ["info@carlopecchia.eu"]
+  s.email             = ["c.pecchia@gmail.com"]
   s.homepage          = "http://github.com/carlopecchia/place"
   s.add_dependency('json')
   s.add_dependency('ohm')

data/test/test_place.rb

@@ -17,12 +17,13 @@ class PlaceTest < Test::Unit::TestCase
   end
   
   def test_duration
-	assert_equal  11, to_hours('1d 3h')
-	assert_equal  16, to_hours('2d')
-	assert_equal   3, to_hours('3h')
-	assert_equal 0.5, to_hours('1/2h')
-	assert_equal   4, to_hours('1/2d')
-	assert_equal   0, to_hours('')
-	assert_equal nil, to_hours(nil)
+	assert_equal   11, to_hours('1d 3h')
+	assert_equal   16, to_hours('2d')
+	assert_equal    3, to_hours('3h')
+	assert_equal  0.5, to_hours('1/2h')
+	assert_equal    4, to_hours('1/2d')
+	assert_equal  9.5, to_hours('1d 1 1/2h')
+	assert_equal    0, to_hours('')
+	assert_equal  nil, to_hours(nil)
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: place
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Carlo Pecchia
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-21 00:00:00 +02:00
+date: 2010-07-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,7 +64,7 @@ description: "    Extract information from Polarion and turns it into easy manag
   \t\n\
   \tThose objects are stored via Redis.\n"
 email: 
-- info@carlopecchia.eu
+- c.pecchia@gmail.com
 executables: []
 
 extensions: []
@@ -128,6 +128,6 @@ rubyforge_project:
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: "Polarion LACE: Polarion items access in Ruby"
+summary: "Polarion Lace: Polarion items access in Ruby"
 test_files: []