engine2 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a2ad0107737d0e5096b9a72b31743f01b8107ba
-  data.tar.gz: 6557952f0c927307bb297d71afc2cbb8086d3318
+  metadata.gz: c81c9b9a3857540db437d0bc5ad18bab4e420a28
+  data.tar.gz: 543048567b1754a90c6c286c6860181882aecd46
 SHA512:
-  metadata.gz: 247de7a7bd6535a169b713cd08d1c9034d4e9de87301530986d9eae7b4ef98b4ceb9bff5610daf7ee66cc168c7f110dd585dd7db5691e07112f372c3345792d4
-  data.tar.gz: b41f9ea4e158dd174b4f71566f93d4fcc0f5bff6270f3885cc5f13e52b9e7fae0ba2f696273611453222bec33aed9f34556cd5a63c46f3a3f3dc8787e4ea7917
+  metadata.gz: fc5faef135f2d9e1115016345988b2eb562e2aa2cec1fc106286fc79d70c43a73da84f580aa37583816af3b2d40e28104341cb0f0fcb9491232e1841bc01088d
+  data.tar.gz: f6d800d24a201d967d91af602fd46918e73263f9fbd1572c525b80eada313b53967e19f010311e8be87666d06bc6485f721ff4502ef0f04b98540e5f6a1a250c

data/conf/message.yaml

@@ -92,3 +92,10 @@
 :access_unauthorized:           Access unauthorized
 :access_not_found:              Not found
 :access_method_not_allowed:     Metod not allowed
+
+:list_locs:
+    :search:                    Search
+    :page:                      Page
+    :selected:                  Selected
+
+:logged_on:                     Logged on

data/conf/message_pl.yaml

@@ -92,3 +92,10 @@
 :access_unauthorized:           Dostęp nieautoryzowany
 :access_not_found:              Nie znaleziono
 :access_method_not_allowed:     Metoda niedozwolona
+
+:list_locs:
+    :search:                    Szukaj
+    :page:                      Strona
+    :selected:                  Wybranych
+
+:logged_on:                     Zalogowany

data/engine2.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
     spec.add_dependency 'coffee-script', '~> 2.4'
 
     spec.add_development_dependency "bundler", "~> 1.11"
-    spec.add_development_dependency "rake", "~> 10.0"
+    spec.add_development_dependency "rake", "~> 11.1"
     spec.add_development_dependency 'uglifier', '~> 3.0'
     spec.add_development_dependency 'yui-compressor', '~> 0.12'
 end

data/lib/engine2/action.rb

@@ -71,11 +71,6 @@ module Engine2
             end
         end
 
-        def undefine_action name
-            ::Kernel.raise E2Error.new("No action #{name} defined") unless @actions[name]
-            @actions.delete(name)
-        end
-
         def define_action_bundle name, *actions
             define_singleton_method!(name) do |&blk|
                 if blk

data/lib/engine2/core.rb

@@ -120,7 +120,7 @@ class Symbol
 end
 
 class << Sequel
-    attr_accessor :alias_tables_in_joins
+    attr_accessor :alias_columns_in_joins
 
     def split_keys id
         id.split('|')
@@ -147,7 +147,7 @@ end
 Sequel.quote_identifiers = false
 Sequel.extension :core_extensions
 Sequel::Inflections.clear
-Sequel.alias_tables_in_joins = true
+Sequel.alias_columns_in_joins = true
 # Sequel::Model.plugin :json_serializer, :naked => true
 # Sequel::Model.plugin :timestamps
 # Sequel::Model.plugin :validation_class_methods
@@ -364,7 +364,7 @@ module E2Model
                     #     nil
                     else
                         if table != model_table_name
-                            if Sequel.alias_tables_in_joins
+                            if Sequel.alias_columns_in_joins
                                 name.qualify(table).as(:"#{table}__#{name}")
                             else
                                 name.qualify(table)
@@ -435,7 +435,7 @@ module Engine2
     PATH ||= File.expand_path('../..', File.dirname(__FILE__))
 
     class << self
-        attr_reader :app, :reloading
+        attr_reader :app, :app_name, :reloading
         attr_reader :core_loaded
 
         def database name
@@ -457,8 +457,8 @@ module Engine2
 
         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')
+            const_set :E2DB, connect(e2_db_file, loggers: [Logger.new($stdout)], convert_types: false, name: :engine2)
+            const_set :DUMMYDB, Sequel::Database.new(uri: 'dummy')
             def DUMMYDB.synchronize *args;end
         end
 
@@ -482,8 +482,8 @@ module Engine2
             puts "MODELS: #{Sequel::DATABASES.reduce(0){|s, d|s + d.models.size}}, Time: #{Time.now - t}"
             Sequel::DATABASES.each &:dump_schema_cache_to_file
 
-            Engine2.send(:remove_const, :ROOT) if defined? ROOT
-            Engine2.const_set(:ROOT, Action.new(nil, :api, DummyMeta, {}))
+            send(:remove_const, :ROOT) if defined? ROOT
+            const_set(:ROOT, Action.new(nil, :api, RootMeta, {}))
 
             @boot_blk.(ROOT)
             ROOT.setup_action_tree
@@ -492,6 +492,7 @@ module Engine2
 
         def bootstrap app, opts = {}
             @app = app
+            @app_name = opts[:name] || File::basename(app)
             @reloading = opts[:reloading]
             bootstrap_e2db
 

data/lib/engine2/handler.rb

@@ -30,7 +30,7 @@ module Engine2
         end
 
         def permit access
-            halt_forbidden 'Permission denied' unless access
+            settings.development? ? raise(E2Error.new("Permission denied")) : halt_forbidden('Permission denied') unless access
         end
 
         def initial?
@@ -113,7 +113,7 @@ module Engine2
         get '/*' do |name|
             headers 'Cache-Control' => 'no-cache, no-store, must-revalidate', 'Pragma' => 'no-cache', 'Expires' => '0'
             if name.empty?
-                if settings.environment == :development
+                if settings.development?
                     load('engine2.rb') if Engine2::reloading
                     Engine2::reload
                 end

data/lib/engine2/meta.rb

@@ -26,10 +26,6 @@ module Engine2
             @static = static
         end
 
-        # def self.method_added name
-        #     puts "ADDED #{name}"
-        # end
-
         def http_method
             @http_method # || (raise E2Error.new("No http method for meta #{self.class}"))
         end
@@ -47,22 +43,14 @@ module Engine2
                 meta = self.class.new(action, assets, self)
                 meta.instance_exec(handler, *meta.request_meta_proc_params(handler), &rmp)
                 meta.post_process
-
-                {response: meta.invoke(handler), meta: meta.get}
+                response = meta.invoke(handler)
+                response[:meta] = meta.get
+                response
             else
-                response = invoke(handler)
-                if response.is_a?(Hash)
-                    {response: response}
-                else
-                    response
-                end
+                invoke(handler)
             end
         end
 
-        def response args
-            (@meta[:response] ||= {}).merge!(args)
-        end
-
         def get
             @meta
         end
@@ -142,6 +130,14 @@ module Engine2
         meta_type :dummy
     end
 
+    class RootMeta < Meta
+        def initialize *args
+            super
+            @meta[:environment] = Handler::environment
+            @meta[:application] = Engine2::app_name
+        end
+    end
+
     module MetaAPISupport
         def reload_routes!
             @meta[:reload_routes] = true
@@ -158,16 +154,12 @@ module Engine2
         def info! *fields, options
             raise E2Error.new("No fields given to info") if fields.empty?
             fields.each do |field|
-                if options
-                    (info[field] ||= {}).merge! options # rmerge ?
-                else
-                    info[field] = false
-                end
+                (info[field] ||= {}).merge! options # rmerge ?
             end
         end
 
         def loc! hash
-            hash.each{|k, v| info! k, loc: v}
+            (@meta[:loc] ||= {}).merge! hash
         end
 
         def decorate list
@@ -202,6 +194,10 @@ module Engine2
             @menus[menu_name]
         end
 
+        def menu? menu_name
+            @menus && @menus[menu_name]
+        end
+
         def post_process
             super
             if @menus && !@menus.empty?
@@ -356,6 +352,10 @@ module Engine2
             end
         end
 
+        def find_record handler, id
+            get_query[assets[:model].primary_keys_hash_qualified(split_keys(id))]
+        end
+
         def select *args, &blk
             assets[:model].select(*args, &blk).ensure_primary_key.setup! (@meta[:fields] = [])
         end
@@ -424,7 +424,7 @@ 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
+                panel_footer true if panel[:footer] != false && menu?(:panel_menu)
             end
         end
 
@@ -452,7 +452,7 @@ module Engine2
             panel[:title] = tle
         end
 
-        def footer ftr
+        def panel_footer ftr
             panel[:footer] = ftr
         end
     end
@@ -470,6 +470,10 @@ module Engine2
         include MetaPanelSupport, MetaMenuSupport
         meta_type :confirm
 
+        def message msg
+            @meta[:message] = msg
+        end
+
         def pre_run
             super
             panel_template 'scaffold/message'
@@ -477,7 +481,7 @@ module Engine2
             panel_class 'modal-default'
 
             menu :panel_menu do
-                option :approve, icon: "ok", loc: LOCS[:ok], disabled: 'action.action_pending'
+                option :approve, icon: "ok", loc: LOCS[:ok], disabled: 'action.action_pending()'
                 option :cancel, icon: "remove"
             end
         end
@@ -544,15 +548,14 @@ module Engine2
             super
             config.merge!(per_page: 10, use_count: false, show_item_menu: true, selectable: true) # search_active: false,
 
-            # modal_action self.class != ListMeta
             panel_template 'scaffold/list'
             panel_panel_template 'panels/menu_m' unless action.parent.*.assets[:model]
             search_template 'scaffold/search'
             panel_title "#{:list.icon} #{LOCS[assets[:model].name.to_sym]}"
-            menu(:panel_menu).option :cancel, icon: "remove"
+            loc! LOCS[:list_locs]
             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
+                option :search_toggle, icon: "search", show: "action.meta.search_fields", active: "action.ui_state.search_active", button_loc: false
                 # divider
                 option :refresh, icon: "refresh", button_loc: false
                 option :default_order, icon: "signal", button_loc: false
@@ -572,7 +575,7 @@ module Engine2
         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
+                m.option_after :default_order, :select_toggle, icon: "check", enabled: "action.meta.config.selectable", active: "action.selection", button_loc: false
             end
         end
 
@@ -725,7 +728,7 @@ module Engine2
         def invoke handler
             json = handler.post_to_json
             record = allocate_record(handler, json)
-            validate_and_approve(handler, record, json) ? static.record(handler, record) : {record: record.to_hash, errors: record.errors}
+            validate_and_approve(handler, record, json) ? static.record(handler, record) : {record!: record.to_hash, errors!: record.errors}
         end
 
         def validate name, &blk
@@ -747,6 +750,154 @@ module Engine2
         end
     end
 
+    module MetaFormSupport
+        include MetaModelSupport, MetaAPISupport, MetaTabSupport, MetaPanelSupport, MetaMenuSupport, MetaAngularSupport, MetaOnChangeSupport
+
+        def field_template template
+            panel[:field_template] = template
+        end
+
+        def pre_run
+            super
+            panel_template 'scaffold/form'
+            field_template 'scaffold/fields'
+            panel_class 'modal-large'
+
+            menu :panel_menu do
+                option :approve, icon: "ok", disabled: 'action.action_pending()' # text: true,
+                option :cancel, icon: "remove" # text: true,
+            end
+            # modal_action false
+        end
+
+        def record handler, record
+        end
+
+        def post_process
+            if fields = @meta[:fields]
+                fields = fields - static.get[:fields] if dynamic?
+
+                decorate(fields)
+
+                fields.each do |name|
+                    # type_info = model.type_info.fetch(name)
+                    type_info = get_type_info(name)
+
+                    info[name][:render] ||= begin
+                        renderer = DefaultFormRenderers[type_info[:type]] # .merge(default: true)
+                        raise E2Error.new("No form renderer found for field '#{type_info[:name]}' of type '#{type_info[:type]}'") unless renderer
+                        renderer.(self, type_info)
+                    end
+
+                    proc = FormRendererPostProcessors[type_info[:type]]
+                    proc.(self, name, type_info) if proc
+                end
+
+                assoc = assets[:assoc]
+                if assoc && assoc[:type] == :one_to_many
+                    # fields.select{|f| assoc[:keys].include? f}.each do |key|
+                    #     # hide_fields(key) if self[:info, key, :hidden] == nil
+                    #     info! key, disabled: true
+                    # end
+                    assoc[:keys].each do |key|
+                        info! key, disabled: true if fields.include? key
+                    end
+                end
+            end
+
+            super
+        end
+
+        def post_run
+            super
+            @meta[:primary_fields] = assets[:model].primary_keys
+        end
+
+        def template
+            Templates
+        end
+
+        def hr_after field, message = '-'
+            info! field, hr: message
+        end
+    end
+
+    module MetaCreateSupport
+        include MetaFormSupport
+
+        def self.included meta
+            meta.meta_type :create
+        end
+
+        def pre_run
+            super
+            panel_title LOCS[:create_title]
+            action.parent.*.menu(:menu).option_at 0, action.name, icon: "plus-sign", button_loc: false
+
+            hide_pk unless assets[:model].natural_key
+        end
+
+        def record handler, record
+            create_record(handler, record)
+        end
+
+        def create_record handler, record
+        end
+
+        def invoke handler
+            record = {}
+            if assoc = assets[:assoc]
+                case assoc[:type]
+                when :one_to_many
+                    handler.permit parent = handler.params[:parent_id]
+                    assoc[:keys].zip(split_keys(parent)).each{|key, val| record[key] = val}
+                end
+            end
+            static.record(handler, record)
+            {record: record, new: true}
+        end
+    end
+
+    module MetaModifySupport
+        include MetaFormSupport
+
+        def self.included meta
+            meta.meta_type :modify
+        end
+
+        def pre_run
+            super
+            panel_title LOCS[:modify_title]
+            action.parent.*.menu(:item_menu).option action.name, icon: "pencil", button_loc: false
+        end
+
+        def record handler, record
+            modify_record(handler, record)
+        end
+
+        def modify_record handler, record
+        end
+
+        def invoke handler
+            handler.permit id = handler.params[:id]
+            record = find_record(handler, id)
+
+            if record
+                static.record(handler, record)
+                {record: record}
+            else
+                handler.halt_not_found LOCS[:no_entry]
+            end
+        end
+
+        def post_run
+            super
+            assets[:model].primary_keys.each do |key| # pre_run ?
+                info! key, disabled: true
+            end
+        end
+    end
+
     module MetaViewSupport
         include MetaModelSupport, MetaAPISupport, MetaTabSupport, MetaPanelSupport, MetaMenuSupport
 
@@ -763,6 +914,20 @@ module Engine2
             action.parent.*.menu(:item_menu).option action.name, icon: "file", button_loc: false
         end
 
+        def record handler, record
+        end
+
+        def invoke handler
+            handler.permit id = handler.params[:id]
+            record = find_record(handler, id)
+            if record
+                static.record(handler, record)
+                {record: record}
+            else
+                handler.halt_not_found LOCS[:no_entry]
+            end
+        end
+
         def post_process
             if fields = @meta[:fields]
                 fields = fields - static.get[:fields] if dynamic?
@@ -850,7 +1015,6 @@ module Engine2
             field_info[:assoc] = :"#{info[:assoc_name]}!"
             field_info[:fields] = info[:keys]
             field_info[:type] = info[:otype]
-            # field_info[:table_loc] = LOCS[info[:assoc_name]]
 
             (info[:keys] - [field]).each do |of|
                 f_info = meta.info.fetch(of)
@@ -919,7 +1083,6 @@ module Engine2
             field_info[:assoc] = :"#{info[:assoc_name]}!"
             field_info[:fields] = keys
             field_info[:type] = info[:otype]
-            # field_info[:table_loc] = LOCS[info[:assoc_name]]
 
             (keys - [field]).each do |of|
                 f_info = meta.info[of]
@@ -972,7 +1135,7 @@ module Engine2
             end
         },
         star_to_many_field: lambda{|meta, info| Templates.scaffold},
-        many_to_one: lambda{|meta, info| # Templates.scaffold_picker
+        many_to_one: lambda{|meta, info|
             tmpl_type = info[:decode][:form]
             case
             when tmpl_type[:scaffold]; Templates.scaffold_picker