ezframe 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1de1a04055c38786bf34b3500dbea3a3ae46a93a6e4a86fab281cf919b1dac8
-  data.tar.gz: c9d87fbba6277f9571f027c5e05876a0ab4f6774fdb03a3ddc940671cbcf616d
+  metadata.gz: 3ba49d27d45a195d4b177c3d95eccdca2f01a3e9f20cd072ccc56acee5265b59
+  data.tar.gz: a3d7589ff5d0d3c81e405a950c9c57f6ca0110cc9748f6dc5bc254e276d27bb7
 SHA512:
-  metadata.gz: 7171e4d623c6adb049ca4bc365b33c5828b4f12558a3beec074ad90b2bb9da0aa5176d84c8153b4309cfb68d4b14d4dd5a3f428e68bb24d1c294bdcaf48a0521
-  data.tar.gz: 529b47101f1aa14eda4605a6bc67329a12deb180e8a84900391d860e7bc5aa23ce27192354aca73199f13acf588513f6fcf0ae0cc0b83879e3a58cedbd0a7ecf
+  metadata.gz: 7ca38e91d91c1e1e30b9175efd9da518da54e6860d8f510173ddfbc2d23e553e52e3189137ef4c807c491740724349991921c58ad8d2749579716a873a8db744
+  data.tar.gz: 847a914cf8c68690be28b40a07903c3d0c47dd8e86dba9d6cbe6e05053cfa454fd0ead717b2267cacab570f96a3583093570cc21647b21c6c00a1bcd7b69f11c

data/lib/ezframe/column_set.rb

@@ -60,6 +60,10 @@ module Ezframe
       end
     end
 
+    def keys
+      @columns.keys
+    end
+
     # 配列を初期化する
     def set(attr_a)
       @columns[:id] = IdType.new(key: "id", label: "ID", no_edit: true)
@@ -128,6 +132,7 @@ module Ezframe
       mylog "column_set.updated_values = #{updated_values.inspect}"
       if updated_values.length > 0
         updated_values[:updated_at] = Time.now
+        puts dataset.where(id: id).update_sql(updated_values) 
         dataset.where(id: id).update(updated_values) 
       end
     end

data/lib/ezframe/editor.rb

@@ -2,187 +2,175 @@
 
 module Ezframe
   class DataEditor < PageBase
-
-    def initialize(request=nil, model=nil)
-      super(request, model)
-      decide_target
-      if model
-        @column_set = @model.column_sets[@target]
-        unless @column_set
-          raise "[ERROR] no such column set: #{@target}"
-        end
-        @dataset = @column_set.dataset
-      end
-      if @parsed_body
-        @event = @parsed_body[:event] || {}
-        @target_id = @event[@target]
+    # 一覧ページ生成
+    def public_default_get
+      id = get_id
+      if id
+        return show_detail_page
+      else
+        data_a = @dataset.all
+        htb = make_index_table(data_a)
+        layout = index_layout(center: Ht.form(child: htb))
+        return show_base_template(title: Message[:index_page_title], body: Html.convert(layout))
       end
-      @auth = false
-      init_vars
     end
 
-    def init_vars
-    end
-
-    def decide_target
-      @target = self.class.to_s
-      if @target.index("::")
-        @target = $1 if /::(\w+)$/ =~ @target
+    # 一覧テーブルの生成
+    def make_index_table(data_a)
+      # @column_set.each { |col| col.attribute.delete(:hidden) }
+      idx_keys = @index_keys || @column_set.keys
+      puts "idx_keys=#{idx_keys.inspect}"
+      a_element = Proc.new { |key, id, text|
+        if key.to_s.index("_name")
+          Ht.a(href: "#{make_base_url(id)}", child: text)
+        else
+          text
+        end
+      }
+      tr_a = data_a.map do |data|
+        @column_set.clear
+        @column_set.values = data
+        line = idx_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
-      @target.downcase!
-      @target = @target.to_sym
-      return @target
+      th_a = idx_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 ], event: "on=load:command=enable_datatable:target=##{table_id}:size=10")
     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_create_get
-      matrix = @column_set.map do |column|
-        [column.label, column.form]
-      end
-      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))
-      show_base_template(title: Message[:create_page_title], body: Html.convert(Materialize.convert(layout)))
+      @column_set.clear
+      table = make_edit_form(:create)
+      layout = main_layout(center: Ht.form(child: table), type: 2)
+      show_base_template(title: Message[:parent_create_page_title], body: Html.convert(layout))
     end
 
+    # 新規登録受信
     def public_create_post
-      @column_set.values = @event[:form]
-      @column_set[:id].value = @target_id = @column_set.create
-      { redirect: "/#{@target}/detail?id=#{@target_id}" }
+      unless @event[:form]
+        { inject: "#center-panel", body: Ht.form(child: make_edit_form(:create)) }
+      else
+        # 値の保存
+        @column_set.clear
+        @column_set.values = @event[:form]
+        @column_set[:id].value = id = @column_set.create
+        return { redirect: make_base_url(id) }
+      end
     end
 
-    #--------------------------------------------------------------------------------------------------------
-    # index parts
-    def public_index_get
-      data_a = @dataset.all
-      htb = make_index_table(data_a)
-      layout = index_layout(left: sidenav, center: Ht.form(child: htb))
-      show_base_template(title: Message[:index_page_title], body: Html.convert(Materialize.convert(layout)))
+    # データ編集受信
+    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
+        { inject: "#center-panel", body: Html.convert(Ht.form(make_edit_form)) }
+      else
+        # 値を保存
+        @column_set.update(id, @event[:form])
+        { redirect: make_base_url(id) }
+      end
     end
 
-    def make_index_table(data_a)
-      column_header = [:id, :name, :email, :zipcode, :prefecture]
-      @column_set.each { |col| col.attribute.delete(:hidden) }
-      a_element = Proc.new { |key, id, text|
-        # mylog "proc executed"
-        if key == :name
-          Ht.a(href: "/#{@target}/detail?id=#{id}", child: text)
-        else
-          text
-        end
-      }
-      table = PageKit::IndexTable.new(column_header: column_header, column_set: @column_set, add_checkbox: :id,
-                                      decorate_column: a_element)
-      table.make_table(data_a)
+    # 編集フォームの生成
+    def make_edit_form(command = :edit)
+      @id = get_id
+      table = []
+      matrix = @column_set.map do |column|
+        form = column.form
+        table.push Ht.p([ Ht.small_text(column.label), form ]) if form
+      end
+      send_button = Ht.button(child: Message[:edit_finish_button_label], class: %w[btn], event: "on=click:url=#{make_base_url(@id)}/#{command}:with=form") 
+      table.push(send_button)
+      return Ht.table(Ht.tr(table))
     end
 
-    alias_method :public_default_get, :public_index_get
-
     #--------------------------------------------------------------------------------------------------------
-    # search parts
+    # 検索
     def public_search_post
       mylog "public_search_post: #{@parsed_body.inspect}"
-      word = @event[:form][:word]
+      sch_keys = @search_keys || @column_set.keys
+      word = @params["word"]
       pattern = "%#{word}%"
-      data_a = @dataset.where(Sequel.|(Sequel.like(:name_kana, pattern), Sequel.like(:name, pattern))).all
-      make_index_table(data_a)
-    end
-
-    #--------------------------------------------------------------------------------------------------------
-    # detail parts
-    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 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_get
-      layout = main_layout( left: sidenav, center: detail_table )
-      @request.env['rack.session'][@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}: #{@parsed_body}"
-      if @parsed_body[:global]
-        @target_id ||= @parsed_body[:global][@target]
-      end
-      @column_set.set_from_db(@target_id)
-      case @event[:branch]
-      when "update_value"
-        update_value
+      pattern_a = sch_keys.map {|key| Sequel.like(key, pattern) }
+      data_a = @dataset.where(Sequel.|(*pattern_a)).all
+      puts data_a.inspect
+      layout = index_layout(center: make_index_table(data_a))
+      show_base_template(title: Message[:search_result_page_title], body: Html.convert(layout))
+    end
+
+    # 詳細表示
+    def show_detail_page
+      mylog "show_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
-      { inject: "#center-panel", is_html: true, body: Html.convert(Materialize.convert(detail_table)) }
+      layout = main_layout(center: make_detail_table)
+      return show_base_template(title: Message[:detail_page_title], body: Html.convert(layout))
     end
 
     private
 
-    def update_value
-      form = @event[:form]
-      @column_set.update(@target_id, form)
+    # 詳細ページの表の生成
+    def make_detail_table
+      @id = get_id
+      table = []
+      array = @column_set.map do |column|
+        edit_btn = nil
+        if @column_edit_mode
+          edit_btn = edit_button(column)
+          edit_btn[:event] = "on=click:branch=edit_column:key=#{column.key}" if edit_btn
+        end
+        table.push(Ht.p(class: %w[hover-button-box], child: [ Ht.small_text(column.label), column.view, edit_btn ].compact))
+      end
+      unless @column_edit_mode
+        edit_btn = Ht.button(class: %w[btn], child: [ Ht.icon("edit"), Message[:edit_button_label] ], event: "on=click:url=#{make_base_url(@id)}/edit")
+        table.push(edit_btn)
+      end
+      return Ht.table(Ht.tr(table))
     end
 
-    def detail_table
-      row_a = @column_set.map do |column|
-        # column.attribute.delete(:hidden)  # Todo: remove this
-        Ht.tr(class: %w[hover-button-box], child: [ 
-          Ht.td(child: column.label),
-          Ht.td(child: Ht.div(class: %w[switch-box], child: [ detail_value_part(column), detail_form_part(column)].compact))
-        ])
-      end
-      return Ht.table(child: row_a)
+    def edit_cancel_button
+      Ht.span(class: %w[btn red small waves-effect waves-light switch-button],  child: Ht.icon("cancel"))
     end
 
-    def detail_value_part(column)
-      return Ht.span(class: %w[switch-element], child: [ Ht.span(child: column.view) , edit_button(column)])
+    # URLからのIDの取得
+    def get_id(class_name = nil)
+      class_name ||= @class_snake
+      params = @request.env['url_params']
+      return nil unless params
+      # mylog "get_id: #{params.inspect}, #{class_name}"
+      return params[class_name.to_sym]
     end
 
-    def detail_form_part(column)
-      return nil if column.attribute[:no_edit]
-      form = column.form
-      if (form)
-        form = Ht.form(class: %w[switch-element hide], child: [ Ht.span(child: column.form) , edit_ok_button(column), edit_cancel_button ])
-      end
-      return form
+    # 値の更新
+    def update_value
+      form = @event[:form]
+      @column_set.update(get_id, form)
     end
 
-    def edit_button(column)
-      return nil if column.attribute[:no_edit]
-      return Ht.button(class: %w[btn-floating switch-button hover-button hide right], child: Ht.icon("edit"))
+    # ラベル付きで1カラムのviewを表示
+    def show_label_view(key)
+      col = @column_set[key]
+      Ht.span([Ht.small_text(col.label), col.view(force: true)])
     end
 
-    def edit_ok_button(column)
-      return Ht.span(class: %w[btn small teal waves-effect waves-light], event: "on=click:branch=update_value:url=/#{@target}/detail:key=#{column.key}:with=form", child: Ht.icon("check"))
+    # ラベル付きで1カラムのformを表示
+    def show_label_edit(key)
+      col = @column_set[key]
+      Ht.span([Ht.small_text(col.label), col.form(force: true)])
     end
 
-    def edit_cancel_button
-      Ht.span(class: %w[btn red small waves-effect waves-light switch-button],  child: Ht.icon("clear"))
+    # エラーページの表示
+    def show_message_page(title, body)
+      return show_base_template(title: title, body: Html.convert(body))
     end
   end
 end

data/lib/ezframe/model.rb

@@ -21,6 +21,7 @@ module Ezframe
       end
 
       def get_clone
+        
         new(@base_column_sets.deep_dup, @base_db)
       end
     end

data/lib/ezframe/route.rb

@@ -68,18 +68,20 @@ module Ezframe
       def get_path(class_snake, route_h = nil)
         route_h = Config[:route] unless route_h
         @get_path_found_it = nil
-        return scan_hash(class_snake, route_h.deep_dup).reverse
+        return scan_route(class_snake, route_h.deep_dup).reverse
       end
 
       # targetに対応する名称のクラスまでの経路を返す
-      def scan_hash(target, hash)
-        if hash.keys.include?(target)
+      def scan_route(target, route_h)
+        # puts "scan_route: target=#{target}, route_h=#{route_h}"
+        if route_h.keys.include?(target.to_sym)
           @get_path_found_it = true
           return [ target ]
         else
-          hash.each do |k, v|
+          route_h.each do |k, v|
+            next if k == :class
             if v.is_a?(Hash)
-              a = scan_hash(target, v)
+              a = scan_route(target, v)
               if @get_path_found_it
                 a.push(k)
                 return a
@@ -87,6 +89,7 @@ module Ezframe
             end
           end
         end
+        return nil
       end
 
       def make_method_name(base_name, method = "get")

data/lib/ezframe/server.rb

@@ -2,14 +2,18 @@
 
 module Ezframe
   class Server
-    def self.call(env)
+    def initialize
+      Controller.init
+    end
+
+    def call(env)
       req = Rack::Request.new(env)
       res = Rack::Response.new
       Controller.exec(req, res)
       if res.body.empty?
         raise "no body in response"
       end
-      res.finish
+      return res.finish
     end
   end
 end

data/lib/ezframe/version.rb

@@ -1,3 +1,3 @@
 module Ezframe
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ezframe
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - KAMACHI Masayuki