ezframe 0.0.4 → 0.1.0

data/lib/ezframe/database.rb

@@ -12,7 +12,7 @@ module Ezframe
 
     def connect
       @dbfile ||= ENV["EZFRAME_DB"] || Config[:database] || "sqlite://db/devel.sqlite"
-      puts "Database.connect: dbfile=#{@dbfile}"
+      # puts "Database.connect: dbfile=#{@dbfile}"
       @sequel = Sequel.connect(@dbfile, loggers: [Logger.new($stdout)])
     end  
 
@@ -31,7 +31,7 @@ module Ezframe
       # puts "create_table: #{table_name}"
       if @dbfile.index("postgres")
         @sequel.create_table(table_name) do 
-          serial :id
+          primary_key :id, identity: true
           dbtype_h.each do |key, dbtype|
             column(key, dbtype)
           end

data/lib/ezframe/editor.rb

@@ -13,8 +13,8 @@ module Ezframe
         end
         @dataset = @column_set.dataset
       end
-      if @json
-        @event = @json[:event] || {}
+      if @parsed_body
+        @event = @parsed_body[:event] || {}
         @target_id = @event[@target]
       end
       @auth = false
@@ -34,53 +34,53 @@ module Ezframe
       return @target
     end
 
-    def public_login_page
-      flash_area = ""
-      mylog "public_login_page: #{@request}"
-      if @request
-        mylog "flash=#{@request.env['x-rack.flash']}"
-        flash_area = Ht.div(class: %w[teal], child: @request['env']['x-rack.flash'].error)
-      end
-      form = Ht.multi_div([ %w[container], %w[row]], 
-          Ht.form(class: "col s6 offset-s3", action: "/#{@target}/login", method: "post", child: [
-            Materialize.input(type: "text", name: "account", label: "User ID"),
-            Materialize.input(type: "password", name: "password", label: "Password"),
-            Ht.button(type: "submit", class: %w[btn], child: "login")
-          ]))
-      common_page(title: "Login", body: Html.convert(Materialize.convert([flash_area, form])))
-    end
-
-    def public_login_post
-      mylog "public_login_post: #{@params.inspect}, #{@json}"
-      warden.authenticate
-      public_index_page
-    end
+#    def public_login_get
+#      flash_area = ""
+#      mylog "public_login_get: #{@request}"
+#      if @request
+#        mylog "flash=#{@request.env['x-rack.flash']}"
+#        flash_area = Ht.div(class: %w[teal], child: @request['env']['x-rack.flash'].error)
+#      end
+#      form = Ht.multi_div([ %w[container], %w[row]], 
+#          Ht.form(class: "col s6 offset-s3", action: "/#{@target}/login", method: "post", child: [
+#            Materialize.input(type: "text", name: "account", label: "User ID"),
+#            Materialize.input(type: "password", name: "password", label: "Password"),
+#            Ht.button(type: "submit", class: %w[btn], child: "login")
+#          ]))
+#      show_base_template(title: "Login", body: Html.convert(Materialize.convert([flash_area, form])))
+#    end
+
+#    def public_login_post
+#      mylog "public_login_post: #{@params.inspect}, #{@parsed_body}"
+#      warden.authenticate
+#    public_index_get
+#    end
 
     #--------------------------------------------------------------------------------------------------------
     # add new parts
-    def public_new_page
+    def public_create_get
       matrix = @column_set.map do |column|
         [column.label, column.form]
       end
-      matrix.push([Ht.button(child: "送信", class: %w[btn], event: "on=click:branch=add_new:url=/#{@target}/new:with=form")])
+      matrix.push([Ht.button(child: Message[:create_finish_button_label], class: %w[btn], event: "on=click:url=/#{@target}/create:with=form")])
       tb = Ht::Table.new(matrix)
       layout = main_layout(left: sidenav, center: Ht.form(child: tb.to_h))
-      common_page(title: "新規登録", body: Html.convert(Materialize.convert(layout)))
+      show_base_template(title: Message[:create_page_title], body: Html.convert(Materialize.convert(layout)))
     end
 
-    def public_new_post
+    def public_create_post
       @column_set.values = @event[:form]
-      @column_set[:id].value = @target_id = @column_set.save
+      @column_set[:id].value = @target_id = @column_set.create
       { redirect: "/#{@target}/detail?id=#{@target_id}" }
     end
 
     #--------------------------------------------------------------------------------------------------------
     # index parts
-    def public_index_page
+    def public_index_get
       data_a = @dataset.all
       htb = make_index_table(data_a)
       layout = index_layout(left: sidenav, center: Ht.form(child: htb))
-      common_page(title: "データ一覧", body: Html.convert(Materialize.convert(layout)))
+      show_base_template(title: Message[:index_page_title], body: Html.convert(Materialize.convert(layout)))
     end
 
     def make_index_table(data_a)
@@ -99,12 +99,12 @@ module Ezframe
       table.make_table(data_a)
     end
 
-    alias_method :public_default_page, :public_index_page
+    alias_method :public_default_get, :public_index_get
 
     #--------------------------------------------------------------------------------------------------------
     # search parts
     def public_search_post
-      mylog "public_search_post: #{@json.inspect}"
+      mylog "public_search_post: #{@parsed_body.inspect}"
       word = @event[:form][:word]
       pattern = "%#{word}%"
       data_a = @dataset.where(Sequel.|(Sequel.like(:name_kana, pattern), Sequel.like(:name, pattern))).all
@@ -113,25 +113,25 @@ module Ezframe
 
     #--------------------------------------------------------------------------------------------------------
     # detail parts
-    def public_detail_page
-      mylog "pubilc_detail_page: #{@request.params.inspect}"
+    def public_detail_get
+      mylog "pubilc_detail_get: #{@request.params.inspect}"
       @target_id ||= @request.params["id"]
       data = @column_set.set_from_db(@target_id)
-      return common_page(title: "no data", body: "no customer data: #{@target_id}") unless data
-      common_page(title: "データ一覧", body: Html.convert(make_detail_page))
+      return show_base_template(title: "no data", body: "no customer data: #{@target_id}") unless data
+      show_base_template(title: Message[:index_page_title], body: Html.convert(make_detail_get))
     end
 
-    def make_detail_page
+    def make_detail_get
       layout = main_layout( left: sidenav, center: detail_table )
       @request.env['rack.session'][@target] = @target_id
-      layout[:event] = "on=load:branch=set_global@target=#{@target_id}"
+      layout[:event] = "on=load:command=set_global@target=#{@target_id}"
       Materialize.convert(layout)
     end
 
     def public_detail_post
-      mylog "public_detail_post: #{@request.params.inspect}: #{@json}"
-      if @json[:global]
-        @target_id ||= @json[:global][@target]
+      mylog "public_detail_post: #{@request.params.inspect}: #{@parsed_body}"
+      if @parsed_body[:global]
+        @target_id ||= @parsed_body[:global][@target]
       end
       @column_set.set_from_db(@target_id)
       case @event[:branch]

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/ht.rb

@@ -57,6 +57,7 @@ module Ezframe
       alias_method :footer, :wrap_tag
 
       alias_method :small, :wrap_tag
+      alias_method :pre, :wrap_tag
 
       alias_method :checkbox, :wrap_tag
       alias_method :radio, :wrap_tag
@@ -88,6 +89,25 @@ module Ezframe
         end
         return child
       end
+
+      def small_text(text)
+        return small(class: %w[teal-text], child: text)
+      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>要素に変換するためのクラス

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)
@@ -14,15 +15,16 @@ module Ezframe
         when "input"
           input(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
+        tag = ht_h[:tag]
         opt_s, child_s = join_attributes(ht_h)
-        if child_s.length >= 0
+        if !child_s.strip.empty? || %w[div span table tr td th textarea].include?(tag)
           return "<#{ht_h[:tag]} #{opt_s}>\n#{child_s}\n</#{ht_h[:tag]}>\n"
         end
-        "<#{ht_h[:tag]} #{opt_s}/>"
+        "<#{ht_h[:tag]} #{opt_s} />"
       end
 
       def join_attributes(attrs)
@@ -56,53 +58,59 @@ module Ezframe
         if size && (size.index("x") || size.index("*"))
           if /(\d+)\s*[x\*]\s*(\d+)/ =~ size
             ht_h[:cols], ht_h[:rows] = $1, $2
+            ht_h.delete(:size)
           end
           ht_h[:tag] = "textarea"
           ht_h[:child] = ht_h[: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|
+        item = attr[:item]
+        # puts "Html.select: #{item}"
+        if item.is_a?(Hash)
+          option_a = ht_h[:item].map do |k, v|
             h = { tag: "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
+            # mylog "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|
+        elsif item.is_a?(Array)
+          option_a = item.map do |v|
             h = { tag: "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
+            # mylog "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.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,10 @@ class Japanese
       return nil if !str
       return str.tr("ぁ-ん\-ー―−", "ァ-ン\-ー―−")
     end
+
+    def to_wday(wday)
+      return nil unless wday
+      return %w(日 月 火 水 木 金 土)[wday]
+    end
   end
 end

data/lib/ezframe/loader.rb

@@ -3,9 +3,9 @@
 if File.exist?("pages/common.rb")
   require "#{Dir.pwd}/pages/common.rb"
 end
-Dir["models/*.rb"].each do |file|
+Dir["models/*.rb"].sort.each do |file|
   require "#{Dir.pwd}/#{file}"
 end
-Dir["pages/*.rb"].each do |file|
+Dir["pages/*.rb"].sort.each do |file|
   require "#{Dir.pwd}/#{file}"
 end

data/lib/ezframe/materialize.rb

@@ -4,7 +4,6 @@ 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" }
 
@@ -27,11 +26,11 @@ module Ezframe
 
       def convert(ht_h)
         return nil unless ht_h
-        return ht_h if (ht_h.kind_of?(Hash) && ht_h[:final])
+        return ht_h if (ht_h.is_a?(Hash) && ht_h[:final])
         new_h = ht_h.clone
-        if ht_h.kind_of?(Array)
+        if ht_h.is_a?(Array)
           new_h = ht_h.map { |v| convert(v) }
-        elsif ht_h.kind_of?(Hash)
+        elsif ht_h.is_a?(Hash)
           unless ht_h[:tag]
             mylog("convert: no tag: #{ht_h.inspect}")
             return nil

data/lib/ezframe/message.rb

@@ -0,0 +1,46 @@
+module Ezframe
+  class Message
+    class << self
+      def init
+        load_yaml_files
+      end
+
+      def load_yaml_files(dir = "./message")
+        unless @catalog
+          @catalog = {}
+          Dir["#{dir}/*.yml"].each do |file|
+            load_one_file(file)
+          end
+        end
+      end
+
+      def load_one_file(file)
+        begin
+          yaml = YAML.load_file(file)
+        rescue
+          mylog("YAML load error: #{file}")
+          return 
+        end
+        if /([a-z]{2})\.yml$/ =~ file
+          lang = $1
+          @catalog[lang.to_sym] = yaml.recursively_symbolize_keys
+        end
+      end
+
+      def languages
+        return @catalog.keys
+      end
+
+      def get(key, lang = nil)
+        lang = languages[0] unless lang
+        messages = @catalog[lang]
+        return messages[key.to_sym] if messages
+        return nil
+      end
+
+      def [](key)
+        return get(key)
+      end
+    end
+  end
+end

data/lib/ezframe/model.rb

@@ -30,7 +30,6 @@ module Ezframe
     def initialize(column_sets, db)
       @column_sets, @db = column_sets, db
       @column_sets.model = self
-      # @column_sets.each {|name, colset| colset.model = self }
     end
 
     def create_tables

data/lib/ezframe/page_base.rb

@@ -2,82 +2,69 @@
 
 require "json"
 require "uri"
-
 require_relative "util"
 
 module Ezframe
   class PageBase
-    class << self
-      def decide_route(path_info)
-        default_class = Config[:default_page_class]||"App"
-        default_method = Config[:default_page_method]||"default"
-        path_parts = path_info.split('/').drop(1)
-        case path_parts.length
-        when 0
-          [get_class(default_class), default_method]
-        when 1
-          filename = path_parts[0]
-          if filename.index(".")
-            return nil
-          end
-          klass = get_class(path_parts)
-          if klass
-            return [klass, default_method]
-          else
-            return [get_class(default_class), path_parts[0]]
-          end
-        else
-          klass = get_class(path_parts)
-          if klass
-            [klass, default_method]
-          else
-            method = path_parts.pop
-            klass = get_class(path_parts)
-            [klass, method]
-          end
-        end
-      end
+    attr_accessor :auth, :request
 
-      def get_class(keys)
-        keys = [keys] if keys.is_a?(String)
-        klass = (%w[Ezframe] + keys.map { |k| k.to_camel }).join("::")
-        mylog "get_class: #{klass}"
-        if Object.const_defined?(klass)
-          return Object.const_get(klass)
-        end
-        return nil
-      end
+    def initialize(request = nil)
+      @class_snake = class_to_snake(self.class)
+      # puts "class_snake = #{@class_snake}"
+      set_request(request) if request
+      init_vars
     end
 
-    attr_accessor :auth
+    def init_vars
+    end
 
-    def initialize(request = nil, model = nil)
-      @model = model if model
-      if request
-        @request = request
-        @params = parse_query_string(request.env["QUERY_STRING"])
-        @params.update(request.params)
-        mylog "params=#{@params.inspect}" if @params.length > 0
-        @id, @key = @params[:id], @params[:key]
-        @env = @request.env
-        @session = @env["rack.session"]
-        mylog "session = #{@session.inspect}"
-        if request.post?
-          parse_json_body
-          mylog "json=#{@json.inspect}"
+    # Rackのrequestを代入し、関連するインスタンス変数を定義
+    def set_request(request)
+      @request = request
+      @model = request.env["model"]
+      mylog "[WARN] model is not defined" unless @model
+      @column_set = @model.column_sets[@class_snake.to_sym]
+      # mylog "[WARN] column_set is not defined: #{@class_snake}" unless @column_set
+      if @column_set
+        @dataset = @column_set.dataset
+      end
+      @params = parse_query_string(request.env["QUERY_STRING"])
+      @params.update(request.params)
+      mylog "params=#{@params.inspect}" if @params.length > 0
+      # @id, @key = @params[:id], @params[:key]
+      @env = @request.env
+      @session = @env["rack.session"]
+      # mylog "session = #{@session.inspect}"
+      if %w[POST PUT].include?(request.request_method)
+        body = @request.body.read
+        if request.content_type.index("json")
+          @parsed_body = parse_json_body(body)
+        else
+          @parsed_body = parse_query_string(body)
         end
+        # mylog "parsed_body=#{@parsed_body.inspect}"
+        @event = @parsed_body[:event] || {}
       end
-      @auth = nil
     end
 
-    def parse_query_string(str)
-      query_a = URI::decode_www_form(str)
-      res_h = {}
-      query_a.map { |a| res_h[a[0].to_sym] = a[1] }
-      res_h
+    # routeから基本URLを生成
+    def make_base_url(id = nil)
+      path = Route::get_path(@class_snake)
+      params = @request.env["url_params"]
+      # params[@class_snake.to_sym] = id
+      path_s = path.map do |pa|
+        if pa == @class_snake.to_sym && id
+          "#{pa}/#{id}"
+        elsif params[p]
+          "#{pa}/#{params[p]}"
+        else
+          pa
+        end
+      end.join("/")
+      return "/#{path_s}"
     end
 
-    def common_page(opts = {})
+    def show_base_template(opts = {})
       args = {
         title: opts[:title],
         body: opts[:body],
@@ -87,17 +74,16 @@ module Ezframe
       Template.fill("template/base.html", args)
     end
 
-    def parse_json_body
-      body = @request.body.read
+    def parse_json_body(body)
       return {} if !body || body.length==0
       begin
-        @json = JSON.parse(body)
+        json = JSON.parse(body)
       rescue => e
         mylog "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
+      json = json.recursively_symbolize_keys if json.is_a?(Hash) || json.is_a?(Array)
+      return json
     end
 
     def warden