ezframe 0.0.4 → 0.1.0

data/ezframe.gemspec

@@ -34,9 +34,12 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest", '~> 5.13.0'
   spec.add_development_dependency "nokogiri", '~> 1.10.7'
   spec.add_development_dependency "rack-test", '~> 1.1.0'
+  spec.add_development_dependency "pry", '~> 0.12.2'
+  spec.add_development_dependency "mailcatcher", '~> 0.7.1'
 
   spec.add_runtime_dependency "rake", "~> 13.0"
   spec.add_runtime_dependency 'rack', '~> 2.0.7'
   spec.add_runtime_dependency 'sequel', '~> 5.27.0'
   spec.add_runtime_dependency 'sqlite3', '~> 1.4.0'
+  spec.add_runtime_dependency 'oj', '~> 3.10.2'
 end

data/lib/ezframe/auth.rb

@@ -39,7 +39,7 @@ module Ezframe
       def authenticate(env, account, pass)
         model = env["model"]
         raise "model is not initialized" unless model
-        @user = model.db.dataset(:user).where(account: account).first
+        @user = model.db.dataset(Config[:login_table]).where(Config[:login_account].to_sym => account ).first
         if @user
           mylog "Auth: authenticate: user=#{@user.inspect}"
         else
@@ -60,7 +60,12 @@ module Ezframe
 
     def initialize(model, account)
       self.account = account
-      @user = model.db.dataset(:user).where(Sequel.or(account: account, id: account)).first
+      dataset = model.db.dataset(Config[:login_table])
+      if account.is_a?(Integer)
+        @user = dataset.where(id: account).first
+      else
+        @user = dataset.where(Config[:login_account].to_sym => account).first
+      end
       unless @user
         mylog "Auth.initialize: This user does not exist: #{account}"
       end

data/lib/ezframe/column_set.rb

@@ -16,18 +16,17 @@ module Ezframe
 
     def load_one_file(filename)
       table_name = $1 if filename =~ /(\w+).ya?ml$/
-      begin
+      #begin
         yaml = YAML.load_file(filename)
-      rescue
-        mylog("YAML load error: #{filename}")
-        return 
-      end
+      #rescue
+      #  raise "YAML load error: #{filename}"
+      #end
       if yaml.length == 0
         mylog("[ERROR] columns file is empty: #{filename}")
         return
       end
       column_info = yaml.recursively_symbolize_keys
-      puts "load_one_file: filename=#{filename} column_info=#{column_info.inspect}"
+      # puts "load_one_file: filename=#{filename} column_info=#{column_info.inspect}"
       add(table_name, column_info)
     end
 
@@ -61,6 +60,7 @@ module Ezframe
       end
     end
 
+    # 配列を初期化する
     def set(attr_a)
       @columns[:id] = IdType.new(key: "id", label: "ID", no_edit: true)
       attr_a.each do |attributes|
@@ -93,12 +93,13 @@ module Ezframe
       return data
     end
 
-    def save
+    # 新規に値を登録する
+    def create
       col_h = get_hash(:value)
       col_h.delete(:id)
       col_h.delete(:created_at)
       col_h[:updated_at] = Time.now
-      mylog "save: #{col_h.inspect}"
+      mylog "create: #{col_h.inspect}"
       id = @columns[:id]
       if id.value.to_i > 0
         dataset.where(id: id.value).update(col_h)
@@ -107,14 +108,28 @@ module Ezframe
       end
     end
 
+    # データベース上の値の更新
     def update(id, value_h)
-      values = {}
-      colkeys = @columns.keys
-      value_h.each do |k, v|
-        values[k] = v if colkeys.include?(k)
+      self.set_from_db(id)
+      updated_values = {}
+      @columns.each do |colkey, column|
+        next if column.no_edit?
+        if column.multi_inputs?
+          new_value = column.form_to_value(value_h)
+        else
+          new_value = value_h[colkey]
+        end
+        prev_value = column.value
+        column.value = new_value
+        if prev_value != column.value
+          updated_values[colkey] = column.value
+        end
+      end
+      mylog "column_set.updated_values = #{updated_values.inspect}"
+      if updated_values.length > 0
+        updated_values[:updated_at] = Time.now
+        dataset.where(id: id).update(updated_values) 
       end
-      dataset.where(id: id).update(values)
-      set_values(values)
     end
 
     def values=(value_h)
@@ -125,6 +140,7 @@ module Ezframe
     def set_values(value_h)
       return unless value_h
       value_h.each do |k, v|
+        next if k.nil? || k.to_s.empty?
         col = @columns[k.to_sym]
         next unless col
         col.value = v

data/lib/ezframe/column_type.rb

@@ -26,10 +26,11 @@ module Ezframe
 
     def initialize(attr = nil)
       @attribute = attr || {}
+      @value = @attribute[:default]
     end
 
     def key
-      @attribute[:key]
+      @attribute[:key].to_sym
     end
 
     def label
@@ -68,10 +69,14 @@ module Ezframe
       @value
     end
 
-    def validate
-      if !@value || @value.empty?
-        if @attribute[:must]
-          @error = "必須項目です。"
+    def normalize(val)
+      return val
+    end
+
+    def validate(val)
+      if !val || val.empty?
+        if @attribute[:required] == "true"
+          @error = "required"
           return @error
         end
       end  
@@ -85,41 +90,81 @@ module Ezframe
     def no_view?
       return (@attribute[:hidden] && !@attribute[:force])
     end
+
+    def multi_inputs?
+      nil
+    end
   end
 
   class TextType < TypeBase
-    def normalize
-      return unless @value
-      @value = @value.to_s
-      @value.gsub!(/　/, " ")
-      @value.gsub!(/\s+/, " ")
-      @value.strip!
+    def normalize(val)
+      return nil unless val
+      val = val.dup.to_s
+      val.gsub!(/　/, " ")
+      val.gsub!(/\s+/, " ")
+      val.strip!
+      return val
     end
 
-    def value=(v)
-      super(v)
-      normalize
+    def value=(val)
+      @value = normalize(val)
     end
 
     def form(opts = {})
       return nil if no_edit? && !opts[:force]
-      h = { tag: "input", type: "text", name: @attribute[:key], key: @attribute[:key], label: @attribute[:label], value: @value || "" }
-      h[:size] = @attribute[:size] if @attribute[:size]
-      h
+      if @attribute[:size]
+        val = @value
+        if val && val.length>0
+          val.gsub!(/\n/, "<br>")
+        end
+        h = Ht.textarea(name: self.key, class: "textarea-size-#{@attribute[:size]}", label: @attribute[:label], child: val)
+      else
+        h = Ht.input(type: "text", name: self.key, label: @attribute[:label], value: @value || "")
+      end
+      return h
     end
 
     def db_type
-      "text"
+      return "text"
+    end
+  end
+
+  class TextareaType < TextType
+    def value=(val)
+      val = normalize(val)
+      val.gsub!(/<br>/, "\n") if val
+      @value = val
+    end
+
+    def form(opts = {})
+      return nil if no_edit? && !opts[:force]
+      val = @value
+      if val && val.length>0
+        val.gsub!(/\n/, "<br>")
+      end
+      h = Ht.textarea(name: self.key, label: @attribute[:label], child: val)
+      h[:class] = @attribute[:class] if @attribute[:class]
+      return h
     end
   end
 
   class IntType < TextType
     def view(opts = {})
       return nil if no_view? && !opts[:force]
-      return Util.add_comma(@value.to_i)
+      return @value.to_i.add_comma
     end
 
     def value=(v)
+      if v.nil?
+        default = @attribute[:default]
+        if default
+          @value = default
+        else
+          @value = nil
+        end
+        return
+      end
+
       if v.nil?
         @value = nil
         return
@@ -132,22 +177,28 @@ module Ezframe
 
     def form(opts = {})
       return nil if no_edit? && !opts[:force]
-      { tag: "input", type: "number", key: @attribute[:key], label: @attribute[:label], value: @value || "" }
+      h = Ht.input(type: "number", name: self.key, label: @attribute[:label], value: @value || "")
+      h[:class] = @attribute[:class] if @attribute[:class]
+      return h
     end
 
     def db_type
-      "int"
+      return "int"
     end
-
-
   end
 
   class ForeignType < IntType
+    def initialize(attr = nil)
+      super
+      @attribute[:no_edit] = true
+    end
+
     def view(opts = {})
       return nil if no_view? && !opts[:force]
-      dataset = @parent.db.dataset[self.type.inner]
-      data = dataset.get(id: @value)
-      return data[@attribute[:view]]
+      return nil
+#      dataset = @parent.parent.model.db.dataset(self.key)
+#      data = dataset.get(id: @value)
+#      return data[@attribute[:view]]
     end
 
     def form
@@ -169,7 +220,9 @@ module Ezframe
   class PasswordType < TextType
     def form(opts = {})
       return nil if no_edit? && !opts[:force]
-      return { tag: "input", type: "password", label: @attribute[:label], value: @value || "" }
+      h = { tag: "input", type: "password", name: self.key, label: @attribute[:label], value: @value || "" }
+      h[:class] = @attribute[:class] if @attribute[:class]
+      return h
     end
 
     def db_value
@@ -180,23 +233,33 @@ module Ezframe
   class SelectType < TypeBase
     def form(opts = {})
       return nil if no_edit? && !opts[:force]
-      # puts "selectType: #{@attribute[:items].inspect}"
-      return { tag: "select", key: @attribute[:key], label: @attribute[:label], items: @attribute[:items], value: @value }
+      # puts "selectType: #{@attribute[:item].inspect}"
+      h = { tag: "select", name: self.key, label: @attribute[:label], item: @attribute[:item], value: @value }
+      h[:class] = @attribute[:class] if @attribute[:class]
+      return h
     end
 
     def db_type
       return "text"
     end
+
+    def view(opts = {})
+      return nil if no_view? && !opts[:force]
+      item = @attribute[:item]
+      return item[@value]
+    end
   end
 
   class CheckboxType < TypeBase
     def form(opts = {})
       return nil if no_edit? && !opts[:force]
-      return { tag: "checkbox", key: @attribute[:key], name: @attribute[:key], value: parent[:id].value, label: @attribute[:label] }
+      h = Ht.checkbox(name: self.key, value: parent[:id].value, label: @attribute[:label])
+      h[:class] = @attribute[:class] if @attribute[:class]
+      return h
     end
 
     def db_type
-      return "int"
+      return "text"
     end
   end
 
@@ -205,10 +268,11 @@ module Ezframe
       return nil if no_edit? && !opts[:force]
       h = super
       if h
-        #        h[:type] = 'date'
+        # h[:type] = 'date'
         h[:type] = "text"
-        h[:class] = "datepicker"
-        h[:value] = value || ""
+        h[:value] = @value || ""
+        h[:class] = [ "datepicker" ]
+        h[:class].push@attribute[:class] if @attribute[:class]
       end
       return h
     end
@@ -226,7 +290,12 @@ module Ezframe
 
     def value=(v)
       if v.nil?
-        @value = nil
+        default = @attribute[:default]
+        if default
+          @value = default
+        else
+          @value = nil
+        end
         return
       end
       if v.is_a?(String)
@@ -235,7 +304,6 @@ module Ezframe
           return
         end
         y, m, d = v.split(/[\-\/]/)
-        # puts "date=#{v.inspect}"
         @value = Date.new(y.to_i, m.to_i, d.to_i)
         return
       end
@@ -265,23 +333,50 @@ module Ezframe
     end
   end
 
-  class BirthdayType < DateType
+  class BirthdayType < TextType
     def form(opts = {})
       return nil if no_edit? && !opts[:force]
-      prefix = @attribute[:key]
+      prefix = self.key
       now = Time.now
       year_list = []
       110.times do |y|
         year = now.year - y - 10
         year_list.push [year, "#{year}年 (#{Japanese.convert_wareki(year)})"]
       end
+
+      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.select(name: "#{prefix}_year", items: year_list),
-              Ht.select(name: "#{prefix}_mon", items: mon_list),
-              Ht.select(name: "#{prefix}_mday", items: mday_list)]
+      return [Ht.select(name: "#{prefix}_year", item: year_list, value: year),
+              Ht.select(name: "#{prefix}_mon", item: mon_list, value: mon),
+              Ht.select(name: "#{prefix}_mday", item: mday_list, value: mday)]
+    end
+
+    def view(opts = {})
+      return nil if no_view? && !opts[:force]
+      return nil unless @value
+      year, mon, mday = parse_date(@value)
+      mon = "?" if mon == 0
+      mday = "?" if mday == 0
+      return "#{year}年 #{mon}月 #{mday}日"
+    end
+
+    def parse_date(date)
+      if date && date =~ /(\d+)\-(\d+)\-(\d+)/
+        return [ $1.to_i,$2.to_i,$3.to_i ]
+      end
+      return nil
+    end
+
+    def multi_inputs?
+      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]
+      return "#{y.to_i}-#{m.to_i}-#{d.to_i}"
     end
   end
 
@@ -290,62 +385,93 @@ module Ezframe
       return nil if no_edit? && !opts[:force]
       h = super
       h[:type] = "email" if h
+      h[:class] = @attribute[:class] if @attribute[:class]
       return h
     end
 
-    def normalize
-      return unless @value
-      @value = NKF.nkf('-w -Z4', @value)
+    def normalize(val)
+      return nil unless val
+      return NKF.nkf('-w -Z4', val)
     end
 
-    def validate
-      super
+    def validate(val)
+      super(val)
       return @error if @error
-      if email_format?
-        @error = "形式が正しくありません"
+      if email_format?(val)
+        @error = :invalid_value
         return @error
       end
       return nil
     end
 
-    def email_format?
-      return nil unless @value
-      return @value =~ /^[a-zA-Z0-9.!\#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/
+    def email_format?(val)
+      return nil unless val
+      return val.to_s =~ /^[a-zA-Z0-9.!\#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/
     end
   end
 
   class TelType < TextType
-    def validate
-      super
+    def validate(val)
+      super(val)
       return @error if @error
-      unless /^0\d{9,10}$/ =~ @value
-        @error = "形式が正しくありません"
+      unless /^0\d{9,10}$/ =~ val.to_s
+        @error = :invalid_value
         return @error
       end
+      return nil
+    end
+
+    def normalize(val)
+      return nil unless val
+      val = super(val)
+      val = val.tr("０-９", "0-9")
+      val = val.gsub(/\D+/, "")
+      return val
     end
   end
 
   class JpnameType < TextType
   end
 
-  class JpnameKanaType < TextType
-    def normalize
-      return unless @value
-      super
-      @value.tr!("ァ-ン", "ぁ-ん")
+  class KatakanaType < TextType
+    def normalize(val)
+      val = super(val)
+      return val.tr("ァ-ン", "ぁ-ん")
     end
 
-    def validation
-      unless /^[ぁ-ん ]+$/ =~ @value
-        "ひらがなのみで入力してください。"
+    def validate(val)
+      super(val)
+      return @error if @error
+      unless /^[ぁ-ん ]+$/ =~ val.to_s
+        @error = :hiragana_only
+        return @error
+      end
+      return nil
+    end
+  end
+
+  class KatakanaType < TextType
+    def normalize(val)
+      return nil unless val
+      val = super(val)
+      return val.tr("ぁ-ん", "ァ-ン")
+    end
+
+    def validate(val)
+      super(val)
+      return @error if @error
+      unless /^[ァ-ン ]+$/ =~ val
+        @error = :katakana_only
+        return @error
       end
+      return nil
     end
   end
 
   class PrefectureType < SelectType
     def initialize(attr)
       super(attr)
-      @pref_a = %w[選択してください 北海道 青森県 岩手県 宮城県 秋田県 山形県 福島県
+      @pref_a = %w[() 北海道 青森県 岩手県 宮城県 秋田県 山形県 福島県
                    茨城県 栃木県 群馬県 埼玉県 千葉県 東京都 神奈川県
                    新潟県 富山県 石川県 福井県 山梨県 長野県 岐阜県 静岡県 愛知県
                    三重県 滋賀県 京都府 大阪府 兵庫県 奈良県 和歌山県
@@ -359,11 +485,12 @@ module Ezframe
     def form(opts = {})
       return nil if no_edit? && !opts[:force]
       h = super
-      h[:items] = @pref_h
+      h[:item] = @pref_h
       return h
     end
 
     def view
+      return nil if no_view? && !opts[:force]
       return @pref_h[@value.to_i]
     end
   end
@@ -376,8 +503,21 @@ module Ezframe
       return @value.to_s.gsub(/(\d{3})(\d{4})/) { "#{$1}-#{$2}" }
     end
 
-    def db_type
-      return "text"
+    def normalize(val)
+      val = super(val)
+      return nil unless val
+      val = val.tr("０-９", "0-9")
+      return val
+    end
+
+    def validate(val)
+      super(val)
+      return @error if @error
+      unless /^\d{7}$/ =~ val.to_s
+        @error = :invalid_value
+        return @error
+      end
+      return nil
     end
   end
 end

data/lib/ezframe/config.rb

@@ -12,8 +12,12 @@ module Ezframe
       end
 
       def load_one_file(filename)
+        instr = File.open(filename, &:read)
+        if instr.index("\#{")
+          instr = Template.fill_in_text(instr)
+        end
         begin
-          yaml = YAML.load_file(filename)
+          yaml = YAML.load(instr)
         rescue
           mylog("YAML load error: #{filename}")
           return 

data/lib/ezframe/controller.rb

@@ -1,60 +1,60 @@
 # frozen_string_literal: true
+require "oj"
 
 module Ezframe
-  class Boot
+  class Controller
     class << self
-      def exec(request, response)
-        @request = request
+      def init
         Config.load_files("./config")
         Model.init
-        model = Model.get_clone
+        Message.init
         Auth.init_warden if defined?(Warden)
+      end
+
+      def exec(request, response)
+        @request = request
+        model = Model.get_clone
         @request.env["model"] = model
 
         mylog("exec: path=#{request.path_info} params=#{request.params}")
-        klass, method = PageBase::decide_route(request.path_info)
-        unless klass
-          response.status = 404
-          response['Content-Type'] = 'text/html; charset=utf-8'
-          response.body = [ Html.convert(Ht.p("file not found")) ]
+        page_instance, method, url_params = Route::choose(request)
+        mylog "page: #{page_instance.class}, method=#{method}, url_params=#{url_params}"
+        if !page_instance || page_instance == 404
+          file_not_found(response)
           return
         end
-        method = "default" if !method || method=="undefined"
-        page = klass.new(request, model)
-        if request.post?
-          method_full_name = "public_#{method}_post"
-        else
-          method_full_name = "public_#{method}_page"
-        end
-        if page.auth
-          warden.authenticate! 
-        end
-        # request.env["rack.session"]["kamatest"]="usable"
-        # mylog "method: #{klass}.#{method_full_name}"
-        #mylog "rack.session.id=#{request.env['rack.session'].id}"
+        @request.env["url_params"] = url_params
+        warden.authenticate! if page_instance.auth
         mylog "rack.session.keys=#{request.env['rack.session'].keys}"
-        #mylog "warden=#{request.env['warden'].inspect}"
-        mylog "klass=#{klass}, method=#{method_full_name}"
-        body = if page.respond_to?(method_full_name)
-                    page.send(method_full_name)
-                  else
-                    mylog "no such method: #{method_full_name}"
-                    page.public_default_page
-                  end
+        page_instance.set_request(@request)
+        body = page_instance.send(method)
+
+        # 戻り値によるレスポンス生成
         if body.is_a?(Hash) || body.is_a?(Array)
+          # puts  "Controller: body = #{body}"
           response.body = [ JSON.generate(body) ]
+          # response.body = [ Oj.dump(body) ]
           response['Content-Type'] = 'application/json; charset=utf-8'
         else
           response.body = [ body ]
           response['Content-Type'] = 'text/html; charset=utf-8'
         end
         response.status = 200
+        # puts response.body
       end
 
-#      def file_not_found(response)
-#        response.body = ['path not found']
-#        response.status = 404
-#      end
+      def file_not_found(response)
+        response.status = 404
+        response['Content-Type'] = 'text/html; charset=utf-8'
+        template_file = ("#{Config[:template_dir]}/404.html")
+        # puts template_file
+        if File.exist?(template_file) 
+          body = File.read(template_file)
+        else
+          body = Html.convert(Ht.p("file not found"))
+        end
+        response.body = [ body ]
+      end
 
       def warden
         @request.env["warden"]