ezframe 0.0.4 → 0.1.0

data/lib/ezframe/route.rb

@@ -0,0 +1,122 @@
+module Ezframe
+  class Route
+    class << self
+      def choose(request, route_h = nil)
+        path_parts = request.path_info.split("/").drop(1)
+        route_h ||= Config[:route].deep_dup
+        # puts  "config=#{Config[:route]}, route_h=#{route_h}"
+        args = {}
+        class_a = []
+        # p path_parts
+        if path_parts.empty?
+          root_conf = route_h[:/]
+          # p root_conf
+          if root_conf
+            klass = get_class(root_conf[:class])
+            return [ klass.new, make_method_name("default", request.request_method) ]
+          end
+          return [ 404 ]
+        end
+        # URLを解析して、クラスの決定とIDの取得を行う
+        while path_parts.length > 0
+          part = path_parts.shift
+          # break if part.empty?
+          # mylog "part=#{part}, route_h=#{route_h.inspect}"
+          if route_h.has_key?(part.to_sym)
+            # mylog "has_route: #{part}"
+            class_a.push(part)
+            if path_parts[0].to_i > 0
+              args[part.to_sym] = val = path_parts.shift
+              # mylog "value: part=#{part}, val=#{val}"
+            end
+            route_h = route_h[part.to_sym]
+            break if route_h.nil?
+            # mylog "route_h changed: #{route_h}"
+          else
+            # routeに無ければ、メソッドを探す
+            # mylog "no_route: #{part}"
+            klass = get_class(class_a[-1])
+            return [ 404 ] unless klass
+            instance = klass.new
+            method_name = make_method_name(part, request.request_method)
+            if instance.respond_to?(method_name)
+              return [instance, method_name, args]
+            else
+              mylog "undefined method: #{klass}.#{method_name}: full path=#{request.path_info}"
+            end
+          end
+        end
+        # 最後にメソッド名が無い場合はpublic_default_#{method}を実行。
+        #puts "class_a=#{class_a}"
+        klass = get_class(class_a[-1])
+        return [404] unless klass
+        if path_parts.length > 0
+          part = path_parts.shift
+        else
+          part = "default"
+        end
+        method_name = make_method_name(part, request.request_method)
+        #mylog "method_name=#{method_name}"
+        instance = klass.new
+        if instance.respond_to?(method_name)
+          return [instance, method_name, args]
+        end
+        return [ 404 ]
+      end
+
+      # ページクラスの階層を辿る
+      def get_path(class_snake, route_h = nil)
+        route_h = Config[:route] unless route_h
+        @get_path_found_it = nil
+        return scan_hash(class_snake, route_h.deep_dup).reverse
+      end
+
+      # targetに対応する名称のクラスまでの経路を返す
+      def scan_hash(target, hash)
+        if hash.keys.include?(target)
+          @get_path_found_it = true
+          return [ target ]
+        else
+          hash.each do |k, v|
+            if v.is_a?(Hash)
+              a = scan_hash(target, v)
+              if @get_path_found_it
+                a.push(k)
+                return a
+              end
+            end
+          end
+        end
+      end
+
+      def make_method_name(base_name, method = "get")
+        return ["public", base_name, method.downcase].join("_")
+      end
+
+      def get_class(keys)
+        mylog "get_class: #{keys.inspect}"
+        return nil unless 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)
+        else
+          raise "get_class: undefined class: #{klass}"
+        end
+        return nil
+      end
+
+      def find_file(target)
+        Find.find("./asset").each do |file|
+          path_a = file.split("/")
+          if path_a[-1] == target
+            suffix = "." + target.split(".")[-1]
+            return [200, { "Content-Type" => Rack::Mime.mime_type(suffix) }, [File.open(file, &:read)]]
+          end
+        end
+        return [ 404 ]
+      end
+    end
+  end
+end

data/lib/ezframe/server.rb

@@ -5,7 +5,7 @@ module Ezframe
     def self.call(env)
       req = Rack::Request.new(env)
       res = Rack::Response.new
-      Boot.exec(req, res)
+      Controller.exec(req, res)
       if res.body.empty?
         raise "no body in response"
       end

data/lib/ezframe/template.rb

@@ -8,16 +8,17 @@ module Ezframe
         unless File.exist?(filename)
           raise "fill_template: file does not exist: #{filename}"
         end
-
         instr = File.open(filename, &:read)
         return fill_in_text(instr, opts)
       end
 
       def fill_in_text(text, opts = {})
-        outstr = text.gsub(/\#\{(.*)\}/) do
+        outstr = text.gsub(/\#\{([^\}]+)\}/) do
           keyword = $1
           if opts[keyword.to_sym]
             opts[keyword.to_sym] 
+          elsif ENV[keyword]
+            ENV[keyword]
           else
             mylog "[WARN] no value for keyword: #{keyword}"
             nil

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
 
@@ -30,6 +34,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 +45,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)
@@ -75,17 +79,33 @@ 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
 
+# クラス名を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
 
-
-
+# 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
 
 def mylog(msg)
-  File.open("log/mylog.log", "a"){|f| f.puts "#{Time.now}:[#{$$}]:#{msg}" }
+  if File.exist?("log")
+    File.open("log/mylog.log", "a"){|f| f.puts "#{Time.now}:[#{$$}]:#{msg}" }
+  end
 end

data/lib/ezframe/version.rb

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

data/lib/ezframe.rb

@@ -17,13 +17,14 @@ 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/server'
+require_relative 'ezframe/message'
 require_relative 'ezframe/auth.rb'
 require_relative 'ezframe/editor.rb'
 require_relative 'ezframe/loader'
+require_relative 'ezframe/route'
 
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ezframe
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - KAMACHI Masayuki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-24 00:00:00.000000000 Z
+date: 2020-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,34 @@ dependencies:
     - - "~>"
       - !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: mailcatcher
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -122,29 +150,42 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.0
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.10.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.10.2
 description: easy web framework
 email:
 - kamachi@sakuraforest.co.jp
 executables:
 - console
-- create_table.rb
-- setup.rb
+- create_table
+- dbmigrate
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".rubocop.yml"
 - 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/image/c_e.ico
+- asset/js/ezframe.js
+- asset/js/materialize.min.js
+- asset/js/mymaterialize.js
 - exe/console
-- exe/create_table.rb
-- exe/setup.rb
+- exe/create_table
+- exe/dbmigrate
 - ezframe.gemspec
 - lib/ezframe.rb
 - lib/ezframe/auth.rb
@@ -154,14 +195,16 @@ files:
 - lib/ezframe/controller.rb
 - lib/ezframe/database.rb
 - lib/ezframe/editor.rb
+- lib/ezframe/email.rb
 - lib/ezframe/ht.rb
 - lib/ezframe/html.rb
 - lib/ezframe/japanese_utils.rb
 - lib/ezframe/loader.rb
 - lib/ezframe/materialize.rb
+- lib/ezframe/message.rb
 - lib/ezframe/model.rb
 - lib/ezframe/page_base.rb
-- lib/ezframe/page_kit.rb
+- lib/ezframe/route.rb
 - lib/ezframe/server.rb
 - lib/ezframe/template.rb
 - lib/ezframe/util.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/config/generic.yml

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

data/app_template/config/materialize.yml

@@ -1,5 +0,0 @@
-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/app_template/config.ru

@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-require "logger"
-require "rack"
-require "ezframe"
-
-use Rack::Session::Pool
-use Rack::Static, urls: ["/image", "/js", "/css"], root: "asset"
-use Rack::ShowExceptions
-run Ezframe::Server

data/app_template/pages/basic.rb

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

data/exe/setup.rb

@@ -1,15 +0,0 @@
-#!/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/lib/ezframe/page_kit.rb

@@ -1,63 +0,0 @@
-# frozen_string_literal: true
-
-module Ezframe
-  module PageKit
-    class IndexTable
-      def initialize(attr = {})
-        @attribute = attr
-      end
-
-      def make_table(row_a)
-        column_set = @attribute[:column_set]
-        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|
-            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)
-            else
-              text = col.view
-            end
-            deco = @attribute[:decorate_column]
-            if deco
-              text = deco.call(key, id, text) 
-              # mylog "deco: #{text}"
-            end
-            Ht.td(child: text)
-          end
-          tr = Ht.tr(child: value_a)
-          if @attribute[:onclick_rows]
-            tr[:id] = elem_id = "tr_#{id}"
-          end
-          tr
-        end
-        Ht.table(child: [make_header, table_a])
-      end
-
-      def add_checkbox(col)
-        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|
-          col = column_set[key]
-          if col
-            Ht.th(child: col.label)
-          else
-            nil
-          end
-        end
-        if @attribute[:add_checkbox]
-        end
-        Ht.tr(child: th_a)
-      end
-    end
-  end
-end