hiro_format 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fbd05ad43abfdead030270847cfbb1ee175059d3
-  data.tar.gz: b131ba35f8d03322e97bab7d2f8a49e92ae55356
+  metadata.gz: 4e37f34a492d81b11e2216f932308cff72e0000d
+  data.tar.gz: 5e69fb4900b13dad9a9f7283a1ce127f5e3f74f9
 SHA512:
-  metadata.gz: 9f55048df4a8dcaa3c73f7ba03740ce68e55f672ab0295831759bec7591bd390d0fa93ce84e6c20feb5bb3761b371697ac32aa8eacf8e7ad412914f15ce77ec9
-  data.tar.gz: ad68d0cf118f665c65e1f4bd4921d84e8ab91bbfd7fb1ed004637eb441331bc96a0ba1a506217d71d3ffd9668668fc1c56b6da9a9088e5ac174ff953cffd451f
+  metadata.gz: bb0b687811881752479d2b3b70aaed7f1084a0b6ab761bd95dd9f3493fab473061f2b713f434b8bc7102f10fa1751450b5edc6b6d9ebcf95f8323a86ecedb407
+  data.tar.gz: 54744fe771614c99f3988ce0e82e88238b88eb806ce7cb2f435a0e89d3d6d11f4edf5ed14a6c78deb0b5b28ad9cc8573960fc7d4ce60adacc95509cfb9f8da7f

data/README.md

@@ -60,32 +60,72 @@ See formatting_sample.rb for more examples.
 ## Usage hint for Active Record  / Sequel users
 
 ~~~ruby
-# require "hiro_format" # you need gem install hiro_format
-require "./lib/hiro_format/formatting"
-require "./lib/hiro_format/coloring"
-
-FIELD_LIST = [
-  {:title => "ID", :key => :id, :format => nil},
-  {:title => "Name", :key => :name, :format => :none, :color => "blue_class"},
-  {:title => "BirthDay", :key => :bday, :format => :obvious_date, },
-  {:title => "Assets", :key => :assets, :format => :euro, :pzm => ["green_class", "blue_class", "red_class"]},
-]
-# @records = MyFriend.all
-# For test without database engine
-@records = [
-  {:id => 1, :name => "John", :bday => Date.parse('2000-01-02'), :assets => '1000000'},
-  {:id => 2, :name => "Kevin", :bday => Date.parse('2000-04-12'), :assets => '-10000'},
-]
+# For Gem users
+require "hiro_format"
+# For cloner
+#require "./lib/hiro_format/formatting"
+#require "./lib/hiro_format/coloring"
+
+# Model class
+class MyFriend # < Sequel::Model # < ActiveRecord::Base
+  RECORDS = [
+    {:id => 1, :name => "John", :bday => Date.parse('1989-01-02'), :assets => 1000000, :gender => 1},
+    {:id => 2, :name => "Kevin", :bday => Date.parse('1991-04-12'), :assets => -10000, :gender => 0},
+    {:id => 3, :name => "Wendy", :bday => Date.parse('1990-05-12'), :assets => 0, :gender => 2},
+  ]
+  GENDERS = {
+    0 => 'Other',
+    1 => 'Male',
+    2 => 'Female',
+  }
+  FIELD_LIST = [
+    {:title => "ID", :key => :id, :callback => :edit_button},
+    {:title => "Name", :key => :name, :format => :none, :color => "blue_class"},
+    {:title => "Gender", :key => :gender, :lookup => GENDERS, },
+    {:title => "BirthDay", :key => :bday, :format => :obvious_date, },
+    {:title => "Assets", :key => :assets, :format => :euro, :pzm => ["green_class", "blue_class", "red_class"]},
+  ]
+  attr_reader :data
+  def initialize(data)
+    @data = data
+  end
+
+  def edit_button
+    "<input type=\"button\" class=\"btn-sm\" value=\"Edit\" onClick=\"location.href='/controller/edit/#{@data[:id]}'\">"
+  end
+
+  def [](key)
+    @data[key]
+  end
+
+  def self.all
+    result = []
+    RECORDS.each do |record|
+      result << self.new(record)
+    end
+    result
+  end
+end
+
+# Controller
+@records = MyFriend.all
+@field_list = MyFriend::FIELD_LIST
+
+# View can be independent from ModelClass
 puts "<table>"
 puts "<tr>"
-FIELD_LIST.each do |field|
+@field_list.each do |field|
   puts "<th>#{field[:title]}</th>"
 end
 puts "</tr>"
 @records.each do |my_friend|
   puts "<tr>"
-  FIELD_LIST.each do |field|
-    if field[:pzm]
+  @field_list.each do |field|
+    if field[:callback]
+      puts "<td>" + my_friend.send(field[:callback]) + "</td>"
+    elsif field[:lookup]
+        puts "<td>" + field[:lookup][my_friend[field[:key]]] + "</td>"
+    elsif field[:pzm]
       puts my_friend[field[:key]].formatting(field[:format]).pzm(field[:pzm]).to_td
     else
       puts my_friend[field[:key]].formatting(field[:format]).color(field[:color]).to_td

data/lib/hiro_format/formatting.rb

@@ -9,7 +9,18 @@
 require 'date'
 
 	class Formatting
-		YOUBI = %w[日 月 火 水 木 金 土]
+		if RUBY_VERSION >= '2.4.0'
+			FORMATTER_LIST_SUB = {
+				:digit6 => {:format => "%06d", :applicable => [Integer, Float], :rest => "000000"},
+      	:digit2 => {:format => "%02d", :applicable => [Integer, Float], :rest => "00"},
+			}.freeze
+		else
+			FORMATTER_LIST_SUB = {
+				:digit6 => {:format => "%06d", :applicable => [Fixnum, Integer, Float], :rest => "000000"},
+      	:digit2 => {:format => "%02d", :applicable => [Fixnum, Integer, Float], :rest => "00"},
+			}.freeze
+		end
+
     FORMATTER_LIST = {
 			:date => {:time_format => "%Y-%m-%d", :applicable => [Date, DateTime], :rest => "0000-00-00" },
       :jp_date => {:time_format => "%Y-%m-%d", :applicable => [Date, DateTime], :rest => "0000-00-00" },
@@ -33,10 +44,6 @@ 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"},
-
       :commify => {:function => "commify", :applicable => [Integer, Float, String, NilClass], :rest => ""},
 			:euro_commify => {:function => "euro_commify", :applicable => [Integer, Float, String, NilClass], :rest => ""},
 			:commify0 => {:function => "commify0", :applicable => [Integer, Float, String, NilClass], :rest => ""},
@@ -49,12 +56,21 @@ require 'date'
 
 			:hide => {:format => "", :applicable => [], :rest => ""},
 		}.freeze
+		YOUBI = %w[日 月 火 水 木 金 土]
+
+		# Not yet used
+		@@custom_formatter = {}
 
     def initialize(data, formatting_option=nil)
       @data = data
       @formatting_option = formatting_option
     end
 
+		def lookup(lookup_hash)
+			@lookup = lookup_hash
+			self
+		end
+
     def color(color_scheme)
       @color_scheme = color_scheme
 			self
@@ -77,17 +93,11 @@ require 'date'
 			self
     end
 
-		def yesno?(yes, no)
-      if @data
-        @color_scheme = yes
-      else
-        @color_scheme = no
-      end
-			self
+		def yesno(yes, no)
+			yesno?(data, yes, no)
     end
 
-
-    def yesno(judge, yes, no)
+    def yesno?(judge, yes, no)
       if judge
         @color_scheme = yes
       else
@@ -96,10 +106,17 @@ require 'date'
 			self
     end
 
+		def get_recipe
+			FORMATTER_LIST[@formatting_option] || FORMATTER_LIST_SUB[@formatting_option]
+			#@@custom_formatter[@formatting_option] || FORMATTER_LIST[@formatting_option] || FORMATTER_LIST_SUB[@formatting_option]
+		end
+
 		def to_string
-			if @formatting_option.nil?
+			if @lookup && (@lookup.is_a?(Hash) || @lookup.is_a?(Array))
+				result = @lookup[@data]
+			elsif @formatting_option.nil?
         #result = @data.to_s
-      elsif recipe = FORMATTER_LIST[@formatting_option]
+      elsif recipe = get_recipe
 				# puts @data.class
         if recipe[:applicable].include?(@data.class)
           if recipe[:time_format]
@@ -217,6 +234,10 @@ require 'date'
 			"€" + Formatting.commify_value(data, '.', ',', 2)
 		end
 
+		# Not yet used
+		def self.add_custom_formatter(new_formatter)
+			@@custom_formatter << new_formatter
+		end
 
 	end
 

data/lib/hiro_format/version.rb

@@ -1,3 +1,3 @@
 module HiroFormat
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/sample_active_record.rb

@@ -1,31 +1,71 @@
 #!/usr/bin/env ruby
 #
-# require "hiro_format" # you need gem install hiro_format
+# For Gem users
+#require "hiro_format"
+# For cloner
 require "./lib/hiro_format/formatting"
 require "./lib/hiro_format/coloring"
 
-FIELD_LIST = [
-  {:title => "ID", :key => :id, :format => nil},
-  {:title => "Name", :key => :name, :format => :none, :color => "blue_class"},
-  {:title => "BirthDay", :key => :bday, :format => :obvious_date, },
-  {:title => "Assets", :key => :assets, :format => :euro, :pzm => ["green_class", "blue_class", "red_class"]},
-]
-# @records = MyFriend.all
-# For test without database engine
-@records = [
-  {:id => 1, :name => "John", :bday => Date.parse('2000-01-02'), :assets => '1000000'},
-  {:id => 2, :name => "Kevin", :bday => Date.parse('2000-04-12'), :assets => '-10000'},
-]
+# Model class
+class MyFriend # < Sequel::Model # < ActiveRecord::Base
+  RECORDS = [
+    {:id => 1, :name => "John", :bday => Date.parse('1989-01-02'), :assets => 1000000, :gender => 1},
+    {:id => 2, :name => "Kevin", :bday => Date.parse('1991-04-12'), :assets => -10000, :gender => 0},
+    {:id => 3, :name => "Wendy", :bday => Date.parse('1990-05-12'), :assets => 0, :gender => 2},
+  ]
+  GENDERS = {
+    0 => 'Other',
+    1 => 'Male',
+    2 => 'Female',
+  }
+  FIELD_LIST = [
+    {:title => "ID", :key => :id, :callback => :edit_button},
+    {:title => "Name", :key => :name, :format => :none, :color => "blue_class"},
+    {:title => "Gender", :key => :gender, :lookup => GENDERS, },
+    {:title => "BirthDay", :key => :bday, :format => :obvious_date, },
+    {:title => "Assets", :key => :assets, :format => :euro, :pzm => ["green_class", "blue_class", "red_class"]},
+  ]
+  attr_reader :data
+  def initialize(data)
+    @data = data
+  end
+
+  def edit_button
+    "<input type=\"button\" class=\"btn-sm\" value=\"Edit\" onClick=\"location.href='/controller/edit/#{@data[:id]}'\">"
+  end
+
+  def [](key)
+    @data[key]
+  end
+
+  def self.all
+    result = []
+    RECORDS.each do |record|
+      result << self.new(record)
+    end
+    result
+  end
+end
+
+# Controller
+@records = MyFriend.all
+@field_list = MyFriend::FIELD_LIST
+
+# View can be independent from ModelClass
 puts "<table>"
 puts "<tr>"
-FIELD_LIST.each do |field|
+@field_list.each do |field|
   puts "<th>#{field[:title]}</th>"
 end
 puts "</tr>"
 @records.each do |my_friend|
   puts "<tr>"
-  FIELD_LIST.each do |field|
-    if field[:pzm]
+  @field_list.each do |field|
+    if field[:callback]
+      puts "<td>" + my_friend.send(field[:callback]) + "</td>"
+    elsif field[:lookup]
+      puts my_friend[field[:key]].formatting.lookup(field[:lookup]).to_td
+    elsif field[:pzm]
       puts my_friend[field[:key]].formatting(field[:format]).pzm(field[:pzm]).to_td
     else
       puts my_friend[field[:key]].formatting(field[:format]).color(field[:color]).to_td

data/sample_formatting.rb

@@ -41,7 +41,7 @@ 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
+  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
 puts Formatting.new(Date.today, :us_date).color("magenta").to_span # <span class="magenta">12-24-2017</span>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiro_format
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Hiro Utsumi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-24 00:00:00.000000000 Z
+date: 2017-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler