ezframe 0.3.0 → 0.4.0

data/exe/dbmigrate

@@ -51,8 +51,12 @@ module Ezframe
       end
 
       def parse_create_sql(sql)
-        sql.gsub(/CREATE TABLE \`(\w+)\` \(/i, "")
-        table_name = $1
+        # EzLog.debug("parse_create_sql: #{sql}")
+        if sql =~ /CREATE TABLE \`(\w+)\` \(/i
+          table_name = $1
+        else
+          return
+        end
         @db_columns[table_name.to_sym] ||= {}
         column_a = sql.split(", ")
         column_a.each do |line|
@@ -114,17 +118,47 @@ module Ezframe
           end
           if dbtype != new_type
             exec_sql("ALTER TABLE #{table_name} ALTER COLUMN #{column.key} DROP DEFAULT;")
-            begin
-              exec_sql("ALTER TABLE #{table_name} ALTER #{column.key} TYPE #{new_type};")
-            rescue => e
-              EzLog.error("alter column type error: #{e.class}:#{e}:#{e.backtrace}")
-              back_key = "#{column.key}_bak"
-              exec_sql("ALTER TABLE #{table_name} RENAME #{column.key} TO #{back_key};")
+            unless change_type(table, column.key, new_type)
+              # 失敗したときは名前を変更してカラム追加
+              rename_column(table_name, column.key, "#{column.key}_bak")
+              add_column(table, column.key, new_type)
             end
             set_default(column)
           end
         end
-        # exec_sql("ALTER TABLE #{table_name} add COLUMN deleted_at timestamp;")
+      end
+
+      # カラム追加
+      def add_column(table_name, key, typ)
+        begin
+          exec_sql("ALTER TABLE #{table_name} ADD #{key} #{typ};")
+        rescue => e
+          EzLog.error("change_type: error: #{e.class}:#{e}:#{e.backtrace}")
+          return nil
+        end
+        return true
+      end
+
+      # カラムの型変更
+      def change_type(table_name, key, typ)
+        begin
+          exec_sql("ALTER TABLE #{table_name} ALTER #{key} TYPE #{typ};")
+        rescue => e
+          EzLog.error("change_type: error: #{e.class}:#{e}:#{e.backtrace}")
+          return nil
+        end
+        return true
+      end
+
+      # カラムの名前変更
+      def rename_column(table_name, old_key, new_key)
+        begin
+          exec_sql("ALTER TABLE #{table_name} RENAME #{old_key} TO #{new_key};")
+        rescue => e
+          EzLog.error("rename_column: error: #{e.class}:#{e}:#{e.backtrace}")
+          return nil
+        end
+        return true
       end
     end
   end

data/exe/html2ruby

@@ -0,0 +1,61 @@
+#!/usr/bin/env ruby
+#coding: utf-8
+=begin
+
+  HTMLから、hthash生成するrubyプログラムを生成する
+
+=end
+require "nokogiri"
+
+class Html2Ruby
+  def show_leaves(node, depth=0)
+    res = []
+    indent = "  "*depth
+    node.children.each do |child|
+      next if child.name == "comment"
+      if child.name == "text" 
+        if child.content.strip.empty?
+          next
+        else
+          res.push "#{indent}\"#{child.content}\""
+        end
+      else
+        attrs = child.attributes.map do |k, v| 
+          if k.index("-")
+            key_s = "\"#{k}\""
+          else
+            key_s = k
+            if k == "class"
+              if v =~/\s/
+                cls_a = v.split(/\s+/)
+                v = "%w[#{cls_a.join(' ')}]"
+              end
+            end
+          end
+          "#{key_s}: \"#{v}\"" 
+        end
+        descendant = show_leaves(child, depth+1)
+        if descendant && descendant.strip.length > 10
+          attrs.push("child: \n#{descendant}\n")
+          res.push "#{indent}Ht.#{child.name}(#{attrs.join(', ')}#{indent})"
+        else
+          res.push "#{indent}Ht.#{child.name}(#{attrs.join(', ')})"
+        end
+      end
+    end
+    if res.length > 1
+      res_s = res.join(",\n")
+      return "[ #{res_s} ]"
+    else
+      return res[0]
+    end
+  end
+
+  def show_all(file)
+    doc = Nokogiri::HTML(File.open(file))
+    puts show_leaves(doc.root)
+  end
+end
+
+node = Html2Ruby.new
+node.show_all(ARGV[0])

data/lib/ezframe.rb

@@ -28,7 +28,6 @@ require_relative 'ezframe/template'
 require_relative 'ezframe/server'
 require_relative 'ezframe/message'
 require_relative 'ezframe/auth.rb'
-require_relative 'ezframe/editor.rb'
 require_relative 'ezframe/loader'
 require_relative 'ezframe/route'
 

data/lib/ezframe/column_type.rb

@@ -108,6 +108,10 @@ module Ezframe
         return pattern % value_a
       end
     end
+
+    def make_error_box(name)
+      Ht.div(id: "error-box-#{name}", class: %w[error-box hide], child: "")
+    end
   end
 
   class TextType < TypeBase
@@ -130,6 +134,7 @@ module Ezframe
       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]
+      h[:after]  = make_error_box(key)
       return h
     end
 
@@ -151,6 +156,7 @@ module Ezframe
       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]
+      h[:after] = make_error_box(key)
       return h
     end
   end
@@ -207,6 +213,7 @@ module Ezframe
       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]
+      h[:after] = make_error_box(key)
       return h
     end
 
@@ -253,7 +260,7 @@ module Ezframe
       end
       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)
+      return Ht.select(name: key, class: %w[browser-default], item: menu_a, value: @value, after: make_error_box(key))
     end
 
     def db_type
@@ -294,9 +301,10 @@ module Ezframe
       return nil if no_edit? && !opts[:force]
       key = self.key
       key ="#{key}#{opts[:key_suffix]}" if opts[:key_suffix]
-      h = { tag: "input", type: "password", name: key, label: @attribute[:label], value: "" }
+      h = Ht.input(type: "password", name: key, label: @attribute[:label], value: "")
       h[:class] = @attribute[:class] if @attribute[:class]
-      return h
+      h[:after] = make_error_box(key)
+      return  h
     end
 
     def db_value
@@ -309,8 +317,9 @@ module Ezframe
     def form(opts = {})
       return nil if no_edit? && !opts[:force]
       @items ||= @attribute[:item]
-      h = { tag: "select", class: %w[browser-default], name: self.key, label: @attribute[:label], item: @items, value: @value }
+      h = Ht.select(class: %w[browser-default], name: self.key, label: @attribute[:label], item: @items, value: @value)
       h[:class] = @attribute[:class] if @attribute[:class]
+      h[:after] = make_error_box(self.key)
       return h
     end
 
@@ -338,6 +347,7 @@ module Ezframe
       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]
+      h[:after] = make_error_box(key)
       return h
     end
 
@@ -350,6 +360,7 @@ module Ezframe
     def form(opts = {})
       return nil if no_edit? && !opts[:force]
       h = super
+      return nil unless h
       if h
         # h[:type] = 'date'
         h[:type] = "text"
@@ -422,7 +433,8 @@ module Ezframe
   class DatetimeType < TextType
     def initialize(attr = nil)
       super(attr)
-      @attribute[:class] = "datetimepicker"
+      # @attribute[:class] = "datettimepicker"  # for jquery datetimepicker
+      @attribute[:class] = "datetpicker"  
     end
 
     def value=(v)
@@ -472,14 +484,13 @@ module Ezframe
       # EzLog.debug("DatetimeType: key=#{self.key}, opts=#{opts}")
       return nil if no_edit? && !opts[:force]
       h = super
+      return nil unless h
       if h
-        # h[:type] = 'date'
         h[:type] = "text"
         h[:value] = @value || ""
         h[:class] = [ "datepicker" ]
         h[:class].push(@attribute[:class]) if @attribute[:class]
       end
-      # EzLog.debug("DatetimeType: res=#{h}")
       return h
     end
 
@@ -513,13 +524,15 @@ module Ezframe
       mon_list.unshift([0, "(月)"])
       mday_list = (1..31).map { |d| [d, "#{d}"] }
       mday_list.unshift([0, "(日)"])
-      return [Ht.div([Ht.select(name: "#{key}_year", class: %w[browser-default], item: year_list, value: year),
+      ezvalid = "target_key=#{key}:with=#multi-#{key}"
+      return  Ht.div(id: "multi-#{key}",
+        child: [ Ht.div([Ht.select(name: "#{key}_year", class: %w[browser-default multi_input], item: year_list, value: year, ezvalid: ezvalid),
               Ht.small("年")]),
-              Ht.select(name: "#{key}_mon", class: %w[browser-default], item: mon_list, value: mon),
+              Ht.select(name: "#{key}_mon", class: %w[browser-default multi_input], item: mon_list, value: mon, ezvalid: ezvalid),
               Ht.small("月"),
-              Ht.select(name: "#{key}_mday", class: %w[browser-default], item: mday_list, value: mday),
-              Ht.small("日")
-      ]
+              Ht.select(name: "#{key}_mday", class: %w[browser-default multi_input], item: mday_list, value: mday, ezvalid: ezvalid),
+              Ht.small("日"), 
+              make_error_box(key)])
     end
 
     def view(opts = {})
@@ -548,13 +561,36 @@ module Ezframe
       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
+
+    def validate(val)
+      return validate_date(val)
+    end
+
+    # 日付の検証
+    def validate_date(val)
+      if val.is_a?(String)
+        y,m,d = val.split("-")
+        if y.to_i == 0 || m.to_i == 0 || d.to_i == 0
+          return nil
+        end
+        tm = Time.mktime(y.to_i, m.to_i, d.to_i)
+      elsif val.is_a?(Time)
+        tm = val
+      end
+      if tm.mday != d.to_i
+        @error = :invalid_value
+        return @error
+      end
+      return nil
+    end
   end
 
   class EmailType < TextType
     def form(opts = {})
       return nil if no_edit? && !opts[:force]
       h = super
-      h[:type] = "email" if h
+      return nil unless h
+      h[:type] = "email"
       h[:class] = @attribute[:class] if @attribute[:class]
       return h
     end
@@ -663,6 +699,7 @@ module Ezframe
     def form(opts = {})
       return nil if no_edit? && !opts[:force]
       h = super
+      return nil unless h
       h[:item] = @pref_h
       return h
     end

data/lib/ezframe/database.rb

@@ -9,13 +9,13 @@ module Ezframe
         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: [EzLog])
-          end
-        else
-          connect(@dbfile)
-        end
+        #if Config[:use_connection_pool] || opts[:use_connection_pool]
+          #@pool = Sequel::ConnectionPool.new(max_connections: 10) do
+          #  Sequel.connect(@dbfile, loggers: [EzLog])
+          #end
+        #else
+        connect(@dbfile)
+        #end
       end
 
       def connect(dbfile = nil)

data/lib/ezframe/editor_common.rb

@@ -3,39 +3,56 @@ module Ezframe
     def get_id(class_name = nil)
       class_name ||= @class_snake
       params = @request.env['url_params']
+      return nil unless params
       # EzLog.info "get_id: #{params.inspect}, #{class_name}"
       return params[class_name.to_sym]
     end
 
+    # 新規データの生成
+    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 make_form(url, child)
+      return Ht.form(ezload: "command=set_validation:validate_url=#{url}", child: child)
+    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)
+      return Ht.button(id: "#{@class_snake}-create-button", class: %[btn], child: [Ht.icon("add"), Message[:create_button_label]], ezevent: 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]])    
+      return Ht.button(class: %w[btn], ezevent: 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]])
+      return Ht.button(class: %w[btn right red], ezevent: 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)
+      return Ht.button(class: %w[btn red], child: [Ht.icon("cancel"), Message[:cancel_button_label]], ezevent: event)
     end
 
     # 値の更新
-    def update_value
-      form = @event[:form]
-      @column_set.update(get_id, form)
-    end
+#    def update_value
+#      form = @event[:form]
+#      @column_set.update(get_id, form)
+#    end
 
     # ラベル付きで1カラムのviewを表示
     def show_label_view(key)
@@ -49,6 +66,7 @@ module Ezframe
       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

data/lib/ezframe/ht.rb

@@ -18,6 +18,7 @@ module Ezframe
           return nil
         end
         h[:tag] ||= __callee__.to_s
+        h[:wrap] = true
         raise "no tag" if h[:tag] == "wrap_tag"
         return h
       end
@@ -58,6 +59,7 @@ module Ezframe
       alias_method :form, :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
@@ -79,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
 
@@ -120,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

@@ -20,24 +20,30 @@ module Ezframe
           tag = "i"
         end
         tag = ht_h[:tag]
-        error_box = ""
-        if %w[input select textarea].include?(tag)
-          error_box = "<div id=\"error-box-#{ht_h[:name]}\" class=\"error-box hide\"></div>"
+        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
-        opt_s, child_s = join_attribute(ht_h)
-        if !child_s.strip.empty? || !%w[img input hr br meta].include?(tag)
-          start_tag = [ht_h[:tag], opt_s].compact.join(" ").strip
-          return "<#{start_tag}>#{child_s}</#{ht_h[:tag]}>"+error_box
-        end
-        tag_content = [ ht_h[:tag], opt_s ].compact.join(" ")
-        return "<#{tag_content}/>"+error_box
+        # tag_content = [ ht_h[:tag], join_info[:attr] ].compact.join(" ")
+        return "#{join_info[:before]}<#{start_tag}/>#{join_info[:after]}"
       end
 
       # 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
@@ -56,7 +62,7 @@ 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 textarea(ht_h)
@@ -73,7 +79,7 @@ module Ezframe
         # puts "Html.select: #{item}"
         if item.is_a?(Hash)
           option_a = ht_h[:item].map do |k, v|
-            h = { tag: "option", value: k }
+            h = Ht.option(value: k)
             if v.is_a?(Array)
               v, selected = v
               h[:selected] = "selected" if selected
@@ -87,7 +93,7 @@ module Ezframe
           end
         elsif item.is_a?(Array)
           option_a = item.map do |v|
-            h = { tag: "option", value: v[0], child: v[1] }
+            h = Ht.option(value: v[0], child: v[1])
             if %w[selected default].include?(v[2])
               h[:selected] = "selected"
             end
@@ -105,6 +111,7 @@ module Ezframe
         attr[:child] = option_a
         attr[:name] ||= attr[:key]
         attr[:final] = true
+        attr[:wrap] = true
         attr.delete(:item)
         Html.convert(attr)
       end