hiro_format 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1b0944ba990e29090b661200cdbe29963e1b388
-  data.tar.gz: ad059da42abe249fd5b2c33d2b32ccdcf9884499
+  metadata.gz: 7ff2b0d324bdb47219ab870ce7e5f2cdb1e3f29d
+  data.tar.gz: c0a9629151e1091c587e4ac3f0fbb021d75431ef
 SHA512:
-  metadata.gz: 2e51014e44811ffb27ec9df658328ee6efd2cf642e828e7953fce16540a31eef81518e16152efb38a52ada9f429e0cee288e8815762905051b73ab78d8520d6b
-  data.tar.gz: 961c3417cd7ffa6338f4e9dc7fc8517e8035921af6ab57d43e3b1ae482b2dfcb002f4f5327dc831d46ef3ebb60334739dc3e3ec2626b4f3408b28b548387edad
+  metadata.gz: 648fade5b38f62a3a469dbe5b88cf4ead5c185d1137318b76c306ba516cd8f0ab3ce671d02f56943fafff148909ecb043597d76388c1d01cabc489c7beb38775
+  data.tar.gz: a06d3941839965b8baf697cc5b09493b6df42595a5c0de876800d1e49613b6113521221270fa78635fe098668b9bd45b2dbdadeb5b599d98df4bc1be3f76645d

data/README.md

@@ -5,7 +5,11 @@ HiroFormat (hiro_format) is a text formatter.
 It converts ruby variables into formatted text by predefined recipe.
 It also supports ANSI color display for console applications, and html class handling to have colorful texts.
 
+## Still Buggy
 
+Sorry, it is still in very early stage of development. If you use this, please update the gem frequently.
+
+Bug reports are welcome.
 
 ## Installation
 
@@ -31,6 +35,7 @@ require 'hiro_format'
 puts "This is a text string".color(:red_marker).to_s
 value = 123456.78
 puts value.formatting(:commify).color(:blue).to_s # 123,456.78 (Blue color)
+puts value.formatting(:euro_commify).color(:red).to_s # 123.456,78 (Red color)
 puts Formatting.new(Date.today, :jp_date).color(:magenta_marker).to_s # 2017-12-24
 puts Date.today.formatting(:euro_date).color(:reverse).to_s # 24-12-2017
 puts Formatting.new(Date.today, :us_date).color("magenta").to_span # <span class="magenta">12-24-2017</span>

data/formatting_samples.rb

@@ -13,15 +13,19 @@ APP_ROOT = File.dirname(__FILE__)
 $LOAD_PATH << "#{APP_ROOT}/lib"
 require "hiro_format/formatting"
 require "hiro_format/coloring"
-#require "pry" # gem install pry pry-byebug
+# require "pry" # gem install pry pry-byebug
 
 value = 123456.78
+print ":commify #{value.class}: "
 puts value.formatting(:commify).color(:blue).to_s
+print ":euro_commify #{value.class}: "
+puts value.formatting(:euro_commify).color(:red).to_s
 puts Formatting.new(Date.today, :us_date).color(:magenta_marker).to_s
 puts Date.today.formatting(:euro_date).color(:reverse).to_s
 puts Date.today.formatting(:machine_date).color(:cyan_bold).to_s
 puts "#pzm (Plus, Zero, Minus) can show in different color depending on the value passed."
 [-1, 0, 1].each do |n|
+  print "#{n.class}: "
   puts n.formatting(:digit6).pzm(:reverse, :red_marker, :magenta_marker).to_s
 end
 puts "Formatting helper for HTML, you set your color in CSS (Cyan Marker)".color(:cyan_marker).to_s

data/lib/hiro_format/formatting.rb

@@ -33,10 +33,12 @@ require 'date'
 			:euro_datetimesecond => {:time_format => "%d-%m-%Y %H:%M:%s", :applicable => [Date, DateTime, Time], :rest => "0000-00-00 00:00:00" },
       :machine_datetime => {:time_format => "%Y%m%d%H%M", :applicable => [Date, DateTime], :rest => "000000000000" },
 
+			# Fixnum is deprecated in Ruby > 2.4.0 should be removed soon.
       :digit6 =>{:format => "%06d", :applicable => [Fixnum, Integer, Float], :rest => "000000"},
       :digit2 =>{:format => "%02d", :applicable => [Fixnum, Integer, Float], :rest => "00"},
 
-      :func =>{:function => "", :applicable => [], :rest => ""},
+      :commify =>{:function => "commify", :applicable => [Integer, Float, String, NilClass], :rest => ""},
+			:euro_commify =>{:function => "euro_commify", :applicable => [Integer, Float, String, NilClass], :rest => ""},
 		}.freeze
 
     def initialize(data, formatting_option=nil)
@@ -103,7 +105,7 @@ require 'date'
           elsif recipe[:format]
             result = recipe[:format] % @data
           elsif recipe[:function]
-            Formatting.send(recipe[:function], @data)
+            result = Formatting.send(recipe[:function], @data)
           end
         else
           result = recipe[:rest]
@@ -143,12 +145,45 @@ require 'date'
 		end
 
 		def self.commify(num)
+			case num.class.to_s
+			when 'Float', 'Integer'
+				return Formatting.commify_string(num.to_s)
+			when 'String'
+				return Formatting.commify_string(num)
+			when 'NilClass'
+				return "0"
+			else
+				return "#{num.class}"
+			end
+		end
+
+		def self.commify_string(num)
 			int, frac = *num.split(".")
 			int = int.gsub(/(\d)(?=\d{3}+$)/, '\\1,')
 			int << "." << frac if frac
 			int
 		end
 
+		def self.euro_commify(num)
+			case num.class.to_s
+			when 'Float', 'Integer'
+				return Formatting.euro_commify_string(num.to_s)
+			when 'String'
+				return Formatting.euro_commify_string(num)
+			when 'NilClass'
+				return "0"
+			else
+				return "#{num.class}"
+			end
+		end
+
+		def self.euro_commify_string(num)
+			int, frac = *num.split(".")
+			int = int.gsub(/(\d)(?=\d{3}+$)/, '\\1.')
+			int << "," << frac if frac
+			int
+		end
+
 	end
 
 	class NilClass

data/lib/hiro_format/version.rb

@@ -1,3 +1,3 @@
 module HiroFormat
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiro_format
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Hiro Utsumi
@@ -53,7 +53,6 @@ files:
 - bin/console
 - bin/setup
 - formatting_samples.rb
-- hiro_format-0.0.1.gem
 - hiro_format.gemspec
 - lib/hiro_format.rb
 - lib/hiro_format/coloring.rb