ezframe 0.1.1 → 0.2.0

data/lib/ezframe/column_type.rb

@@ -9,8 +9,6 @@ module Ezframe
       return nil unless key
       upper = Object.const_get("Ezframe")
       key_camel = "#{key}_type".to_camel
-      # puts "get_class: #{key_camel}"
-      # puts "const_get: #{upper.const_get(key_camel).inspect}"
       if upper.const_defined?(key_camel)
         return upper.const_get(key_camel)
       end
@@ -38,6 +36,10 @@ module Ezframe
       @attribute[:label]
     end
 
+    def type
+      @attribute[:type]
+    end
+
     def value(_situation = nil)
       @value
     end
@@ -58,12 +60,6 @@ module Ezframe
       nil
     end
 
-    def form_html(opts = {})
-      form_h = form(opts)
-      return nil unless form_h
-      return Html.convert(form_h)
-    end
-
     def view(opts = {})
       return nil if no_view?
       @value
@@ -74,7 +70,7 @@ module Ezframe
     end
 
     def validate(val)
-      if !val || val.empty?
+      if !val || val.to_s.empty?
         if @attribute[:required] == "true"
           @error = "required"
           return @error
@@ -88,12 +84,21 @@ module Ezframe
     end
 
     def no_view?
-      return (@attribute[:hidden] && !@attribute[:force])
+      return (@attribute[:hidden] || @attribute[:no_view]) && !@attribute[:force]
     end
 
+    # 複数のinputを持っているか？
     def multi_inputs?
       nil
     end
+
+    # 日時をフォーマットに従って表示する
+    def use_view_format(format_a, tm)
+      fmt_a = format_a.clone
+      pattern = fmt_a.shift
+      value_a = fmt_a.map {|key| tm.send(key) }
+      return pattern % value_a
+    end
   end
 
   class TextType < TypeBase
@@ -101,7 +106,7 @@ module Ezframe
       return nil unless val
       val = val.dup.to_s
       val.gsub!(/　/, " ")
-      val.gsub!(/\s+/, " ")
+      # val.gsub!(/\s+/, " ")
       val.strip!
       return val
     end
@@ -112,15 +117,8 @@ module Ezframe
 
     def form(opts = {})
       return nil if no_edit? && !opts[:force]
-      if @attribute[:size]
-        val = @value
-        if val && val.length>0
-          val.gsub!(/\n/, "<br>")
-        end
-        h = Ht.textarea(name: self.key, class: "textarea-size-#{@attribute[:size]}", label: @attribute[:label], child: val)
-      else
-        h = Ht.input(type: "text", name: self.key, label: @attribute[:label], value: @value || "")
-      end
+      h = Ht.input(type: "text", name: self.key, label: @attribute[:label], value: @value || "")
+      h[:class] = @attribute[:class] if @attribute[:class]
       return h
     end
 
@@ -131,17 +129,13 @@ module Ezframe
 
   class TextareaType < TextType
     def value=(val)
-      val = normalize(val)
-      val.gsub!(/<br>/, "\n") if val
+      @value = normalize(val)
       @value = val
     end
 
     def form(opts = {})
       return nil if no_edit? && !opts[:force]
       val = @value
-      if val && val.length>0
-        val.gsub!(/\n/, "<br>")
-      end
       h = Ht.textarea(name: self.key, label: @attribute[:label], child: val)
       h[:class] = @attribute[:class] if @attribute[:class]
       return h
@@ -154,6 +148,13 @@ module Ezframe
       return @value.to_i.add_comma
     end
 
+    def normalize(val)
+      if val.is_a?(String)
+        val = val.tr("０-９", "0-9").strip
+      end
+      return val
+    end
+
     def value=(v)
       if v.nil?
         default = @attribute[:default]
@@ -169,9 +170,7 @@ module Ezframe
         @value = nil
         return
       end
-      if v.is_a?(String)
-        v = v.tr("０-９", "0-9").strip
-      end
+      v = normalize(v)
       @value = v.to_i
     end
 
@@ -182,6 +181,14 @@ module Ezframe
       return h
     end
 
+    def validate(val)
+      return nil if !val || val.to_s.strip.empty?
+      unless /^\d+$/ =~ val.to_s
+        return :invalid_value
+      end
+      return nil
+    end
+
     def db_type
       return "int"
     end
@@ -190,19 +197,38 @@ module Ezframe
   class ForeignType < IntType
     def initialize(attr = nil)
       super
-      @attribute[:no_edit] = true
+    end
+
+    def target_table
+      table = @attribute[:table]
+      return table if table
+      return self.key
     end
 
     def view(opts = {})
       return nil if no_view? && !opts[:force]
+      colkey = @attribute[:view_column]
+      if @value && colkey
+        data_h = DB::Cache[target_table.to_sym]
+        data = data_h[@value.to_i]
+        return nil unless data
+        return data[colkey.to_sym]
+      end
       return nil
-#      dataset = @parent.parent.model.db.dataset(self.key)
-#      data = dataset.get(id: @value)
-#      return data[@attribute[:view]]
     end
 
-    def form
-      return nil
+    def form(opts = {})
+      return nil if no_edit? && !opts[:force]
+      view_key = @attribute[:menu_column] || @attribute[:view_column]
+      data_h = DB::Cache[target_table.to_sym]
+      menu_a = data_h.map do |id, data|
+        [ data[:id], data[view_key&.to_sym] ]
+      end
+      return Ht.select(name: self.key, class: %w[browser-default], item: menu_a, value: @value)
+    end
+
+    def db_type
+      return "int"
     end
   end
 
@@ -218,15 +244,36 @@ module Ezframe
   end
 
   class PasswordType < TextType
+    def initialize(attr = nil)
+      super(attr)
+      @attribute[:no_view] = true
+      @encrypt_on_set = true
+    end
+
+    def form_to_value(val)
+      return encrypt_value(val)
+    end
+
+    def encrypt_value(val)
+      crypt = BCrypt::Password.create(val)
+      return crypt.to_s
+    end
+
+    def value_equal?(value_from_db, new_value)
+      @crypt = Bcrypt::Password.new(value_from_db)
+      return @crypt == new_value
+    end
+
     def form(opts = {})
       return nil if no_edit? && !opts[:force]
-      h = { tag: "input", type: "password", name: self.key, label: @attribute[:label], value: @value || "" }
+      h = { tag: "input", type: "password", name: self.key, label: @attribute[:label], value: "" }
       h[:class] = @attribute[:class] if @attribute[:class]
       return h
     end
 
     def db_value
-      return value
+      crypt = BCrypt::Password.create(@value)
+      return crypt.to_s
     end
   end
 
@@ -234,7 +281,7 @@ module Ezframe
     def form(opts = {})
       return nil if no_edit? && !opts[:force]
       # puts "selectType: #{@attribute[:item].inspect}"
-      h = { tag: "select", name: self.key, label: @attribute[:label], item: @attribute[:item], value: @value }
+      h = { tag: "select", class: %w[browser-default], name: self.key, label: @attribute[:label], item: @attribute[:item], value: @value }
       h[:class] = @attribute[:class] if @attribute[:class]
       return h
     end
@@ -246,7 +293,13 @@ module Ezframe
     def view(opts = {})
       return nil if no_view? && !opts[:force]
       item = @attribute[:item]
-      return item[@value]
+      # Logger.debug("select.view: @value=#{@value}, #{@value.class}, item=#{item}, result=#{item[@value]}")
+      return nil unless @value
+      return item[@value.to_s.to_sym]
+    end
+
+    def validate(val)
+      return nil
     end
   end
 
@@ -272,7 +325,7 @@ module Ezframe
         h[:type] = "text"
         h[:value] = @value || ""
         h[:class] = [ "datepicker" ]
-        h[:class].push@attribute[:class] if @attribute[:class]
+        h[:class].push(@attribute[:class]) if @attribute[:class]
       end
       return h
     end
@@ -282,6 +335,7 @@ module Ezframe
     end
 
     def value
+      return nil if @value.nil? || (@value.is_a?(String) && @value.strip.empty?)
       if @value.is_a?(Date) || @value.is_a?(Time)
         return "%d-%02d-%02d" % [@value.year, @value.mon, @value.mday]
       end
@@ -310,14 +364,18 @@ module Ezframe
       if v.is_a?(Date) || v.is_a?(Time)
         @value = v
       else
-        mylog "[WARN] illegal value for date type: #{v.inspect}"
+        Logger.info "[WARN] illegal value for date type: #{v.inspect}"
       end
     end
 
     def view(opts = {})
       return nil if no_view? && !opts[:force]
       if @value.is_a?(Time) || @value.is_a?(Date)
-        return "#{@value.year}/#{@value.mon}/#{@value.mday}"
+        if @attribute[:view_format]
+          return use_view_format(@attribute[:view_format], @value)
+        else
+          return "%d-%02d-%02d" % [@value.year, @value.mon, @value.mday]
+        end
       else
         return @value
       end
@@ -325,12 +383,85 @@ module Ezframe
   end
 
   class TimeType < TextType
+    def db_value
+      return nil if @value.nil? || @value.strip.empty?
+      return @value
+    end
   end
 
-  class DatetimeType < DateType
+  class DatetimeType < TextType
+    def initialize(attr = nil)
+      super(attr)
+      @attribute[:class] = "datetimepicker"
+    end
+
+    def value=(v)
+      if v.nil?
+        default = @attribute[:default]
+        if default
+          @value = default
+        else
+          @value = nil
+        end
+        return
+      end
+      if v.is_a?(String)
+        if v.strip.empty?
+          @value = nil
+          return
+        end
+        begin
+          @value = DateTime.parse(v)
+        rescue
+          Logger.warn("date format error: #{self.key}=#{v}")
+          @value = nil
+        end
+        return
+      end
+      if v.is_a?(Date) || v.is_a?(Time) || v.is_a?(DateTime)
+        @value = v
+      else
+        Logger.info "[WARN] illegal value for date type: #{v.inspect}"
+      end
+    end
+
+    def view(opts = {})
+      return nil if no_view? && !opts[:force]
+      if @value.is_a?(Time) || @value.is_a?(Date)
+        if @attribute[:view_format]
+          return use_view_format(@attribute[:view_format], @value)
+        else
+          return "%d/%02d/%02d %02d:%02d:%02d"%[@value.year, @value.mon, @value.mday, @value.hour, @value.min, @value.sec]
+        end
+      else
+        return @value
+      end
+    end
+
+    def form(opts = {})
+      Logger.debug("DatetimeType: key=#{self.key}, opts=#{opts}")
+      return nil if no_edit? && !opts[:force]
+      h = super
+      if h
+        # h[:type] = 'date'
+        h[:type] = "text"
+        h[:value] = @value || ""
+        h[:class] = [ "datepicker" ]
+        h[:class].push(@attribute[:class]) if @attribute[:class]
+      end
+      Logger.debug("DatetimeType: res=#{h}")
+      return h
+    end
+
     def db_type
       "timestamp"
     end
+
+    def value
+      return nil if @value.nil? || (@value.is_a?(String) && @value.strip.empty?)
+      return @value if @value.is_a?(Date) || @value.is_a?(Time)
+      return DateTime.parse(@value) if @value.is_a?(String)
+    end
   end
 
   class BirthdayType < TextType
@@ -341,26 +472,32 @@ module Ezframe
       year_list = []
       110.times do |y|
         year = now.year - y - 10
-        year_list.push [year, "#{year}年 (#{Japanese.convert_wareki(year)})"]
+        year_list.push [year, "#{year}(#{Japanese.convert_wareki(year)})"]
       end
+      year_list.unshift([ 0, "(年)" ])
 
       year, mon, mday = parse_date(@value)
-      mon_list = (1..12).map { |m| [m, "#{m}月"] }
+      mon_list = (1..12).map { |m| [m, "#{m}"] }
       mon_list.unshift([0, "(月)"])
-      mday_list = (1..31).map { |d| [d, "#{d}日"] }
+      mday_list = (1..31).map { |d| [d, "#{d}"] }
       mday_list.unshift([0, "(日)"])
-      return [Ht.select(name: "#{prefix}_year", item: year_list, value: year),
-              Ht.select(name: "#{prefix}_mon", item: mon_list, value: mon),
-              Ht.select(name: "#{prefix}_mday", item: mday_list, value: mday)]
+      return [Ht.div([Ht.select(name: "#{prefix}_year", class: %w[browser-default], item: year_list, value: year),
+              Ht.small("年")]),
+              Ht.select(name: "#{prefix}_mon", class: %w[browser-default], item: mon_list, value: mon),
+              Ht.small("月"),
+              Ht.select(name: "#{prefix}_mday", class: %w[browser-default], item: mday_list, value: mday),
+              Ht.small("日")
+      ]
     end
 
     def view(opts = {})
       return nil if no_view? && !opts[:force]
       return nil unless @value
       year, mon, mday = parse_date(@value)
-      mon = "?" if mon == 0
-      mday = "?" if mday == 0
-      return "#{year}年 #{mon}月 #{mday}日"
+      year_s = if year.to_i == 0 then "?" else "%d" % [year]; end
+      mon_s = if mon.to_i == 0 then "?" else "%2d" % [mon]; end
+      mday_s = if mday.to_i == 0 then "?" else "%2d" % [mday]; end
+      return "#{year_s}<small>年</small>#{mon_s}<small>月</small>#{mday_s}<small>日</small>"
     end
 
     def parse_date(date)
@@ -376,7 +513,7 @@ module Ezframe
 
     def form_to_value(form)
       y, m, d = form["#{self.key}_year".to_sym], form["#{self.key}_mon".to_sym], form["#{self.key}_mday".to_sym]
-      return "#{y.to_i}-#{m.to_i}-#{d.to_i}"
+      return "%d-%02d-%02d"%[y.to_i, m.to_i, d.to_i]
     end
   end
 
@@ -397,7 +534,8 @@ module Ezframe
     def validate(val)
       super(val)
       return @error if @error
-      if email_format?(val)
+      return nil if !val || val.strip.empty?
+      unless email_format?(val)
         @error = :invalid_value
         return @error
       end
@@ -405,29 +543,29 @@ module Ezframe
     end
 
     def email_format?(val)
-      return nil unless val
       return val.to_s =~ /^[a-zA-Z0-9.!\#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/
     end
   end
 
   class TelType < TextType
+    def normalize(val)
+      return nil unless val
+      val = super(val)
+      val = val.tr("０-９", "0-9")
+      # val = val.gsub(/\D+/, "")
+      return val
+    end
+
     def validate(val)
       super(val)
       return @error if @error
+      return nil if !val || val.strip.empty?
       unless /^0\d{9,10}$/ =~ val.to_s
         @error = :invalid_value
         return @error
       end
       return nil
     end
-
-    def normalize(val)
-      return nil unless val
-      val = super(val)
-      val = val.tr("０-９", "0-9")
-      val = val.gsub(/\D+/, "")
-      return val
-    end
   end
 
   class JpnameType < TextType
@@ -442,6 +580,7 @@ module Ezframe
     def validate(val)
       super(val)
       return @error if @error
+      return nil if !val || val.strip.empty?
       unless /^[ぁ-ん ]+$/ =~ val.to_s
         @error = :hiragana_only
         return @error
@@ -460,6 +599,7 @@ module Ezframe
     def validate(val)
       super(val)
       return @error if @error
+      return nil if !val || val.strip.empty?
       unless /^[ァ-ン ]+$/ =~ val
         @error = :katakana_only
         return @error
@@ -469,6 +609,8 @@ module Ezframe
   end
 
   class PrefectureType < SelectType
+    attr_accessor :pref_h
+
     def initialize(attr)
       super(attr)
       @pref_a = %w[() 北海道 青森県 岩手県 宮城県 秋田県 山形県 福島県
@@ -505,7 +647,7 @@ module Ezframe
 
     def normalize(val)
       val = super(val)
-      return nil unless val
+      return nil if !val || val.strip.empty?
       val = val.tr("０-９", "0-9")
       return val
     end
@@ -513,6 +655,8 @@ module Ezframe
     def validate(val)
       super(val)
       return @error if @error
+      return nil if !val || val.to_s.strip.empty?
+
       unless /^\d{7}$/ =~ val.to_s
         @error = :invalid_value
         return @error