ezframe 0.2.0 → 0.3.0

data/lib/ezframe/column_type.rb

@@ -31,8 +31,8 @@ module Ezframe
       @attribute[:key].to_sym
     end
 
-    def label
-      return nil if @attribute[:hidden]
+    def label(opts = {})
+      return nil if @attribute[:hidden] && !opts[:force]
       @attribute[:label]
     end
 
@@ -62,7 +62,11 @@ module Ezframe
 
     def view(opts = {})
       return nil if no_view?
-      @value
+      if @attribute[:view_format]
+        return use_view_format(@attribute[:view_format], @value)
+      else
+        @value
+      end
     end
 
     def normalize(val)
@@ -92,12 +96,17 @@ module Ezframe
       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
+    # フォーマットに従って表示する
+    def use_view_format(format_a, val)
+      return nil unless val
+      if format_a.is_a?(String)
+        return format_a % val
+      else
+        fmt_a = format_a.clone
+        pattern = fmt_a.shift
+        value_a = fmt_a.map {|key| val.send(key) }
+        return pattern % value_a
+      end
     end
   end
 
@@ -117,7 +126,9 @@ module Ezframe
 
     def form(opts = {})
       return nil if no_edit? && !opts[:force]
-      h = Ht.input(type: "text", name: self.key, label: @attribute[:label], value: @value || "")
+      key = self.key
+      key ="#{key}#{opts[:key_suffix]}" if opts[:key_suffix]
+      h = Ht.input(type: "text", name: key, label: @attribute[:label], value: @value || "")
       h[:class] = @attribute[:class] if @attribute[:class]
       return h
     end
@@ -136,7 +147,9 @@ module Ezframe
     def form(opts = {})
       return nil if no_edit? && !opts[:force]
       val = @value
-      h = Ht.textarea(name: self.key, label: @attribute[:label], child: val)
+      key = self.key
+      key ="#{key}#{opts[:key_suffix]}" if opts[:key_suffix]
+      h = Ht.textarea(name: key, label: @attribute[:label], child: val)
       h[:class] = @attribute[:class] if @attribute[:class]
       return h
     end
@@ -145,7 +158,17 @@ module Ezframe
   class IntType < TextType
     def view(opts = {})
       return nil if no_view? && !opts[:force]
-      return @value.to_i.add_comma
+      return nil unless @value
+      return nil if @attribute[:no_view_if_zero] && @value.to_i == 0
+      if @attribute[:view_format]
+        return use_view_format(@attribute[:view_format], @value)
+      else
+        if @attribute[:add_comma]
+          return @value.to_i.add_comma
+        else
+          return @value.to_s
+        end
+      end
     end
 
     def normalize(val)
@@ -170,13 +193,19 @@ module Ezframe
         @value = nil
         return
       end
+      unless v.is_a?(Integer)  || v.is_a?(String)
+        EzLog.debug("value must integer or string: key=#{self.key}, #{v}: class=#{v.class}")
+        return
+      end
       v = normalize(v)
       @value = v.to_i
     end
 
     def form(opts = {})
       return nil if no_edit? && !opts[:force]
-      h = Ht.input(type: "number", name: self.key, label: @attribute[:label], value: @value || "")
+      key = self.key
+      key ="#{key}#{opts[:key_suffix]}" if opts[:key_suffix]
+      h = Ht.input(type: "number", name: key, label: @attribute[:label], value: @value || "")
       h[:class] = @attribute[:class] if @attribute[:class]
       return h
     end
@@ -195,9 +224,7 @@ module Ezframe
   end
 
   class ForeignType < IntType
-    def initialize(attr = nil)
-      super
-    end
+    attr_accessor :db_data 
 
     def target_table
       table = @attribute[:table]
@@ -224,20 +251,24 @@ module Ezframe
       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)
+      key = self.key
+      key ="#{key}#{opts[:key_suffix]}" if opts[:key_suffix]
+      return Ht.select(name: key, class: %w[browser-default], item: menu_a, value: @value)
     end
 
     def db_type
       return "int"
     end
-  end
 
-  class IdType < IntType
-    def label
-      return nil if no_view?
-      return "ID"
+    def set_db_data
+      @db_data = {}
+      if @value
+        @db_data = DB::Cache[target_table.to_sym][@value]
+      end
     end
+  end
 
+  class IdType < IntType
     def form(opts = {})
       return nil
     end
@@ -247,11 +278,6 @@ module Ezframe
     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)
@@ -260,13 +286,15 @@ module Ezframe
     end
 
     def value_equal?(value_from_db, new_value)
-      @crypt = Bcrypt::Password.new(value_from_db)
-      return @crypt == 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: "" }
+      key = self.key
+      key ="#{key}#{opts[:key_suffix]}" if opts[:key_suffix]
+      h = { tag: "input", type: "password", name: key, label: @attribute[:label], value: "" }
       h[:class] = @attribute[:class] if @attribute[:class]
       return h
     end
@@ -280,8 +308,8 @@ module Ezframe
   class SelectType < TypeBase
     def form(opts = {})
       return nil if no_edit? && !opts[:force]
-      # puts "selectType: #{@attribute[:item].inspect}"
-      h = { tag: "select", class: %w[browser-default], name: self.key, label: @attribute[:label], item: @attribute[:item], value: @value }
+      @items ||= @attribute[:item]
+      h = { tag: "select", class: %w[browser-default], name: self.key, label: @attribute[:label], item: @items, value: @value }
       h[:class] = @attribute[:class] if @attribute[:class]
       return h
     end
@@ -293,7 +321,7 @@ module Ezframe
     def view(opts = {})
       return nil if no_view? && !opts[:force]
       item = @attribute[:item]
-      # Logger.debug("select.view: @value=#{@value}, #{@value.class}, item=#{item}, result=#{item[@value]}")
+      # EzLog.debug("select.view: @value=#{@value}, #{@value.class}, item=#{item}, result=#{item[@value]}")
       return nil unless @value
       return item[@value.to_s.to_sym]
     end
@@ -306,7 +334,9 @@ module Ezframe
   class CheckboxType < TypeBase
     def form(opts = {})
       return nil if no_edit? && !opts[:force]
-      h = Ht.checkbox(name: self.key, value: parent[:id].value, label: @attribute[:label])
+      key = self.key
+      key ="#{key}#{opts[:key_suffix]}" if opts[:key_suffix]
+      h = Ht.checkbox(name: key, value: parent[:id].value, label: @attribute[:label])
       h[:class] = @attribute[:class] if @attribute[:class]
       return h
     end
@@ -331,7 +361,7 @@ module Ezframe
     end
 
     def db_type
-      "date"
+      return "date"
     end
 
     def value
@@ -364,7 +394,7 @@ module Ezframe
       if v.is_a?(Date) || v.is_a?(Time)
         @value = v
       else
-        Logger.info "[WARN] illegal value for date type: #{v.inspect}"
+        EzLog.info "[WARN] illegal value for date type: #{v.inspect}"
       end
     end
 
@@ -412,8 +442,8 @@ module Ezframe
         end
         begin
           @value = DateTime.parse(v)
-        rescue
-          Logger.warn("date format error: #{self.key}=#{v}")
+        rescue => e
+          EzLog.warn("date format error: #{self.key}=#{v}:#{e}")
           @value = nil
         end
         return
@@ -421,7 +451,7 @@ module Ezframe
       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}"
+        EzLog.info "[WARN] illegal value for date type: #{v.inspect}"
       end
     end
 
@@ -439,7 +469,7 @@ module Ezframe
     end
 
     def form(opts = {})
-      Logger.debug("DatetimeType: key=#{self.key}, opts=#{opts}")
+      # EzLog.debug("DatetimeType: key=#{self.key}, opts=#{opts}")
       return nil if no_edit? && !opts[:force]
       h = super
       if h
@@ -449,7 +479,7 @@ module Ezframe
         h[:class] = [ "datepicker" ]
         h[:class].push(@attribute[:class]) if @attribute[:class]
       end
-      Logger.debug("DatetimeType: res=#{h}")
+      # EzLog.debug("DatetimeType: res=#{h}")
       return h
     end
 
@@ -467,7 +497,6 @@ module Ezframe
   class BirthdayType < TextType
     def form(opts = {})
       return nil if no_edit? && !opts[:force]
-      prefix = self.key
       now = Time.now
       year_list = []
       110.times do |y|
@@ -476,16 +505,19 @@ module Ezframe
       end
       year_list.unshift([ 0, "(年)" ])
 
+      key = self.key
+      key ="#{key}#{opts[:key_suffix]}" if opts[:key_suffix]
+
       year, mon, mday = parse_date(@value)
       mon_list = (1..12).map { |m| [m, "#{m}"] }
       mon_list.unshift([0, "(月)"])
       mday_list = (1..31).map { |d| [d, "#{d}"] }
       mday_list.unshift([0, "(日)"])
-      return [Ht.div([Ht.select(name: "#{prefix}_year", class: %w[browser-default], item: year_list, value: year),
+      return [Ht.div([Ht.select(name: "#{key}_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.select(name: "#{key}_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.select(name: "#{key}_mday", class: %w[browser-default], item: mday_list, value: mday),
               Ht.small("日")
       ]
     end
@@ -511,8 +543,9 @@ module Ezframe
       true
     end
 
-    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]
+    def form_to_value(form, target_key: nil)
+      key = target_key || self.key
+      y, m, d = form["#{key}_year".to_sym], form["#{key}_mon".to_sym], form["#{key}_mday".to_sym]
       return "%d-%02d-%02d"%[y.to_i, m.to_i, d.to_i]
     end
   end
@@ -568,6 +601,9 @@ module Ezframe
     end
   end
 
+  class UrlType < TextType
+  end
+
   class JpnameType < TextType
   end
 
@@ -611,7 +647,7 @@ module Ezframe
   class PrefectureType < SelectType
     attr_accessor :pref_h
 
-    def initialize(attr)
+    def initialize(attr = nil)
       super(attr)
       @pref_a = %w[() 北海道 青森県 岩手県 宮城県 秋田県 山形県 福島県
                    茨城県 栃木県 群馬県 埼玉県 千葉県 東京都 神奈川県
@@ -631,7 +667,7 @@ module Ezframe
       return h
     end
 
-    def view
+    def view(opts = {})
       return nil if no_view? && !opts[:force]
       return @pref_h[@value.to_i]
     end

data/lib/ezframe/config.rb

@@ -30,13 +30,13 @@ module Ezframe
           instr = Template.fill_in_text(instr)
         end
         begin
-          yaml = YAML.load(instr)
-        rescue
-          Logger.info("YAML load error: #{filename}")
+          yaml = YAML.load(instr, symbolize_names: true)
+        rescue => e
+          EzLog.info("YAML load error: #{filename}:#{e}")
           return 
         end
         @value_h ||={}
-        @value_h.update(yaml.recursively_symbolize_keys) if yaml.length>0
+        @value_h.update(yaml) if yaml.length>0 # .recursively_symbolize_keys
       end
 
       def [](k)

data/lib/ezframe/controller.rb

@@ -14,7 +14,7 @@ module Ezframe
         @request = request
         page_instance, method, url_params, class_opts = Route::choose(request)
 
-        Logger.debug("Controller.exec: path=#{request.path_info}, params=#{request.params}, class=#{page_instance.class}, method=#{method}, url_params=#{url_params}, class_opts=#{class_opts}")
+        EzLog.debug("Controller.exec: path=#{request.path_info}, params=#{request.params}, class=#{page_instance.class}, method=#{method}, url_params=#{url_params}, class_opts=#{class_opts}")
         if !page_instance || page_instance == 404
           file_not_found(response)
           return
@@ -23,18 +23,18 @@ module Ezframe
         opt_auth = class_opts[:auth]
         @session = @request.env['rack.session']
         if !@session[:user] && Config[:auth] && (!opt_auth || opt_auth != "disable")
-          Logger.debug("authenticate!")
+          EzLog.debug("authenticate!")
           warden.authenticate! 
-          Logger.info "Controller.exec: warden.options = #{@request.env['warden.options']}"
+          EzLog.info "Controller.exec: warden.options = #{@request.env['warden.options']}"
         end
         # session["in_controller"] = "set in controller"
-        Logger.debug "rack.session.keys=#{@session.keys}" if @session
+        EzLog.debug "rack.session.keys=#{@session.keys}" if @session
         page_instance.set_request(@request)
         body = page_instance.send(method)
 
         # 戻り値によるレスポンス生成
         if body.is_a?(Hash) || body.is_a?(Array)
-          # Logger.debug("Controller: body = #{body}")
+          # EzLog.debug("Controller: body = #{body}")
           json = JSON.generate(body)
           response.body = [ json ]
           response['Content-Type'] = 'application/json; charset=utf-8'
@@ -43,7 +43,7 @@ module Ezframe
           response['Content-Type'] = 'text/html; charset=utf-8'
         end
         response.status = 200
-        # Logger.debug("Controller.exec: response.body=#{response.body}")
+        # EzLog.debug("Controller.exec: response.body=#{response.body}")
       end
 
       def file_not_found(response)

data/lib/ezframe/database.rb

@@ -1,6 +1,4 @@
 # frozen_string_literal: true
-require "logger"
-
 module Ezframe
   class DB
     class << self
@@ -8,9 +6,12 @@ module Ezframe
 
       def init(dbfile = nil, opts = {})
         @dbfile = dbfile || ENV["EZFRAME_DB"] || Config[:database]
+        unless @dbfile
+          raise "database settings error: dbfile=#{Config[:database]}"
+        end
         if Config[:use_connection_pool] || opts[:use_connection_pool]
           @pool = Sequel::ConnectionPool(max_connections: 10) do
-            Sequel.connect(@dbfile, loggers: [Logger])
+            Sequel.connect(@dbfile, loggers: [EzLog])
           end
         else
           connect(@dbfile)
@@ -19,7 +20,7 @@ module Ezframe
 
       def connect(dbfile = nil)
         dbfile ||= @dbfile
-        @sequel = Sequel.connect(dbfile, loggers: [Logger])
+        @sequel = Sequel.connect(dbfile, EzLogs: [EzLog])
         return @sequel
       end
 
@@ -117,7 +118,7 @@ module Ezframe
 
       # テーブル生成
       def create_table(table_name, dbtype_h)
-        %w[id created_at updated_at].each do |key|
+        %w[id created_at updated_at deleted_at].each do |key|
           dbtype_h.delete(key.to_sym)
         end
         # puts "create_table: #{table_name}"
@@ -128,7 +129,8 @@ module Ezframe
               column(key, dbtype)
             end
             column(:created_at, :timestamp, default: Sequel::CURRENT_TIMESTAMP)
-            column(:updated_at, :timestamp, default: Sequel::CURRENT_TIMESTAMP)
+            column(:updated_at, :timestamp)
+            column(:deleted_at, :timestamp)
           end
         else
           @sequel.create_table(table_name) do
@@ -137,7 +139,8 @@ module Ezframe
               column(key, dbtype)
             end
             column(:created_at, :timestamp, default: Sequel::CURRENT_TIMESTAMP)
-            column(:updated_at, :timestamp, default: Sequel::CURRENT_TIMESTAMP)
+            column(:updated_at, :timestamp)
+            column(:deleted_at, :timestamp)
           end
         end
       end
@@ -146,9 +149,13 @@ module Ezframe
         dataset(table_name).insert(val_h)
       end
 
-      def update(dataset, val_h)
-        val_h.update({ updated_at: Time.now() })
-        dataset.update(val_h)
+      def update(dataset, id, val_h)
+        val_h.update({ updated_at: Time.now })
+        dataset.where(id: id).update(val_h)
+      end
+
+      def delete(dataset, id)
+        dataset.where(id: id).update({ deleted_at: Time.now })
       end
     end
 
@@ -158,14 +165,14 @@ module Ezframe
         def [](table)
           @store ||= {}
           dataset = DB.dataset(table.to_sym)
-          # Logger.debug("DB::Cache: #{table}")
+          # EzLog.debug("DB::Cache: #{table}")
           unless @store[table.to_sym]
-            data_a = dataset.all
+            data_a = dataset.where(deleted_at: nil).all
             h = {}
             data_a.each {|data| h[data[:id]] = data }
             @store[table.to_sym] = h
           end
-          # Logger.debug(@store[table.to_sym])
+          # EzLog.debug(@store[table.to_sym])
           return @store[table.to_sym]
         end
       end