ezframe 0.0.4 → 0.4.0

data/lib/ezframe/email.rb

@@ -0,0 +1,34 @@
+require "mail"
+
+module Ezframe
+  class Email
+    class << self
+      def receive
+
+      end
+
+      # options =
+      #      :address              => "smtp.server.host",
+      #      :port                 => 1025,
+      #      :user_name            => login user,
+      #      :password             => login password,
+      #      :authentication       => 'plain',
+      #      :ssl => true,
+      def setup_smtp(options)
+        Mail.defaults do
+          delivery_method :smtp, options
+        end
+      end
+
+      def send(data)
+        mail = Mail.new do
+          from     data[:mail_from]
+          to       data[:mail_to]
+          subject  data[:subject]
+          body     data[:body]
+        end
+        mail.deliver! 
+      end
+    end
+  end
+end

data/lib/ezframe/ezlog.rb

@@ -0,0 +1,40 @@
+module Ezframe
+  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}"
+        File.open("log/#{ENV['RACK_ENV']||'development'}.log", "a+") {|f| f.puts "#{Time.now.to_s}:#{level.upcase}:#{msg}"}
+      end
+
+      def level=(lv)
+        @level = lv
+      end
+
+      def info(msg)
+        writer("info", msg)  
+      end
+
+      def debug(msg)
+        writer("debug", msg)
+      end
+
+      def warn(msg)
+        writer("warn", msg)
+      end
+
+      def error(msg)
+        writer("debug", msg)
+      end
+
+      def <<(msg)
+        writer("", msg)
+      end
+    end
+  end
+end

data/lib/ezframe/ht.rb

@@ -3,24 +3,33 @@ module Ezframe
   module Ht
     class << self
       # メソッド名の名前のタグのhthashを生成
-      def wrap_tag(opts = {})
-        if opts.is_a?(String) || opts.is_a?(Array)
-          h = { child: opts }
-        elsif opts.is_a?(Hash)
-          if opts[:tag] && !__callee__.to_s.index("wrap_tag")
-            h = { child: opts }
+      def wrap_tag(ht_h = {})
+        return nil unless ht_h
+        if ht_h.is_a?(String) || ht_h.is_a?(Array)
+          h = { child: ht_h }
+        elsif ht_h.is_a?(Hash)
+          if ht_h[:tag] && !__callee__.to_s.index("wrap_tag")
+            h = { child: ht_h }
           else
-            h = opts.dup
+            h = ht_h.dup
           end
         else
-          mylog("wrap_tag: unknown type: #{opts.inspect}")
+          EzLog.info("[WARN] wrap_tag: unknown type: #{ht_h.inspect}")
           return nil
         end
         h[:tag] ||= __callee__.to_s
+        h[:wrap] = true
         raise "no tag" if h[:tag] == "wrap_tag"
         return h
       end
 
+      def single_tag(ht_h = {})
+        ht_h[:tag] ||= __callee__.to_s
+        raise "no tag" if ht_h[:tag] == "wrap_tag"
+        raise "has child: #{ht_h.inspect}" if ht_h[:child]
+        return ht_h
+      end
+
       alias_method :script, :wrap_tag
 
       alias_method :h1, :wrap_tag
@@ -30,8 +39,8 @@ module Ezframe
       alias_method :h5, :wrap_tag
       alias_method :h6, :wrap_tag
       alias_method :p, :wrap_tag
-      alias_method :br, :wrap_tag
-      alias_method :hr, :wrap_tag
+      alias_method :br, :single_tag
+      alias_method :hr, :single_tag
       alias_method :div, :wrap_tag
       alias_method :span, :wrap_tag
       alias_method :i, :wrap_tag
@@ -45,11 +54,12 @@ module Ezframe
       alias_method :tr, :wrap_tag
       alias_method :th, :wrap_tag
       alias_method :td, :wrap_tag
-      alias_method :img, :wrap_tag
+      alias_method :img, :single_tag
       alias_method :a, :wrap_tag
       alias_method :form, :wrap_tag
-      alias_method :input, :wrap_tag
+      alias_method :input, :single_tag
       alias_method :select, :wrap_tag
+      alias_method :option, :wrap_tag
       alias_method :textarea, :wrap_tag
       alias_method :label, :wrap_tag
       alias_method :fieldset, :wrap_tag
@@ -57,6 +67,8 @@ module Ezframe
       alias_method :footer, :wrap_tag
 
       alias_method :small, :wrap_tag
+      alias_method :pre, :wrap_tag
+      alias_method :iframe, :wrap_tag
 
       alias_method :checkbox, :wrap_tag
       alias_method :radio, :wrap_tag
@@ -69,7 +81,7 @@ module Ezframe
           h[:tag] = "icon"
           return wrap_tag(h)
         elsif arg.is_a?(String)
-          return { tag: "icon", name: arg }
+          return { tag: "icon", wrap: true, name: arg }
         end
       end
 
@@ -88,6 +100,21 @@ module Ezframe
         end
         return child
       end
+
+      def search(ht_h, opts)
+        @found ||= []
+        if ht_h.is_a?(Hash)
+          if opts[:tag] && ht_h[:tag] && ht_h[:tag] == opts[:tag]
+            @found.push(ht_h)
+          end
+          if ht_h[:child]
+            search(ht_h[:child], opts)
+          end
+        elsif ht_h.is_a?(Array)
+          ht_h.map { |h| search(h, opts) }
+        end
+        return @found
+      end
     end
 
     # 配列を<UL><OL>要素に変換するためのクラス
@@ -95,10 +122,8 @@ module Ezframe
       attr_accessor :tag
       def to_h(opts = {})
         return nil if self.empty?
-        child = self.map do |elem|
-          { tag: "li", child: elem }
-        end
-        h = { tag: @tag, child: child }
+        child = self.map { |elem| Ht.li(elem) }
+        h = { tag: @tag, wrap: true, child: child }
         h.update(opts)
         return h
       end

data/lib/ezframe/html.rb

@@ -4,6 +4,7 @@ module Ezframe
   class Html
     class << self
       def convert(ht_h = {})
+        ht_h = hook_for_convert(ht_h)
         return "" if ht_h.nil? || ht_h.to_s.empty?
         return ht_h.to_html if ht_h.respond_to?(:to_html)
         return ht_h.to_s if ht_h.is_a?(String) || ht_h.is_a?(Symbol) || ht_h.is_a?(Integer) || ht_h.is_a?(Time)
@@ -11,24 +12,38 @@ module Ezframe
 
         tag = ht_h[:tag]
         case tag
-        when "input"
-          input(ht_h)
+        when "textarea"
+          textarea(ht_h)
         when "select"
-          return select(ht_h) if ht_h[:items]
+          return select(ht_h) if ht_h[:item]
         when "icon"
           tag = "i"
         end
-        opt_s, child_s = join_attributes(ht_h)
-        if child_s.length >= 0
-          return "<#{ht_h[:tag]} #{opt_s}>\n#{child_s}\n</#{ht_h[:tag]}>\n"
+        tag = ht_h[:tag]
+        join_info = join_attribute(ht_h)
+        start_tag = [ht_h[:tag], join_info[:attr]].compact.join(" ").strip
+        if ht_h[:wrap]   # !child_s.strip.empty? || 
+          return "#{join_info[:before]}<#{start_tag}>#{join_info[:child]}</#{ht_h[:tag]}>#{join_info[:after]}"
         end
-        "<#{ht_h[:tag]} #{opt_s}/>"
+        # tag_content = [ ht_h[:tag], join_info[:attr] ].compact.join(" ")
+        return "#{join_info[:before]}<#{start_tag}/>#{join_info[:after]}"
       end
 
-      def join_attributes(attrs)
+      # attributeの連結文字列化
+      def join_attribute(attrs)
         child_s = ""
+        before = ""
+        after = ""
         opt_a = attrs.map do |k, v|
           case k
+          when :before
+            before = convert(v)
+            next
+          when :after
+            after = convert(v)
+            next
+          when :wrap
+            nil
           when :child
             child_s = convert(v)
             next
@@ -47,62 +62,63 @@ module Ezframe
             end
           end
         end
-        [opt_a.compact.join(" "), child_s]
+        { attr: opt_a.compact.join(" "), before: before, after: after, child: child_s }
       end
 
-      def input(ht_h)
-        size = ht_h[:size]
-        # puts "input: size=#{size.inspect}"
-        if size && (size.index("x") || size.index("*"))
-          if /(\d+)\s*[x\*]\s*(\d+)/ =~ size
-            ht_h[:cols], ht_h[:rows] = $1, $2
-          end
-          ht_h[:tag] = "textarea"
-          ht_h[:child] = ht_h[:value]
+      def textarea(ht_h)
+        value = ht_h[:value]
+        if value
+          ht_h[:child] = value
           ht_h.delete(:value)
-          p ht_h
         end
       end
 
       def select(ht_h = {})
         attr = ht_h.clone
-        items = attr[:items]
-        # puts "Html.select: #{items}"
-        if items.is_a?(Hash)
-          option_a = ht_h[:items].map do |k, v|
-            h = { tag: "option", value: k }
+        item = attr[:item]
+        # puts "Html.select: #{item}"
+        if item.is_a?(Hash)
+          option_a = ht_h[:item].map do |k, v|
+            h = Ht.option(value: k)
             if v.is_a?(Array)
               v, selected = v
               h[:selected] = "selected" if selected
             end
             h[:child] = v
-            if ht_h[:default] && ht_h[:default] == v
+            # 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
             h
           end
-        elsif items.is_a?(Array)
-          option_a = items.map do |v|
-            h = { tag: "option", value: v[0], child: v[1] }
+        elsif item.is_a?(Array)
+          option_a = item.map do |v|
+            h = Ht.option(value: v[0], child: v[1])
             if %w[selected default].include?(v[2])
               h[:selected] = "selected"
             end
-            if ht_h[:default] && ht_h[:default] == v
+            # 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
             # puts h.inspect
             h
           end
         else
-          warn "unknown items: #{ht_h.inspect}"
+          warn "unknown item: #{ht_h.inspect}"
         end
         attr[:tag] = "select"
         attr[:child] = option_a
         attr[:name] ||= attr[:key]
         attr[:final] = true
-        attr.delete(:items)
+        attr[:wrap] = true
+        attr.delete(:item)
         Html.convert(attr)
       end
+
+      def hook_for_convert(ht_h)
+        return ht_h
+      end
     end
   end
 end

data/lib/ezframe/japanese_utils.rb

@@ -36,5 +36,20 @@ class Japanese
       return nil if !str
       return str.tr("ぁ-ん\-ー―−", "ァ-ン\-ー―−")
     end
+
+    def to_wday(wday)
+      return nil unless wday
+      return %w(日 月 火 水 木 金 土)[wday]
+    end
+
+    def to_datetime_str(tm)
+      return nil unless tm
+      return "%d年%2d月%2d日 %2d:%02d:%02d" %[ tm.year, tm.mon, tm.mday, tm.hour, tm.min, tm.sec ]
+    end
+
+    def to_date_str(tm)
+      return nil unless tm
+      return "%d年%2d月%2d日" %[ tm.year, tm.mon, tm.mday]
+    end
   end
 end

data/lib/ezframe/jquery-ui.rb

@@ -0,0 +1,29 @@
+module Ezframe
+  class Jquery
+    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_files = Dir["./asset/css/*.css"]||[]
+        css_a += css_files.map do |file|
+          file.gsub!("./asset", "")
+          "<link href=\"#{file}\" rel=\"stylesheet\">\n"
+        end
+        js_files = Dir["./asset/js/*.js"]||[]
+        js_a += js_files.map do |file|
+          file.gsub!("./asset", "")
+          "<script src=\"#{file}\"></script>\n"
+        end
+        (css_a+js_a).join
+      end
+
+      def into_bottom_of_body
+        ""
+      end
+
+      def convert(ht_h)
+      end
+    end
+  end
+end

data/lib/ezframe/loader.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-if File.exist?("pages/common.rb")
-  require "#{Dir.pwd}/pages/common.rb"
+if File.exist?("page/common.rb")
+  require "#{Dir.pwd}/page/common.rb"
 end
-Dir["models/*.rb"].each do |file|
+Dir["model/*.rb"].sort.each do |file|
   require "#{Dir.pwd}/#{file}"
 end
-Dir["pages/*.rb"].each do |file|
+Dir["page/*.rb"].sort.each do |file|
   require "#{Dir.pwd}/#{file}"
 end

data/lib/ezframe/main_editor.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+require_relative "main_page_kit"
+
+module Ezframe
+  class MainEditor < PageBase
+    include EditorCommon
+    include MainPageKit::Default
+    include MainPageKit::Index
+    include MainPageKit::Edit
+    include MainPageKit::Detail
+
+     def init_vars
+      super
+      @sort_key = :id
+      @event = @parsed_body[:ezevent] if @parsed_body
+      @dom_id = { create: "create-area", edit: "edit-area", index: "index-area", detail: "detail-area"}
+    end   
+  end
+end

data/lib/ezframe/main_page_kit.rb

@@ -0,0 +1,226 @@
+module Ezframe
+  module MainPageKit
+    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
+    end
+
+    # 一覧テーブルの生成
+    module Index
+      def public_default_post
+        return { inject: "#main-box", body: [ Ht.div(make_index_top), Ht.div(make_index_table)], set_url: make_base_url }
+      end
+
+      def make_index_table
+        data_a = list_for_index
+        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|
+          @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
+          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_index_top
+        make_create_button
+      end
+    end
+
+    module Edit
+      # 新規登録フォーム表示
+      def public_create_get
+        @column_set.clear
+        table = make_edit_form(:create)
+        layout = main_layout(center: make_form("#{make_base_url}/create", 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)
+        EzLog.debug("public_create_post: event=#{@event}, form=#{@form}")
+        if @event[:branch] == "single_validate"
+          EzLog.debug("public_create_post: single validate")
+          return single_validation(validation, @event[:target_key] || @form.keys[0])
+        end
+        unless @form
+          url = "#{make_base_url}/create"
+          return { inject: "#center-panel", body: Html.convert(make_form(url, make_edit_form(:create))), set_url: url }
+        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(make_form("#{make_base_url}/edit", 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
+
+      # 自動入力を行う
+      def exec_completion
+        return nil
+      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], ezevent: "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 single_validation(validate_h, target_key)
+        EzLog.debug("single_validation: validate_h=#{validate_h}, target_key=#{target_key}")
+        unless target_key
+          raise "target_key is empty: #{validate_h}"
+          return []
+        end
+        cmd_a = []
+        if validate_h[target_key.to_sym]
+          cmd_a = show_validate_result(validate_h)
+        end
+        if count_errors(validate_h) == 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}, validate_h=#{validate_h}, count=#{count_errors(validate_h)}, cmd_a=#{cmd_a}")
+        return cmd_a
+      end
+
+      # 全てのカラムに対してバリデーションを行う
+      def full_validation(validate_h)
+        cmd_a = show_validate_result(validate_h)
+        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 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]], ezevent: event)
+      end
+    end
+
+    # 詳細表示
+    module Detail
+      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
+
+      # 詳細ページの表の生成
+      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]], ezevent: "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
+    end
+  end
+end