ezframe 0.1.1 → 0.2.0

data/lib/ezframe/html.rb

@@ -12,22 +12,29 @@ module Ezframe
 
         tag = ht_h[:tag]
         case tag
-        when "input"
-          input(ht_h)
+        when "textarea"
+          textarea(ht_h)
         when "select"
           return select(ht_h) if ht_h[:item]
         when "icon"
           tag = "i"
         end
         tag = ht_h[:tag]
-        opt_s, child_s = join_attributes(ht_h)
-        if !child_s.strip.empty? || %w[div span table tr td th textarea].include?(tag)
-          return "<#{ht_h[:tag]} #{opt_s}>\n#{child_s}\n</#{ht_h[:tag]}>\n"
+        error_box = ""
+        if %w[input select textarea].include?(tag)
+          error_box = "<div id=\"error-box-#{ht_h[:name]}\" class=\"error-box hide\"></div>"
         end
-        "<#{ht_h[:tag]} #{opt_s} />"
+        opt_s, child_s = join_attribute(ht_h)
+        if !child_s.strip.empty? || !%w[img input hr br meta].include?(tag)
+          start_tag = [ht_h[:tag], opt_s].compact.join(" ").strip
+          return "<#{start_tag}>#{child_s}</#{ht_h[:tag]}>"+error_box
+        end
+        tag_content = [ ht_h[:tag], opt_s ].compact.join(" ")
+        return "<#{tag_content}/>"+error_box
       end
 
-      def join_attributes(attrs)
+      # attributeの連結文字列化
+      def join_attribute(attrs)
         child_s = ""
         opt_a = attrs.map do |k, v|
           case k
@@ -52,16 +59,10 @@ 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
-            ht_h.delete(:size)
-          end
-          ht_h[:tag] = "textarea"
-          ht_h[:child] = ht_h[:value]
+      def textarea(ht_h)
+        value = ht_h[:value]
+        if value
+          ht_h[:child] = value
           ht_h.delete(:value)
         end
       end
@@ -78,7 +79,7 @@ module Ezframe
               h[:selected] = "selected" if selected
             end
             h[:child] = v
-            # mylog "select: hash: k=#{k}, v=#{v}, value=#{ht_h[:value]}"
+            # Logger.info "select: hash: k=#{k}, v=#{v}, value=#{ht_h[:value]}"
             if ht_h[:value] && ht_h[:value].to_s == k.to_s
               h[:selected] = "selected"
             end
@@ -90,7 +91,7 @@ module Ezframe
             if %w[selected default].include?(v[2])
               h[:selected] = "selected"
             end
-            # mylog "select: array: v=#{v}, value=#{ht_h[:value]}"
+            # Logger.info "select: array: v=#{v}, value=#{ht_h[:value]}"
             if ht_h[:value] && ht_h[:value].to_s == v[0].to_s
               h[:selected] = "selected"
             end

data/lib/ezframe/japanese_utils.rb

@@ -41,5 +41,15 @@ class Japanese
       return nil unless wday
       return %w(日 月 火 水 木 金 土)[wday]
     end
+
+    def to_datetime_str(tm)
+      return nil unless tm
+      return "%d年%2d月%2d日 %2d:%02d:%02d" %[ tm.year, tm.mon, tm.mday, tm.hour, tm.min, tm.sec ]
+    end
+
+    def to_date_str(tm)
+      return nil unless tm
+      return "%d年%2d月%2d日" %[ tm.year, tm.mon, tm.mday]
+    end
   end
 end

data/lib/ezframe/jquery-ui.rb

@@ -0,0 +1,29 @@
+module Ezframe
+  class Jquery
+    class << self
+      def into_html_header
+        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|
+          file.gsub!("./asset", "")
+          "<link href=\"#{file}\" rel=\"stylesheet\">\n"
+        end
+        js_files = Dir["./asset/js/*.js"]||[]
+        js_a += js_files.map do |file|
+          file.gsub!("./asset", "")
+          "<script src=\"#{file}\"></script>\n"
+        end
+        (css_a+js_a).join
+      end
+
+      def into_bottom_of_body
+        ""
+      end
+
+      def convert(ht_h)
+      end
+    end
+  end
+end

data/lib/ezframe/loader.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-if File.exist?("pages/common.rb")
-  require "#{Dir.pwd}/pages/common.rb"
+if File.exist?("page/common.rb")
+  require "#{Dir.pwd}/page/common.rb"
 end
-Dir["models/*.rb"].sort.each do |file|
+Dir["model/*.rb"].sort.each do |file|
   require "#{Dir.pwd}/#{file}"
 end
-Dir["pages/*.rb"].sort.each do |file|
+Dir["page/*.rb"].sort.each do |file|
   require "#{Dir.pwd}/#{file}"
 end

data/lib/ezframe/logger.rb

@@ -0,0 +1,39 @@
+module Ezframe
+  class Logger
+    class << self
+      @instance = nil
+
+      def writer(level="", msg)
+        unless @instance
+          @instance = File.open("log/#{ENV['RACK_ENV']||'development'}.log", "a+")
+          @instance.sync = true
+        end
+        @instance.puts "#{Time.now.to_s}:#{level.upcase}:#{msg}"
+      end
+
+      def level=(lv)
+        @level = lv
+      end
+
+      def info(msg)
+        writer("info", msg)  
+      end
+
+      def debug(msg)
+        writer("debug", msg)
+      end
+
+      def warn(msg)
+        writer("warn", msg)
+      end
+
+      def error(msg)
+        writer("debug", msg)
+      end
+
+      def <<(msg)
+        writer("", msg)
+      end
+    end
+  end
+end

data/lib/ezframe/materialize.rb

@@ -8,12 +8,12 @@ module Ezframe
         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.sort.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.sort.map do |file|
           file.gsub!("./asset", "")
           "<script src=\"#{file}\"></script>\n"
         end
@@ -32,13 +32,10 @@ module Ezframe
           new_h = ht_h.map { |v| convert(v) }
         elsif ht_h.is_a?(Hash)
           unless ht_h[:tag]
-            mylog("convert: no tag: #{ht_h.inspect}")
+            Logger.info("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 :checkbox
             return checkbox(ht_h)
           when :radio
@@ -57,8 +54,8 @@ module Ezframe
 
       def icon(ht_h)
         new_h = ht_h.clone
-        mylog "[warn] no name attribute for icon ht_h: #{ht_h.inspect}" unless new_h[:name]
-        new_h.add_class("material-icons")
+        Logger.info "[warn] no name attribute for icon ht_h: #{ht_h.inspect}" unless new_h[:name]
+        new_h.add_class(%w[material-icons align-icon])
         new_h.update({ tag: "i", child: ht_h[:name] })
         new_h.delete(:name)
         return new_h

data/lib/ezframe/message.rb

@@ -18,7 +18,7 @@ module Ezframe
         begin
           yaml = YAML.load_file(file)
         rescue
-          mylog("YAML load error: #{file}")
+          Logger.info("YAML load error: #{file}")
           return 
         end
         if /([a-z]{2})\.yml$/ =~ file

data/lib/ezframe/page_base.rb

@@ -6,7 +6,11 @@ require_relative "util"
 
 module Ezframe
   class PageBase
-    attr_accessor :auth, :request
+#    class << self
+#      attr_accessor :auth
+#    end
+    
+    attr_accessor :request
 
     def initialize(request = nil)
       @class_snake = class_to_snake(self.class)
@@ -21,20 +25,16 @@ module Ezframe
     # Rackのrequestを代入し、関連するインスタンス変数を定義
     def set_request(request)
       @request = request
-      @model = request.env["model"]
-      mylog "[WARN] model is not defined" unless @model
-      @column_set = @model.column_sets[@class_snake.to_sym]
-      # mylog "[WARN] column_set is not defined: #{@class_snake}" unless @column_set
-      if @column_set
-        @dataset = @column_set.dataset
-      end
+      @column_set = ColumnSets.get(@class_snake)
+      @dataset = DB.dataset(@class_snake)
+      Logger.debug "column_set is not defined: #{@class_snake}" unless @column_set
       @params = parse_query_string(request.env["QUERY_STRING"])
       @params.update(request.params)
-      mylog "params=#{@params.inspect}" if @params.length > 0
+      # Logger.info "set_request: params=#{@params.inspect}" if @params.length > 0
       # @id, @key = @params[:id], @params[:key]
       @env = @request.env
       @session = @env["rack.session"]
-      # mylog "session = #{@session.inspect}"
+
       if %w[POST PUT].include?(request.request_method)
         body = @request.body.read
         if request.content_type.index("json")
@@ -42,25 +42,30 @@ module Ezframe
         else
           @parsed_body = parse_query_string(body)
         end
-        # mylog "parsed_body=#{@parsed_body.inspect}"
+        # Logger.info "parsed_body=#{@parsed_body.inspect}"
         @event = @parsed_body[:event] || {}
+        @form = @event[:form]
+
+        # Logger.info "event=#{@event}"
       end
     end
 
     # routeから基本URLを生成
     def make_base_url(id = nil)
       path = Route::get_path(@class_snake)
-      params = @request.env["url_params"]
+      params = @request.env["url_params"] || {}
+      # Logger.info "make_base_url: params=#{params}"
       # params[@class_snake.to_sym] = id
       path_s = path.map do |pa|
         if pa == @class_snake.to_sym && id
           "#{pa}/#{id}"
-        elsif params[p]
-          "#{pa}/#{params[p]}"
+        elsif params[pa.to_sym]
+          "#{pa}/#{params[pa.to_sym]}"
         else
           pa
         end
       end.join("/")
+      # Logger.info "path_s=#{path_s}"
       return "/#{path_s}"
     end
 
@@ -71,7 +76,7 @@ module Ezframe
         into_html_header: Materialize.into_html_header,
         into_bottom_of_body: Materialize.into_bottom_of_body,
       }
-      Template.fill("template/base.html", args)
+      Template.fill_from_file("template/base.html", args)
     end
 
     def parse_json_body(body)
@@ -79,15 +84,19 @@ module Ezframe
       begin
         json = JSON.parse(body)
       rescue => e
-        mylog "ERROR: #{e.class}:#{e.message}\n#{e.backtrace}"
+        Logger.info "ERROR: #{e.class}:#{e.message}\n#{e.backtrace}"
         return nil
       end
       json = json.recursively_symbolize_keys if json.is_a?(Hash) || json.is_a?(Array)
       return json
     end
 
+    def session
+      return @request.env['rack.session']
+    end
+
     def warden
-      @request.env["warden"]
+      return @request.env["warden"]
     end
 
     def login?
@@ -95,7 +104,7 @@ module Ezframe
     end
 
     def user
-      warden.user
+      return warden.user
     end
   end
 end

data/lib/ezframe/route.rb

@@ -6,6 +6,7 @@ module Ezframe
         route_h ||= Config[:route].deep_dup
         # puts  "config=#{Config[:route]}, route_h=#{route_h}"
         args = {}
+        opts = {}
         class_a = []
         # p path_parts
         if path_parts.empty?
@@ -21,28 +22,34 @@ module Ezframe
         while path_parts.length > 0
           part = path_parts.shift
           # break if part.empty?
-          # mylog "part=#{part}, route_h=#{route_h.inspect}"
+          # Logger.info "part=#{part}, route_h=#{route_h.inspect}"
           if route_h.has_key?(part.to_sym)
-            # mylog "has_route: #{part}"
+            # Logger.info "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}"
+              # Logger.info "value: part=#{part}, val=#{val}"
             end
             route_h = route_h[part.to_sym]
             break if route_h.nil?
-            # mylog "route_h changed: #{route_h}"
+            opts = {}
+            route_h.keys.compact.each do |rkey|
+              if rkey =~ /option_(\w+)/
+                opt_key = $1
+                opts[opt_key.to_sym] = route_h[rkey]
+              end
+            end
           else
             # routeに無ければ、メソッドを探す
-            # mylog "no_route: #{part}"
+            # Logger.info "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]
+              return [instance, method_name, args, opts]
             else
-              mylog "undefined method: #{klass}.#{method_name}: full path=#{request.path_info}"
+              Logger.info "undefined method: #{klass}.#{method_name}: full path=#{request.path_info}"
             end
           end
         end
@@ -56,10 +63,10 @@ module Ezframe
           part = "default"
         end
         method_name = make_method_name(part, request.request_method)
-        #mylog "method_name=#{method_name}"
+        #Logger.info "method_name=#{method_name}"
         instance = klass.new
         if instance.respond_to?(method_name)
-          return [instance, method_name, args]
+          return [instance, method_name, args, opts]
         end
         return [ 404 ]
       end
@@ -67,21 +74,23 @@ module Ezframe
       # ページクラスの階層を辿る
       def get_path(class_snake, route_h = nil)
         route_h = Config[:route] unless route_h
+        # Logger.info "get_path: route_h=#{route_h}"
         @get_path_found_it = nil
-        return scan_route(class_snake, route_h.deep_dup).reverse
+        route =_scan_route(class_snake, route_h.deep_dup) 
+        return route.reverse if route
+        return nil
       end
 
       # targetに対応する名称のクラスまでの経路を返す
-      def scan_route(target, route_h)
-        # puts "scan_route: target=#{target}, route_h=#{route_h}"
+      def _scan_route(target, route_h)
         if route_h.keys.include?(target.to_sym)
           @get_path_found_it = true
           return [ target ]
         else
           route_h.each do |k, v|
-            next if k == :class
+            next if k.to_s =~ /^option_/
             if v.is_a?(Hash)
-              a = scan_route(target, v)
+              a = _scan_route(target, v)
               if @get_path_found_it
                 a.push(k)
                 return a
@@ -97,11 +106,11 @@ module Ezframe
       end
 
       def get_class(keys)
-        mylog "get_class: #{keys.inspect}"
+        # Logger.info "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}"
+        klass = (%w[Ezframe] + keys.map { |k| k.to_s.to_camel }).join("::")
+        # Logger.info "get_class: #{klass}"
         if Object.const_defined?(klass)
           return Object.const_get(klass)
         else
@@ -109,17 +118,6 @@ module Ezframe
         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