engine2 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee392cd291e6908be3d724216be1ad7f79ece1e1
-  data.tar.gz: 5a198484207426f1596052de6542fe27730fabf1
+  metadata.gz: 5a2ad0107737d0e5096b9a72b31743f01b8107ba
+  data.tar.gz: 6557952f0c927307bb297d71afc2cbb8086d3318
 SHA512:
-  metadata.gz: 0273154703273cbdb46f21a26049dad06ad12924e9e1f10c15fc278b1bbb79f7569e821e7fe1c4db9a93a26d519bc7c716115bf76528bee4c2bf5155cfacccbe
-  data.tar.gz: e53351d9d0af5d5da010f94f28c2a5f73277cc1c92400c56d473d78d595ec3f272db23ef603724440891a2b39f2a2d1c7f7efce7bd048a4946be2bcb56428fa3
+  metadata.gz: 247de7a7bd6535a169b713cd08d1c9034d4e9de87301530986d9eae7b4ef98b4ceb9bff5610daf7ee66cc168c7f110dd585dd7db5691e07112f372c3345792d4
+  data.tar.gz: b41f9ea4e158dd174b4f71566f93d4fcc0f5bff6270f3885cc5f13e52b9e7fae0ba2f696273611453222bec33aed9f34556cd5a63c46f3a3f3dc8787e4ea7917

data/lib/engine2.rb

@@ -30,5 +30,3 @@ require 'engine2/version'
 ].each do |f|
     load "engine2/#{f}"
 end
-
-Engine2.bootstrap

data/lib/engine2/action.rb

@@ -1,10 +1,11 @@
 # coding: utf-8
 
 module Engine2
+
     class Action < BasicObject
         ACCESS_FORBIDDEN ||= ->h{false}
         attr_reader :parent, :name, :number, :actions, :recheck_access
-        attr_reader :meta_proc, :meta_proc_chained
+        attr_reader :meta_proc
 
         class << self
             attr_accessor :count
@@ -20,17 +21,7 @@ module Engine2
         end
 
         def * &blk
-            if blk
-                @meta_proc = if meta_proc = @meta_proc
-                    @meta_proc_chained = true
-                    ::Kernel::lambda do |obj|
-                        obj.instance_eval(&meta_proc)
-                        obj.instance_eval(&blk)
-                    end
-                else
-                    blk
-                end
-            end
+            @meta_proc = @meta_proc ? @meta_proc.chain(&blk) : blk if blk
             @meta
         end
 
@@ -74,6 +65,12 @@ module Engine2
             end
         end
 
+        def define_action_invoke name, meta_class = DummyMeta, assets = {}, &blk
+            define_action name, meta_class, assets do
+                self.*.define_singleton_method(:invoke, &blk)
+            end
+        end
+
         def undefine_action name
             ::Kernel.raise E2Error.new("No action #{name} defined") unless @actions[name]
             @actions.delete(name)
@@ -163,7 +160,7 @@ module Engine2
                     model_name = model.name.to_sym
                     model.synchronize_type_info
                     model_actions[model_name] = action.to_a_rec{|a| !a.*.assets[:assoc]}
-                    action.run_scheme(model_name) if SCHEMES.schemes[model_name]
+                    action.run_scheme(model_name) if SCHEMES[model_name, false]
                     false
                 else
                     true
@@ -216,6 +213,10 @@ module Engine2
             end
             ::Kernel::puts "VERIFY #{::Time.now - t}"
         end
+
+        def p *args
+            ::Kernel::p *args
+        end
     end
 
 

data/lib/engine2/core.rb

@@ -27,6 +27,14 @@ class Proc
         loc = source_location
         "\"#<Proc:#{loc.first[/\w+.rb/]}:#{loc.last}>\""
     end
+
+    def chain &blk
+        proc = self
+        lambda do |obj|
+            obj.instance_eval(&proc)
+            obj.instance_eval(&blk)
+        end
+    end
 end
 
 class Hash
@@ -123,7 +131,7 @@ class Sequel::Database
     attr_accessor :models, :default_schema
 
     def cache_file
-        "#{APP_LOCATION}/#{opts[:orig_opts][:name]}.dump"
+        "#{Engine2::app}/#{opts[:orig_opts][:name]}.dump"
     end
 
     def load_schema_cache_from_file
@@ -236,7 +244,7 @@ module E2Model
                 else
                     info[:validations].each_pair do |validation, args|
                         validation_proc = Engine2::Validations[validation] || args[:lambda] # swap ?
-                        raise "Validation not found for field '#{name}' of type #{validation}" unless validation_proc
+                        raise E2Error.new("Validation not found for field '#{name}' of type #{validation}") unless validation_proc
                         if result = validation_proc.(self, name, info)
                             errors.add(name, result)
                             break
@@ -345,11 +353,7 @@ module E2Model
                         fields << name
                     else
                         fields << :"#{table}__#{name}"
-                        assoc = model.many_to_one_associations[table]
-                        unless assoc
-                            # fail
-                        end
-                        joins[table] = assoc
+                        joins[table] = model.many_to_one_associations[table]
                     end
 
                     if f_info[:dummy]
@@ -375,11 +379,9 @@ module E2Model
             @opts[:select].compact!
 
             joins.reduce(self) do |joined, (table, assoc)|
-                assoc = model.many_to_one_associations[table] # || model.one_to_one_associations[table]
                 m = Object.const_get(assoc[:class_name])
                 keys = assoc[:qualified_key]
-                keys = [keys] unless keys.is_a?(Array)
-                joined.left_join(table, m.primary_keys.zip(keys))
+                joined.left_join(table, m.primary_keys.zip(keys.is_a?(Array) ? keys : [keys]))
             end
         end
 
@@ -433,65 +435,74 @@ module Engine2
     PATH ||= File.expand_path('../..', File.dirname(__FILE__))
 
     class << self
-        attr_accessor :core_loading
-    end
+        attr_reader :app, :reloading
+        attr_reader :core_loaded
 
-    self.core_loading = true
+        def database name
+            Object.const_set(name, yield) unless Object.const_defined?(name)
+        end
 
-    def self.database name
-        Object.const_set(name, yield) unless Object.const_defined?(name)
-    end
+        def connect *args
+            db = Sequel.connect *args
+            db
+        end
 
-    def self.connect *args
-        db = Sequel.connect *args
-        db.models = {}
-        db
-    end
+        def boot &blk
+            @boot_blk = blk
+        end
 
-    e2_db_file = (defined? JRUBY_VERSION) ? "jdbc:sqlite:#{APP_LOCATION}/engine2.db" : "sqlite://#{APP_LOCATION}/engine2.db"
-    E2DB ||= connect e2_db_file, loggers: [Logger.new($stdout)], convert_types: false, name: :engine2
-    DUMMYDB ||= Sequel::Database.new uri: 'dummy'
-    def DUMMYDB.synchronize *args;end
+        def model_boot &blk
+            @model_boot_blk = blk
+        end
 
-    def self.boot &blk
-        @boot_blk = blk
-    end
+        def bootstrap_e2db
+            e2_db_file = (defined? JRUBY_VERSION) ? "jdbc:sqlite:#{@app}/engine2.db" : "sqlite://#{@app}/engine2.db"
+            Engine2.const_set :E2DB, connect(e2_db_file, loggers: [Logger.new($stdout)], convert_types: false, name: :engine2)
+            Engine2.const_set :DUMMYDB, Sequel::Database.new(uri: 'dummy')
+            def DUMMYDB.synchronize *args;end
+        end
 
-    def self.model_boot &blk
-        @model_boot_blk = blk
-    end
+        def reload
+            @core_loaded = true
+            t = Time.now
+            Action.count = 0
+            SCHEMES.user.clear
+
+            Sequel::DATABASES.each do |db|
+                db.models.each{|n, m| Object.send(:remove_const, n) if Object.const_defined?(n)} unless db == E2DB || db == DUMMYDB
+            end
 
-    def self.bootstrap app = APP_LOCATION
-        require 'engine2/pre_bootstrap'
-        t = Time.now
-        Action.count = 0
-        SCHEMES.clear
+            load "#{app}/boot.rb"
 
-        Sequel::DATABASES.each do |db|
-            db.models.each{|n, m| Object.send(:remove_const, n) if Object.const_defined?(n)} unless db == E2DB || db == DUMMYDB
-        end
+            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["#{app}/models/*"].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
 
-        load "#{app}/boot.rb"
+            Engine2.send(:remove_const, :ROOT) if defined? ROOT
+            Engine2.const_set(:ROOT, Action.new(nil, :api, DummyMeta, {}))
 
-        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["#{app}/models/*"].each{|m| load m}
-        puts "MODELS, Time: #{Time.now - t}"
-        Sequel::DATABASES.each &:dump_schema_cache_to_file
+            @boot_blk.(ROOT)
+            ROOT.setup_action_tree
+            puts "BOOTSTRAP #{app}, Time: #{Time.new - t}"
+        end
 
-        SCHEMES.merge!
-        Engine2.send(:remove_const, :ROOT) if defined? ROOT
-        Engine2.const_set(:ROOT, Action.new(nil, :api, DummyMeta, {}))
+        def bootstrap app, opts = {}
+            @app = app
+            @reloading = opts[:reloading]
+            bootstrap_e2db
 
-        @boot_blk.(ROOT)
-        ROOT.setup_action_tree
-        puts "BOOTSTRAP #{app}, Time: #{Time.new - t}"
-        self.core_loading = false
-        require 'engine2/post_bootstrap'
+            require 'engine2/pre_bootstrap'
+            reload
+            require 'engine2/post_bootstrap'
+        end
     end
 
+    @core_loaded = false
+
     class E2Error < RuntimeError
         def initialize msg
             super
@@ -534,9 +545,9 @@ module Engine2
             option name, properties, index, &blk
         end
 
-        def option_index iname
+        def option_index iname, raise = true
             index = @entries.index{|e| (e.is_a?(MenuBuilder) ? e.name : e[:name]) == iname}
-            raise E2Error.new("No menu option #{iname} found") unless index
+            raise E2Error.new("No menu option #{iname} found") if !index && raise
             index
         end
 

data/lib/engine2/handler.rb

@@ -113,7 +113,10 @@ module Engine2
         get '/*' do |name|
             headers 'Cache-Control' => 'no-cache, no-store, must-revalidate', 'Pragma' => 'no-cache', 'Expires' => '0'
             if name.empty?
-                load 'engine2.rb' if settings.environment == :development
+                if settings.environment == :development
+                    load('engine2.rb') if Engine2::reloading
+                    Engine2::reload
+                end
                 name = 'index'
             end
             slim name.to_sym

data/lib/engine2/meta.rb

@@ -140,13 +140,13 @@ module Engine2
 
     class DummyMeta < Meta
         meta_type :dummy
-
-        # def invoke handler
-        #     {}
-        # end
     end
 
     module MetaAPISupport
+        def reload_routes!
+            @meta[:reload_routes] = true
+        end
+
         def info
             @meta[:info] ||= {}
         end
@@ -166,6 +166,10 @@ module Engine2
             end
         end
 
+        def loc! hash
+            hash.each{|k, v| info! k, loc: v}
+        end
+
         def decorate list
             list.each do |f|
                 m = (info[f] ||= {})
@@ -420,13 +424,10 @@ module Engine2
                 panel_panel_template 'menu_m' unless panel[:panel_template] == false
                 # modal_action false if panel[:panel_template] == false
                 panel_class '' unless panel[:class]
+                footer true unless panel[:footer] == false
             end
         end
 
-        def glyphicon name
-            "<span class='glyphicon glyphicon-#{name}'></span>"
-        end
-
         def panel
             @meta[:panel] ||= {}
         end
@@ -450,6 +451,10 @@ module Engine2
         def panel_title tle
             panel[:title] = tle
         end
+
+        def footer ftr
+            panel[:footer] = ftr
+        end
     end
 
     class MenuMeta < Meta
@@ -543,16 +548,14 @@ module Engine2
             panel_template 'scaffold/list'
             panel_panel_template 'panels/menu_m' unless action.parent.*.assets[:model]
             search_template 'scaffold/search'
-            panel_title "#{glyphicon('list')} #{LOCS[assets[:model].name.to_sym]}"
+            panel_title "#{:list.icon} #{LOCS[assets[:model].name.to_sym]}"
             menu(:panel_menu).option :cancel, icon: "remove"
             menu :menu do
                 properties break: 2, group_class: "btn-group-xs"
                 option :search_toggle, icon: "search", show: "action.meta.search_fields", class: "action.ui_state.search_active && 'active'", button_loc: false
-
                 # divider
                 option :refresh, icon: "refresh", button_loc: false
                 option :default_order, icon: "signal", button_loc: false
-                option :select_toggle, icon: "check", enabled: "action.meta.config.selectable", button_loc: false
                 divider
                 option :debug_info, icon: "list-alt" do
                     option :show_meta, icon: "eye-open"
@@ -566,6 +569,13 @@ module Engine2
             @meta[:state] = [:query, :ui_state]
         end
 
+        def select_toggle_menu
+            m = menu :menu
+            unless m.option_index(:select_toggle, false)
+                m.option_after :default_order, :select_toggle, icon: "check", enabled: "action.meta.config.selectable", button_loc: false
+            end
+        end
+
         def post_run
             unless panel[:class]
                 panel_class case @meta[:fields].size
@@ -666,6 +676,10 @@ module Engine2
         include MetaModelSupport
         attr_reader :validations
 
+        def self.included meta
+            meta.http_method :post
+        end
+
         def validate_fields *fields
             if fields.empty?
                 @validate_fields
@@ -736,6 +750,10 @@ module Engine2
     module MetaViewSupport
         include MetaModelSupport, MetaAPISupport, MetaTabSupport, MetaPanelSupport, MetaMenuSupport
 
+        def self.included meta
+            meta.meta_type :view
+        end
+
         def pre_run
             super
             panel_template 'scaffold/view'
@@ -761,6 +779,35 @@ module Engine2
         end
     end
 
+    module MetaDeleteSupport
+        include MetaModelSupport
+
+        def self.included meta
+            meta.http_method :delete
+            meta.meta_type :delete
+        end
+
+        def pre_run
+            super
+            action.parent.parent.*.menu(:item_menu).option :confirm_delete, icon: "trash", show: "action.selected_size() == 0", button_loc: false
+        end
+    end
+
+    module MetaBulkDeleteSupport
+        include MetaModelSupport
+
+        def self.included meta
+            meta.http_method :delete
+            meta.meta_type :bulk_delete
+        end
+
+        def pre_run
+            super
+            action.parent.parent.*.select_toggle_menu
+            action.parent.parent.*.menu(:menu).option_after :default_order, :confirm_bulk_delete, icon: "trash", show: "action.selected_size() > 0"
+        end
+    end
+
     (FormRendererPostProcessors ||= {}).merge!(
         boolean: lambda{|meta, field, info|
             meta.info[field][:render].merge! true_value: info[:true_value], false_value: info[:false_value]

data/lib/engine2/meta/delete_meta.rb

@@ -2,7 +2,6 @@
 
 module Engine2
     class DeleteMetaBase < Meta
-        include MetaModelSupport
 
         def invoke_delete_db handler, ids
             begin
@@ -40,13 +39,7 @@ module Engine2
     end
 
     class DeleteMeta < DeleteMetaBase
-        http_method :delete
-        meta_type :delete
-
-        def pre_run
-            super
-            action.parent.parent.*.menu(:item_menu).option :confirm_delete, icon: "trash", show: "action.selected_size() == 0", button_loc: false
-        end
+        include MetaDeleteSupport
 
         def invoke handler
             handler.permit id = handler.params[:id]
@@ -55,13 +48,7 @@ module Engine2
     end
 
     class BulkDeleteMeta < DeleteMetaBase
-        http_method :delete
-        meta_type :bulk_delete
-
-        def pre_run
-            super
-            action.parent.parent.*.menu(:menu).option_after :default_order, :confirm_bulk_delete, icon: "trash", show: "action.selected_size() > 0"
-        end
+        include MetaBulkDeleteSupport
 
         def invoke handler
             ids = handler.param_to_json(:ids)

data/lib/engine2/meta/infra_meta.rb

@@ -12,7 +12,7 @@ module Engine2
                     option :inspect_modal, icon: :wrench, button_loc: false # , show: "action.logged_on"
 
                     option :logout_form, icon: :"log-out" # , show: "action.logged_on"
-                    option :login_form, icon: :"log-in" # , show: "!action.logged_on"
+                    option :login_form, icon: :"log-in", disabled: 'action.action_pending' # , show: "!action.logged_on"
                 end
 
                 @meta_type = :infra
@@ -249,7 +249,6 @@ module Engine2
 
     class LoginMeta < Meta
         include MetaApproveSupport
-        http_method :post
         meta_type :login
 
         def after_approve handler, record

data/lib/engine2/meta/link_meta.rb

@@ -113,6 +113,7 @@ module Engine2
 
         def pre_run
             super
+            action.parent.parent.*.select_toggle_menu
             action.parent.parent.*.menu(:menu).option_after :default_order, :confirm_bulk_unlink, icon: "minus", show: "action.selected_size() > 0", button_loc: false
         end
 

data/lib/engine2/meta/list_meta.rb

@@ -155,7 +155,7 @@ module Engine2
         meta_type :star_to_many_list
         def pre_run
             super
-            panel_title "#{glyphicon('list')} #{LOCS[assets[:assoc][:name]]}"
+            panel_title "#{:list.icon} #{LOCS[assets[:assoc][:name]]}"
         end
 
         # def decode_panel_title handler
@@ -177,10 +177,11 @@ module Engine2
             handler.permit parent = handler.params[:parent_id]
             model = assets[:model]
             assoc = assets[:assoc]
+            parent_keys = split_keys(parent)
             case assoc[:type]
             when :one_to_many
                 keys = assoc[:keys]
-                condition = parent.empty? ? false : Hash[keys.map{|k| k.qualify(model.table_name)}.zip(split_keys(parent))]
+                condition = parent_keys.all?(&:empty?) ? false : Hash[keys.map{|k| k.qualify(model.table_name)}.zip(parent_keys)]
                 if handler.params[:negate]
                     query = query.exclude(condition)
                     query = query.or(Hash[keys.zip([nil])]) if keys.all?{|k|model.db_schema[k][:allow_null] == true} # type_info[:required] ?
@@ -194,7 +195,7 @@ module Engine2
                 l_keys = assoc[:left_keys].map{|k| k.qualify(j_table)}
                 r_keys = assoc[:right_keys].map{|k| k.qualify(j_table)}
                 r_keys_vals = Hash[r_keys.zip(q_pk)]
-                l_keys_vals = parent.empty? ? false : Hash[l_keys.zip(split_keys(parent))]
+                l_keys_vals = parent_keys.all?(&:empty?) ? false : Hash[l_keys.zip(parent_keys)]
 
                 if handler.params[:negate]
                     query.exclude(model.db[j_table].select(nil).where(r_keys_vals, l_keys_vals).exists)

data/lib/engine2/meta/save_meta.rb

@@ -4,7 +4,6 @@ module Engine2
 
     class SaveMeta < Meta
         include MetaApproveSupport
-        http_method :post
 
         def validate_and_approve handler, record, json
             record.skip_save_refresh = true
@@ -28,7 +27,7 @@ module Engine2
     end
 
     class InsertMeta < SaveMeta
-        meta_type :save
+        meta_type :approve
         def allocate_record handler, json
             record = super(handler, json)
             record.instance_variable_set(:"@new", true)
@@ -40,7 +39,7 @@ module Engine2
     end
 
     class UpdateMeta < SaveMeta
-        meta_type :save
+        meta_type :approve
         def allocate_record handler, json
             record = super(handler, json)
             model = assets[:model]
@@ -48,16 +47,4 @@ module Engine2
             record
         end
     end
-
-    module TimeStampMeta
-        def before_approve handler, record
-            super
-            puts "before approve"
-        end
-
-        def after_approve handler, record
-            super
-            puts "after approve"
-        end
-    end
 end

data/lib/engine2/meta/view_meta.rb

@@ -2,7 +2,6 @@
 
 module Engine2
     class ViewMeta < Meta
-        meta_type :view
         include MetaViewSupport, MetaQuerySupport
 
         def record handler, record

data/lib/engine2/model.rb

@@ -7,28 +7,25 @@ module Engine2
         attr_reader :before_save_processors, :after_save_processors, :before_destroy_processors, :after_destroy_processors
         attr_reader :validation_in_transaction
 
-        class << self
-            def extended cls
-                # cls.dataset.row_proc = nil
-                models = cls.db.models ||= {}
-                raise E2Error.new("Model '#{cls.name}' already defined") if models[cls.name.to_sym]
-                models[cls.name.to_sym] = cls
-
-                cls.instance_eval do
-                    @many_to_one_associations = association_reflections.select{|n, a| a[:type] == :many_to_one}
-                    @one_to_many_associations = association_reflections.select{|n, a| a[:type] == :one_to_many}
-                    @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
-                    @before_save_processors = nil
-                    @after_save_processors = nil
-                    @around_save_processors = nil
-                    @before_destroy_processors = nil
-                    @after_destroy_processors = nil
-                    @type_info_synchronized = nil
-                end
-                cls.setup_schema
+        def self.extended cls
+            models = cls.db.models
+            raise E2Error.new("Model '#{cls.name}' already defined") if models[cls.name.to_sym]
+            models[cls.name.to_sym] = cls
+
+            cls.instance_eval do
+                @many_to_one_associations = association_reflections.select{|n, a| a[:type] == :many_to_one}
+                @one_to_many_associations = association_reflections.select{|n, a| a[:type] == :one_to_many}
+                @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
+                @before_save_processors = nil
+                @after_save_processors = nil
+                @around_save_processors = nil
+                @before_destroy_processors = nil
+                @after_destroy_processors = nil
+                @type_info_synchronized = nil
             end
+            cls.setup_schema
         end
 
         def install_processors processors
@@ -111,6 +108,7 @@ module Engine2
 
         def synchronize_type_info
             resolve_dependencies
+            verify_associations
             @before_save_processors = install_processors(BeforeSaveProcessors)
             @after_save_processors = install_processors(AfterSaveProcessors)
             @around_save_processors = {}
@@ -119,6 +117,18 @@ module Engine2
             @type_info_synchronized = true
         end
 
+        def verify_associations
+            one_to_many_associations.each do |name, assoc|
+                other = Object.const_get(assoc[:class_name])
+                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|
@@ -133,7 +143,7 @@ module Engine2
             deps = @type_info[name][:depends]
             deps.each do |e|
                 if !resolved[e]
-                    raise "Circular dependency for field '#{name}' in model '#{self}'" if seen.include?(e)
+                    raise E2Error.new("Circular dependency for field '#{name}' in model '#{self}'") if seen.include?(e)
                     resolve_dependency(e, resolved, seen)
                 end
             end if deps

data/lib/engine2/scheme.rb

@@ -6,31 +6,23 @@ module Engine2
         VIEW ||= {view: true}.freeze
         LINK ||= {star_to_many_link: true, view: true, star_to_many_unlink: true}.freeze # star_to_many_bulk_unlink: true
 
-        attr_reader :schemes, :builtin
+        attr_reader :builtin, :user
         def initialize
             @builtin = {}
-            @schemes = {}
+            @user = {}
         end
 
         def define_scheme name, &blk
-            schemes = Engine2::core_loading ? @builtin : @schemes
-            raise "Scheme '#{name}' already defined" if schemes[name]
+            schemes = Engine2::core_loaded ? @user : @builtin
+            raise E2Error.new("Scheme '#{name}' already defined") if schemes[name]
             schemes[name] = blk
         end
 
-        def clear
-            @schemes = {}
-        end
-
-        def [] name
-            scheme = @schemes[name]
-            raise E2Error.new("Scheme #{name} not found") unless scheme
+        def [] name, raise = true
+            scheme = @builtin[name] || @user[name]
+            raise E2Error.new("Scheme #{name} not found") if !scheme && raise
             scheme
         end
-
-        def merge!
-            @schemes.merge!(@builtin){|n| raise E2Error.new("Scheme collision: #{n}")}
-        end
     end
 
     SCHEMES ||= Schemes.new

data/lib/engine2/type_info.rb

@@ -209,8 +209,8 @@ module Engine2
                 info[:multiple] = multiple
                 info[:table] = table
                 info[:store] = store
-                info[:store][:upload] ||= "#{APP_LOCATION}/store/upload"
-                info[:store][:files] ||= "#{APP_LOCATION}/store/files"
+                info[:store][:upload] ||= "#{Engine2::app}/store/upload"
+                info[:store][:files] ||= "#{Engine2::app}/store/files"
                 info[:transaction] = true
             end
         end
@@ -265,9 +265,8 @@ module Engine2
         end
 
         def foreign_blob_store_field assoc_name, name, name_field, mime_field
-            assoc = @model.association_reflections[assoc_name]
-            raise E2Error.new("Association '#{assoc_name}' not found for model '#{@model}'") unless assoc
-            raise E2Error.new("Association '#{assoc_name}' in model '#{@mode}' is not of type many_to_one") unless assoc[:type] == :many_to_one
+            assoc = @model.many_to_one_associations[assoc_name]
+            raise E2Error.new("'many_to_one' association '#{assoc_name}' not found for model '#{@model}'") unless assoc
             define_field :"#{assoc[:key]}_blob", :foreign_blob_store do |info|
                 info[:assoc_name] = assoc_name
                 info[:bytes_field] = name
@@ -278,9 +277,8 @@ module Engine2
         end
 
         def many_to_one_field assoc_name
-            assoc = @model.association_reflections[assoc_name]
-            raise E2Error.new("Association '#{assoc_name}' not found for model '#{@model}'") unless assoc
-            raise E2Error.new("Association '#{assoc_name}' in model '#{@mode}' is not of type many_to_one") unless assoc[:type] == :many_to_one
+            assoc = @model.many_to_one_associations[assoc_name]
+            raise E2Error.new("'many_to_one' association '#{assoc_name}' not found for model '#{@model}'") unless assoc
             keys = assoc[:keys]
             modify_field keys.first do |info|
                 info[:type] = :many_to_one
@@ -290,9 +288,8 @@ module Engine2
         end
 
         def star_to_many_field assoc_name
-            assoc = @model.association_reflections[assoc_name]
-            raise E2Error.new("Association '#{assoc_name}' not found for model '#{@model}'") unless assoc
-            raise E2Error.new("Association '#{assoc_name}' in model '#{@model}' is not of type *_to_many") unless [:one_to_many, :many_to_many].include?(assoc[:type])
+            assoc = @model.one_to_many_associations[assoc_name] || @model.many_to_many_associations[assoc_name]
+            raise E2Error.new("'*_to_many' association '#{assoc_name}' not found for model '#{@model}'") unless assoc
             define_field assoc_name, :string do |info|
                 info[:type] = :star_to_many_field
                 info[:keys] = assoc[:keys]
@@ -309,7 +306,7 @@ module Engine2
                         # list.map{|k, v| {id: k, value: v}}
                         list.to_a
                     else
-                        raise E2Error.new("type not supported for list_select modifier for field #{name}")
+                        raise E2Error.new("type '#{list.class}' not supported for list_select modifier for field #{name}")
                 end
                 info[:validations][:list_select] = true
             end
@@ -317,7 +314,7 @@ module Engine2
 
         def decode name, dinfo = {form: {scaffold: true}, search: {scaffold: true}}
             modify_field name do |info|
-                raise E2Error.new("Field type of #{name} needs to be :many_to_one") unless info[:type] == :many_to_one
+                raise E2Error.new("Field type of '#{name}' in model '#{@model}' needs to be 'many_to_one'") unless info[:type] == :many_to_one
                 dec = info[:decode] ||= {}
                 dec[:search].clear if dinfo[:search] && dec[:search]
                 dec[:form].clear if dinfo[:form] && dec[:form]

data/lib/engine2/version.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 
 module Engine2
-    MAJOR, MINOR, TINY = [1, 0, 1]
+    MAJOR, MINOR, TINY = [1, 0, 2]
     VERSION = [MAJOR, MINOR, TINY].join('.').freeze
     def self.version
         VERSION

data/views/engine2.coffee

@@ -279,14 +279,14 @@ angular.module('Engine2', ['ngRoute', 'ngSanitize', 'ngAnimate', 'ngCookies', 'm
         error: (title, msg, html) ->
             body = if html then msg else "<div class='alert alert-danger'>#{msg}</div>"
             clazz = if html then "modal-huge" else "modal-large"
-            @show meta: panel: (panel_template: "close_m", template_string: body, title: title, class: clazz) # message: msg,
+            @show meta: panel: (panel_template: "close_m", template_string: body, title: title, class: clazz, footer: true) # message: msg,
 
         confirm: (title, msg, action) ->
             body = "<div class='alert alert-warning'>#{msg}</div>"
             clazz = "modal-large"
             @show
                 confirm: action,
-                meta: panel: (panel_template: "confirm_m", template_string: body, title: title, class: clazz) # message: msg,
+                meta: panel: (panel_template: "confirm_m", template_string: body, title: title, class: clazz, footer: true) # message: msg,
 
 .directive 'e2Modal', ($e2Modal) ->
     restrict: 'E'
@@ -301,7 +301,7 @@ angular.module('Engine2', ['ngRoute', 'ngSanitize', 'ngAnimate', 'ngCookies', 'm
                 return if ev.defaultPrevented
                 ev.preventDefault()
 
-                panel = panel_template: attrs.panelTemplate, title: attrs.title, class: attrs.clazz
+                panel = panel_template: attrs.panelTemplate, title: attrs.title, class: attrs.clazz, footer: true
                 if obody then panel.template_string = obody.outerHTML else panel.template = attrs.template
                 action = meta: (panel: panel), scope: -> scope
                 _.assign(action, args)
@@ -386,12 +386,16 @@ angular.module('Engine2', ['ngRoute', 'ngSanitize', 'ngAnimate', 'ngCookies', 'm
             selection = scope.action.selection
             out = ''
             _.each scope.action.entries, (e, i) ->
-                out += if selection then "<tr ng-class='action.selected_class(#{i})' class='tr_hover' ng-click='action.select(#{i}, $event)'>" else "<tr>"
+                out += if selection then "<tr ng-class='action.selected_class(#{i})' class='tr_hover' ng-click='action.select(#{i}, $event)'>" else
+                    row_cls = e.$row_info?.class
+                    if row_cls then "<tr class=\"#{row_cls}\">" else "<tr>"
                 out += "<td>"
-                out += "<div e2-button-set='action.meta.menus.item_menu' index='#{i}'></div>" if meta.config.show_item_menu #  data='action.entries[#{i}]'></div>
+                out += "<div e2-button-set='action.meta.menus.item_menu' index='#{i}'></div>" if meta.config.show_item_menu
                 out += "</td>"
-                # out += "<td><div e2-button-set='item_menu' index='#{i}' ng-if='action.meta.config.show_item_menu'></div></td>"
-                _.each meta.fields, (f) -> out += "<td>#{scope.action.list_cell(e, f) ? ''}</td>"
+                _.each meta.fields, (f) ->
+                    out += if col_cls = meta.info[f].column_class then "<td class='#{col_cls}'>" else "<td>"
+                    out += scope.action.list_cell(e, f) ? ''
+                    out += "</td>"
                 out += "</tr>"
 
             elem.empty()

data/views/engine2actions.coffee

@@ -128,9 +128,11 @@ angular.module('Engine2')
 
         pre_invoke: ->
             @parent().action_pending = true
+            @action_pending = true
             # @parent().parent().action_pending = true if @parent().parent()
         post_invoke: ->
             delete @parent().action_pending # = false
+            delete @action_pending
             # @parent().parent().action_pending = false if @parent().parent()
         invoke: ->
             args = arguments
@@ -282,7 +284,7 @@ angular.module('Engine2')
 
         traverse: (routes) ->
             menu_tmpl = _.template("<li><a href='{{href}}'>{{icon}}{{aicon}} {{loc}}</a></li>")
-            menu_sub_tmpl = _.template("<li e2-drop-down='{{dropdown}}'><a href='javascript://'>{{icon}}{{aicon}}{{loc}}<span class='caret'></span></a></li>")
+            menu_sub_tmpl = _.template("<li e2-drop-down='{{dropdown}}'><a href='javascript://'>{{icon}}{{aicon}} {{loc}}<span class='caret'></span></a></li>")
             out = routes.map (route, i) ->
                 if route.menu
                     menu_sub_tmpl
@@ -565,6 +567,7 @@ angular.module('Engine2')
             super()
             @decode_field = @scope().f
             @dinfo = @parentp().meta.info[@decode_field]
+            throw "Primary and foreign key list lengths dont match: [#{@meta.primary_fields}] and [#{@dinfo.fields}]" unless @meta.primary_fields.length == @dinfo.fields.length
             @scope().$on "search_reset", => @clean()
 
         if_fk_values: (f) ->

data/views/infra/inspect.slim

@@ -1,5 +1,5 @@
 e2-action action="'inspect'"
-  div bs-tabs="" ng-if="'true'"
+  div bs-tabs=""
     br
     div title="API" bs-pane=""
       .row

data/views/modals/close_m.slim

@@ -8,7 +8,7 @@
       .modal-body
         | modal-content-to-replace
 
-      .modal-footer
+      .modal-footer ng-if="::action.meta.panel.footer"
         .loader.pull-left: img src="img/ajax-loader.gif"
         .btn.btn-default ng-click="$hide()"
           span.glyphicon.glyphicon-remove>

data/views/modals/confirm_m.slim

@@ -8,7 +8,7 @@
       .modal-body
         | modal-content-to-replace
 
-      .modal-footer
+      .modal-footer ng-if="::action.meta.panel.footer"
         .loader.pull-left: img src="img/ajax-loader.gif"
         .btn-group
           .btn.btn-default ng-click="action.confirm()"

data/views/modals/empty_m.slim

@@ -8,5 +8,5 @@
       .modal-body
         | modal-content-to-replace
 
-      .modal-footer
+      .modal-footer ng-if="::action.meta.panel.footer"
         .loader.pull-left: img src="img/ajax-loader.gif"

data/views/modals/menu_m.slim

@@ -8,6 +8,6 @@
       .modal-body
         | modal-content-to-replace
 
-      .modal-footer
+      .modal-footer ng-if="::action.meta.panel.footer"
         .loader.pull-left: img src="img/ajax-loader.gif"
         div e2-button-set="action.meta.menus.panel_menu"

data/views/modals/yes_no_m.slim

@@ -8,7 +8,7 @@
       .modal-body
         | modal-content-to-replace
 
-      .modal-footer
+      .modal-footer ng-if="::action.meta.panel.footer"
         .loader.pull-left: img src="img/ajax-loader.gif"
         .btn-group
           .btn.btn-default ng-click="action.yes(); $hide()"

data/views/panels/menu_m.slim

@@ -3,7 +3,7 @@
     h4.modal-title ng-bind-html="action.meta.panel.title"
   .panel-body
     | modal-content-to-replace
-  .panel-footer
+  .panel-footer ng-if="::action.meta.panel.footer"
     // .loader.pull-left: img src="img/ajax-loader.gif"
     div e2-button-set="action.meta.menus.panel_menu"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: engine2
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - lopex
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-04-21 00:00:00.000000000 Z
+date: 2016-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement