ezframe 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 872c21ee29e5590b12c895415e69d95c3d1c4f76dabfe1295ad100b3e2f05b9f
-  data.tar.gz: 4b7e60705c6ea94ee56b67dd4343b04cc1c6eb4cadf96ce5f3b7c10fd1f05221
+  metadata.gz: 66c032e7ea5bbeaaccb2afb326e586b64566e2a55fcc4402abfd5629caf80418
+  data.tar.gz: 790b2060a76feccd9970dcd3c6cf452dbfb3b42834e3dbfbee7196f173b2b8f1
 SHA512:
-  metadata.gz: bc4597ab89948f4e2eecd7da41c2cf065a7cd38bde8d42d4c1032624490d427bc68727762d79d2cd41e324fa976358224439c518fa41eb3dea5e0f05c1cadc99
-  data.tar.gz: 3871153cd7e232392dd112ed165749c6a53ca3747a18de73e4e723b9114ddb49687f3d151e90a0c4e03fdb6671e98c61fa820d6d0fc255a19a5219931443664d
+  metadata.gz: b402c070b7bd0664709f8d12ea14e88ea29fba58e649d49b86394d1cff120ffae755eb2c255055709a31d41ec542f58535d171fa1e2a00e4c583918141e8d9b7
+  data.tar.gz: 6a5f44ba9417b892c77ad61ccb0316dbdf6d945aff93cfed1c2161ec173e44a7e2f6396b19a74e872b147d42ecd4a3d7adc167b57fc30974f18949b627858114

data/.gitignore

@@ -10,3 +10,4 @@ db/*
 **/db/*
 pkg/
 *.old
+*.gem

data/README.md

@@ -1,18 +1,25 @@
 # ezframe
 
-ezframeは主にRubyで記述されたウェブフレームワークです。
-最小の学習コストで、最大限の柔軟性を実現することを目指して開発しています。
+ ezframeは主にRubyで記述されたウェブフレームワークです。
+以下を目指して開発を進めています。
 
-## 使い方
+* Ruby言語でのプログラミングだけでリッチなGUIを持つウエブアプリを作れる。
+* 最小の学習コストで、最大限の柔軟性を実現する。
+* コードの再利用性を高める
+* 他ライブラリーへの依存は極力少なくし、見通しの良さ
+
+## 基本的な使い方
 
 1. レポジトリーの取得
 ```sh
 git clone git@github.com:sakura-forest/ezframe.git
 cd ezframe
 bundle install --path vendor/bundle
+bundle exec rackup
 ```
+
 2. columns/に、データ項目を記したyamlファイルを生成
-  例: vi columns/user.yml
+  例: vi columns/address.yml
 
 ```yaml
 - key: name

data/app_template/asset/js/ezframe.js

@@ -0,0 +1,288 @@
+function add_event(obj) {
+  var elems = obj.querySelectorAll('[event]')
+  if (elems) {
+    console.log("events=" + elems.length)
+    for (var i = 0; i < elems.length; i++) {
+      var elem = elems[i]
+      var event_s = elem.getAttribute("event")
+      // console.log(event_s)
+      var event = parse_event(event_s)
+      if (event.on == "load" && !elem.event_done) {
+        console.log("load: "+event_s)
+        execute_event(elem)
+        elem.event_done = 1
+      } else {
+        elem.addEventListener(event.on, function () {
+          execute_event(this)
+        })
+      }
+    }
+  }
+  register_switch_event(obj)
+  register_hover_button(obj)
+  // initialize_materialize()
+  // var elems = document.querySelectorAll('.dropdown-trigger')
+  // var instances = M.Dropdown.init(elems, {})
+}
+
+function parse_event(event) {
+  var ev = {}
+  var a = event.split(":")
+  for (var i = 0; i < a.length; i++) {
+    if (a[i].indexOf("=") > 0) {
+      var b = a[i].split("=")
+      var key = b[0]
+      var value = b[1]
+      if (value.indexOf(",") > 0) {
+        value = value.split(",")
+      }
+      var cur_value = ev[key]
+      if (cur_value) {
+        if (Array.isArray(cur_value)) {
+          cur_value.push(value)
+        } else {
+          ev[key] = [ev[key], value]
+        }
+      } else {
+        ev[key] = value
+      }
+    }
+  }
+  /*if (!ev.url) {
+    ev.url = location.pathname
+  }*/
+  return ev
+}
+
+function execute_event(obj) {
+  console.log("execute_event")
+  // console.dir(obj)
+  var event_s = obj.getAttribute("event")
+  var event = parse_event(event_s)
+  switch(event.branch) {
+    case "switch":
+      var a = event.between
+      for(var i = 0; i < a.length; i++) {
+        switch_hide(a[i])
+      }
+      return
+    case "set_global":
+      if (!window.ezframe) { window.ezframe = {} }
+      for(key in event) {
+        if ([ "branch", "on", "url" ].indexOf(key) >= 0) { continue }
+        window.ezframe[key] = event[key]
+      }
+      // console.log("set_global:" + JSON.stringify(window.ezframe))
+      return
+    case "redirect":
+      console.log("redirect:" + event.url)
+      location.href = event.url
+      return
+  }
+  with_attr(event, obj)
+  post_values(event, obj)
+}
+
+function with_attr(event, obj) {
+  if (!event.with) {
+    return null
+  }
+  var with_s = event.with
+  switch(event.with) {
+    case "form":
+      var node = obj
+      while (node && node.nodeName != 'FORM') {
+        node = node.parentNode
+      }
+      form = collect_form_values(node)
+      event.form = form
+      break;
+    case "input":
+      event.form = {}
+      event.form[obj.name] = obj.value
+      break;
+  }
+}
+
+function post_values(event, obj) {
+  var xhr = new XMLHttpRequest()
+  xhr.onreadystatechange = function () {
+    if (this.readyState == 4 && this.status == 200) {
+      var res = this.response
+      manage_response(res, event, obj)
+    }
+  }
+  if (!event.url) {
+    event.url = "/default"
+  }
+  console.log("post_values: url="+event.url+",event="+JSON.stringify(event))
+  xhr.open("POST", event.url, true)
+  xhr.setRequestHeader("Content-Type", "application/json")
+  xhr.responseType = 'json'
+  send_values = { event: event }
+  if (window.ezframe) {
+    send_values.global = window.ezframe
+  }
+  xhr.send(JSON.stringify(send_values))
+}
+
+function manage_response(res, event, obj) {
+  var elem
+  /* console.log("manage_response: res="+JSON.stringify(res)+", event=" + JSON.stringify(event) +
+    ", obj=" + JSON.stringify(obj)) 
+  */
+  if (!res) { return }
+  if (Array.isArray(res)) {
+    for(var i = 0; i < res.length; i++) {
+      exec_one_response(res[i])
+    }
+  } else {
+    exec_one_response(res)
+  }
+}
+
+function exec_one_response(res) {
+  if (res.inject) {
+    console.log("inject: " + res.inject)
+    elem = document.querySelector(res.inject)
+    if (elem) {
+      if (res.is_html) {
+        elem.innerHTML = res.body
+      } else {
+        elem.innerHTML = htmlgen(res.body)
+      }
+      add_event(elem)
+    } else {
+      console.log("inject: no such element: "+res.inject)
+    }
+  }
+  if (res.set_value) {
+    console.log("set_value: "+res.set_value+", value=", res.value)
+    elem = document.querySelector(res.set_value)
+    if (elem) {
+      if (res.set_value.indexOf("select") > 0) {
+        elem.selectedIndex = res.value
+      } else {
+        elem.value = res.value
+      }
+    } else {
+      console.log("set_value: no such element: "+res.set_value)
+    }
+  }
+  if (res.redirect) {
+    console.log("redirect:" + res.redirect)
+    location.href = res.redirect
+    return
+  }
+  if (res.scroll) {
+    scroll_to(res.scroll)
+  }
+  if (res.reset) {
+    elem = document.querySelector(res.reset)
+    if (event.reset == "form") {
+      while (node && node.nodeName != 'FORM') {
+        node = node.parentNode
+      }
+      node.reset();
+    }
+  }
+}
+
+function collect_form_values(obj) {
+  var res = {};
+  var inputs = Array.from(obj.querySelectorAll("input"));
+  var selects = Array.from(obj.querySelectorAll("select"));
+  var textareas = Array.from(obj.querySelectorAll("textarea"));
+  // console.dir(inputs)
+  inputs = inputs.concat(selects)
+  inputs = inputs.concat(textareas)
+  for (var i = 0; i < inputs.length; i++) {
+    var elem = inputs[i]
+    if (!elem.name) { continue }
+    console.log("name,value="+elem.name+","+elem.value)
+    if ((elem.type == "checkbox" || elem.type == "radio") && !elem.checked) {
+      continue
+    }
+    var cur_value = res[elem.name]
+    var elem_value = normalize(elem.value)
+    if (cur_value) {
+      if (Array.isArray(cur_value)) {
+        cur_value.push(elem_value)
+      } else {
+        res[elem.name] = [ cur_value, elem_value ]
+      }
+    } else {
+      res[elem.name] = elem_value
+    }
+  }
+  return res
+}
+
+function normalize(str) {
+  return str.replace(/^[\s|　]+|[\s|　]+$/g, '').trim()
+}
+
+function switch_hide(button) {
+  // console.log("switch_hide")
+  var node = button
+  while (node && !node.classList.contains('switch-box')) {
+    node = node.parentNode
+  }
+  var switch_box = node
+
+  var elems = switch_box.querySelectorAll(".switch-element")
+  for(var i = 0; i < elems.length; i++) {
+    var elem = elems[i]
+    var list = elem.classList
+    if (list.contains("hide")) {
+      elem.classList.remove("hide")
+    } else {
+      elem.classList.add("hide")
+    }
+  }
+}
+
+function register_switch_event(elem) {
+  var boxes = elem.querySelectorAll(".switch-box")
+  for(var i = 0; i < boxes.length; i++) {
+    var box = boxes[i]
+    var buttons = box.querySelectorAll(".switch-button")
+    for(var j = 0; j < buttons.length; j++) {
+      var button = buttons[j]
+      button.addEventListener('click', function() { switch_hide(this) })
+    }
+  }
+}
+
+function register_hover_button(obj) {
+  var elems = obj.querySelectorAll(".hover-button")
+  for(var i = 0; i < elems.length; i++) {
+    var node = elems[i]
+    while(node && node.classList.contains("hover-button-box") ) { node = node.parentNode  }
+    var parent = elems[i].parentNode.parentNode
+    parent.addEventListener('mouseenter', function() {
+      var elem = this.querySelector(".hover-button")
+      elem.classList.remove("hide")
+    })
+    parent.addEventListener('mouseleave', function() { 
+      var elem = this.querySelector(".hover-button")
+      elem.classList.add("hide") 
+    })
+  }
+}
+
+function scroll_to(query) {
+  var element = document.querySelector(query)
+  if (element) {
+    element.getBoundingClientRect().top
+    var height = window.screenY - rect.top
+    console.log("scroll_to_form_top: " + height)
+    window.scroll({ top: height, behavior: "smooth" })
+  } else {
+    console.log("no such element: "+query)
+  }
+}
+
+document.addEventListener('DOMContentLoaded', function () {
+  add_event(document)
+})

data/app_template/config/generic.yml

@@ -0,0 +1,3 @@
+default_page_class: BasicPages
+template_file: base.html
+favicon: /image/favicon.ico

data/app_template/config/materialize.yml

@@ -0,0 +1,5 @@
+extra_js_list: 
+  - https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js
+extra_css_list: 
+  - https://fonts.googleapis.com/icon?family=Material+Icons
+  - https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/css/materialize.min.css

data/{example/chat → app_template}/config.ru

@@ -3,21 +3,13 @@
 require "logger"
 require "rack"
 require "rack-flash"
-require "warden"
+require 'rack/session/redis'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "lib"))
 require "ezframe"
 
-use Warden::Manager do |manager|
-  manager.default_strategies :mystrategy
-  manager.failure_app = Proc.new do |env|
-    ["401", { "Content-Type" => "text/html" }, [ Ezframe::App.new.public_login_page ]]
-  end
-end
-
-use Rack::Session::Pool, secret: Digest::SHA256.hexdigest(rand.to_s)
+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/app_template/pages/basic.rb

@@ -0,0 +1,5 @@
+class BasicPages < Ezframe::PageBase
+  def public_default_page
+    return "<H1>Ezframe is working.</H1>"
+  end
+end

data/exe/create_table.rb

@@ -6,6 +6,7 @@ $:.push("lib")
 require 'ezframe'
 require 'sequel'
 
+Ezframe::Config.load_files("config")
 Ezframe::Model.init
 model = Ezframe::Model.get_clone
 model.create_tables

data/exe/setup.rb

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+#coding: utf-8
+=begin
+
+  アプリケーションテンプレートの生成
+
+=end
+require "fileutils"
+
+target_dir = ARGV[0]
+
+unless File.exist?(target_dir)
+  Dir.mkdir(target_dir)
+end
+FileUtils.cp_r("app_template", target_dir)

data/ezframe.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["KAMACHI Masayuki"]
   spec.email         = ["kamachi@sakuraforest.co.jp"]
 
-  spec.summary       = %q{simple and easy-to-use web framework}
+  spec.summary       = %q{simple and easy-to-use web framework by ruby language}
   spec.description   = %q{easy web framework}
   spec.homepage      = "https://github.com/sakura-forest/ezframe"
   spec.license       = "MIT"
@@ -31,13 +31,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.16"
-  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "minitest", '~> 5.13.0'
   spec.add_development_dependency "nokogiri", '~> 1.10.7'
-  spec.add_development_dependency "rubocop", '~> 0.77.0'
+  spec.add_development_dependency "rack-test", '~> 1.1.0'
 
+  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 'htmlbeautifier', '~> 1.3.1'
 end

data/lib/ezframe/auth.rb

@@ -10,22 +10,21 @@ module Ezframe
         end
         Warden::Manager.serialize_from_session do |account|
           mylog "serialize_from: account = #{account}"
-          inst = Auth.get(account)
+          inst = Auth.get(env['model'], account)
           mylog "inst = #{inst.inspect}"
           inst
         end
         Warden::Strategies.add(:mystrategy) do
           def valid?
-            mylog "valid?"
+            # mylog "valid?"
             params["account"] || params["password"]
           end
 
           def authenticate!
             mylog "authenticate!: #{params}"
-            if Auth.authenticate(params["account"], params["password"])
-              success!(Auth.get(params["account"]))
+            if Auth.authenticate(env, params["account"], params["password"])
+              success!(Auth.get(env['model'], params["account"]))
             else
-              # mylog "can i get env?: #{env}"
               env['x-rack.flash'].error = 'ユーザーが登録されていないか、パスワードが違っています。'
               fail!("authenticate failure")
             end
@@ -33,21 +32,25 @@ module Ezframe
         end 
       end
 
-      def get(account)
-        new(account)
+      def get(model, account)
+        new(model, account)
       end
 
-      def authenticate(account, pass)
-        raise "model is not initialized" unless @model
-        @user = @model.db.dataset(:user).where(account: account).first
+      def authenticate(env, account, pass)
+        model = env["model"]
+        raise "model is not initialized" unless model
+        @user = model.db.dataset(:user).where(account: account).first
         if @user
           mylog "Auth: authenticate: user=#{@user.inspect}"
         else
           mylog "authenticate: this user does not exist: #{account}"
           return nil
         end
+        mylog "env=#{env.inspect}"
+        env['rack.session'][:user] = @user[:id]
         password = @user[:password]
         @user.delete(:password)
+
         return nil if !pass || !password
         !!(password == pass)
       end
@@ -55,9 +58,9 @@ module Ezframe
 
     attr_accessor :account, :password, :model, :user, :id
 
-    def initialize(account)
+    def initialize(model, account)
       self.account = account
-      @user = Auth.model.db.dataset(:user).where(Sequel.or(account: account, id: account)).first
+      @user = model.db.dataset(:user).where(Sequel.or(account: account, id: account)).first
       unless @user
         mylog "Auth.initialize: This user does not exist: #{account}"
       end

data/lib/ezframe/column_set.rb

@@ -37,7 +37,7 @@ module Ezframe
     end
 
     def [](table_name)
-      @tables[table_name]
+      return @tables[table_name]
     end
 
     def each
@@ -46,7 +46,7 @@ module Ezframe
   end
 
   class ColumnSet
-    attr_accessor :name, :parent
+    attr_accessor :name, :parent, :edit_keys, :view_keys
 
     def initialize(parent:, name: nil, columns: nil)
       @parent = parent
@@ -62,7 +62,7 @@ module Ezframe
     end
 
     def set(attr_a)
-      @columns[:id] = IdType.new(key: "id", label: "ID", hidden: true, no_edit: true)
+      @columns[:id] = IdType.new(key: "id", label: "ID", no_edit: true)
       attr_a.each do |attributes|
         attr = attributes.clone
         col_key = attr[:key]
@@ -74,16 +74,16 @@ module Ezframe
           @columns[col_key.to_sym] = klass.new(attr)
         end
       end
-      @columns[:created_at] = DateType.new(type: "date", key: "created_at", label: "生成日時", hidden: true, no_edit: true)
-      @columns[:updated_at] = DateType.new(type: "date", key: "updated_at", label: "更新日時", hidden: true, no_edit: true)
+      @columns[:created_at] = DatetimeType.new(type: "datetime", key: "created_at", label: "生成日時", no_edit: true)
+      @columns[:updated_at] = DatetimeType.new(type: "datetime", key: "updated_at", label: "更新日時", no_edit: true)
       # mylog "set: #{@columns.inspect}"
       @columns.values.each {|col| col.parent = self }
-      @columns
+      return @columns
     end
 
     def dataset
       # puts "dataset: #{@model.inspect}"
-      @parent.model.db.dataset(@name)
+      return @parent.model.db.dataset(@name)
     end
 
     def set_from_db(id)
@@ -98,36 +98,53 @@ module Ezframe
       col_h.delete(:id)
       col_h.delete(:created_at)
       col_h[:updated_at] = Time.now
-      p "save: #{col_h.inspect}"
+      mylog "save: #{col_h.inspect}"
       id = @columns[:id]
       if id.value.to_i > 0
         dataset.where(id: id.value).update(col_h)
       else
-        dataset.insert(col_h)
+        return dataset.insert(col_h)
       end
     end
 
-    def update(id, key, value)
-      dataset.where(id: id).update(key => value)
-      column = @columns[key.to_sym]
-      column.value = value
-      return column
+    def update(id, value_h)
+      values = {}
+      colkeys = @columns.keys
+      value_h.each do |k, v|
+        values[k] = v if colkeys.include?(k)
+      end
+      dataset.where(id: id).update(values)
+      set_values(values)
     end
 
     def values=(value_h)
       clear
-      # puts "value_h=#{value_h.inspect}"
+      set_values(value_h)
+    end
+
+    def set_values(value_h)
+      return unless value_h
       value_h.each do |k, v|
-        # puts "values=: k=#{k}, v=#{v}"
         col = @columns[k.to_sym]
-        unless col
-          mylog("no such column: #{k}")
-          next
-        end
+        next unless col
         col.value = v
       end
     end
 
+    def validate
+      clear_error
+      errors = []
+      @columns.values.each do |col| 
+        err = col.validate
+        errors.push([ col.key, err ]) if err
+      end
+      return errors
+    end
+
+    def clear_error
+      @columns.values.each {|col| col.error = nil }
+    end
+
     def values
       @columns.map {|key, col| col.value}
     end  
@@ -141,7 +158,7 @@ module Ezframe
     end
 
     def get_matrix(method_a)
-      @columns.map do |_key, col|
+      return @columns.map do |_key, col|
         method_a.map { |method| col.send(method) }
       end
     end
@@ -149,24 +166,47 @@ module Ezframe
     def get_hash(method)
       res_h = {}  
       @columns.map do |key, col|
-        res_h[key] = col.send(method)
+        res_h[key.to_sym] = col.send(method)
       end
-      res_h
+      return res_h
     end
 
     def [](col_key)
-      @columns[col_key.to_sym]
+      return @columns[col_key.to_sym]
     end
     
     def form
-      res = @columns.values.map do |coltype|
-        coltype.form
+      if @edit_keys
+        return @edit_keys.map do |key| 
+          col = @columns[key.to_sym]
+          unless col
+            mylog "[ERROR] @edit_keys has unknown column:name=#{@name}:key=#{key}"
+            next
+          end
+          col.form
+        end
+      else
+        return  @columns.values.map {|coltype| coltype.form }
+      end        
+    end
+
+    def view
+      if @view_keys
+        return @view_keys.map do |key| 
+          col = @columns[key.to_sym]
+          unless col
+            mylog "[ERROR] @view_keys has unknown column:name=#{@name}:key=#{key}"
+            next
+          end
+          col.view
+        end
+      else
+        return  @columns.values.map {|coltype| coltype.view }
       end
-      res.compact
     end
 
     def hidden_form
-      @columns.map do |colkey, coltype|
+      return @columns.map do |colkey, coltype|
         { tag: 'input', id: colkey, name: colkey, type: 'hidden', value: coltype.value }
       end
     end