ezframe 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ba49d27d45a195d4b177c3d95eccdca2f01a3e9f20cd072ccc56acee5265b59
-  data.tar.gz: a3d7589ff5d0d3c81e405a950c9c57f6ca0110cc9748f6dc5bc254e276d27bb7
+  metadata.gz: 4ee9abffabef18607104a790bf9c044fd18022c1bb9c325d0b49c3919504da0e
+  data.tar.gz: 7c624b8735e2d081a73c8c5b771abdb3ca0a531a66d1e80ac953c4063dd237ba
 SHA512:
-  metadata.gz: 7ca38e91d91c1e1e30b9175efd9da518da54e6860d8f510173ddfbc2d23e553e52e3189137ef4c807c491740724349991921c58ad8d2749579716a873a8db744
-  data.tar.gz: 847a914cf8c68690be28b40a07903c3d0c47dd8e86dba9d6cbe6e05053cfa454fd0ead717b2267cacab570f96a3583093570cc21647b21c6c00a1bcd7b69f11c
+  metadata.gz: abf17a71fad66bdb9776346a155913664b78ebc9dfe4bc2fc94526340238423c7adf593650ed82e5e15ae052ecaa25e38a3a3803a68efa831d5cdf3d46478951
+  data.tar.gz: 4235b2a4e945845797e3cb41f27b675775598b8996952087701ca5ce678ef08abb28b44fb5f9b475a6281e16dd9845d77522824486b23f818ef773ea617e77ef

data/asset/html/index.html

@@ -0,0 +1 @@
+ezframe asset test

data/asset/js/ezframe.js

@@ -1,4 +1,3 @@
-// version. 2020?01?31?(?)
 function add_event(obj) {
   var elems = obj.querySelectorAll('[event]')
   if (elems) {
@@ -49,9 +48,6 @@ function parse_event(event) {
       }
     }
   }
-  /*if (!ev.url) {
-    ev.url = location.pathname
-  }*/
   return ev
 }
 
@@ -68,10 +64,9 @@ function execute_event(obj) {
       }
       return
     case "set_global":
-      if (!window.ezframe) { window.ezframe = {} }
       for(key in event) {
-        if ([ "command", "branch", "on", "url" ].indexOf(key) >= 0) { continue }
-        window.ezframe[key] = event[key]
+        if ([ "command", "on", "url" ].indexOf(key) >= 0) { continue }
+        window.ez_global[key] = event[key]
       }
       // console.log("set_global:" + JSON.stringify(window.ezframe))
       return
@@ -79,11 +74,45 @@ function execute_event(obj) {
       console.log("redirect:" + event.url)
       location.href = event.url
       return
+    case "enable_datatable":
+      enable_datatable(event)
+      return
   }
   with_attr(event, obj)
   post_values(event, obj)
 }
 
+function enable_datatable(event) {
+  // $("#enable_datatable").DataTable();
+  console.log("enable_datatable: target="+event.target)
+  // console.log($(tevent.arget))
+  var list_size = event.size || 5
+  $(event.target).DataTable({
+    lengthChange: false,
+    displayLength: parseInt(list_size),
+    columnDefs: [{ targets: '_all', className: 'ellipsis' }],
+    language: {
+      "decimal": ".",
+      "thousands": ",",
+      "sProcessing": "処理中...",
+      "sLengthMenu": "_MENU_ 件表示",
+      "sZeroRecords": "データはありません。",
+      "sInfo": " _TOTAL_ 件中 _START_ から _END_ まで表示",
+      "sInfoEmpty": " 0 件中 0 から 0 まで表示",
+      "sInfoFiltered": "（全 _MAX_ 件より抽出）",
+      "sInfoPostFix": "",
+      "sSearch": "検索:",
+      "sUrl": "",
+      "oPaginate": {
+        "sFirst": "<< 先頭",
+        "sPrevious": "< 前",
+        "sNext": "次 > ",
+        "sLast": "最終 >>"
+      }
+    }
+  })
+}
+
 function with_attr(event, obj) {
   if (!event.with) {
     return null
@@ -120,9 +149,8 @@ function post_values(event, obj) {
 
 function manage_response(res, event, obj) {
   var elem
-  /* console.log("manage_response: res="+JSON.stringify(res)+", event=" + JSON.stringify(event) +
+  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++) {
@@ -138,11 +166,7 @@ function exec_one_response(res) {
     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)
-      }
+      elem.innerHTML = res.body.replace(/<br>/g, "\n")
       add_event(elem)
     } else {
       console.log("no such element: "+res.inject)
@@ -175,12 +199,13 @@ function collect_form_values(obj) {
   for (var i = 0; i < inputs.length; i++) {
     var elem = inputs[i]
     if (!elem.name) { continue }
-    console.log("name,value="+elem.name+","+elem.value)
+    // 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)
+    var elem_value = elem.value
+    elem_value = elem_value.replace(/\n/g, '<br>')
     if (cur_value) {
       if (Array.isArray(cur_value)) {
         cur_value.push(elem_value)
@@ -194,10 +219,6 @@ function collect_form_values(obj) {
   return res
 }
 
-function normalize(str) {
-  return str.replace(/^[\s|　]+|[\s|　]+$/g, '').trim()
-}
-
 function switch_hide(button) {
   console.log("switch_hide")
   var node = button
@@ -253,6 +274,14 @@ function register_hover_button(obj) {
   }
 }
 
+
 document.addEventListener('DOMContentLoaded', function () {
+  if (!window.ez_global) { window.ez_global = {} }
+  add_event(document)
+})
+
+/*
+$(document).ready(function () {
   add_event(document)
 })
+*/

data/exe/check_column_yml

@@ -0,0 +1,64 @@
+#!/usr/bin/env ruby
+#codnig: utf-8
+
+=begin
+
+  column/*.ymlのチェックをする。
+
+=end
+require "ezframe"
+
+# https://stackoverflow.com/questions/4911105/in-ruby-how-to-be-warned-of-duplicate-keys-in-hashes-when-loading-a-yaml-docume
+def duplicate_keys(file_or_content)
+  yaml = file_or_content.is_a?(File) ? file_or_content.read : file_or_content
+  duplicate_keys = []
+
+  validator = ->(node, parent_path) do
+    if node.is_a?(Psych::Nodes::Mapping)
+      children = node.children.each_slice(2) # In a Mapping, every other child is the key node, the other is the value node.
+      duplicates = children.map { |key_node, _value_node| key_node }.group_by(&:value).select { |_value, nodes| nodes.size > 1 }
+
+      duplicates.each do |key, nodes|
+        duplicate_key = {
+          file: (file_or_content.path if file_or_content.is_a?(File)),
+          key: parent_path + [key],
+          occurrences: nodes.map { |occurrence| "line: #{occurrence.start_line + 1}" },
+        }.compact
+
+        duplicate_keys << duplicate_key
+      end
+
+      children.each { |key_node, value_node| validator.call(value_node, parent_path + [key_node ? key_node.value : nil].compact) }
+    else
+      node.children.to_a.each { |child| validator.call(child, parent_path) }
+    end
+  end
+
+  ast = Psych.parse_stream(yaml)
+  validator.call(ast, [])
+
+  duplicate_keys
+end
+
+Ezframe::Config.init
+Dir["column/*.yml"].each do |file|
+  instr = File.read(file)
+  dup = duplicate_keys(instr)
+  if dup && dup.length > 0
+    puts "#{file}\n#{dup}"
+  end
+  yaml = YAML.load_file(file)
+  upper = Object.const_get("Ezframe")
+  yaml.each do |column|
+    type = column["type"]
+    unless type
+      puts "#{file}: type is not defined: key=#{column['key']}"
+      next
+    end
+    klass = "Ezframe::#{type.to_camel}Type"
+    unless upper.const_defined?(klass)
+      puts "#{file}: unknown type: key=#{column['key']}, type=#{type}"
+    end
+  end
+end
+

data/exe/create_table

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

data/exe/dbmigrate

@@ -1,25 +1,68 @@
 #!/usr/bin/env ruby
 #coding: utf-8
 require "ezframe"
-
 include Ezframe
-# get column set
-Config.load_files("./config")
-Model.init
-$model = Model.get_clone
 
-def get_db_info(table_name)
-  dbcol = {}
-  sql = "SELECT column_name,data_type FROM information_schema.columns WHERE table_name = '#{table_name}'"
-  $model.db.sequel[sql].each do |row|
-    dbcol[row[:column_name].to_sym] = normalize_dbtype(row[:data_type])
+class DBInfo
+  class << self
+    def get_db_info(table_name)
+      typ = get_database_type(Config[:database])
+      case typ
+      when "postgresql"
+        return get_info_from_postgres(table_name)
+      when "sqlite"
+        return get_info_from_sqlite(table_name)
+      else
+        raise "unknown database"
+      end
+      return nil
+    end
+
+    def get_info_from_postgres(table_name)
+      dbcol = {}
+      sql = "SELECT column_name,data_type FROM information_schema.columns WHERE table_name = '#{table_name}'"
+      begin
+        data_a = DB.sequel[sql].all
+      rescue
+        return nil
+      end
+      # puts data_a
+      data_a.each do |row|
+        dbcol[row[:column_name].to_s.to_sym] = normalize_dbtype(row[:data_type])
+      end
+      return dbcol
+    end
+
+    def get_info_from_sqlite(table_name)
+      sql = "SELECT * from sqlite_master WHERE name = '#{table_name}';"
+      data = DB.sequel[sql].first
+      return nil unless data
+      sql = data[:sql]
+      return parse_create_sql(sql)
+    end
+
+    def parse_create_sql(sql)
+      sql.gsub(/CREATE TABLE \`\w+\` \(/, "")
+      column_a = sql.split(", ")
+      dbcol = {}
+      column_a.each do |line|
+        if line =~ /\`(\w+)\`\s(\w+)/
+          colkey, dbtype = $1, $2
+          dbcol[colkey.to_sym] = dbtype
+        end
+      end
+      return dbcol
+    end
+
+    def get_database_type(config)
+      return config.split("://")[0]
+    end
   end
-  return dbcol
 end
 
 def exec_sql(sql)
   begin
-    $model.db.sequel.run(sql)
+    DB.sequel.run(sql)
   rescue => exception
     p exception
   end
@@ -44,7 +87,11 @@ end
 
 def check_diff(column_set)
   table_name = column_set.name
-  dbcols = get_db_info(table_name)
+  dbcols = DBInfo.get_db_info(table_name)
+  unless dbcols
+    ColumnSets.create_one_table(table_name, ColumnSets.get(table_name.to_sym))
+    return
+  end
   column_set.each do |column|
     next if %w[id updated_at created_at].include?(column.key.to_s)
     dbtype = dbcols[column.key]
@@ -62,6 +109,10 @@ def check_diff(column_set)
   end
 end
 
-$model.column_sets.each do |table_name, column_set|
+Config.init
+DB.init
+ColumnSets.init
+
+ColumnSets.each do |table_name, column_set|
   check_diff(column_set)
 end

data/ezframe.gemspec

@@ -30,16 +30,15 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.16"
-  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_development_dependency "bundler", '>= 1.16'
+  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_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'
+  spec.add_runtime_dependency "rake", '>= 13.0'
+  spec.add_runtime_dependency 'rack', '>= 2.0.6'
+  spec.add_runtime_dependency 'sequel', '>= 5.27.0'
+  spec.add_runtime_dependency 'sqlite3', '>= 1.4.0'
+  spec.add_runtime_dependency 'bcrypt', '>= 3.1.13'
 end

data/lib/ezframe.rb

@@ -4,9 +4,11 @@ require 'yaml'
 require "sequel"
 require "json"
 require "nkf"
+require "date"
 
 require_relative 'ezframe/version'
 require_relative 'ezframe/util'
+require_relative 'ezframe/logger'
 require_relative 'ezframe/config'
 require_relative 'ezframe/controller'
 require_relative 'ezframe/japanese_utils'
@@ -16,7 +18,6 @@ require_relative 'ezframe/database'
 require_relative 'ezframe/ht'
 require_relative 'ezframe/html'
 require_relative 'ezframe/materialize'
-require_relative 'ezframe/model'
 require_relative 'ezframe/page_base'
 require_relative 'ezframe/template'
 require_relative 'ezframe/server'

data/lib/ezframe/auth.rb

@@ -1,75 +1,80 @@
 module Ezframe
   class Auth
     class << self
-      attr_accessor :model, :user
+      attr_accessor :user
 
-      def init_warden
+      def init
         Warden::Manager.serialize_into_session do |auth|
-          mylog "serialize_into: #{auth.inspect}"
+          # Logger.info "serialize_into: #{auth.inspect}"
           auth.user[:id]
         end
         Warden::Manager.serialize_from_session do |account|
-          mylog "serialize_from: account = #{account}"
-          inst = Auth.get(env['model'], account)
-          mylog "inst = #{inst.inspect}"
+          # Logger.info "serialize_from: account = #{account}"
+          inst = Auth.get(account)
+          # Logger.info "inst = #{inst.inspect}"
           inst
         end
         Warden::Strategies.add(:mystrategy) do
           def valid?
-            # mylog "valid?"
+            # Logger.info "valid?"
             params["account"] || params["password"]
           end
 
           def authenticate!
-            mylog "authenticate!: #{params}"
+            Logger.info "Auth.authenticate: #{params}"
             if Auth.authenticate(env, params["account"], params["password"])
-              success!(Auth.get(env['model'], params["account"]))
+              success!(Auth.get(params["account"]))
             else
-              env['x-rack.flash'].error = 'ユーザーが登録されていないか、パスワードが違っています。'
-              fail!("authenticate failure")
+              fail!(Message[:login_failure])
             end
           end
         end 
       end
 
-      def get(model, account)
-        new(model, account)
+      def get(account)
+        new(account)
       end
 
       def authenticate(env, account, pass)
-        model = env["model"]
-        raise "model is not initialized" unless model
-        @user = model.db.dataset(Config[:login_table]).where(Config[:login_account].to_sym => account ).first
+        Logger.debug("authenticate: #{env}")
+        auth_conf = Config[:auth]
+        @user = DB.dataset(auth_conf[:table]).where(auth_conf[:user].to_sym => account ).first
         if @user
-          mylog "Auth: authenticate: user=#{@user.inspect}"
+          Logger.info "Auth: authenticate"
         else
-          mylog "authenticate: this user does not exist: #{account}"
+          Logger.info "authenticate: this user does not exist: #{account}"
           return nil
         end
-        mylog "env=#{env.inspect}"
+        # Logger.info "env=#{env.inspect}"
         env['rack.session'][:user] = @user[:id]
-        password = @user[:password]
+        password = @user[auth_conf[:password].to_sym]
+        Logger.debug("@user=#{@user}")
+        bcrypt = BCrypt::Password.new(password)
         @user.delete(:password)
 
-        return nil if !pass || !password
-        !!(password == pass)
+        return nil if !pass || pass.strip.empty? || !password || password.strip.empty?
+        # 生パスワード比較
+        # !!(password == pass)
+        return bcrypt == pass
       end
     end
 
-    attr_accessor :account, :password, :model, :user, :id
+    attr_accessor :account, :password, :user, :id
 
-    def initialize(model, account)
+    def initialize(account)
       self.account = account
-      dataset = model.db.dataset(Config[:login_table])
+      auth_conf = Config[:auth]
+      dataset = DB.dataset(auth_conf[:table])
       if account.is_a?(Integer)
         @user = dataset.where(id: account).first
       else
-        @user = dataset.where(Config[:login_account].to_sym => account).first
+        @user = dataset.where(auth_conf[:user].to_sym => account).first
       end
       unless @user
-        mylog "Auth.initialize: This user does not exist: #{account}"
+        Logger.error "Auth.initialize: This user does not exist: #{account}"
+        return
       end
-      self.password = @user[:password]
+      self.password = @user[auth_conf[:password].to_sym]
       @user.delete(:password)
     end
   end