ezframe 0.0.4 → 0.4.0

data/lib/ezframe/util.rb

@@ -1,6 +1,10 @@
-class Util
-  def self.add_comma(value)
-    value.to_s.reverse.gsub(/(\d{3})/) { "#{$1}," }.reverse
+class Integer
+  def to_sym
+    return self.to_s.to_sym
+  end
+
+  def add_comma
+    return self.to_s.reverse.gsub(/(\d{3})(\d)/) { "#{$1},#{$2}" }.reverse
   end
 end
 
@@ -16,10 +20,14 @@ end
 
 # https://github.com/cliftonsluss/recursively_symbolize_keys/blob/master/recursively_symbolize_keys.rb
 class Hash
-  def recursively_symbolize_keys
-    h = Hash.new
+#  def [](key)
+#    return (fetch key, nil) || (fetch key.to_s, nil) || (fetch key.to_s.to_sym, nil)
+#  end.recursively_symbolize_keys
+
+  def symbolize_keys
+    h = {}
     self.each do |k, v|
-      if v.class == Hash
+      if v.is_a?(Hash)
 	      h[k.to_s.to_sym] = v.recursively_symbolize_keys
       else
 	      h[k.to_s.to_sym] = v
@@ -30,6 +38,10 @@ class Hash
 
   def add_class(klass)
     return unless klass
+    if klass.is_a?(Array)
+      klass.each {|k| add_class(k) }
+      return
+    end
     c = self[:class]
     if !c
       self[:class] = c = []
@@ -37,12 +49,8 @@ class Hash
       a = [ c ]
       self[:class] = c = a
     end
-    if klass.is_a?(Array)
-      klass.each {|k| add_class(k) }
-    else
-      return if c.include?(klass)
-      c.push(klass)
-    end
+    return if c.include?(klass)
+    c.push(klass)
   end
 
   def remove_class(klass)
@@ -58,10 +66,10 @@ class Hash
 end
 
 class Array
-  def recursively_symbolize_keys
+  def symbolize_keys
     self.collect do |v|
       if v.kind_of?(Hash) || v.kind_of?(Array) 
-        v.recursively_symbolize_keys
+        v.symbolize_keys
       else
         v  
       end  
@@ -75,17 +83,31 @@ class Object
   end
 end
 
-def multi_div(class_a, child)
-  class_a.reverse.each do |klass|
-    child = { tag: "div", class: klass, child: child }
+class Time
+  def to_date_key
+    return "%d-%02d-%02d"%[ self.year, self.mon, self.mday ]
   end
-  return child
-end
-
-
 
+  def wday_jp
+    return %w[日 月 火 水 木 金 土 日][self.wday]
+  end
+end
 
+# クラス名をsnake caseにする。
+def class_to_snake(class_name)
+  return nil unless class_name
+  class_name = class_name.to_s
+  if class_name.index("::")
+    return class_name.split("::")[-1].to_snake.to_sym
+  else
+    return class_name.to_snake.to_sym
+  end
+end
 
-def mylog(msg)
-  File.open("log/mylog.log", "a"){|f| f.puts "#{Time.now}:[#{$$}]:#{msg}" }
+# URLのオプションを解析
+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] }
+  return res_h
 end

data/lib/ezframe/version.rb

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

metadata

@@ -1,150 +1,181 @@
 --- !ruby/object:Gem::Specification
 name: ezframe
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.4.0
 platform: ruby
 authors:
 - KAMACHI Masayuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-24 00:00:00.000000000 Z
+date: 2020-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.13.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.10.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.10.7
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.12.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '13.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.7
+        version: 2.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.7
+        version: 2.0.6
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.27.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 5.27.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
+- !ruby/object:Gem::Dependency
+  name: bcrypt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.13
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.13
 description: easy web framework
 email:
 - kamachi@sakuraforest.co.jp
 executables:
+- check_column_yml
 - console
-- create_table.rb
-- setup.rb
+- create_table
+- dbmigrate
+- html2ruby
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".rubocop.yml"
+- Gemfile
 - README.md
 - Rakefile
-- app_template/asset/image/favicon.ico
-- app_template/asset/js/ezframe.js
-- app_template/config.ru
-- app_template/config/generic.yml
-- app_template/config/materialize.yml
-- app_template/pages/basic.rb
+- asset/css/materialize.min.css
+- asset/css/style.css
+- asset/html/index.html
+- asset/image/c_e.ico
+- asset/js/ezframe.js
+- exe/check_column_yml
 - exe/console
-- exe/create_table.rb
-- exe/setup.rb
+- exe/create_table
+- exe/dbmigrate
+- exe/html2ruby
 - ezframe.gemspec
 - lib/ezframe.rb
 - lib/ezframe/auth.rb
@@ -153,16 +184,25 @@ files:
 - lib/ezframe/config.rb
 - lib/ezframe/controller.rb
 - lib/ezframe/database.rb
-- lib/ezframe/editor.rb
+- lib/ezframe/editor_common.rb
+- lib/ezframe/email.rb
+- lib/ezframe/ezlog.rb
 - lib/ezframe/ht.rb
 - lib/ezframe/html.rb
 - lib/ezframe/japanese_utils.rb
+- lib/ezframe/jquery-ui.rb
 - lib/ezframe/loader.rb
+- lib/ezframe/main_editor.rb
+- lib/ezframe/main_page_kit.rb
 - lib/ezframe/materialize.rb
-- lib/ezframe/model.rb
+- lib/ezframe/message.rb
 - lib/ezframe/page_base.rb
-- lib/ezframe/page_kit.rb
+- lib/ezframe/route.rb
 - lib/ezframe/server.rb
+- lib/ezframe/single_page_editor.rb
+- lib/ezframe/single_page_kit.rb
+- lib/ezframe/sub_editor.rb
+- lib/ezframe/sub_page_kit.rb
 - lib/ezframe/template.rb
 - lib/ezframe/util.rb
 - lib/ezframe/version.rb

data/.rubocop.yml

@@ -1,44 +0,0 @@
-AllCops:
-  TargetRubyVersion: 2.6
-  DisabledByDefault: true
-  Exclude:
-    - '**/vendor/**/*'
-
-Style/FrozenStringLiteralComment:
-  Enabled: true
-  EnforcedStyle: always
-
-# Use Ruby >= 1.9 syntax for hashes. Prefer { a: :b } over { :a => :b }.
-Style/HashSyntax:
-  Enabled: true
-
-Layout/EmptyLineAfterMagicComment:
-  Enabled: true
-
-Layout/LeadingCommentSpace:
-  Enabled: true
-
-Layout/SpaceAfterColon:
-  Enabled: true
-
-Layout/SpaceAfterComma:
-  Enabled: true
-
-Layout/SpaceAroundEqualsInParameterDefault:
-  Enabled: true
-
-Layout/SpaceAroundKeyword:
-  Enabled: true
-
-Layout/SpaceAroundOperators:
-  Enabled: true
-
-Layout/SpaceBeforeComma:
-  Enabled: true
-
-Layout/SpaceBeforeFirstArg:
-  Enabled: true
-
-# Use `{ a: 1 }` not `{a:1}`.
-Layout/SpaceInsideHashLiteralBraces:
-  Enabled: true

data/app_template/asset/js/ezframe.js

@@ -1,288 +0,0 @@
-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)
-})