engine2 1.0.5 → 1.0.6

data/lib/engine2/action/array.rb

@@ -45,7 +45,7 @@ module Engine2
 
             if order_str = params[:order]
                 order = order_str.to_sym
-                handler.permit lookup(:info, order, :sort)
+                handler.permit lookup(:fields, order, :sort)
                 entries = entries.sort_by{|e|e[order].to_s}
                 entries = entries.reverse if params[:asc] == "true"
             end
@@ -60,14 +60,14 @@ module Engine2
         def list_search entries, handler, search
             hash = JSON.parse(search, symbolize_names: true) rescue handler.halt_forbidden
             model = assets[:model]
-            sfields = lookup(:search_fields)
+            sfields = lookup(:search_field_list)
             handler.permit sfields
             hash.each_pair do |name, value|
                 handler.permit sfields.include?(name)
 
-                type_info = get_type_info(name)
+                type_info = model.find_type_info(name)
                 entries = if filter = (@filters && @filters[name]) || (dynamic? && (static.filters && static.filters[name]))
-                    filter.(entries, hash, handler)
+                    filter.(handler, entries, hash)
                 elsif filter = DefaultFilters[type_info[:otype]]
                     filter.(entries, name, value, type_info, hash)
                 else

data/lib/engine2/action/decode.rb

@@ -19,8 +19,8 @@ module Engine2
         end
 
         def post_process
-            if fields = @meta[:fields]
-                fields = fields - static.meta[:fields] if dynamic?
+            if fields = @meta[:field_list]
+                fields = fields - static.meta[:field_list] if dynamic?
                 # no decorate here
                 fields.each do |name|
                     type_info = assets[:model].type_info[name] # foreign keys ?
@@ -55,7 +55,7 @@ module Engine2
         action_type :decode_list
 
         def invoke handler
-            {entries: get_query.limit(200).all}
+            {entries: get_query.limit(200).load_all}
         end
     end
 
@@ -64,20 +64,24 @@ module Engine2
 
         def pre_run
             super
-            limit 10
+            @limit = 10
         end
 
         def limit lmt
-            @meta[:limit] = lmt
+            @limit = lmt
+        end
+
+        def case_insensitive
+            @case_insensitive = true
         end
 
         def invoke handler
             if query = handler.params[:query]
-                condition = @meta[:decode_fields].map{|f|f.like("%#{query}%")}.reduce{|q, f| q | f}
-                {entries: get_query.where(condition).limit(@meta[:limit]).all}
+                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}
             else
                 handler.permit id = handler.params[:id]
-                record = get_query[Hash[assets[:model].primary_keys.zip(split_keys(id))]]
+                record = get_query.load Hash[assets[:model].primary_keys.zip(split_keys(id))]
                 # handler.halt_not_found(LOCS[:no_entry]) unless record
                 {entry: record}
             end
@@ -92,7 +96,7 @@ module Engine2
         end
 
         def invoke_decode handler, ids
-            records = get_query.where(ids.map{|keys| Hash[assets[:model].primary_keys.zip(keys)]}.reduce{|q, c| q | c}).all
+            records = get_query.where(ids.map{|keys| Hash[assets[:model].primary_keys.zip(keys)]}.reduce{|q, c| q | c}).load_all
             # handler.halt_not_found(LOCS[:no_entry]) if records.empty?
             records
         end

data/lib/engine2/action/infra.rb

@@ -263,9 +263,9 @@ module Engine2
             super
             panel_class 'modal-default'
             panel_title LOCS[:login_title]
-            info! :name, loc: LOCS[:user_name]
+            fields! :name, loc: LOCS[:user_name]
             menu(:panel_menu).modify_option :approve, name: :login, icon: :"log-in"
-            @meta[:fields] = [:name, :password]
+            @meta[:field_list] = [:name, :password]
             parent_action = node.parent.*
             if parent_action.is_a? ActionMenuSupport
                 parent_action.menu(:menu).option :login_form, icon: :"log-in", disabled: "action.action_pending()"
@@ -281,7 +281,7 @@ module Engine2
         include ActionApproveSupport
         action_type :login
 
-        def validate_record handler, record
+        def validate_record handler, record, parent_id
             super
             record.values[:password] = nil
         end

data/lib/engine2/action/list.rb

@@ -9,6 +9,9 @@ module Engine2
         (DefaultFilters ||= {}).merge!(
             string: lambda{|query, name, value, type_info, hash|
                 case type_info[:type]
+                when :list_select
+                    raise E2Error.new("Filter unimplemented for string multi list_select, field: '#{name.to_sym}'") if type_info[:multiselect] # todo
+                    query.where(name => value)
                 when :many_to_one
                     query.where(name => value)
                 else
@@ -39,8 +42,8 @@ module Engine2
                     else
                         query.where(from ? name >= from.to_i : name <= to.to_i)
                     end
-                elsif value.is_a? Integer
-                    query.where(name => value)
+                elsif value.is_a?(Integer) || value.is_a?(String)
+                    query.where(name => value.to_i)
                 elsif value.is_a? Array
                     if !value.empty?
                         case type_info[:type]
@@ -52,7 +55,11 @@ module Engine2
                                 query.where(keys.map{|k| hash[k]}.transpose.map{|vals| Hash[keys.zip(vals)]}.reduce{|q, c| q | c})
                             end
                         when :list_select
-                            query.where(name => value) # decode in sql query ?
+                            if type_info[:multiselect]
+                                query.where(~{(name.sql_number & value.reduce(0, :|)) => 0})
+                            else
+                                query.where(name => value) # decode in sql query ?
+                            end
                         when :integer
                             query
                         else
@@ -88,10 +95,10 @@ module Engine2
 
             if order_str = params[:order]
                 order = order_str.to_sym
-                handler.permit lookup(:info, order, :sort)
+                handler.permit lookup(:fields, order, :sort)
 
                 if order_blk = (@orders && @orders[order]) || (dynamic? && (static.orders && static.orders[order]))
-                    query = order_blk.(query, handler)
+                    query = order_blk.(handler, query)
                 else
                     order = model.table_name.q(order) if model.type_info[order]
                     query = query.order(order)
@@ -106,7 +113,7 @@ module Engine2
 
             query = query.limit(per_page, page)
 
-            res = {entries: query.all}
+            res = {entries: query.load_all}
             res[:count] = count if count
             res
         end
@@ -114,14 +121,14 @@ module Engine2
         def list_search query, handler, search
             hash = JSON.parse(search, symbolize_names: true) rescue handler.halt_forbidden
             model = assets[:model]
-            sfields = lookup(:search_fields)
+            sfields = lookup(:search_field_list)
             handler.permit sfields
             hash.each_pair do |name, value|
                 handler.permit name = sfields.find{|sf|sf.to_sym == name}
 
-                type_info = get_type_info(name)
+                type_info = model.find_type_info(name)
                 query = if filter = (@filters && @filters[name]) || (dynamic? && (static.filters && static.filters[name]))
-                    filter.(query, hash, handler)
+                    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)
@@ -205,7 +212,7 @@ module Engine2
                 if h.initial? && nd = node.parent.nodes[:decode_entry]
                     action = nd.*
                     rec = action.invoke_decode(h, [[h.params[:parent_id]]]).first
-                    panel_title "#{static.panel[:title]} - #{rec}"
+                    panel_title "#{static.panel[:title]} - #{action.meta[:decode_fields].map{|f|rec[f]}.join(action.meta[:separator])}"
                 end
             end
         end

data/lib/engine2/action_node.rb

@@ -38,7 +38,7 @@ module Engine2
         end
 
         def check_access! handler
-        	!@access_block || @access_block.(handler)
+            !@access_block || @access_block.(handler)
         end
 
         def run_scheme name, *args, &blk
@@ -162,7 +162,6 @@ module Engine2
             each_node do |node|
                 if model = node.*.assets[:model]
                     model_name = model.name.to_sym
-                    model.synchronize_type_info
                     model_nodes[model_name] = node.to_a_rec{|a| !a.*.assets[:assoc]}
                     node.run_scheme(model_name) if SCHEMES[model_name, false]
                     false

data/lib/engine2/core.rb

@@ -328,6 +328,33 @@ module E2Model
     end
 
     module DatasetMethods
+        def load *args
+            if entry = self[*args]
+                model.after_load_processors.each do |name, proc|
+                    type_info = model.find_type_info(name)
+                    name_sym = name.to_sym
+                    proc.(entry, name_sym, type_info) if entry.key?(name_sym)
+                end if model.after_load_processors
+                entry
+            end
+        end
+
+        def load_all
+            entries = self.all
+            apply_after_load_processors(model, entries) if model.after_load_processors
+            entries
+        end
+
+        def apply_after_load_processors model, entries
+            model.after_load_processors.each do |name, proc|
+                type_info = model.find_type_info(name)
+                name_sym = name.to_sym
+                entries.each do |entry|
+                    proc.(entry, name_sym, type_info) if entry.key?(name_sym)
+                end
+            end
+        end
+
         def ensure_primary_key
             pk = model.primary_keys
             raise Engine2::E2Error.new("No primary key defined for model #{model}") unless pk && pk.all?
@@ -376,12 +403,12 @@ module E2Model
             end
         end
 
-        def setup! fields
+        def setup_query fields
             joins = {}
             type_info = model.type_info
             model_table_name = model.table_name
 
-            @opts[:select] = @opts[:select].map do |sel|
+            select = @opts[:select].map do |sel|
                 extract_select sel do |table, name, aliaz|
                     info = if table
                         if table == model_table_name
@@ -416,11 +443,9 @@ module E2Model
                         end
                     end
                 end
-            end
+            end.compact
 
-            @opts[:select].compact!.freeze
-
-            joins.reduce(self) do |joined, (table, assoc)|
+            joins.reduce(clone(select: select)) do |joined, (table, assoc)|
                 m = assoc.associated_class
                 case assoc[:type]
                 when :many_to_one
@@ -521,7 +546,10 @@ module Engine2
             load 'engine2/models/UserInfo.rb'
             Dir["#{Engine2::SETTINGS.path_for(:model_path)}/*"].each{|m| load m}
             puts "MODELS: #{Sequel::DATABASES.reduce(0){|s, d|s + d.models.size}}, Time: #{Time.now - t}"
-            Sequel::DATABASES.each &:dump_schema_cache_to_file
+            Sequel::DATABASES.each do |db|
+                db.dump_schema_cache_to_file
+                db.models.each{|n, m|m.synchronize_type_info}
+            end
 
             send(:remove_const, :ROOT) if defined? ROOT
             const_set(:ROOT, ActionNode.new(nil, :api, RootAction, {}))

data/lib/engine2/model.rb

@@ -5,7 +5,7 @@ module Engine2
     module Model
         attr_reader :dummies
         attr_reader :many_to_one_associations, :one_to_many_associations, :many_to_many_associations #, :one_to_one_associations
-        attr_reader :before_save_processors, :after_save_processors, :before_destroy_processors, :after_destroy_processors
+        attr_reader :after_load_processors, :before_save_processors, :after_save_processors, :before_destroy_processors, :after_destroy_processors
         attr_reader :validation_in_transaction
 
         def self.extended cls
@@ -19,6 +19,7 @@ module Engine2
                 @many_to_many_associations = association_reflections.select{|n, a| a[:type] == :many_to_many}
                 # @one_to_one_associations = association_reflections.select{|n, a| a[:type] == :one_to_one}
                 @validation_in_transaction = nil
+                @after_load_processors = nil
                 @before_save_processors = nil
                 @after_save_processors = nil
                 @around_save_processors = nil
@@ -109,9 +110,27 @@ module Engine2
             end
         end
 
+        def find_type_info name
+            model = self
+            info = case name
+            when Symbol
+                model.type_info[name]
+            when Sequel::SQL::QualifiedIdentifier
+                assoc = model.many_to_one_associations[name.table] || model.many_to_many_associations[name.table]
+                raise E2Error.new("Association #{name.table} not found for model #{model}") unless assoc
+                assoc.associated_class.type_info[name.column]
+            else
+                raise E2Error.new("Unknown type info key: #{name} in model #{model}")
+            end
+
+            raise E2Error.new("Type info not found for '#{name}' in model '#{model}'") unless info
+            info
+        end
+
         def synchronize_type_info
             resolve_dependencies
             verify_associations
+            @after_load_processors = install_processors(AfterLoadProcessors)
             @before_save_processors = install_processors(BeforeSaveProcessors)
             @after_save_processors = install_processors(AfterSaveProcessors)
             @around_save_processors = {}
@@ -120,18 +139,6 @@ module Engine2
             @type_info_synchronized = true
         end
 
-        def verify_associations
-            one_to_many_associations.each do |name, assoc|
-                other = assoc.associated_class
-                other_type_info = other.type_info
-                if other_keys = assoc[:keys]
-                    other_keys.each do |key|
-                        raise E2Error.new("No key '#{key}' found in model '#{other}' being related from #{self}") unless other_type_info[key]
-                    end
-                end
-            end
-        end
-
         def resolve_dependencies
             resolved = {}
             @type_info.each_pair do |name, info|
@@ -153,6 +160,18 @@ module Engine2
             resolved[name] = @type_info[name]
         end
 
+        def verify_associations
+            one_to_many_associations.each do |name, assoc|
+                other = assoc.associated_class
+                other_type_info = other.type_info
+                if other_keys = assoc[:keys]
+                    other_keys.each do |key|
+                        raise E2Error.new("No key '#{key}' found in model '#{other}' being related from #{self}") unless other_type_info[key]
+                    end
+                end
+            end
+        end
+
         attr_reader :scheme_name, :scheme_args
 
         def scheme s_name = :default, opts = nil, &blk
@@ -272,7 +291,14 @@ module Engine2
         },
         list_select: lambda{|record, field, info|
             value = record.values[field]
-            LOCS[:invalid_list_value] unless info[:list].any?{|a|a.first == value}
+            values = info[:values].map(&:first)
+
+            result = if info[:multiselect]
+                value.is_a?(Array) && (values - value).length == values.length - value.length
+            else
+                values.include?(value)
+            end
+            LOCS[:invalid_list_value] unless result
         },
         decimal: lambda{|record, field, info|
             value = record.values[field]
@@ -300,6 +326,20 @@ module Engine2
         }
     )
 
+    (AfterLoadProcessors ||= {}).merge!(
+        list_select: lambda{|record, field, info|
+            value = record[field]
+            record[field] = case info[:otype]
+            when :string
+                 value.split(info[:separator])
+            when :integer
+                arr = []
+                value.bit_length.times{|i| arr << (1 << i) unless value[i].zero?}
+                arr
+            end if value && info[:multiselect]
+        }
+    )
+
     (BeforeSaveProcessors ||= {}).merge!(
         blob_store: lambda{|record, field, info|
             if value = record.values[field] # attachment info
@@ -326,6 +366,15 @@ module Engine2
                 end
                 File.delete("#{upload}/#{value[:rackname]}")
             end
+        },
+        list_select: lambda{|record, field, info|
+            value = record.values[field]
+            record[field] = case info[:otype]
+            when :string
+                value.join(info[:separator])
+            when :integer
+                value.reduce(0, :|)
+            end if value && info[:multiselect]
         }
     )
 
@@ -359,7 +408,7 @@ module Engine2
                 # record.model.where(id).update(info[:field] => Sequel.blob(open("#{upload}/#{value[:rackname]}", "rb"){|f|f.read}))
                 File.delete("#{upload}/#{value[:rackname]}")
             end
-        }
+        },
     )
 
     (BeforeDestroyProcessors ||= {}).merge!(

data/lib/engine2/post_bootstrap.rb

@@ -9,7 +9,7 @@ module Sequel
                 when Sequel::SQL::QualifiedIdentifier
                     sel.column
                 when Sequel::SQL::AliasedExpression
-                    Sequel::SQL::Identifier.new sel.aliaz
+                    Sequel::SQL::Identifier.new sel.alias
                 else
                     sel # symbol ?
                 end

data/lib/engine2/pre_bootstrap.rb

@@ -24,6 +24,16 @@ module Sequel
             rs.getInt(1)
           end
         end
+
+        def valid_connection_sql
+            'select 1 from sysibm.sysdummy1'
+        end
+    end if defined?(JDBC::AS400)
+
+    class JDBC::AS400::Dataset
+        def supports_where_true?
+            false
+        end
     end if defined?(JDBC::AS400)
 
     module SchemaCaching

data/lib/engine2/scheme.rb

@@ -163,7 +163,7 @@ module Engine2
         define_scheme :blob_store do |model, field|
             define_node :"#{field}_blob_store!", BlobStoreAction do
                 self.*.model = model
-                self.*.field = field # model.type_info[field][:field]
+                self.*.field = field
                 define_node :download, DownloadBlobStoreAction
                 define_node :upload, UploadBlobStoreAction
             end
@@ -175,7 +175,7 @@ module Engine2
         define_scheme :foreign_blob_store do |model, field|
             define_node :"#{field}_blob_store!", ForeignBlobStoreAction do
                 self.*.model = model
-                self.*.field = field # model.type_info[field][:field]
+                self.*.field = field
                 define_node :download, DownloadForeignBlobStoreAction
                 define_node :upload, UploadBlobStoreAction
             end