engine2 1.0.8 → 1.0.9

data/lib/engine2/action/decode.rb

@@ -57,6 +57,10 @@ module Engine2
         def invoke handler
             {entries: get_query.limit(200).load_all}
         end
+
+        def order *fields
+            @query = get_query.order *fields
+        end
     end
 
     class TypeAheadAction < DecodeAction
@@ -71,17 +75,39 @@ module Engine2
             @limit = lmt
         end
 
+        def get_limit
+            @limit
+        end
+
+        def get_case_insensitive
+            @case_insensitive
+        end
+
         def case_insensitive
             @case_insensitive = true
         end
 
+        def order *fields
+            @query = get_query.order *fields
+        end
+
         def invoke handler
+            model = assets[:model]
             if query = handler.params[:query]
-                condition = @meta[:decode_fields].map{|f|f.like("%#{query}%", case_insensitive: @case_insensitive)}.reduce{|q, f| q | f}
-                {entries: get_query.where(condition).limit(@limit).load_all}
+                fields = @meta[:decode_fields] || static.meta[:decode_fields]
+
+                entries = if query.to_s.empty?
+                    get_query
+                else
+                    table_name = model.table_name
+                    condition = fields.map{|f|table_name.q(f).like("%#{query}%", case_insensitive: @case_insensitive || static.get_case_insensitive)}.reduce{|q, f| q | f}
+                    get_query.where(condition)
+                end.limit(@limit || static.get_limit).load_all
+
+                {entries: entries}
             else
                 handler.permit id = handler.params[:id]
-                record = get_query.load Hash[assets[:model].primary_keys.zip(split_keys(id))]
+                record = get_query.unordered.load Hash[model.primary_keys_qualified.zip(split_keys(id))]
                 # handler.halt_not_found(LOCS[:no_entry]) unless record
                 {entry: record}
             end

data/lib/engine2/action/delete.rb

@@ -61,5 +61,4 @@ module Engine2
             invoke_delete_db(handler, ids)
         end
     end
-
-end
+end

data/lib/engine2/action/infra.rb

@@ -24,7 +24,7 @@ module Engine2
 
             define_node :inspect_modal, InspectModalAction do
                 access! &:logged_in?
-                define_node :inspect, WebSocketAction.inherit do
+                define_node :"inspect_#{SETTINGS[:name]}", WebSocketAction.inherit do
                     self.* do
                         @action_type = :inspect
 
@@ -112,7 +112,8 @@ module Engine2
             temp.close
             rackname = File.basename(temp.path)
             info = node.parent.*.model.type_info[node.parent.*.field]
-            File.rename(temp.path, "#{info[:store][:upload]}/#{rackname}")
+            FileUtils.cp(temp.path, "#{info[:store][:upload]}/#{rackname}") # File.rename(temp.path, "#{info[:store][:upload]}/#{rackname}")
+            FileUtils.rm(temp.path)
             {rackname: rackname}
         end
     end
@@ -233,9 +234,9 @@ module Engine2
             {user: user ? user.to_hash : nil}
         end
 
-        def login_meta show_login_otion = 'false', &blk
+        def login_meta menu_properties = {show: 'false'}, &blk
             node.login_form.* &blk
-            menu(:menu).modify_option :login_form, show: show_login_otion
+            menu(:menu).modify_option :login_form, menu_properties
             node.parent.login_form.* &blk
         end
     end

data/lib/engine2/action/list.rb

@@ -34,6 +34,13 @@ module Engine2
                     query.where(name => Sequel.string_to_date(value))
                 end
             },
+            datetime: lambda{|query, name, value, type_info, hash|
+                if value.is_a? Hash
+                    DefaultFilters[:date].(query, name, value, type_info, hash)
+                else
+                    query.where(:date.sql_function(name) => Sequel.string_to_date(value))
+                end
+            },
             integer: lambda{|query, name, value, type_info, hash|
                 if value.is_a? Hash
                     from, to = value[:from], value[:to]
@@ -82,6 +89,10 @@ module Engine2
             super
         end
 
+        def page_frame handler, entries
+            entries
+        end
+
         def invoke handler
             params = handler.params
             model = assets[:model]
@@ -89,31 +100,30 @@ module Engine2
 
             if search = params[:search]
                 query = list_search(query, handler, search)
+            elsif @filters || static.filters
+                static.filters.to_h.merge(@filters.to_h).each do |name, filter|
+                    query = filter.(handler, query, {})
+                    handler.permit query
+                end
             end
 
             count = query.count if lookup(:config, :use_count)
 
-            if order_str = params[:order]
-                order = order_str.to_sym
+            if order = params[:order]
+                order = order.to_sym
                 handler.permit lookup(:fields, order, :sort)
-
-                if order_blk = (@orders && @orders[order]) || (dynamic? && (static.orders && static.orders[order]))
-                    query = order_blk.(handler, query)
-                else
-                    order = model.table_name.q(order) if model.type_info[order]
-                    query = query.order(order)
-                end
-
-                query = query.reverse if params[:asc] == "true"
+                query = list_order(query, handler, order, params[:asc] == "true")
+            elsif order = @default_order_field || static.default_order_field
+                query = list_order(query, handler, order, true)
             end
 
             per_page = lookup(:config, :per_page)
             page = params[:page].to_i
-            handler.permit page >= 0 && page < 1000
+            handler.permit page >= 0 && page < 1000000
 
             query = query.limit(per_page, page)
 
-            res = {entries: query.load_all}
+            res = {entries: page_frame(handler, query.load_all)}
             res[:count] = count if count
             res
         end
@@ -123,24 +133,60 @@ module Engine2
             model = assets[:model]
             sfields = lookup(:search_field_list)
             handler.permit sfields
-            hash.each_pair do |name, value|
-                handler.permit name = sfields.find{|sf|sf.to_sym == name}
 
+            filters = @filters || static.filters ? static.filters.to_h.merge(@filters.to_h) : {}
+
+            sfields.each do |name|
                 type_info = model.find_type_info(name)
-                query = if filter = (@filters && @filters[name]) || (dynamic? && (static.filters && static.filters[name]))
-                    filter.(handler, query, hash)
-                elsif filter = DefaultFilters[type_info[:otype]]
-                    name = model.type_info[name] ? model.table_name.q(name) : Sequel.expr(name)
-                    filter.(query, name, value, type_info, hash)
+                name = name.to_sym
+                filter = filters[name]
+                if !(value = hash[name]).nil? # use key?
+                    query = if filter
+                        filter.(handler, query, hash)
+                    elsif filter = DefaultFilters[type_info[:otype]]
+                        name = model.type_info[name] ? model.table_name.q(name) : Sequel.expr(name)
+                        filter.(query, name, value, type_info, hash)
+                    else
+                        raise E2Error.new("Filter not found for field '#{name}' in model '#{model}'") unless filter
+                    end
+                    handler.permit query
                 else
-                    raise E2Error.new("Filter not found for field '#{name}' in model '#{model}'") unless filter
+                    if filter
+                        query = filter.(handler, query, hash)
+                        handler.permit query
+                    end
                 end
-
-                handler.permit query
             end
+
+            # hash.each_pair do |name, value|
+            #     handler.permit name = sfields.find{|sf|sf.to_sym == name}
+            #     type_info = model.find_type_info(name)
+            #     query = if filter = (@filters && @filters[name]) || (dynamic? && (static.filters && static.filters[name]))
+            #         filter.(handler, query, hash)
+            #     elsif filter = DefaultFilters[type_info[:otype]]
+            #         name = model.type_info[name] ? model.table_name.q(name) : Sequel.expr(name)
+            #         filter.(query, name, value, type_info, hash)
+            #     else
+            #         raise E2Error.new("Filter not found for field '#{name}' in model '#{model}'") unless filter
+            #     end
+            #     handler.permit query
+            # end
+
             query
         end
 
+        def list_order query, handler, order, asc
+            model = assets[:model]
+            query = if order_blk = (@orders && @orders[order]) || (dynamic? && (static.orders && static.orders[order]))
+                order_blk.(handler, query)
+            else
+                order = model.table_name.q(order) if model.type_info[order]
+                query.order(order)
+            end
+
+            asc ? query : query.reverse
+        end
+
         def list_context query, handler
             query
         end
@@ -165,7 +211,7 @@ module Engine2
         def pre_run
             super
             menu(:panel_menu).option_at 0, :close, icon: "remove"
-            panel_title "#{:list.icon} #{LOCS[assets[:assoc][:name]]}"
+            panel_title "#{assets[:model].model_icon.icon} #{LOCS[assets[:assoc][:name]]}"
         end
 
         def list_context query, handler
@@ -285,4 +331,3 @@ module Engine2
         end
     end
 end
-

data/lib/engine2/action/save.rb

@@ -2,7 +2,6 @@
 # frozen_string_literal: true
 
 module Engine2
-
     class SaveAction < Action
         include ActionSaveSupport
     end
@@ -26,5 +25,4 @@ module Engine2
         self.validate_only = true
         action_type :star_to_many_field_approve
     end
-
 end

data/lib/engine2/action_node.rb

@@ -2,7 +2,6 @@
 # frozen_string_literal: true
 
 module Engine2
-
     class ActionNode < BasicObject
         ACCESS_FORBIDDEN ||= ->h{false}
         attr_reader :parent, :name, :number, :nodes, :recheck_access
@@ -201,7 +200,7 @@ module Engine2
                 true
             end
 
-            ::Kernel::puts "ACTION NODES: #{ActionNode.count}, Panels: #{panels},  Time: #{::Time.now - time}, Thefts: #{thefts}"
+            ::Kernel::puts "ACTION NODES: #{ActionNode.count}, Panels: #{panels}, Thefts: #{thefts}, Time: #{::Time.now - time}"
         end
 
         def p *args
@@ -209,7 +208,6 @@ module Engine2
         end
     end
 
-
     class ActionNodeBundle
         def initialize node, node_names
             @node = node
@@ -220,4 +218,4 @@ module Engine2
             @node_names.each{|an| @node[an].__send__(name, *args, &blk)}
         end
     end
-end
+end

data/lib/engine2/core.rb

@@ -126,6 +126,10 @@ class String
             s
         end
     end
+
+    def escape_html
+        Rack::Utils.escape_html(self)
+    end
 end
 
 class Symbol
@@ -138,12 +142,18 @@ class Symbol
         end
     end
 
+    def loc
+        Engine2::LOCS[self]
+    end
+
     def q col
         col.qualify self
     end
 
-    def loc
-        Engine2::LOCS[self]
+    def html body = '', attrs = {}
+        element = self.to_s
+        attrs = attrs.map{|k, v| "#{k}=\"#{v}\""}.join(" ")
+        "<#{element} #{attrs}>#{body}</#{element}>"
     end
 end
 
@@ -174,7 +184,7 @@ class Sequel::Database
     attr_accessor :models, :default_schema
 
     def cache_file
-        "#{Engine2::SETTINGS.path_for(:db_path)}/#{opts[:orig_opts][:name]}.dump"
+        "#{Engine2::SETTINGS.path_for(:db_path)}/#{opts[:orig_opts][:name]}.schema_cache"
     end
 
     def load_schema_cache_from_file
@@ -282,7 +292,7 @@ module E2Model
                 next if info[:primary_key] && !model.natural_key
 
                 value = values[name].to_s
-                value.strip! unless info[:dont_strip]
+                value.strip! unless value.frozen? || info[:dont_strip]
                 if value.empty?
                     if req = info[:required]
                         errors.add(name, req[:message]) if !req[:if] || req[:if].(self)
@@ -392,7 +402,6 @@ module E2Model
             else
                 select(*pk.map{|k| model.table_name.q(k)})
             end
-
         end
 
         def extract_select sel, al = nil, &blk
@@ -413,41 +422,41 @@ module E2Model
 
         def setup_query fields
             joins = {}
-            type_info = model.type_info
             model_table_name = model.table_name
 
             select = @opts[:select].map do |sel|
                 extract_select sel do |table, name, aliaz|
-                    info = if table
+                    mdl = if table
                         if table == model_table_name
                             model
                         else
                             assoc = model.many_to_one_associations[table] || model.many_to_many_associations[table]
                             raise Engine2::E2Error.new("Association #{table} not found for model #{model}") unless assoc
                             assoc.associated_class
-                        end.type_info
+                        end
                     else
-                        type_info
+                        model
                     end
 
-                    table ||= model_table_name
-                    if table == model_table_name
+                    mdl_table_name = mdl.table_name
+                    table ||= mdl_table_name
+                    if mdl_table_name == model_table_name
                         fields << name
                     else
                         fields << table.q(name)
-                        joins[table] ||= model.many_to_one_associations[table] || model.many_to_many_associations[table]
+                        joins[mdl_table_name] ||= model.many_to_one_associations[table] || model.many_to_many_associations[table]
                     end
 
-                    f_info = info[name]
-                    raise Engine2::E2Error.new("Column #{name} not found for table #{table || model_table_name}") unless f_info
+                    f_info = mdl.type_info[name]
+                    raise Engine2::E2Error.new("Column #{name} not found for table #{table}") unless f_info
                     if f_info[:dummy]
                         nil
                     else
-                        qname = table.q(name)
-                        if table != model_table_name
-                            Sequel.alias_columns_in_joins ? qname.as(:"#{table}__#{name}") : qname
-                        else
+                        qname = mdl_table_name.q(name)
+                        if table == model_table_name
                             qname
+                        else
+                            Sequel.alias_columns_in_joins ? qname.as(:"#{table}__#{name}") : qname
                         end
                     end
                 end
@@ -488,7 +497,6 @@ module Sequel
             @error = error
         end
     end
-
 end
 
 module Engine2
@@ -501,7 +509,8 @@ module Engine2
         model_path: 'models',
         view_path: 'views',
         asset_path: 'assets',
-        conf_path: 'conf'
+        conf_path: 'conf',
+        log_path: 'log'
     }
 
     def SETTINGS.path_for path
@@ -549,10 +558,10 @@ module Engine2
             load "#{Engine2::SETTINGS[:app_path]}/boot.rb"
 
             Sequel::DATABASES.each &:load_schema_cache_from_file
-            @model_boot_blk.() if @model_boot_blk
             load 'engine2/models/Files.rb'
             load 'engine2/models/UserInfo.rb'
             Dir["#{Engine2::SETTINGS.path_for(:model_path)}/*"].each{|m| load m}
+            @model_boot_blk.() if @model_boot_blk
             puts "MODELS: #{Sequel::DATABASES.reduce(0){|s, d|s + d.models.size}}, Time: #{Time.now - t}"
             Sequel::DATABASES.each do |db|
                 db.dump_schema_cache_to_file

data/lib/engine2/handler.rb

@@ -119,16 +119,16 @@ module Engine2
             slim name.to_sym
         end
 
-        production = environment == :production
-
-        set :slim, pretty: !production, sort_attrs: false
-        set :sessions, expire_after: 3600, httponly: production # , secure: production
+        set :slim, pretty: !production?, sort_attrs: false
+        unless production? # use Engine2::SETTINGS[:reloading] ?
+            set :sessions, expire_after: 3600
+            # set :session_store, Rack::Session::Pool
+        end
 
         helpers do
             def find_template(views, name, engine, &block)
                 views.each{|v| super(v, name, engine, &block)}
             end
         end
-
     end
 end