modalh 1.0.4 → 1.0.5

data/Gemfile

@@ -7,4 +7,6 @@ group :development do
   gem "rdoc", "~> 3.12"
   gem "bundler", "~> 1"
   gem "jeweler", "~> 1.8.3"
+  gem 'activesupport'
+  gem 'i18n'
 end

data/Gemfile.lock

@@ -1,7 +1,11 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    activesupport (3.2.3)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
     git (1.2.5)
+    i18n (0.6.0)
     jeweler (1.8.3)
       bundler (~> 1.0)
       git (>= 1.2.5)
@@ -9,6 +13,7 @@ GEM
       rdoc
     json (1.6.6)
     modalsupport (0.8.3)
+    multi_json (1.3.4)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
@@ -24,7 +29,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activesupport
   bundler (~> 1)
+  i18n
   jeweler (~> 1.8.3)
   rdoc (~> 3.12)
   shoulda

data/VERSION

@@ -1 +1 @@
-1.0.4
+1.0.5

data/lib/h/h.rb

@@ -37,7 +37,7 @@ module H
     end
 
     def number_to(value, options={})
-      options = I18n.translate(:'number.format', :locale => options[:locale]).except(:precision).merge(options)
+      options = number_format_options(options).except(:precision).merge(options)
       precision = options[:precision]
 
       return options[:blank] || '' if value.nil?
@@ -51,7 +51,7 @@ module H
          else
           value = value.to_i if precision==0
           value = value.to_s
-          value = value[0...-2] if value.ends_with?('.0')
+          value = value[0...-2] if value.end_with?('.0')
          end
       end
       if options[:delimiter]
@@ -73,7 +73,7 @@ module H
     end
 
     def number_from(txt, options={})
-      options = I18n.translate(:'number.format', :locale => options[:locale]).except(:precision).merge(options)
+      options = number_format_options(options).except(:precision).merge(options)
       type = check_type(options[:type] || (options[:precision]==0 ? Integer : Float))
 
       return nil if txt.to_s.strip.empty? || txt==options[:blank]
@@ -94,7 +94,7 @@ module H
     end
 
     def integer_to(value, options={})
-      options = I18n.translate(:'number.format', :locale => options[:locale]).merge(options)
+      options = number_format_options(options).merge(options)
       if value.nil?
         options[:blank] || ''
       else
@@ -120,7 +120,7 @@ module H
     end
 
     def date_from(txt, options={})
-      options = I18n.translate(:'number.format', :locale => options[:locale]).merge(options)
+      options = number_format_options(options).merge(options)
       type = check_type(options[:type] || Date)
 
       return nil if txt.to_s.strip.empty? || txt==options[:blank]
@@ -155,12 +155,12 @@ module H
     end
 
     def logical_to(value, options={})
-      options = I18n.translate(:'logical.format', :locale => options[:locale]).merge(options)
+      options = logical_format_options(options).merge(options)
       value.nil? ? options[:blank] : (value ? options[:true] : options[:false])
     end
 
     def logical_from(txt, options={})
-      options = I18n.translate(:'logical.format', :locale => options[:locale]).merge(options)
+      options = logical_format_options(options).merge(options)
       txt = normalize_txt(txt)
       trues = options[:trues]
       trues ||= [normalize_txt(options[:true])]
@@ -174,6 +174,16 @@ module H
     private
       # include ActionView::Helpers::NumberHelper
 
+      def number_format_options(options)
+        opt = I18n.translate(:'number.format', :locale => options[:locale])
+        opt.kind_of?(Hash) ? opt : {:separator=>'.'}
+      end
+
+      def logical_format_options(options)
+        opt = I18n.translate(:'logical.format', :locale => options[:locale])
+        opt.kind_of?(Hash) ? opt : {:separator=>'.'}
+      end
+
       def round(v, ndec)
         return v if (v.respond_to?(:nan?) && v.nan?) || (v.respond_to?(:infinite?) && v.infinite?)
         if ndec
@@ -190,12 +200,7 @@ module H
 
       # pos0 first digit, pos1 one past last integral digit
       def digit_grouping(txt,n,sep,pos0,pos1)
-        if sep
-          while pos1>pos0
-            pos1 -= n
-            txt.insert pos1, sep if pos1>pos0
-          end
-        end
+        txt[pos0...pos1] = txt[pos0...pos1].gsub(/(\d)(?=(#{'\\d'*n})+(?!\d))/, "\\1#{sep}") if sep
         txt
       end
 

data/modalh.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "modalh"
-  s.version = "1.0.4"
+  s.version = "1.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Javier Goizueta"]
-  s.date = "2012-04-30"
+  s.date = "2012-05-08"
   s.description = "Rails plugin for localization & delocalization of data values"
   s.email = "jgoizueta@gmail.com"
   s.extra_rdoc_files = [
@@ -49,12 +49,16 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
+      s.add_development_dependency(%q<activesupport>, [">= 0"])
+      s.add_development_dependency(%q<i18n>, [">= 0"])
     else
       s.add_dependency(%q<units-system>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+      s.add_dependency(%q<activesupport>, [">= 0"])
+      s.add_dependency(%q<i18n>, [">= 0"])
     end
   else
     s.add_dependency(%q<units-system>, [">= 0"])
@@ -62,6 +66,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
+    s.add_dependency(%q<activesupport>, [">= 0"])
+    s.add_dependency(%q<i18n>, [">= 0"])
   end
 end
 

data/test/helper.rb

@@ -10,6 +10,10 @@ end
 require 'test/unit'
 require 'shoulda'
 
+require 'i18n'
+require 'active_support'
+require 'bigdecimal'
+
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'modalh'

data/test/test_modalh.rb

@@ -1,7 +1,83 @@
 require 'helper'
 
 class TestModalh < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
+  should "group digits with a delimiter" do
+    assert_equal "123.456", H.to(123.456, :delimiter=>',')
+    assert_equal "123", H.to(123.0, :delimiter=>',')
+    assert_equal "123", H.to(123, :delimiter=>',')
+    assert_equal "12.456", H.to(12.456, :delimiter=>',')
+    assert_equal "1.456", H.to(1.456, :delimiter=>',')
+    assert_equal "1", H.to(1, :delimiter=>',')
+    assert_equal "1", H.to(1.0, :delimiter=>',')
+    assert_equal "1,234.567", H.to(1234.567, :delimiter=>',')
+    assert_equal "41,234.567", H.to(41234.567, :delimiter=>',')
+    assert_equal "241,234.567", H.to(241234.567, :delimiter=>',')
+    assert_equal "3,241,234.567", H.to(3241234.567, :delimiter=>',')
+    assert_equal "3,241,234", H.to(3241234.0, :delimiter=>',')
+    assert_equal "3,241,234", H.to(3241234, :delimiter=>',')
+    assert_equal "-123.456", H.to(-123.456, :delimiter=>',')
+    assert_equal "-123", H.to(-123.0, :delimiter=>',')
+    assert_equal "-123", H.to(-123, :delimiter=>',')
+    assert_equal "-12.456", H.to(-12.456, :delimiter=>',')
+    assert_equal "-1.456", H.to(-1.456, :delimiter=>',')
+    assert_equal "-1", H.to(-1, :delimiter=>',')
+    assert_equal "-1", H.to(-1.0, :delimiter=>',')
+    assert_equal "-1,234.567", H.to(-1234.567, :delimiter=>',')
+    assert_equal "-41,234.567", H.to(-41234.567, :delimiter=>',')
+    assert_equal "-241,234.567", H.to(-241234.567, :delimiter=>',')
+    assert_equal "-3,241,234.567", H.to(-3241234.567, :delimiter=>',')
+    assert_equal "-3,241,234", H.to(-3241234.0, :delimiter=>',')
+    assert_equal "-3,241,234", H.to(-3241234, :delimiter=>',')
   end
+
+  should "group digits with a delimiter and round" do
+    assert_equal "123.46", H.to(123.456, :delimiter=>',', :precision=>2)
+    assert_equal "123.00", H.to(123.0, :delimiter=>',', :precision=>2)
+    assert_equal "123.00", H.to(123, :delimiter=>',', :precision=>2)
+    assert_equal "12.46", H.to(12.456, :delimiter=>',', :precision=>2)
+    assert_equal "1.46", H.to(1.456, :delimiter=>',', :precision=>2)
+    assert_equal "1.00", H.to(1, :delimiter=>',', :precision=>2)
+    assert_equal "1.00", H.to(1.0, :delimiter=>',', :precision=>2)
+    assert_equal "1,234.57", H.to(1234.567, :delimiter=>',', :precision=>2)
+    assert_equal "41,234.57", H.to(41234.567, :delimiter=>',', :precision=>2)
+    assert_equal "241,234.57", H.to(241234.567, :delimiter=>',', :precision=>2)
+    assert_equal "3,241,234.57", H.to(3241234.567, :delimiter=>',', :precision=>2)
+    assert_equal "3,241,234.00", H.to(3241234.0, :delimiter=>',', :precision=>2)
+    assert_equal "3,241,234.00", H.to(3241234, :delimiter=>',', :precision=>2)
+    assert_equal "-123.46", H.to(-123.456, :delimiter=>',', :precision=>2)
+    assert_equal "-123.00", H.to(-123.0, :delimiter=>',', :precision=>2)
+    assert_equal "-123.00", H.to(-123, :delimiter=>',', :precision=>2)
+    assert_equal "-12.46", H.to(-12.456, :delimiter=>',', :precision=>2)
+    assert_equal "-1.46", H.to(-1.456, :delimiter=>',', :precision=>2)
+    assert_equal "-1.00", H.to(-1, :delimiter=>',', :precision=>2)
+    assert_equal "-1.00", H.to(-1.0, :delimiter=>',', :precision=>2)
+    assert_equal "-1,234.57", H.to(-1234.567, :delimiter=>',', :precision=>2)
+    assert_equal "-41,234.57", H.to(-41234.567, :delimiter=>',', :precision=>2)
+    assert_equal "-241,234.57", H.to(-241234.567, :delimiter=>',', :precision=>2)
+    assert_equal "-3,241,234.57", H.to(-3241234.567, :delimiter=>',', :precision=>2)
+    assert_equal "-3,241,234.00", H.to(-3241234.0, :delimiter=>',', :precision=>2)
+    assert_equal "-3,241,234.00", H.to(-3241234, :delimiter=>',', :precision=>2)
+    assert_equal "123.400", H.to(123.4, :delimiter=>',', :precision=>3)
+  end
+
+  should "parse numbers with delimiters" do
+    assert_equal 123.456, H.from("123.456", :type=>Float, :delimiter=>',')
+    assert_equal 123.0, H.from("123", :type=>Float, :delimiter=>',')
+    assert_equal 123.0, H.from("123.0", :type=>Float, :delimiter=>',')
+    assert_equal 123, H.from("123", :type=>Integer, :delimiter=>',')
+    assert_equal 123, H.from("123.0", :type=>Integer, :delimiter=>',')
+    assert_equal 12.456, H.from("12.456", :delimiter=>',')
+    assert_equal 1.456, H.from("1.456", :delimiter=>',')
+    assert_equal 1.0, H.from("1", :delimiter=>',')
+    assert_equal 1234.567, H.from("1,234.567", :delimiter=>',')
+    assert_equal 1234.567, H.from("1234.567", :delimiter=>',')
+    assert_equal 41234.567, H.from("41,234.567", :delimiter=>',')
+    assert_equal 241234.567, H.from("241,234.567", :delimiter=>',')
+    assert_equal -123.456, H.from("-123.456", :delimiter=>',')
+    assert_equal -123.0, H.from("-123.0", :delimiter=>',')
+    assert_equal -123.0, H.from("-123", :delimiter=>',')
+    assert_equal -12.456, H.from("-12.456", :delimiter=>',')
+    assert_equal -1234.567, H.from("-1,234.567", :delimiter=>',')
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: modalh
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-30 00:00:00.000000000 Z
+date: 2012-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: units-system
@@ -91,6 +91,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.8.3
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Rails plugin for localization & delocalization of data values
 email: jgoizueta@gmail.com
 executables: []
@@ -130,7 +162,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1933836106922413735
+      hash: -230677022647937802
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: