ezframe 0.0.1 → 0.0.3

data/lib/ezframe/html.rb

@@ -11,16 +11,18 @@ module Ezframe
 
         tag = ht_h[:tag]
         case tag
+        when "input"
+          input(ht_h)
         when "select"
           return select(ht_h) if ht_h[:items]
         when "icon"
           tag = "i"
         end
         opt_s, child_s = join_attributes(ht_h)
-        if child_s.length.positive?
-          return "<#{tag} #{opt_s}>\n#{child_s}\n</#{tag}>\n"
+        if child_s.length >= 0
+          return "<#{ht_h[:tag]} #{opt_s}>\n#{child_s}\n</#{ht_h[:tag]}>\n"
         end
-        "<#{tag} #{opt_s}/>"
+        "<#{ht_h[:tag]} #{opt_s}/>"
       end
 
       def join_attributes(attrs)
@@ -48,9 +50,24 @@ module Ezframe
         [opt_a.compact.join(" "), child_s]
       end
 
+      def input(ht_h)
+        size = ht_h[:size]
+        # puts "input: size=#{size.inspect}"
+        if size && (size.index("x") || size.index("*"))
+          if /(\d+)\s*[x\*]\s*(\d+)/ =~ size
+            ht_h[:cols], ht_h[:rows] = $1, $2
+          end
+          ht_h[:tag] = "textarea"
+          ht_h[:child] = ht_h[:value]
+          ht_h.delete(:value)
+          p ht_h
+        end
+      end
+
       def select(ht_h = {})
         attr = ht_h.clone
         items = attr[:items]
+        # puts "Html.select: #{items}"
         if items.is_a?(Hash)
           option_a = ht_h[:items].map do |k, v|
             h = { tag: "option", value: k }
@@ -59,6 +76,9 @@ module Ezframe
               h[:selected] = "selected" if selected
             end
             h[:child] = v
+            if ht_h[:default] && ht_h[:default] == v
+              h[:selected] = "selected"
+            end
             h
           end
         elsif items.is_a?(Array)
@@ -67,6 +87,10 @@ module Ezframe
             if %w[selected default].include?(v[2])
               h[:selected] = "selected"
             end
+            if ht_h[:default] && ht_h[:default] == v
+              h[:selected] = "selected"
+            end
+            # puts h.inspect
             h
           end
         else
@@ -74,7 +98,7 @@ module Ezframe
         end
         attr[:tag] = "select"
         attr[:child] = option_a
-        attr[:name] = attr[:key]
+        attr[:name] ||= attr[:key]
         attr[:final] = true
         attr.delete(:items)
         Html.convert(attr)

data/lib/ezframe/japanese_utils.rb

@@ -0,0 +1,40 @@
+class Japanese
+  class << self
+    def convert_wareki(year)
+      [
+        ["令和", 2019],
+        ["平成", 1989],
+        ["昭和", 1926],
+        ["大正", 1912],
+        ["明治", 1868],
+      ].each do |a|
+        gengo, start_at = a
+        wareki = year - start_at + 1
+        if wareki > 0
+          wareki = "元" if wareki == 1
+          return "#{gengo}#{wareki}"
+        end
+      end
+    end
+
+    def is_katakana?(str)
+      return nil if !str || str.empty?
+      return /^[ァ-ン\-ー―−]+$/ =~ str
+    end
+
+    def is_hiragana?(str)
+      return nil if !str || str.empty?
+      return /^[ぁ-ん\-ー―−]+$/ =~ str
+    end
+
+    def to_hiragana(str)
+      return nil if !str
+      return str.tr("ァ-ン\-ー―−", "ぁ-ん\-ー―−")
+    end
+
+    def to_katakana(str)
+      return nil if !str
+      return str.tr("ぁ-ん\-ー―−", "ァ-ン\-ー―−")
+    end
+  end
+end

data/lib/ezframe/{pages.rb → loader.rb}

@@ -3,6 +3,9 @@
 if File.exist?("pages/common.rb")
   require "#{Dir.pwd}/pages/common.rb"
 end
+Dir["models/*.rb"].each do |file|
+  require "#{Dir.pwd}/#{file}"
+end
 Dir["pages/*.rb"].each do |file|
   require "#{Dir.pwd}/#{file}"
 end

data/lib/ezframe/materialize.rb

@@ -4,32 +4,25 @@ module Ezframe
   class Materialize
     class << self
       def into_html_header
-        str =<<~EOHEAD2
-          <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
-          <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/css/materialize.min.css">
-          <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0/js/materialize.min.js"></script>
-        EOHEAD2
+
+        css_a = Config[:extra_css_list].map {|file| "<link href=\"#{file}\" rel=\"stylesheet\">\n" }
+        js_a = Config[:extra_js_list].map {|file| "<script src=\"#{file}\"></script>\n" }
 
         css_files = Dir["./asset/css/*.css"]||[]
-        css_a = css_files.map do |file|
+        css_a += css_files.map do |file|
           file.gsub!("./asset", "")
           "<link href=\"#{file}\" rel=\"stylesheet\">\n"
         end
         js_files = Dir["./asset/js/*.js"]||[]
-        js_a = js_files.map do |file|
+        js_a += js_files.map do |file|
           file.gsub!("./asset", "")
           "<script src=\"#{file}\"></script>\n"
         end
-        str+(css_a+js_a).join
+        (css_a+js_a).join
       end
 
       def into_bottom_of_body
         ""
-#        Dir["./asset/js"].each do ||
-#        <<~EOBOT
-#          <script src="/js/htmlgen.js"></script>
-#          <script src="/js/common.js"></script>
-#        EOBOT
       end
 
       def convert(ht_h)
@@ -39,10 +32,14 @@ module Ezframe
         if ht_h.kind_of?(Array)
           new_h = ht_h.map { |v| convert(v) }
         elsif ht_h.kind_of?(Hash)
+          unless ht_h[:tag]
+            mylog("convert: no tag: #{ht_h.inspect}")
+            return nil
+          end
           case ht_h[:tag].to_sym
-          when :input, :select
-            new_h = input(ht_h) if "hidden" != ht_h[:type]
-            return new_h
+#          when :input, :select
+#            new_h = input(ht_h) if "hidden" != ht_h[:type]
+#            return new_h
           when :checkbox
             return checkbox(ht_h)
           when :radio
@@ -75,10 +72,10 @@ module Ezframe
       end
 
       def input(ht_h)
-        ht_h[:name] ||= ht_h[:key]
+        ht_h[:tag] = "input"
         width_s = "s#{ht_h[:width_s] || 12}"
         ht_h.delete(:witdth_s)
-        label = Ht.label(for: ht_h[:key], child: ht_h[:label], final: true )
+        label = Ht.label(class: %w[active], for: ht_h[:name], child: ht_h[:label], final: true )
         cls = ["input-field", "col", width_s]
         new_h = Ht.div(class: cls, child: [ht_h, label])
         new_h = Ht.div(child: new_h, class: "row")
@@ -88,13 +85,13 @@ module Ezframe
       def checkbox(ht_h)
         ht_h[:tag] = "input"
         ht_h[:type] = "checkbox"
-        Ht.label(child: [ht_h, { tag: "span", child: ht_h[:value] }])
+        return Ht.label(child: [ht_h, { tag: "span", child: ht_h[:value] }])
       end
 
       def radio(ht_h)
         ht_h[:tag] = "input"
         ht_h[:type] = "radio"
-        Ht.label(child: [ht_h, { tag: "span", child: ht_h[:label] }])
+        return Ht.label(child: [ht_h, { tag: "span", child: ht_h[:label] }])
       end
 
       def add_sibling(dest, elem)
@@ -104,6 +101,44 @@ module Ezframe
           [dest, elem]
         end
       end
+
+      def loading
+       Ht.div(class: %w[preloader-wrapper big active], child: 
+         Ht.div(class: %w[spinner-layer spinner-green], child: [
+           Ht.multi_div([%w[circle-clipper left], %w[circle]], ""),
+           Ht.multi_div([%w[gap-patch], %w[circle]], ""),
+           Ht.multi_div([%w[circle-clipper right], %w[circle]], "")
+         ]))
+      end
+    end
+
+    class Collection < Array
+      def to_h
+        list = self.map do |line|
+          Ht.li(class: %w[collection-item], child: line)
+        end
+        return Ht.ul(class: %w[collection], child: list)
+      end
+    end
+
+    class Tab
+      def self.base_layout(link_list)
+        size = 12 / link_list.length
+        tabs = link_list.map do |link|
+          Ht.li(class: ["tab", "s#{size}"], child: link)
+        end
+        Ht.multi_div([%w[row], %w[col s12]], Ht.ul(class: %w[tabs], child: tabs))
+      end
+    end
+
+    class Card
+      def self.base_layout(title: "", content: "")
+        Ht.multi_div([%w[row], %w[col s12], %w[card blue-grey darken-1], %w[card-content white-text]],
+                  [
+                  Ht.span(class: %w[card-title], child: title),
+                  Ht.p(child: content),
+                ])
+      end
     end
   end
 end

data/lib/ezframe/model.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "singleton"
-
 module Ezframe
   class Model
     class << self

data/lib/ezframe/page_base.rb

@@ -8,15 +8,6 @@ require_relative "util"
 module Ezframe
   class PageBase
     class << self
-      def get_class(keys)
-        keys = [keys] if keys.is_a?(String)
-        klass = (%w[Ezframe] + keys.map { |k| k.to_camel }).join("::")
-        if Object.const_defined?(klass)
-          return Object.const_get(klass)
-        end
-        return nil
-      end
-
       def decide_route(path_info)
         default_class = Config[:default_page_class]||"App"
         default_method = Config[:default_page_method]||"default"
@@ -25,11 +16,15 @@ module Ezframe
         when 0
           [get_class(default_class), default_method]
         when 1
+          filename = path_parts[0]
+          if filename.index(".")
+            return nil
+          end
           klass = get_class(path_parts)
           if klass
             return [klass, default_method]
           else
-            return [get_class(default_class), parth_parts[0]]
+            return [get_class(default_class), path_parts[0]]
           end
         else
           klass = get_class(path_parts)
@@ -42,6 +37,16 @@ module Ezframe
           end
         end
       end
+
+      def get_class(keys)
+        keys = [keys] if keys.is_a?(String)
+        klass = (%w[Ezframe] + keys.map { |k| k.to_camel }).join("::")
+        mylog "get_class: #{klass}"
+        if Object.const_defined?(klass)
+          return Object.const_get(klass)
+        end
+        return nil
+      end
     end
 
     attr_accessor :auth
@@ -55,7 +60,8 @@ module Ezframe
         mylog "params=#{@params.inspect}" if @params.length > 0
         @id, @key = @params[:id], @params[:key]
         @env = @request.env
-        @session = @env["rack.x-session"]
+        @session = @env["rack.session"]
+        mylog "session = #{@session.inspect}"
         if request.post?
           parse_json_body
           mylog "json=#{@json.inspect}"
@@ -78,7 +84,7 @@ module Ezframe
         into_html_header: Materialize.into_html_header,
         into_bottom_of_body: Materialize.into_bottom_of_body,
       }
-      EzView::Template.fill_template("template/base.html", args)
+      Template.fill("template/base.html", args)
     end
 
     def parse_json_body

data/lib/ezframe/page_kit.rb

@@ -12,8 +12,12 @@ module Ezframe
         table_a = row_a.map do |row_h|
           column_set.values = row_h
           id = column_set[:id].value
-          value_a = @attribute[:column_header].map do |key|
+          value_a = (@attribute[:column_header]||[]).map do |key|
             col = column_set[key]
+            unless col
+              mylog "undefined key: #{key}"
+              next
+            end
             checkbox_key = @attribute[:add_checkbox]
             if checkbox_key && key == checkbox_key
               text = add_checkbox(col)
@@ -25,59 +29,34 @@ module Ezframe
               text = deco.call(key, id, text) 
               # mylog "deco: #{text}"
             end
-            td = { tag: "td", child: text }
-            # td.update(@attribute[:onclick_rows].call(id, text)) if @attribute[:onclick_rows]
-            td
+            Ht.td(child: text)
           end
-          tr = { tag: "tr", child: value_a }
+          tr = Ht.tr(child: value_a)
           if @attribute[:onclick_rows]
             tr[:id] = elem_id = "tr_#{id}"
-            # tr.update(@attribute[:onclick_rows].call(id))
           end
           tr
         end
-        { tag: "table", child: [make_header, table_a] }
+        Ht.table(child: [make_header, table_a])
       end
 
       def add_checkbox(col)
-        { tag: "checkbox", name: "checkbox_#{col.key}_#{col.value}", value: col.value, label: col.view }
+        Ht.checkbox(name: "checkbox_#{col.key}_#{col.value}", value: col.value, label: col.view)
       end
 
       def make_header
         column_set = @attribute[:column_set]
-        th_a = @attribute[:column_header].map do |key|
+        th_a = (@attribute[:column_header]||[]).map do |key|
           col = column_set[key]
           if col
-            { tag: "th", child: col.label }
+            Ht.th(child: col.label)
           else
             nil
           end
         end
         if @attribute[:add_checkbox]
         end
-        { tag: "tr", child: th_a }
-      end
-    end
-
-    class Tab
-      def self.base_hthash(link_list)
-        size = 12 / link_list.length
-        tabs = link_list.map do |link|
-          { tag: "li", class: ["tab", "s#{size}"], child: link }
-        end
-        ul = { tag: "ul", class: %w[tabs], child: tabs }
-        div = { tag: "div", class: %w[row s12], child: ul }
-        { tag: "div", class: %w[row], child: div }
-      end
-    end
-
-    class Card
-      def self.base_hthash(title: "", content: "")
-        multi_div([%w[row], %w[col s12], %w[card blue-grey darken-1], %w[card-content white-text]],
-                  [
-                  { tag: "span", class: %w[card-tite], child: title },
-                  { tag: "p", child: content },
-                ])
+        Ht.tr(child: th_a)
       end
     end
   end

data/lib/ezframe/template.rb

@@ -1,25 +1,30 @@
 # frozen_string_literal: true
 
-module EzView
+module Ezframe
   class Template
-    def self.embed_words(keyword, dir, opts)
-      return opts[keyword.to_sym] if opts[keyword.to_sym]
+    class << self
+      def fill(filename, opts = {})
+        dir = File.dirname(filename)
+        unless File.exist?(filename)
+          raise "fill_template: file does not exist: #{filename}"
+        end
 
-     temp = "#{dir}/#{keyword}.html"
-     return File.open(temp, &:read) if File.exist?(temp)
-    end
-
-    def self.fill_template(filename, opts = {})
-      dir = File.dirname(filename)
-      unless File.exist?(filename)
-        raise "fill_template: file does not exist: #{filename}"
+        instr = File.open(filename, &:read)
+        return fill_in_text(instr, opts)
       end
 
-      instr = File.open(filename, &:read)
-      outstr = instr.gsub(/\#\{(.*)\}/) do
-        embed_words(Regexp.last_match(1), dir, opts)
+      def fill_in_text(text, opts = {})
+        outstr = text.gsub(/\#\{(.*)\}/) do
+          keyword = $1
+          if opts[keyword.to_sym]
+            opts[keyword.to_sym] 
+          else
+            mylog "[WARN] no value for keyword: #{keyword}"
+            nil
+          end
+        end
+        return outstr
       end
-      outstr
     end
   end
 end

data/lib/ezframe/util.rb

@@ -29,6 +29,7 @@ class Hash
   end
 
   def add_class(klass)
+    return unless klass
     c = self[:class]
     if !c
       self[:class] = c = []
@@ -81,6 +82,10 @@ def multi_div(class_a, child)
   return child
 end
 
+
+
+
+
 def mylog(msg)
   File.open("log/mylog.log", "a"){|f| f.puts "#{Time.now}:[#{$$}]:#{msg}" }
 end

data/lib/ezframe/version.rb

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

data/lib/ezframe.rb

@@ -1,27 +1,28 @@
 # frozen_string_literal: true
 
 require 'yaml'
-require 'htmlbeautifier'
 require "sequel"
 require "json"
-require "yaml"
+require "nkf"
 
+require_relative 'ezframe/version'
 require_relative 'ezframe/util'
 require_relative 'ezframe/config'
 require_relative 'ezframe/controller'
+require_relative 'ezframe/japanese_utils'
 require_relative 'ezframe/column_set'
 require_relative 'ezframe/column_type'
 require_relative 'ezframe/database'
-require_relative 'ezframe/hthash'
+require_relative 'ezframe/ht'
 require_relative 'ezframe/html'
 require_relative 'ezframe/materialize'
 require_relative 'ezframe/model'
 require_relative 'ezframe/page_kit'
 require_relative 'ezframe/page_base'
 require_relative 'ezframe/template'
-require_relative 'ezframe/pages'
 require_relative 'ezframe/server'
 require_relative 'ezframe/auth.rb'
+require_relative 'ezframe/loader'