engine2 1.0.3 → 1.0.4

data/bower.json

@@ -0,0 +1,13 @@
+{
+  "name": "engine2",
+  "version": "1.0.0",
+  "dependencies": {
+    "angular-strap": "^2.3.10",
+    "angular": "^1.5.8"
+  },
+  "overrides": {
+    "angular": {
+      "main": []
+    }
+  }
+}

data/conf/message.yaml

@@ -1,4 +1,3 @@
-:engine2_resource_loaded:       true
 :default_date_format:           yyyy-MM-dd
 :default_date_short_format:     yy-MM-dd
 :default_date_model_format:     yyyy-MM-dd
@@ -88,6 +87,8 @@
 :invalid_email_format:          Incorrect email format
 :invalid_format:                Incorrect format
 
+:currency_symbol:               $
+
 :access_forbidden:              Access forbidden
 :access_unauthorized:           Access unauthorized
 :access_not_found:              Not found

data/conf/message_pl.yaml

@@ -1,4 +1,3 @@
-:engine2_resource_loaded:       true
 :default_date_format:           yyyy-MM-dd
 :default_date_short_format:     yy-MM-dd
 :default_date_model_format:     yyyy-MM-dd
@@ -93,6 +92,8 @@
 :access_not_found:              Nie znaleziono
 :access_method_not_allowed:     Metoda niedozwolona
 
+:currency_symbol:               zł
+
 :list_locs:
     :search:                    Szukaj
     :page:                      Strona

data/config.coffee

@@ -0,0 +1,62 @@
+exports.config =
+  npm:
+    enabled: true
+    globals:
+        _: 'lodash'
+        angular: 'angular'
+    styles:
+        "bootstrap": ["dist/css/bootstrap.css"]
+        "bootstrap-additions": ["dist/bootstrap-additions.css"]
+        "angular-motion": ["dist/angular-motion.css"]
+        "angular-ui-tree": ["dist/angular-ui-tree.css"]
+        "font-awesome": ["css/font-awesome.css"]
+
+  modules:
+    definition: 'commonjs'
+    wrapper: false
+
+  paths:
+    public: 'public'
+    watched: ['app']
+
+  files:
+    javascripts:
+      joinTo:
+        'engine2vendor.js': /^node_modules|bower_components/
+        'engine2.js': /^app/
+
+    stylesheets:
+      joinTo:
+        'engine2vendor.css': /^node_modules/
+        'engine2app.css': /^app/
+      order:
+        before: [
+          /bootstrap.css$/
+        ]
+
+  plugins:
+    on: ["ng-annotate-brunch"]
+
+    uglify:
+      mangle: true
+      compress:
+        global_defs:
+          DEBUG: false
+
+    replacement:
+      replacements: [
+        files: [/vendor.js$/]
+        match: (
+            fix = "$modal.$element = compileData.link(modalScope, function(clonedElement, scope) {});"
+            find: fix.replace(/([.*+?^=!:${}()|\[\]\/\\])/g, "\\$1")
+            replace: "#{fix}$modal.$backdrop = backdropElement;"
+          )
+      ]
+
+    copycat:
+      fonts: [
+        "node_modules/font-awesome/fonts"
+        "node_modules/bootstrap/fonts"
+      ]
+      verbose: true
+      onlyChanged: true

data/engine2.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |spec|
     spec.require_paths = ["lib"]
 
     spec.add_dependency "sequel", '~> 4'
+    spec.add_dependency "rack-contrib", '~> 1.4'
     if defined? JRUBY_VERSION
         spec.add_dependency 'jdbc-sqlite3', '~> 3.8'
     else
@@ -24,11 +25,7 @@ Gem::Specification.new do |spec|
     end
     spec.add_dependency "sinatra", '~> 1.4'
     spec.add_dependency 'slim', '~> 3.0'
-    spec.add_dependency "execjs", '~> 2.6'
-    spec.add_dependency 'coffee-script', '~> 2.4'
 
     spec.add_development_dependency "bundler", "~> 1.11"
-    spec.add_development_dependency "rake", "~> 11.1"
-    spec.add_development_dependency 'uglifier', '~> 3.0'
-    spec.add_development_dependency 'yui-compressor', '~> 0.12'
+    spec.add_development_dependency "rake", "~> 11"
 end

data/lib/engine2.rb

@@ -6,7 +6,6 @@ require 'sequel'
 require 'sinatra'
 require 'json'
 require 'slim'
-require 'tilt/coffee'
 require 'engine2/version'
 
 %w[
@@ -19,6 +18,7 @@ require 'engine2/version'
     action.rb
     scheme.rb
 
+    meta/array_meta.rb
     meta/list_meta.rb
     meta/view_meta.rb
     meta/form_meta.rb

data/lib/engine2/action.rb

@@ -9,6 +9,10 @@ module Engine2
 
         class << self
             attr_accessor :count
+
+            def default_meta
+                Class.new(InlineMeta){meta_type :inline}
+            end
         end
 
         def initialize parent, name, meta_class, assets
@@ -46,7 +50,7 @@ module Engine2
             result
         end
 
-        def define_action name, meta_class = DummyMeta, assets = {}, &blk
+        def define_action name, meta_class = Action.default_meta, assets = {}, &blk
             ::Kernel.raise E2Error.new("Action #{name} already defined") if @actions[name]
             action = @actions[name] = Action.new(self, name, meta_class, assets)
             action.*.pre_run
@@ -59,15 +63,15 @@ module Engine2
             action
         end
 
-        def define_action_meta name, meta_class = DummyMeta, assets = {}, &blk
+        def define_action_meta name, meta_class = Action.default_meta, assets = {}, &blk
             define_action name, meta_class, assets do
                 self.* &blk
             end
         end
 
-        def define_action_invoke name, meta_class = DummyMeta, assets = {}, &blk
+        def define_action_invoke name, meta_class = Action.default_meta, assets = {}, &blk
             define_action name, meta_class, assets do
-                self.*.define_singleton_method(:invoke, &blk)
+                self.*.define_invoke &blk
             end
         end
 
@@ -101,8 +105,7 @@ module Engine2
                     access: recheck_access ? nil : a.check_access!(handler),
                     recheck_access: a.recheck_access,
                     terminal: a.actions.empty?,
-                    meta: !meta.get.empty?,
-                    invokable: meta.invokable
+                    meta: !meta.get.empty?
                 }
                 h
             end
@@ -189,24 +192,6 @@ module Engine2
             end
 
             ::Kernel::puts "ACTIONS: #{Action.count}, Time: #{::Time.now - time}"
-            # verify_action_usage
-        end
-
-        def verify_action_usage
-            t = ::Time.now
-            each_action do |action|
-                meta = action.*
-                model = meta.assets[:model]
-                if model
-                    model.one_to_many_associations.each do |a|
-                    end
-                    true
-                else
-                    true
-                end
-
-            end
-            ::Kernel::puts "VERIFY #{::Time.now - t}"
         end
 
         def p *args

data/lib/engine2/core.rb

@@ -123,7 +123,7 @@ class << Sequel
     attr_accessor :alias_columns_in_joins
 
     def split_keys id
-        id.split('|')
+        id.split(Engine2::SETTINGS[:key_separator])
     end
 end
 
@@ -336,7 +336,7 @@ module E2Model
                         else
                             a = model.many_to_one_associations[table] # || model.one_to_one_associations[table]
                             raise Engine2::E2Error.new("Association #{table} not found for model #{model}") unless a
-                            m = Object.const_get(a[:class_name])
+                            m = a.associated_class
                         end
                         # raise Engine2::E2Error.new("Model not found for table #{table} in model #{model}") unless m
                         info = m.type_info
@@ -379,7 +379,7 @@ module E2Model
             @opts[:select].compact!
 
             joins.reduce(self) do |joined, (table, assoc)|
-                m = Object.const_get(assoc[:class_name])
+                m = assoc.associated_class
                 keys = assoc[:qualified_key]
                 joined.left_join(table, m.primary_keys.zip(keys.is_a?(Array) ? keys : [keys]))
             end
@@ -395,7 +395,7 @@ module E2Model
                 end
             when Sequel::SQL::QualifiedIdentifier
                 yield sel.table, sel.column, al
-            when Sequel::SQL::AliasedExpression
+            when Sequel::SQL::AliasedExpression, Sequel::SQL::Function
                 sel
                 # extract_select sel.expression, sel.aliaz, &blk
                 # expr = sel.expression
@@ -433,9 +433,10 @@ end
 module Engine2
     LOCS ||= Hash.new{|h, k| ":#{k}:"}
     PATH ||= File.expand_path('../..', File.dirname(__FILE__))
+    SETTINGS ||= {key_separator: '|'}
 
     class << self
-        attr_reader :app, :app_name, :reloading
+        attr_reader :app
         attr_reader :core_loaded
 
         def database name
@@ -490,10 +491,10 @@ module Engine2
             puts "BOOTSTRAP #{app}, Time: #{Time.new - t}"
         end
 
-        def bootstrap app, opts = {}
+        def bootstrap app, settings = {}
             @app = app
-            @app_name = opts[:name] || File::basename(app)
-            @reloading = opts[:reloading]
+            SETTINGS.merge! settings
+            SETTINGS[:name] ||= File::basename(app)
             bootstrap_e2db
 
             require 'engine2/pre_bootstrap'

data/lib/engine2/handler.rb

@@ -106,15 +106,11 @@ module Engine2
             halt_server_error Rack::Utils.escape_html(error.inspect) + "<hr>" + error.backtrace.take(30).map{|b| Rack::Utils.escape_html(b)}.join("<br>"), LOCS[:error]
         end
 
-        get "/js/*.js" do |c|
-            coffee c.to_sym
-        end
-
         get '/*' do |name|
             headers 'Cache-Control' => 'no-cache, no-store, must-revalidate', 'Pragma' => 'no-cache', 'Expires' => '0'
             if name.empty?
                 if settings.development?
-                    load('engine2.rb') if Engine2::reloading
+                    load('engine2.rb') if Engine2::SETTINGS[:reloading]
                     Engine2::reload
                 end
                 name = 'index'

data/lib/engine2/meta.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 module Engine2
     class Meta
-        attr_reader :action, :assets, :invokable, :static
+        attr_reader :action, :assets, :static, :invokable
 
         class << self
             def meta_type mt = nil
@@ -38,12 +38,17 @@ module Engine2
             raise E2Error.new("Static meta required") if dynamic?
         end
 
+        def define_invoke &blk
+            check_static_meta
+            self.class.class_eval{define_method :invoke, &blk}
+        end
+
         def invoke! handler
             if rmp = @request_meta_proc
                 meta = self.class.new(action, assets, self)
-                meta.instance_exec(handler, *meta.request_meta_proc_params(handler), &rmp)
+                meta_result = meta.instance_exec(handler, *meta.request_meta_proc_params(handler), &rmp)
                 meta.post_process
-                response = meta.invoke(handler)
+                response = @requestable ? (meta_result || {}) : meta.invoke(handler)
                 response[:meta] = meta.get
                 response
             else
@@ -51,6 +56,18 @@ module Engine2
             end
         end
 
+        def repeat time
+            @meta[:repeat] = time
+        end
+
+        def arguments args
+            @meta[:arguments] = args
+        end
+
+        def execute time
+            @meta[:execute] = time
+        end
+
         def get
             @meta
         end
@@ -114,7 +131,16 @@ module Engine2
         end
 
         def post_run
-            @invokable = respond_to?(:invoke)
+            if respond_to? :invoke
+                @invokable = true
+            else
+                if @request_meta_proc
+                    @invokable = true
+                    @requestable = true
+                else
+                    @meta[:invokable] = false
+                end
+            end
             post_process
         end
 
@@ -126,15 +152,14 @@ module Engine2
         end
     end
 
-    class DummyMeta < Meta
-        meta_type :dummy
+    class InlineMeta < Meta
+        meta_type :inline
     end
 
     class RootMeta < Meta
         def initialize *args
             super
-            @meta[:environment] = Handler::environment
-            @meta[:application] = Engine2::app_name
+            @meta.merge! environment: Handler::environment, application: Engine2::SETTINGS[:name], key_separator: Engine2::SETTINGS[:key_separator]
         end
     end
 
@@ -220,7 +245,7 @@ module Engine2
                 end until mdl
 
                 if asc = @assets[:assoc]
-                    @assets[:model] = Object.const_get(asc[:class_name])
+                    @assets[:model] = asc.associated_class
                     # raise E2Error.new("Association '#{asc}' for model '#{asc[:class_name]}' not found") unless @assets[:model]
                 else
                     @assets[:model] = mdl
@@ -250,7 +275,7 @@ module Engine2
                 if name =~ /^(\w+)__(\w+?)$/ # (?:___\w+)?
                     assoc = model.many_to_one_associations[$1.to_sym] || model.one_to_one_associations[$1.to_sym]
                     raise E2Error.new("Association #{$1} not found for model #{model}") unless assoc
-                    m = Object.const_get(assoc[:class_name])
+                    m = assoc.associated_class
                     info = m.type_info.fetch($2.to_sym)
                 else
                     raise E2Error.new("Type info not found for '#{name}' in model '#{model}'")
@@ -546,7 +571,7 @@ module Engine2
 
         def pre_run
             super
-            config.merge!(per_page: 10, use_count: false, show_item_menu: true, selectable: true) # search_active: false,
+            config.merge!(per_page: 10, use_count: false, selectable: true) # search_active: false,
 
             panel_template 'scaffold/list'
             panel_panel_template 'panels/menu_m' unless action.parent.*.assets[:model]
@@ -572,6 +597,11 @@ module Engine2
             @meta[:state] = [:query, :ui_state]
         end
 
+        def field_tabs hash
+            super
+            search_template 'scaffold/search_tabs'
+        end
+
         def select_toggle_menu
             m = menu :menu
             unless m.option_index(:select_toggle, false)
@@ -670,6 +700,11 @@ module Engine2
             (@filters ||= {})[name] = blk
         end
 
+        def filter_case_insensitive name
+            raise E2Error.new("Field '#{name}' needs to be a string one") unless get_type_info(name)[:otype] == :string
+            filter(name){|query, hash, handler| query.where(name.ilike("%#{hash[name]}%")) }
+        end
+
         def order name, &blk
             (@orders ||= {})[name] = blk
         end
@@ -770,6 +805,11 @@ module Engine2
             # modal_action false
         end
 
+        def field_tabs hash
+            super
+            panel_template 'scaffold/form_tabs'
+        end
+
         def record handler, record
         end
 
@@ -909,11 +949,17 @@ module Engine2
             super
             panel_template 'scaffold/view'
             panel_title LOCS[:view_title]
+            panel[:backdrop] = true
 
             menu(:panel_menu).option :cancel, icon: "remove"
             action.parent.*.menu(:item_menu).option action.name, icon: "file", button_loc: false
         end
 
+        def field_tabs hash
+            super
+            panel_template 'scaffold/view_tabs'
+        end
+
         def record handler, record
         end
 
@@ -1002,6 +1048,9 @@ module Engine2
         datetime: lambda{|meta, field, info|
             meta.info[field][:render].merge! date_format: info[:date_format], time_format: info[:time_format], date_model_format: info[:date_model_format], time_model_format: info[:time_model_format]
         },
+        currency: lambda{|meta, field, info|
+            meta.info[field][:render].merge! symbol: info[:symbol]
+        },
         # date_range: lambda{|meta, field, info|
         #     meta.info[field][:render].merge! other_date: info[:other_date], format: info[:format], model_format: info[:model_format]
         #     meta.hide_fields info[:other_date]
@@ -1024,14 +1073,10 @@ module Engine2
         },
         file_store: lambda{|meta, field, info|
             meta.info[field][:render].merge! multiple: info[:multiple]
-            # meta[:model] = meta.action.model.table_name
         },
         star_to_many_field: lambda{|meta, field, info|
             field_info = meta.info[field]
             field_info[:assoc] = :"#{info[:assoc_name]}!"
-            # meta.info[field][:render].merge! multiple: info[:multiple]
-            # field_info = meta.info[field]
-            # field_info[:resource] ||= "#{Handler::API}#{meta.model.namespace}/#{info[:assoc_name]}"
         }
     )
 
@@ -1067,15 +1112,7 @@ module Engine2
                 keys = info[:keys]
             else
                 meta.check_static_meta
-                model = Object.const_get(model.many_to_one_associations[field[/^\w+?(?=__)/].to_sym][:class_name])
-                # meta.action.define_action :"#{info[:assoc_name]}!" do # assoc_#{aname}
-                #     define_action :decode, DecodeEntryMeta, assoc: model.association_reflections[info[:assoc_name]] do
-                #         run_scheme :default_many_to_one
-                #     end
-                # end
-
-                # verify associations ?
-                # model = Model.models.fetch(field[/^\w+?(?=__)/].to_sym)
+                model = model.many_to_one_associations[field[/^\w+?(?=__)/].to_sym].associated_class
                 keys = info[:keys].map{|k| :"#{model.table_name}__#{k}"}
             end