From a6311a960370af3606ac3a18ce1d45facf318e22 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 26 Apr 2008 11:59:51 +0000
Subject: Estimated time recognizes improved time formats (#1092).
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1361 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
lib/redmine.rb | 1 +
lib/redmine/core_ext.rb | 1 +
lib/redmine/core_ext/string.rb | 5 ++++
lib/redmine/core_ext/string/conversions.rb | 40 ++++++++++++++++++++++++++++++
4 files changed, 47 insertions(+)
create mode 100644 lib/redmine/core_ext.rb
create mode 100644 lib/redmine/core_ext/string.rb
create mode 100644 lib/redmine/core_ext/string/conversions.rb
(limited to 'lib')
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 5443eef4a..2697e8f5f 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -1,6 +1,7 @@
require 'redmine/access_control'
require 'redmine/menu_manager'
require 'redmine/mime_type'
+require 'redmine/core_ext'
require 'redmine/themes'
require 'redmine/plugin'
diff --git a/lib/redmine/core_ext.rb b/lib/redmine/core_ext.rb
new file mode 100644
index 000000000..573313e74
--- /dev/null
+++ b/lib/redmine/core_ext.rb
@@ -0,0 +1 @@
+Dir[File.dirname(__FILE__) + "/core_ext/*.rb"].each { |file| require(file) }
diff --git a/lib/redmine/core_ext/string.rb b/lib/redmine/core_ext/string.rb
new file mode 100644
index 000000000..ce2646fb9
--- /dev/null
+++ b/lib/redmine/core_ext/string.rb
@@ -0,0 +1,5 @@
+require File.dirname(__FILE__) + '/string/conversions'
+
+class String #:nodoc:
+ include Redmine::CoreExtensions::String::Conversions
+end
diff --git a/lib/redmine/core_ext/string/conversions.rb b/lib/redmine/core_ext/string/conversions.rb
new file mode 100644
index 000000000..7444445b0
--- /dev/null
+++ b/lib/redmine/core_ext/string/conversions.rb
@@ -0,0 +1,40 @@
+# redMine - project management software
+# Copyright (C) 2008 Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+module Redmine #:nodoc:
+ module CoreExtensions #:nodoc:
+ module String #:nodoc:
+ # Custom string conversions
+ module Conversions
+ # Parses hours format and returns a float
+ def to_hours
+ s = self.dup
+ s.strip!
+ unless s =~ %r{^[\d\.,]+$}
+ # 2:30 => 2.5
+ s.gsub!(%r{^(\d+):(\d+)$}) { $1.to_i + $2.to_i / 60.0 }
+ # 2h30, 2h, 30m => 2.5, 2, 0.5
+ s.gsub!(%r{^((\d+)\s*(h|hours?))?\s*((\d+)\s*(m|min)?)?$}) { |m| ($1 || $4) ? ($2.to_i + $5.to_i / 60.0) : m[0] }
+ end
+ # 2,5 => 2.5
+ s.gsub!(',', '.')
+ s.to_f
+ end
+ end
+ end
+ end
+end
--
cgit v1.2.3