ezframe 0.3.0 → 0.4.0

data/lib/ezframe/page_base.rb

@@ -6,10 +6,6 @@ require_relative "util"
 
 module Ezframe
   class PageBase
-#    class << self
-#      attr_accessor :auth
-#    end
-    
     attr_accessor :request
 
     def initialize(request = nil)
@@ -43,10 +39,8 @@ module Ezframe
           @parsed_body = parse_query_string(body)
         end
         # EzLog.info "parsed_body=#{@parsed_body.inspect}"
-        @event = @parsed_body[:event] || {}
+        @event = @parsed_body[:ezevent] || {}
         @form = @event[:form]
-
-        # EzLog.info "event=#{@event}"
       end
     end
 
@@ -87,7 +81,6 @@ module Ezframe
         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)
       return json
     end
 

data/lib/ezframe/single_page_editor.rb

@@ -1,205 +1,22 @@
 require_relative "editor_common"
+require_relative "single_page_kit"
 
 module Ezframe
   # ページ遷移無しでデータを編集する仕組み
   class SinglePageEditor < PageBase
     include EditorCommon
+    include PageKit::Default
+    include PageKit::Index
+    include PageKit::Edit
+    include PageKit::Detail
+    include PageKit::Delete
 
     def init_vars
       super
       @sort_key = :id
-      @event = @parsed_body[:event] if @parsed_body
+      @event = @parsed_body[:ezevent] if @parsed_body
       @dom_id = { create: "create-area", edit: "edit-area", index: "index-area", detail: "detail-area"}
       # @show_delete_button = nil
     end
-
-    def public_default_get
-      @id = get_id
-#      if @id
-#        return public_detail_post
-#      else
-        div = [ Ht.div(id: @dom_id[:create], child: make_index_top), Ht.div(id: @dom_id[:index], child: make_index_table) ]
-        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("on=click:url=#{make_base_url}/create")
-    end
-
-    def public_default_post
-      return { inject: "##{@dom_id[:index]}", body: Html.convert(make_index_table) }
-    end
-
-    # 新規データ登録
-    def public_create_post
-      @form = @event[:form]
-      EzLog.debug("public_create_post: event=#{@event}")
-      if @event[:cancel]
-        return { inject: "##{@dom_id[:create]}", body: Html.convert(make_index_top) }
-      elsif !@form
-        return { inject: "##{@dom_id[:create]}", body: Html.convert(make_edit_form(:create)) }
-      else
-        # 値の保存
-        @column_set.clear
-        form_values = @form
-        form_values.update(@env["url_params"])
-        # @column_set.values = form_values
-        @column_set[:id].value = @id = @column_set.create(form_values)
-        return { redirect: make_base_url(@id) }
-        # return public_default_post
-      end
-    end
-
-    # データ編集受信
-    def public_edit_post
-      @id = get_id
-      unless @event[:form]
-        data = @column_set.set_from_db(@id)
-        return show_message_page("no data", "data is not defined: #{@id}") unless data
-        # フォームの表示
-        form = make_edit_form
-        found_a = Ht.search(form, tag: "input")
-        found_a.each { |h| h.add_class("#{@class_snake}-edit-box") if h[:size] }
-        return { inject: "##{@dom_id[:detail]}", body: Html.convert(form) }
-      else
-        if @event[:cancel]
-          data = @column_set.set_from_db(@id)
-          return act_after_cancel
-        else
-          # 値を保存
-          @column_set.update(@id, @event[:form])
-        end
-        return act_after_edit
-      end
-    end
-
-    # データ詳細表示
-    def public_detail_post
-      @id ||= get_id
-      data = @column_set.set_from_db(@id)
-      target_keys = @detail_keys || @column_set.keys.select { |key| !@column_set[key].attribute[:no_view] }
-      line_a = []
-      target_keys.each do |key|
-        column = @column_set[key]
-        v = make_detail_line(column)
-        line_a.push(v) if v
-      end
-      table = Ht.div(line_a)
-      collection = Materialize::Collection.new
-      # 詳細表示用のblockを追加
-      collection.push(Ht.div(id: @dom_id[:detail], child: [button_for_detail_box(data), table]))
-      return { inject: "##{@dom_id[:detail]}", body: Html.convert(collection.to_h) }
-    end
-
-    def public_delete_post
-      @id = get_id
-      dataset = DB.dataset(@column_set.name)
-      DB.delete(dataset, @id)
-      return public_default_post
-    end
-
-    # 詳細表示欄の一行を生成
-    def make_detail_line(column)
-      view = column.view
-      if view
-        view = Ht.pre(view) if view.strip.index("\n")
-        return Ht.p([Ht.small(column.label), view])
-      end
-      return nil
-    end
-    
-    def act_after_edit
-      return [public_default_post, public_detail_post]
-    end
-
-    def act_after_cancel
-      return public_detail_post
-    end
-
-    # 一覧表の生成
-    def make_index_table
-      list = list_for_index
-      target_keys = @index_keys
-      unless target_keys
-        target_keys = @column_set.keys.select {|k| !@column_set[k].no_view?}
-      end
-      labels = @table_labels
-      unless labels
-        labels = target_keys.map {|k| @column_set[k].label(force: true) || "　"}
-      end
-      # 項目名欄の生成
-      thead = Ht.thead(Ht.tr(labels.map {|label| Ht.th(label||"　")}))
-
-      tr_a = list.map do |data|
-        view_a = make_index_line(target_keys, data)
-        td_a = view_a.map {|view| Ht.td(view)}
-        Ht.tr(id: "tr-#{@class_snake}-#{data[:id]}", child: td_a, event: "on=click:url=#{make_base_url(data[:id])}/detail")
-      end
-      tbody = Ht.tbody(tr_a)
-      return [
-               Ht.table(id: "enable_datatable_#{@class_snake}", child: [thead, tbody], ezload: "command=enable_datatable:target=#enable_datatable_#{@class_snake}"),
-               Ht.div(id: @dom_id[:detail], child: ""),
-             ]
-    end
-
-    # 一覧表示の１行を生成
-    def make_index_line(target_keys, data)
-      @column_set.clear
-      @column_set.values = data
-      return target_keys.map { |key| make_index_column(key) }
-    end
-
-    # 一覧表示の１カラムを生成
-    def make_index_column(key)
-      column = @column_set[key.to_sym]
-#      if @with_label
-#        child = [Ht.small(column.label), column.view(force: true)]
-#        return Ht.p(id: "edit-#{@class_snake}-#{@column_set[:id].value}-column-#{column.key}", child: child)
-#      else
-        return column.view(force: true)
-#      end
-    end
-
-    # 一覧ページ用のデータリスト生成
-    def list_for_index
-      return @column_set.dataset.where(deleted_at: nil).order(@sort_key).all
-    end
-
-    # 一覧ページ用ボタン
-    def button_for_index_line(data)
-      Ht.button(class: %w[btn right], event: "on=click:url=#{make_base_url(data[:id])}/edit", child: [Ht.icon("edit"), Message[:edit_button_label]])
-    end
-
-    # 詳細ページ用ボタン
-    def button_for_detail_box(data)
-      buttons = [Ht.button(class: %w[btn right], event: "on=click:url=#{make_base_url(data[:id])}/edit", child: [Ht.icon("edit"), Message[:edit_button_label]]) ]
-      if @show_delete_button
-        buttons.push(make_delete_button)
-      end
-      return Ht.div(class: %w[button-box], child: buttons)
-    end
-
-    # 編集フォームの生成
-    def make_edit_form(command = :edit)
-      @id ||= get_id
-      target_keys = @edit_keys || @column_set.keys
-      list = target_keys.map do |colkey|
-        column = @column_set[colkey.to_sym]
-        unless column
-          EzLog.error("undefined column entry: #{colkey}")
-          next
-        end
-        form = column.form
-        Ht.p(class: %w[form-line], child: [Ht.small(column.label), form]) if form
-      end
-      send_button = Ht.button(id: "#{@class_snake}-#{command}-finish-button", class: %w[btn], child: [Ht.icon("check"), Message[:edit_finish_button_label]], event: "on=click:url=#{make_base_url(@id)}/#{command}:with=form")
-      cancel_button = make_cancel_button("on=click:url=#{make_base_url(@id)}/#{command}:cancel=true:with=form")
-      list.push(Ht.p(class: %w[edit-finish-buttons], child: [send_button, cancel_button]))
-      return Ht.form(list)
-    end
-
-
   end
 end

data/lib/ezframe/single_page_kit.rb

@@ -0,0 +1,199 @@
+module Ezframe
+  module PageKit
+    module Default
+      def public_default_get
+        @id = get_id
+        div = [Ht.div(id: @dom_id[:create], child: make_index_top), Ht.div(id: @dom_id[:index], child: "", ezload: "url=#{make_base_url}")]
+        layout = index_layout(center: make_form(make_base_url, div))
+        return show_base_template(title: Message[:index_page_title], body: Html.convert(layout))
+      end
+
+      def public_default_post
+        return { inject: "##{@dom_id[:index]}", body: Html.convert(make_index_table), set_url: make_base_url }
+      end
+    end
+
+    module Index
+      def make_index_top
+        make_create_button("on=click:url=#{make_base_url}/create")
+      end
+
+      # 一覧表の生成
+      def make_index_table
+        list = list_for_index
+        target_keys = @index_keys
+        unless target_keys
+          target_keys = @column_set.keys.select { |k| !@column_set[k].no_view? }
+        end
+        labels = @table_labels
+        unless labels
+          labels = target_keys.map { |k| @column_set[k].label(force: true) || "　" }
+        end
+        # 項目名欄の生成
+        thead = Ht.thead(Ht.tr(labels.map { |label| Ht.th(label || "　") }))
+
+        tr_a = list.map do |data|
+          view_a = make_index_line(target_keys, data)
+          td_a = view_a.map { |view| Ht.td(view) }
+          Ht.tr(id: "tr-#{@class_snake}-#{data[:id]}", child: td_a, ezevent: "on=click:url=#{make_base_url(data[:id])}/detail")
+        end
+        tbody = Ht.tbody(tr_a)
+        return [
+          Ht.table(id: "enable_datatable_#{@class_snake}", child: [thead, tbody], ezload: "command=enable_datatable:target=#enable_datatable_#{@class_snake}"),
+          Ht.div(id: @dom_id[:detail], child: ""),
+        ]
+      end
+
+      # 一覧表示の１行を生成
+      def make_index_line(target_keys, data)
+        @column_set.clear
+        @column_set.values = data
+        return target_keys.map { |key| make_index_column(key) }
+      end
+
+      # 一覧表示の１カラムを生成
+      def make_index_column(key)
+        column = @column_set[key.to_sym]
+        return column.view(force: true)
+      end
+
+      # 一覧ページ用のデータリスト生成
+      def list_for_index
+        return @column_set.dataset.where(deleted_at: nil).order(@sort_key).all
+      end
+
+      # 一覧ページ用ボタン
+      def button_for_index_line(data)
+        return Ht.button(class: %w[btn right], ezevent: "on=click:url=#{make_base_url(data[:id])}/edit", child: [Ht.icon("edit"), Message[:edit_button_label]])
+      end
+    end
+
+    module Edit
+      # 新規データ登録
+      def public_create_post
+        @form = @event[:form]
+        EzLog.debug("public_create_post: event=#{@event}")
+        if @event[:cancel]
+          return { inject: "##{@dom_id[:create]}", body: Html.convert(make_index_top) }
+        elsif !@form
+          return { inject: "##{@dom_id[:create]}", body: Html.convert(make_edit_form(:create)) }
+        else
+          # 値の保存
+          @column_set.clear
+          form_values = @form
+          form_values.update(@env["url_params"])
+          # @column_set.values = form_values
+          @column_set[:id].value = @id = @column_set.create(form_values)
+          return { redirect: make_base_url(@id) }
+          # return public_default_post
+        end
+      end
+
+      # データ編集受信
+      def public_edit_post
+        @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 @event[:form]
+          data = @column_set.set_from_db(@id)
+          return show_message_page("no data", "data is not defined: #{@id}") unless data
+          # フォームの表示
+          form = make_edit_form
+          found_a = Ht.search(form, tag: "input")
+          found_a.each { |h| h.add_class("#{@class_snake}-edit-box") if h[:size] }
+          return { inject: "##{@dom_id[:detail]}", body: Html.convert(form) }
+        else
+          if @event[:cancel]
+            data = @column_set.set_from_db(@id)
+            return act_after_cancel
+          else
+            # 値を保存
+            @column_set.update(@id, @event[:form])
+          end
+          return act_after_edit
+        end
+      end
+
+      # 編集フォームの生成
+      def make_edit_form(command = :edit)
+        @id ||= get_id
+        target_keys = @edit_keys || @column_set.keys
+        list = target_keys.map do |colkey|
+          column = @column_set[colkey.to_sym]
+          unless column
+            EzLog.error("undefined column entry: #{colkey}")
+            next
+          end
+          form = column.form
+          Ht.p(class: %w[form-line], child: [Ht.small(column.label), form]) if form
+        end
+        send_button = Ht.button(id: "#{@class_snake}-#{command}-finish-button", class: %w[btn], child: [Ht.icon("check"), Message[:edit_finish_button_label]], ezevent: "on=click:url=#{make_base_url(@id)}/#{command}:with=form")
+        cancel_button = make_cancel_button("on=click:url=#{make_base_url(@id)}/#{command}:cancel=true:with=form")
+        list.push(Ht.p(class: %w[edit-finish-buttons], child: [send_button, cancel_button]))
+        return make_form("#{make_base_url}/edit", list)
+      end
+
+      # 編集完了後の表示
+      def act_after_edit
+        return [public_default_post, public_detail_post]
+      end
+
+      # キャンセル時の表示
+      def act_after_cancel
+        return public_detail_post
+      end
+    end
+
+    # 詳細表示ページ生成キット
+    module Detail
+      # データ詳細表示
+      def public_detail_post
+        @id ||= get_id
+        data = @column_set.set_from_db(@id)
+        target_keys = @detail_keys || @column_set.keys.select { |key| !@column_set[key].attribute[:no_view] }
+        line_a = []
+        target_keys.each do |key|
+          column = @column_set[key]
+          v = make_detail_line(column)
+          line_a.push(v) if v
+        end
+        table = Ht.div(line_a)
+        collection = Materialize::Collection.new
+        # 詳細表示用のblockを追加
+        collection.push(Ht.div(id: @dom_id[:detail], child: [button_for_detail_box(data), table]))
+        return { inject: "##{@dom_id[:detail]}", body: Html.convert(collection.to_h) }
+      end
+
+      # 詳細ページ用ボタン
+      # 詳細表示欄の一行を生成
+      def make_detail_line(column)
+        view = column.view
+        if view
+          view = Ht.pre(view) if view.strip.index("\n")
+          return Ht.p([Ht.small(column.label), view])
+        end
+        return nil
+      end
+
+      def button_for_detail_box(data)
+        buttons = [Ht.button(class: %w[btn right], ezevent: "on=click:url=#{make_base_url(data[:id])}/edit", child: [Ht.icon("edit"), Message[:edit_button_label]])]
+        if @show_delete_button
+          buttons.push(make_delete_button)
+        end
+        return Ht.div(class: %w[button-box], child: buttons)
+      end
+    end
+
+    module Delete
+      def public_delete_post
+        @id = get_id
+        dataset = DB.dataset(@column_set.name)
+        DB.delete(dataset, @id)
+        return public_default_post
+      end
+    end
+  end
+end

data/lib/ezframe/sub_editor.rb

@@ -1,3 +1,5 @@
+require_relative "sub_page_kit"
+
 module Ezframe
   # 各顧客に関連づいた情報の編集を一般化したクラス
   class SubEditor < PageBase
@@ -7,7 +9,7 @@ module Ezframe
       super
       @sort_key = :id
       # @parent_key = :customer
-      @event = @parsed_body[:event] if @parsed_body
+      @event = @parsed_body[:ezevent] if @parsed_body
       # @use_detail_box = true
     end
 
@@ -19,204 +21,5 @@ module Ezframe
       end
       return params[@parent_key.to_sym]
     end
-
-    def public_default_post
-      return { inject: "##{@class_snake}_tab", body: Html.convert(make_index_page) }
-    end
-
-    # 新規データ登録
-    def public_create_post
-      @form = @event[:form]
-      # EzLog.debug("public_create_post: form=#{@form}")
-      unless @form
-        { inject: "##{@class_snake}-create-area", body: Html.convert(make_edit_form(:create)) }
-      else
-        # 値の保存
-        @column_set.clear
-        form_values = @form
-        form_values.update(@env["url_params"])
-        # @column_set.values = form_values
-        @column_set[:id].value = @id = @column_set.create(form_values)
-        # return { redirect: "#{make_base_url}/#{@id}" }
-        return public_default_post
-      end
-    end
-
-    # データ編集受信
-    def public_edit_post
-      @id ||= get_id
-      unless @event[:form]
-        data = @column_set.set_from_db(@id)
-        # データが空ならエラーページ
-        return { inject: "##{edit_inject_element}", body: "データがありません: #{@id}"} unless data
-        # フォームの表示
-        form = make_edit_form
-        found_a = Ht.search(form, tag: "input")
-        found_a.each { |h| h.add_class("#{@class_snake}-edit-box") if h[:size] }
-        return { inject: "##{edit_inject_element}", body: Html.convert(form) }
-      else
-        if @event[:cancel]
-          data = @column_set.set_from_db(@id)
-          return act_after_cancel
-        else
-          # 値を保存
-          @column_set.update(@id, @event[:form])
-        end
-        return act_after_edit
-      end
-    end
-
-    # データ詳細表示
-    def public_detail_post
-      @id = get_id
-      data = @column_set.set_from_db(@id)
-      target_keys = @show_keys || @column_set.keys.select { |key| !@column_set[key].attribute[:no_view] }
-      line_a = []
-      target_keys.each do |key|
-        column = @column_set[key]
-        v = make_detail_line(column)
-        line_a.push(v) if v
-      end
-      table = Ht.div(line_a)
-      collection = Materialize::Collection.new
-      # 詳細表示用のblockを追加
-      collection.push(Ht.div(class: "detail-box", child: [button_for_detail_box(data), table]))
-      return { inject: "##{edit_inject_element}", body: Html.convert(collection.to_h) }
-    end
-
-    # 削除ボタン押下時の処理
-    def public_delete_post
-      @id = get_id
-      dataset = DB.dataset(@column_set.name)
-      DB.delete(dataset, @id)
-      return public_default_post
-    end
-
-    # 詳細表示欄の一行を生成
-    def make_detail_line(column)
-      view = column.view
-      if view
-        view = Ht.pre(view) if view.index("\n")
-        return Ht.p([Ht.small(column.label), view])
-      end
-      return nil
-    end
-
-    def edit_inject_element
-      return "#{@class_snake}_show"
-    end
-    
-    def act_after_edit
-      return [public_default_post, public_detail_post]
-      # return { inject: edit_inject_element, body: Html.convert(make_index_line(@column_set.get_hash(:value))) }
-    end
-
-    def act_after_cancel
-      return public_detail_post
-    end
-
-    # 一覧表の生成
-    def make_index_page
-      list = list_for_index
-      target_keys = @index_keys
-      unless target_keys
-        target_keys = @column_set.keys.select {|k| !@column_set[k].no_view?}
-      end
-      # 項目名欄の生成
-      if @table_labels
-        thead = Ht.thead(Ht.tr(@table_labels.map {|label| Ht.th(label)}))
-      else
-        thead = Ht.thead(Ht.tr(target_keys.map {|key| 
-          if @column_set[key].respond_to?(:label) 
-            Ht.th(@column_set[key].label(force: true))
-          else
-            nil
-          end
-        })).compact
-      end
-
-      tr_a = list.map do |data|
-        view_a = make_index_line(target_keys, data)
-        td_a = view_a.map {|view| Ht.td(view)}
-        Ht.tr(id: "tr-#{@class_snake}-#{data[:id]}", child: td_a, event: "on=click:url=#{make_base_url(data[:id])}/detail")
-      end
-      tbody = Ht.tbody(tr_a)
-      return [
-        area_for_create,
-        Ht.table(id: "enable_datatable_#{@class_snake}", child: [thead, tbody], ezload: "command=enable_datatable:target=#enable_datatable_#{@class_snake}"),
-        Ht.div(id: edit_inject_element),
-      ]
-    end
-
-    # 一覧表示の１行を生成
-    def make_index_line(target_keys, data)
-      @column_set.clear
-      @column_set.set_values(data, from_db: true)
-      return target_keys.map { |key| make_index_column(key) }
-    end
-
-    # 一覧表示の１カラムを生成
-    def make_index_column(key)
-      column = @column_set[key.to_sym]
-      return column.view(force: true)
-    end
-
-    # 一覧ページ用のデータリスト生成
-    def list_for_index
-      return @column_set.dataset.where(@parent_key.to_sym => get_parent_id, deleted_at: nil).order(@sort_key).all
-    end
-
-    # 一覧ページ用ボタン
-    def button_for_index_line(data)
-      Ht.button(class: %w[btn right], event: "on=click:url=#{make_base_url(data[:id])}/edit", child: [Ht.icon("edit"), Message[:edit_button_label]])
-    end
-
-    # 詳細ページ用ボタン
-    def button_for_detail_box(data)
-      buttons = [Ht.button(class: %w[btn right], event: "on=click:url=#{make_base_url(data[:id])}/edit", child: [Ht.icon("edit"), Message[:edit_button_label]]) ]
-      if @show_delete_button
-        buttons.push(make_delete_button)
-      end
-      return Ht.div(class: %w[button-box], child: buttons)
-    end
-
-    #--------------------------------------------------------------------------------------------------------
-    # 新規データ追加欄
-    def area_for_create(extra_buttons = nil)
-      create_button = make_create_button
-      create_button[:event] = "on=click:url=#{make_base_url}/create"
-      return Ht.div(id: "#{@class_snake}-create-area", child: [ create_button, extra_buttons ].compact)
-    end
-
-    # 編集フォームの生成
-    def make_edit_form(command = :edit)
-      # @id ||= get_id
-      if command == :edit && !@id
-        EzLog.error "make_edit_form: @id is not defined"
-      end
-      target_keys = @edit_keys || @column_set.keys
-      list = target_keys.map do |colkey|
-        column = @column_set[colkey.to_sym]
-        unless column
-          EzLog.error("undefined column entry: #{colkey}")
-          next
-        end
-        make_edit_line(column)    
-      end.compact
-      event = "on=click:url=#{make_base_url(@id)}/#{command}:with=form"
-      send_button = Ht.button(id: "#{@class_snake}-#{command}-finish-button", class: %w[btn], child: [Ht.icon("check"), Message[:edit_finish_button_label]], event: event)
-      cancel_button = make_cancel_button("on=click:url=#{make_base_url(@id)}/#{command}:cancel=true:with=form")
-      list.push(Ht.p(class: %w[edit-finish-buttons], child: [send_button, cancel_button]))
-      return Ht.form(list)
-    end
-
-    def make_edit_line(column)
-      form = column.form
-      if form
-        return Ht.p(class: %w[form-line], child: [ Ht.small(column.label), form ]) 
-      else
-        return nil
-      end
-    end
   end
 end