ezframe 0.2.0 → 0.3.0

data/lib/ezframe/editor.rb

@@ -29,7 +29,7 @@ module Ezframe
       }
       tr_a = data_a.map do |data|
         @column_set.clear
-        @column_set.values = data
+        @column_set.set_value(data, from_db: true)
         line = idx_keys.map do |key| 
           view = @column_set[key].view
           Ht.td(Ht.a(href: "#{make_base_url(data[:id])}", child: view))
@@ -40,7 +40,7 @@ module Ezframe
       thead = Ht.thead(Ht.tr(th_a))
       tbody = Ht.tbody(tr_a)
       table_id = "enable_datatable_#{@class_snake}"
-      return Ht.table(id: table_id, class: %w[enable_datatable], child: [ thead, tbody ], event: "on=load:command=enable_datatable:target=##{table_id}:size=10")
+      return Ht.table(id: table_id, class: %w[enable_datatable], child: [ thead, tbody ], ezload: "command=enable_datatable:target=##{table_id}:size=10")
     end
 
     # 新規登録フォーム表示
@@ -94,7 +94,7 @@ module Ezframe
     #--------------------------------------------------------------------------------------------------------
     # 検索
     def public_search_post
-      Logger.info "public_search_post: #{@parsed_body.inspect}"
+      EzLog.info "public_search_post: #{@parsed_body.inspect}"
       sch_keys = @search_keys || @column_set.keys
       word = @params["word"]
       pattern = "%#{word}%"
@@ -107,7 +107,7 @@ module Ezframe
 
     # 詳細表示
     def show_detail_page
-      Logger.info "show_detail_page: #{@request.params.inspect}"
+      EzLog.info "show_detail_page: #{@request.params.inspect}"
       id = get_id(@class_snake)
       unless @column_set.set_from_db(id)
         return show_message_page("no data", "data is not defined: #{id}")
@@ -146,7 +146,7 @@ module Ezframe
       class_name ||= @class_snake
       params = @request.env['url_params']
       return nil unless params
-      # Logger.info "get_id: #{params.inspect}, #{class_name}"
+      # EzLog.info "get_id: #{params.inspect}, #{class_name}"
       return params[class_name.to_sym]
     end
 

data/lib/ezframe/editor_common.rb

@@ -0,0 +1,56 @@
+module Ezframe
+  module EditorCommon
+    def get_id(class_name = nil)
+      class_name ||= @class_snake
+      params = @request.env['url_params']
+      # EzLog.info "get_id: #{params.inspect}, #{class_name}"
+      return params[class_name.to_sym]
+    end
+
+    #  新規登録ボタンの生成
+    def make_create_button(event = nil)
+      event ||= "on=click:url=#{make_base_url(@id)}/create"
+      return Ht.button(id: "#{@class_snake}-create-button", class: %[btn], child: [Ht.icon("add"), Message[:create_button_label]], event: event)
+    end
+
+    # 編集ボタンの生成
+    def make_edit_button(event = nil)
+      event ||= "on=click:url=#{make_base_url(@id)}/edit"
+      return Ht.button(class: %w[btn], event: event, child: [ Ht.icon("edit"), Message[:edit_button_label]])    
+    end
+
+    # 削除ボタンの生成
+    def make_delete_button(event = nil)
+      event ||= "on=click:url=#{make_base_url(@id)}/delete"
+      return Ht.button(class: %w[btn right red], event: event, child: [Ht.icon("delete"), Message[:delete_button_label]])
+    end
+
+    # キャンセルボタンの生成
+    def make_cancel_button(event = nil)
+      event ||= "on=click:url=#{make_base_url(@id)}/detail:cancel=true:with=form"
+      return Ht.button(class: %w[btn red], child: [Ht.icon("cancel"), Message[:cancel_button_label]], event: event)
+    end
+
+    # 値の更新
+    def update_value
+      form = @event[:form]
+      @column_set.update(get_id, form)
+    end
+
+    # ラベル付きで1カラムのviewを表示
+    def show_label_view(key)
+      col = @column_set[key]
+      Ht.span([Ht.small(col.label), col.view(force: true)])
+    end
+
+    # ラベル付きで1カラムのformを表示
+    def show_label_edit(key)
+      col = @column_set[key]
+      Ht.span([Ht.small(col.label), col.form(force: true)])
+    end
+
+    def show_message_page(title, body)
+      return show_base_template(title: title, body: Html.convert(body))
+    end
+  end
+end

data/lib/ezframe/{logger.rb → ezlog.rb}

@@ -1,14 +1,15 @@
 module Ezframe
-  class Logger
+  class EzLog
     class << self
       @instance = nil
 
       def writer(level="", msg)
-        unless @instance
-          @instance = File.open("log/#{ENV['RACK_ENV']||'development'}.log", "a+")
-          @instance.sync = true
-        end
-        @instance.puts "#{Time.now.to_s}:#{level.upcase}:#{msg}"
+        # unless @instance
+        #  @instance = File.open("log/#{ENV['RACK_ENV']||'development'}.log", "a+")
+        #  @instance.sync = true
+        # end
+        # @instance.puts "#{Time.now.to_s}:#{level.upcase}:#{msg}"
+        File.open("log/#{ENV['RACK_ENV']||'development'}.log", "a+") {|f| f.puts "#{Time.now.to_s}:#{level.upcase}:#{msg}"}
       end
 
       def level=(lv)

data/lib/ezframe/ht.rb

@@ -14,7 +14,7 @@ module Ezframe
             h = ht_h.dup
           end
         else
-          Logger.info("[WARN] wrap_tag: unknown type: #{ht_h.inspect}")
+          EzLog.info("[WARN] wrap_tag: unknown type: #{ht_h.inspect}")
           return nil
         end
         h[:tag] ||= __callee__.to_s

data/lib/ezframe/html.rb

@@ -79,7 +79,7 @@ module Ezframe
               h[:selected] = "selected" if selected
             end
             h[:child] = v
-            # Logger.info "select: hash: k=#{k}, v=#{v}, value=#{ht_h[:value]}"
+            # EzLog.info "select: hash: k=#{k}, v=#{v}, value=#{ht_h[:value]}"
             if ht_h[:value] && ht_h[:value].to_s == k.to_s
               h[:selected] = "selected"
             end
@@ -91,7 +91,7 @@ module Ezframe
             if %w[selected default].include?(v[2])
               h[:selected] = "selected"
             end
-            # Logger.info "select: array: v=#{v}, value=#{ht_h[:value]}"
+            # EzLog.info "select: array: v=#{v}, value=#{ht_h[:value]}"
             if ht_h[:value] && ht_h[:value].to_s == v[0].to_s
               h[:selected] = "selected"
             end

data/lib/ezframe/main_editor.rb

@@ -0,0 +1,238 @@
+# frozen_string_literal: true
+module Ezframe
+  class MainEditor < PageBase
+    include EditorCommon
+
+    # 一覧ページ生成
+    def public_default_get
+      @id = get_id
+      if @id
+        return make_detail_page
+      else
+        data_a = list_for_index
+        div = [ Ht.div(id: "detail-top-area", child: make_index_top), Ht.div(id: "index-area", child: make_index_table(data_a)) ]
+        layout = index_layout(center: Ht.form(child: div))
+        return show_base_template(title: Message[:index_page_title], body: Html.convert(layout))
+      end
+    end
+
+    # 一覧ページの上部に表示するボタン等の生成
+    def make_index_top
+      make_create_button
+    end
+
+    # 新規登録フォーム表示
+    def public_create_get
+      @column_set.clear
+      table = make_edit_form(:create)
+      layout = main_layout(center: Ht.form(child: table), type: 2)
+      show_base_template(title: Message[:parent_create_page_title], body: Html.convert(layout))
+    end
+
+    # 新規登録受信
+    def public_create_post
+      validation = @column_set.validate(@form)
+      if @event[:branch] == "single_validate"
+        EzLog.debug("public_create_post: single validate: event=#{@event}, form=#{@form}")
+        return single_validation(validation, @event[:target_key]) 
+      end
+      unless @form
+        return { inject: "#center-panel", body: Ht.form(child: make_edit_form(:create)) }
+      else
+        if count_errors(validation) > 0
+          cmd_a = full_validation(validation)
+          EzLog.debug("public_create_post: cmd_a=#{cmd_a}")
+          return cmd_a if cmd_a.length > 0
+        end
+        # 値の保存
+        id = create_data(@form)
+        return { redirect: make_base_url(id) }
+      end
+    end
+
+
+    # データ編集受信
+    def public_edit_post
+      EzLog.debug("public_edit_post: #{@form}")
+      @id = get_id
+      validation = @column_set.validate(@form)
+      if @event[:branch] == "single_validate"
+        EzLog.debug("public_edit_post: single validate:event=#{@event}, form=#{@form}")
+        return single_validation(validation, @event[:target_key]) 
+      end
+      unless @form
+        data = @column_set.set_from_db(@id)
+        return show_message_page("no data", "data is not defined: #{@id}") unless data
+        return { inject: "#center-panel", body: Html.convert(Ht.form(make_edit_form)) }
+      else
+        if count_errors(validation) > 0
+          cmd_a = full_validation(validation)
+          return cmd_a 
+        end
+        # 値を保存
+        update_data(@id, @form)
+        return { redirect: make_base_url(@id) }
+      end
+    end
+
+    private
+
+    # 新規データの生成
+    def create_data(form)
+      @column_set.clear
+      @column_set[:id].value = id = @column_set.create(form)
+      return id
+    end
+
+    # データの更新
+    def update_data(id, form)
+      @column_set.update(id, form)
+    end
+
+    # 自動入力を行う
+    def exec_completion
+      return nil
+    end
+
+    # 一覧テーブルの生成
+    def make_index_table(data_a)
+      EzLog.debug("make_index_table: #{data_a.length}")
+      target_keys = @index_keys
+      unless target_keys
+        target_keys = @column_set.keys.select {|k| !@column_set[k].no_view? }
+      end
+      tr_a = data_a.map do |data|
+        # EzLog.debug("data=#{data}")
+        @column_set.clear
+        @column_set.set_values(data, from_db: true)
+        line = target_keys.map do |key| 
+          view = @column_set[key].view
+          Ht.td(Ht.a(href: "#{make_base_url(data[:id])}", child: view))
+        end
+        EzLog.debug("line=#{line}")
+        Ht.tr(line)
+      end
+      th_a = target_keys.map {|key| Ht.th(@column_set[key.to_sym].label) }
+      thead = Ht.thead(Ht.tr(th_a))
+      tbody = Ht.tbody(tr_a)
+      table_id = "enable_datatable_#{@class_snake}"
+      return Ht.table(id: table_id, class: %w[enable_datatable], child: [ thead, tbody ], ezload: "command=enable_datatable:target=##{table_id}:size=10")
+    end
+
+    # 編集フォームの生成
+    def make_edit_form(command = :edit)
+      table = []
+      matrix = @column_set.map do |column|
+        next if column.no_edit?
+        form = column.form
+        table.push Ht.p([ Ht.small(column.label), form ]) if form
+      end
+      send_button = Ht.button(id: "edit-finish-button", child: Message[:edit_finish_button_label], class: %w[btn], event: "on=click:url=#{make_base_url}/#{command}:with=form") 
+      cancel_button = edit_cancel_button
+      cancel_button[:event] = "on=click:command=redirect:url=#{make_base_url}"
+      table.push(Ht.p([send_button, cancel_button]))
+      return table
+    end
+
+    # 詳細表示
+    def make_detail_page
+      # EzLog.info "make_detail_page: #{@request.params.inspect}"
+      id = get_id(@class_snake)
+      unless @column_set.set_from_db(id)
+        return show_message_page("no data", "data is not defined: #{id}")
+      end
+      right = nil
+      right = right_tabs if @with_right_tabs
+      layout = main_layout( center: make_detail_table, right: right)
+      return show_base_template(title: Message[:customer_detail], body: Html.convert(layout))
+    end
+
+    private
+
+    # １カラムに対してだけバリデーションを行う。
+    def single_validation(result, target_key)
+      unless target_key
+        raise "target_key is empty: #{result}"
+        return [] 
+      end
+      cmd_a = []
+      if result[target_key.to_sym]
+        cmd_a = show_validate_result(result)
+      end
+      if count_errors(result) == 0
+        cmd_a.unshift({ reset_error: "#error-box-#{target_key}"})
+      end
+      comp_a = exec_completion(@form)
+      cmd_a += comp_a if comp_a
+      EzLog.debug("reset_error: #error-box-#{target_key}")
+      EzLog.debug("single_validation: target_key=#{target_key}, result=#{result}, count=#{count_errors(result)}, cmd_a=#{cmd_a}")
+      return cmd_a
+    end
+
+    # 全てのカラムに対してバリデーションを行う
+    def full_validation(result)
+      cmd_a = show_validate_result(result)
+      cmd_a.unshift({ reset_error: ".error-box" })
+      EzLog.debug("full_validation: full, cmd_a=#{cmd_a}")
+      return cmd_a
+    end
+
+    # フォームの値の有効性チェックし、ajax用返信ハッシュを生成
+    def show_validate_result(validate_result)
+      cmd_a = []
+      validate_result.each do |key, status|
+        norm, err = status
+        EzLog.debug("norm=#{norm}, err=#{err}")
+        if norm
+          cmd_a.push({ set_value: "input[name=#{key}]", value: norm })
+        end
+        if err
+          msg = Message[err.to_sym]||err
+          cmd_a.push({ set_error: "#error-box-#{key}", value: msg })
+        end
+      end
+      return cmd_a
+    end
+
+    # validate_resultの中のエラーの数を数える
+    def count_errors(validate_result)
+      return validate_result.count {|k, a| a[1] }
+    end
+
+    # 詳細ページの表の生成
+    def make_detail_table
+      table = []
+      array = @column_set.map do |column|
+        next if column.no_view?
+        edit_btn = nil
+        if column.type.to_s == "textarea"
+          view = Ht.pre(id: "#{@class_snake}-#{column.key}-view", child: column.view)
+        else
+          view = Ht.span(id: "#{@class_snake}-#{column.key}-view", child: column.view)
+        end          
+        table.push Ht.p(class: %w[hover-button-box], child: [ Ht.small(column.label), view, edit_btn ].compact)  
+      end
+      edit_btn = Ht.button(id: "#{@class_snake}-detail-edit-button", class: %w[btn], child: [ Ht.icon("edit"), Message[:edit_button_label] ], event: "on=click:url=#{make_base_url}/edit")
+      table.push edit_btn
+      return table
+    end
+
+    # 一覧ページ用のデータリスト生成
+    def list_for_index(where: nil)
+      where ||= {}
+      where[:deleted_at] = nil
+      sql = @column_set.dataset.where(where).order(@sort_key).sql
+      EzLog.debug("list_for_index: #{sql}")
+      return @column_set.dataset.where(where).order(@sort_key).all
+    end
+
+    def edit_cancel_button
+      Ht.span(class: %w[btn red small waves-effect waves-light switch-button],  child: Ht.icon("clear"))
+    end
+
+    def make_create_button(event = nil)
+      event ||= "on=click:command=redirect:url=#{make_base_url}/create"
+      return Ht.button(class: %w[btn], child: [ Ht.icon("add"), Message[:create_button_label] ], event: event )
+    end
+  end
+end

data/lib/ezframe/materialize.rb

@@ -4,8 +4,8 @@ module Ezframe
   class Materialize
     class << self
       def into_html_header
-        css_a = Config[:extra_css_list].map {|file| "<link href=\"#{file}\" rel=\"stylesheet\">\n" }
-        js_a = Config[:extra_js_list].map {|file| "<script src=\"#{file}\"></script>\n" }
+        css_a = Config[:extra_css_list]&.map {|file| "<link href=\"#{file}\" rel=\"stylesheet\">\n" }
+        js_a = Config[:extra_js_list]&.map {|file| "<script src=\"#{file}\"></script>\n" }
 
         css_files = Dir["./asset/css/*.css"]||[]
         css_a += css_files.sort.map do |file|
@@ -32,7 +32,7 @@ module Ezframe
           new_h = ht_h.map { |v| convert(v) }
         elsif ht_h.is_a?(Hash)
           unless ht_h[:tag]
-            Logger.info("convert: no tag: #{ht_h.inspect}")
+            EzLog.info("convert: no tag: #{ht_h.inspect}")
             return nil
           end
           case ht_h[:tag].to_sym
@@ -54,7 +54,7 @@ module Ezframe
 
       def icon(ht_h)
         new_h = ht_h.clone
-        Logger.info "[warn] no name attribute for icon ht_h: #{ht_h.inspect}" unless new_h[:name]
+        EzLog.info "[warn] no name attribute for icon ht_h: #{ht_h.inspect}" unless new_h[:name]
         new_h.add_class(%w[material-icons align-icon])
         new_h.update({ tag: "i", child: ht_h[:name] })
         new_h.delete(:name)

data/lib/ezframe/message.rb

@@ -16,14 +16,14 @@ module Ezframe
 
       def load_one_file(file)
         begin
-          yaml = YAML.load_file(file)
+          yaml = YAML.load(File.open(file), symbolize_names: true)
         rescue
-          Logger.info("YAML load error: #{file}")
+          EzLog.info("YAML load error: #{file}")
           return 
         end
         if /([a-z]{2})\.yml$/ =~ file
           lang = $1
-          @catalog[lang.to_sym] = yaml.recursively_symbolize_keys
+          @catalog[lang.to_sym] = yaml # .recursively_symbolize_keys
         end
       end
 

data/lib/ezframe/page_base.rb

@@ -27,10 +27,10 @@ module Ezframe
       @request = request
       @column_set = ColumnSets.get(@class_snake)
       @dataset = DB.dataset(@class_snake)
-      Logger.debug "column_set is not defined: #{@class_snake}" unless @column_set
+      EzLog.debug "column_set is not defined: #{@class_snake}" unless @column_set
       @params = parse_query_string(request.env["QUERY_STRING"])
       @params.update(request.params)
-      # Logger.info "set_request: params=#{@params.inspect}" if @params.length > 0
+      # EzLog.info "set_request: params=#{@params.inspect}" if @params.length > 0
       # @id, @key = @params[:id], @params[:key]
       @env = @request.env
       @session = @env["rack.session"]
@@ -42,11 +42,11 @@ module Ezframe
         else
           @parsed_body = parse_query_string(body)
         end
-        # Logger.info "parsed_body=#{@parsed_body.inspect}"
+        # EzLog.info "parsed_body=#{@parsed_body.inspect}"
         @event = @parsed_body[:event] || {}
         @form = @event[:form]
 
-        # Logger.info "event=#{@event}"
+        # EzLog.info "event=#{@event}"
       end
     end
 
@@ -54,7 +54,7 @@ module Ezframe
     def make_base_url(id = nil)
       path = Route::get_path(@class_snake)
       params = @request.env["url_params"] || {}
-      # Logger.info "make_base_url: params=#{params}"
+      # EzLog.info "make_base_url: params=#{params}"
       # params[@class_snake.to_sym] = id
       path_s = path.map do |pa|
         if pa == @class_snake.to_sym && id
@@ -65,7 +65,7 @@ module Ezframe
           pa
         end
       end.join("/")
-      # Logger.info "path_s=#{path_s}"
+      # EzLog.info "path_s=#{path_s}"
       return "/#{path_s}"
     end
 
@@ -82,12 +82,12 @@ module Ezframe
     def parse_json_body(body)
       return {} if !body || body.length==0
       begin
-        json = JSON.parse(body)
+        json = JSON.parse(body, symbolize_names: true)
       rescue => e
-        Logger.info "ERROR: #{e.class}:#{e.message}\n#{e.backtrace}"
+        EzLog.info "ERROR: #{e.class}:#{e.message}\n#{e.backtrace}"
         return nil
       end
-      json = json.recursively_symbolize_keys if json.is_a?(Hash) || json.is_a?(Array)
+      # json = json.recursively_symbolize_keys if json.is_a?(Hash) || json.is_a?(Array)
       return json
     end