ezframe 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66c032e7ea5bbeaaccb2afb326e586b64566e2a55fcc4402abfd5629caf80418
-  data.tar.gz: 790b2060a76feccd9970dcd3c6cf452dbfb3b42834e3dbfbee7196f173b2b8f1
+  metadata.gz: 82287b72480dbecef6d697d80d7fbc286233622997f49ab94ef45162f0a2c5f6
+  data.tar.gz: 0f5d7c0caaccaba148d5c1c8ab8d8b725fe65cf36723773eb88beb0b6edc6295
 SHA512:
-  metadata.gz: b402c070b7bd0664709f8d12ea14e88ea29fba58e649d49b86394d1cff120ffae755eb2c255055709a31d41ec542f58535d171fa1e2a00e4c583918141e8d9b7
-  data.tar.gz: 6a5f44ba9417b892c77ad61ccb0316dbdf6d945aff93cfed1c2161ec173e44a7e2f6396b19a74e872b147d42ecd4a3d7adc167b57fc30974f18949b627858114
+  metadata.gz: 43fc823b68520ca5814624c1afceaf76a54ce77d423490a99ef2e2661dc6087da295f7c59920d3c21210942c62c73e98c20eb0c0111c562f647e4a30cb2cee07
+  data.tar.gz: a70a72705c927fc3338c0afd75aa80dc1c438a736f6559cda3130d5401f56febb2422af7c32863f888f8ff41bc4741b66d1a74d2e15c83da5d3902a09d6ec300

data/README.md

@@ -1,44 +1,51 @@
 # ezframe
 
  ezframeは主にRubyで記述されたウェブフレームワークです。
-以下を目指して開発を進めています。
+ 以下を目指して開発を進めています。
 
 * Ruby言語でのプログラミングだけでリッチなGUIを持つウエブアプリを作れる。
-* 最小の学習コストで、最大限の柔軟性を実現する。
-* コードの再利用性を高める
-* 他ライブラリーへの依存は極力少なくし、見通しの良さ
+* 最小の学習コストで、最大限の自由で柔軟な開発スキルを得られる。
+* コードの再利用性を高める。
+* 他ライブラリーへの依存は極力少なくし、見通しの良くする。
 
 ## 基本的な使い方
 
 1. レポジトリーの取得
 ```sh
-git clone git@github.com:sakura-forest/ezframe.git
-cd ezframe
+git clone git@github.com:sakura-forest/ezframe-template
+cd ezframe-template
 bundle install --path vendor/bundle
-bundle exec rackup
 ```
 
-2. columns/に、データ項目を記したyamlファイルを生成
-  例: vi columns/address.yml
+2. columns/に、データ項目を記したyamlファイルを生成します。
+  ここではcolumns/address.ymlという名前のファイルを作ります。
 
 ```yaml
 - key: name
   label: 氏名
   type: jpname
 - key: email
-　label: E-mail
+  label: E-mail
   type: email
 ```
 
+3. データを編集する機能を実装します。
+  
+
 3. データベースの生成
+  データベースにaddressテーブルを作ります。
+  デフォルトではdb/dev.sqliteを生成します。
+
 ```sh
-$ bin/create_tables
+$ bundle exec create_tables.rb
 ```
 
-4. 使う機能の選択
-* Todo..
-
 5. アプリケーションサーバーの起動
+
+　サーバーが起動します。デフォルトでは9292番ポートが使われます。
+
 ```sh
 bundle exec rackup
 ```
+
+6. ブラウザでhttp://localhost:9292を開きます。

data/app_template/config.ru

@@ -2,14 +2,9 @@
 
 require "logger"
 require "rack"
-require "rack-flash"
-require 'rack/session/redis'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "lib"))
 require "ezframe"
 
 use Rack::Session::Pool
 use Rack::Static, urls: ["/image", "/js", "/css"], root: "asset"
 use Rack::ShowExceptions
-use Rack::Flash, :accessorize => [:notice, :error]
 run Ezframe::Server

data/lib/ezframe/column_set.rb

@@ -27,7 +27,7 @@ module Ezframe
         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
 

data/lib/ezframe/config.rb

@@ -4,8 +4,10 @@ module Ezframe
       attr_accessor :value_h
 
       def load_files(dir)
-        Dir["#{dir}/*.yml"].each do |file|
-          load_one_file(file)
+        unless @value_h
+          Dir["#{dir}/*.yml"].each do |file|
+            load_one_file(file)
+          end
         end
       end
 

data/lib/ezframe/controller.rb

@@ -8,9 +8,8 @@ module Ezframe
         Config.load_files("./config")
         Model.init
         model = Model.get_clone
-        Auth.init_warden
+        Auth.init_warden if defined?(Warden)
         @request.env["model"] = model
-        # Auth.model = model
 
         mylog("exec: path=#{request.path_info} params=#{request.params}")
         klass, method = PageBase::decide_route(request.path_info)

data/lib/ezframe/database.rb

@@ -28,18 +28,25 @@ module Ezframe
       %w[id created_at updated_at].each do |key|
         dbtype_h.delete(key.to_sym)
       end
-      puts "create_table: #{table_name}"
-      @sequel.create_table(table_name) do 
-#        if @dbfile.index("postgresql")
+      # puts "create_table: #{table_name}"
+      if @dbfile.index("postgres")
+        @sequel.create_table(table_name) do 
           serial :id
-#        else
-          #primary_key :id, auto_increment: true
-        #end
-        dbtype_h.each do |key, dbtype|
-          column(key, dbtype)
+          dbtype_h.each do |key, dbtype|
+            column(key, dbtype)
+          end
+          column(:created_at, :timestamp, default: Sequel::CURRENT_TIMESTAMP)
+          column(:updated_at, :timestamp, default: Sequel::CURRENT_TIMESTAMP)
+        end
+      else
+        @sequel.create_table(table_name) do 
+          primary_key :id, auto_increment: true
+          dbtype_h.each do |key, dbtype|
+            column(key, dbtype)
+          end
+          column(:created_at, :timestamp, default: Sequel::CURRENT_TIMESTAMP)
+          column(:updated_at, :timestamp, default: Sequel::CURRENT_TIMESTAMP)
         end
-        column(:created_at, :timestamp, default: Sequel::CURRENT_TIMESTAMP)
-        column(:updated_at, :timestamp, default: Sequel::CURRENT_TIMESTAMP)
       end
     end
     

data/lib/ezframe/editor.rb

@@ -0,0 +1,188 @@
+# frozen_string_literal: true
+
+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 @json
+        @event = @json[:event] || {}
+        @target_id = @event[@target]
+      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
+      end
+      @target.downcase!
+      @target = @target.to_sym
+      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
+
+    #--------------------------------------------------------------------------------------------------------
+    # add new parts
+    def public_new_page
+      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")])
+      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)))
+    end
+
+    def public_new_post
+      @column_set.values = @event[:form]
+      @column_set[:id].value = @target_id = @column_set.save
+      { redirect: "/#{@target}/detail?id=#{@target_id}" }
+    end
+
+    #--------------------------------------------------------------------------------------------------------
+    # index parts
+    def public_index_page
+      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)))
+    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)
+    end
+
+    alias_method :public_default_page, :public_index_page
+
+    #--------------------------------------------------------------------------------------------------------
+    # search parts
+    def public_search_post
+      mylog "public_search_post: #{@json.inspect}"
+      word = @event[:form][: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_page
+      mylog "pubilc_detail_page: #{@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))
+    end
+
+    def make_detail_page
+      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}"
+      Materialize.convert(layout)
+    end
+
+    def public_detail_post
+      mylog "public_detail_post: #{@request.params.inspect}: #{@json}"
+      if @json[:global]
+        @target_id ||= @json[:global][@target]
+      end
+      @column_set.set_from_db(@target_id)
+      case @event[:branch]
+      when "update_value"
+        update_value
+      end
+      { inject: "#center-panel", is_html: true, body: Html.convert(Materialize.convert(detail_table)) }
+    end
+
+    private
+
+    def update_value
+      form = @event[:form]
+      @column_set.update(@target_id, form)
+    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)
+    end
+
+    def detail_value_part(column)
+      return Ht.span(class: %w[switch-element], child: [ Ht.span(child: column.view) , edit_button(column)])
+    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
+    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"))
+    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"))
+    end
+
+    def edit_cancel_button
+      Ht.span(class: %w[btn red small waves-effect waves-light switch-button],  child: Ht.icon("clear"))
+    end
+  end
+end

data/lib/ezframe/version.rb

@@ -1,3 +1,3 @@
 module Ezframe
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/ezframe.rb

@@ -22,6 +22,7 @@ require_relative 'ezframe/page_base'
 require_relative 'ezframe/template'
 require_relative 'ezframe/server'
 require_relative 'ezframe/auth.rb'
+require_relative 'ezframe/editor.rb'
 require_relative 'ezframe/loader'
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ezframe
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - KAMACHI Masayuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-23 00:00:00.000000000 Z
+date: 2020-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -134,7 +134,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rubocop.yml"
-- Gemfile
 - README.md
 - Rakefile
 - app_template/asset/image/favicon.ico
@@ -154,6 +153,7 @@ files:
 - lib/ezframe/config.rb
 - lib/ezframe/controller.rb
 - lib/ezframe/database.rb
+- lib/ezframe/editor.rb
 - lib/ezframe/ht.rb
 - lib/ezframe/html.rb
 - lib/ezframe/japanese_utils.rb

data/Gemfile

@@ -1,5 +0,0 @@
-source "https://rubygems.org"
-
-git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
-
-gemspec