engine2 1.0.3 → 1.0.4

data/lib/engine2/meta/array_meta.rb

@@ -0,0 +1,82 @@
+# coding: utf-8
+
+module Engine2
+    class ArrayListMeta < Meta
+        meta_type :list
+        include MetaListSupport
+
+        (DefaultFilters ||= {}).merge!(
+            exact: lambda{|entries, name, value, type_info, hash|
+                entries.select{|e|e[name] == value}
+            },
+            string: lambda{|entries, name, value, type_info, hash|
+                entries.select{|e|e[name].to_s[value]}
+            },
+            boolean: lambda{|*args| DefaultFilters[:exact].(*args)},
+            integer: lambda{|entries, name, value, type_info, hash|
+                if value.is_a? Hash
+                    from, to = value[:from], value[:to]
+                    if from && to
+                        entries.select{|e|e[name] >= from.to_i && e[name] <= to.to_i}
+                    else
+                        entries.select{|e| from ? e[name] >= from.to_i : e[name] <= to.to_i}
+                    end
+                elsif value.is_a? Integer
+                    entries.select{|e|e[name] == value.to_i}
+                else
+                    nil
+                end
+            }
+        )
+
+        def data_source handler
+            []
+        end
+
+        def invoke handler
+            params = handler.params
+            # if params[:initial] || params[:refresh]
+            entries = data_source(handler)
+
+            per_page = lookup(:config, :per_page)
+            page = params[:page].to_i
+            handler.permit page >= 0 && page < 1000
+
+            if order_str = params[:order]
+                order = order_str.to_sym
+                handler.permit lookup(:info, order, :sort)
+                entries = entries.sort_by{|e|e[order].to_s}
+                entries = entries.reverse if params[:asc] == "true"
+            end
+
+            if search = params[:search]
+                entries = list_search(entries, handler, search)
+            end
+
+            {entries: entries.drop(page).take(per_page), count: entries.size}
+        end
+
+        def list_search entries, handler, search
+            hash = JSON.parse(search, symbolize_names: true) rescue handler.halt_forbidden
+            model = assets[:model]
+            sfields = lookup(:search_fields)
+            handler.permit sfields
+            hash.each_pair do |name, value|
+                handler.permit sfields.include?(name)
+
+                type_info = get_type_info(name)
+                entries = if filter = (@filters && @filters[name]) || (dynamic? && (static.filters && static.filters[name]))
+                    filter.(entries, hash, handler)
+                elsif filter = DefaultFilters[type_info[:otype]]
+                    filter.(entries, name, value, type_info, hash)
+                else
+                    raise E2Error.new("Filter not found for field '#{name}' in model '#{model}'") unless filter
+                end
+
+                handler.permit entries
+            end
+
+            entries
+        end
+    end
+end

data/lib/engine2/meta/decode_meta.rb

@@ -36,7 +36,7 @@ module Engine2
                 decode = assoc[:model].type_info[assoc[:keys].first][:decode]
                 if decode[:search][:multiple]
                     show_max_selected 3
-                    @meta[:decode_selected] = LOCS[:decode_selected]
+                    loc! decode_selected: LOCS[:decode_selected]
                 end
             end
         end

data/lib/engine2/meta/infra_meta.rb

@@ -18,7 +18,7 @@ module Engine2
 
                 @meta_type = :infra
 
-                def invoke handler
+                define_invoke do |handler|
                     user = handler.user
                     {user: user ? user.to_hash : nil}
                 end
@@ -41,40 +41,35 @@ module Engine2
                     extend MetaPanelSupport, MetaMenuSupport
                     modal_action
                     panel_template 'infra/inspect'
-                    panel_title "Inspect"
+                    panel_title "#{:wrench.icon} Inspect"
                     panel_class "modal-huge"
+                    panel[:backdrop] = true
                     menu(:panel_menu).option :cancel, icon: "remove"
-
-                    # def invoke handler;{};end
                 end
                 define_action :inspect do
                     self.* do
                         @meta_type = :inspect
                     end
 
-                    define_action :models do
-                        def (self.*).invoke handler
-                            {models: Sequel::DATABASES.map{|db| {name: db.uri, models: db.models.keys} }}
-                        end
+                    define_action_invoke :models do |handler|
+                        {models: Sequel::DATABASES.map{|db| {name: db.uri, models: db.models.keys} }}
                     end
 
-                    define_action :model_info do
-                        def (self.*).invoke handler
-                            db_name = handler.params[:db]
-                            handler.permit db = Sequel::DATABASES.find{|d|d.uri == db_name || (d.uri && d.uri.start_with?(db_name))}
-                            handler.permit model = db.models[handler.params[:model].to_sym]
-                            {
-                                model!: {
-                                    info: {
-                                        name: model.to_s,
-                                        table: model.table_name
-                                    },
-                                    assoc: model.association_reflections,
-                                    schema: model.db_schema,
-                                    type_info: model.type_info
-                                }
+                    define_action_invoke :model_info do |handler|
+                        db_name = handler.params[:db]
+                        handler.permit db = Sequel::DATABASES.find{|d|d.uri == db_name || (d.uri && d.uri.start_with?(db_name))}
+                        handler.permit model = db.models[handler.params[:model].to_sym]
+                        {
+                            model!: {
+                                info: {
+                                    name: model.to_s,
+                                    table: model.table_name
+                                },
+                                assoc: model.association_reflections,
+                                schema: model.db_schema,
+                                type_info: model.type_info
                             }
-                        end
+                        }
                     end
                 end
             end
@@ -189,7 +184,7 @@ module Engine2
 
             inf = model.type_info[field]
             assoc = model.association_reflections[inf[:assoc_name]]
-            blob_model = Object.const_get(assoc[:class_name])
+            blob_model = assoc.associated_class
 
             rec = model.naked.select(assoc[:key]).where(model.primary_keys_hash(split_keys(id))).first
             handler.permit rec
@@ -208,7 +203,7 @@ module Engine2
             model = action.parent.*.model
             inf = model.type_info[action.parent.*.field]
             assoc = model.association_reflections[inf[:assoc_name]]
-            blob_model = Object.const_get(assoc[:class_name])
+            blob_model = assoc.associated_class
             handler.permit id = handler.params[:id]
             rec = model.naked.select(assoc[:key]).where(model.primary_keys_hash(split_keys(id))).first
             handler.permit rec

data/lib/engine2/meta/list_meta.rb

@@ -48,8 +48,7 @@ module Engine2
                             if keys.length == 1
                                 query.where(name => value)
                             else
-                                query.where(keys.map{|k| hash[k]}.transpose.map{|vals| Hash[keys.zip(vals)]}.inject{|q, c| q | c
-                                })
+                                query.where(keys.map{|k| hash[k]}.transpose.map{|vals| Hash[keys.zip(vals)]}.inject{|q, c| q | c})
                             end
                         when :list_select
                             query.where(name => value) # decode in sql query ?
@@ -123,7 +122,7 @@ module Engine2
                     name = model.type_info[name] ? name.qualify(model.table_name) : Sequel.expr(name)
                     filter.(query, name, value, type_info, hash)
                 else
-                    raise E2Error.new("Filter not found for field #{name} in model #{model}") unless filter
+                    raise E2Error.new("Filter not found for field '#{name}' in model '#{model}'") unless filter
                 end
 
                 handler.permit query

data/lib/engine2/model.rb

@@ -46,7 +46,7 @@ module Engine2
                 @model.primary_keys.each{|pk| (schema[pk]||={})[:primary_key] = true} if @model.primary_key
 
                 schema.each_pair do |name, db_info|
-                    @info[name] = {otype: db_info[:type]}
+                    @info[name] = {}
 
                     case db_info[:type]
                     when :integer
@@ -119,7 +119,7 @@ module Engine2
 
         def verify_associations
             one_to_many_associations.each do |name, assoc|
-                other = Object.const_get(assoc[:class_name])
+                other = assoc.associated_class
                 other_type_info = other.type_info
                 if other_keys = assoc[:keys]
                     other_keys.each do |key|
@@ -307,7 +307,7 @@ module Engine2
         foreign_blob_store: lambda{|record, field, info|
             if value = record.values[field] # attachment info
                 assoc = record.model.association_reflections[info[:assoc_name]]
-                blob_model = Object.const_get(assoc[:class_name])
+                blob_model = assoc.associated_class
                 file_fields = {info[:bytes_field] => :$data, info[:name_field] => :$name_field, info[:mime_field] => :$mime_field}
                 upload = info[:store][:upload]
                 file_data = {data: Sequel.blob(open("#{upload}/#{value[:rackname]}", "rb"){|f|f.read}), name_field: value[:name], mime_field: value[:mime]}
@@ -331,7 +331,7 @@ module Engine2
             value = record.values[field]
             if value && value.is_a?(Hash)
                 assoc = record.model.association_reflections[info[:assoc_name]]
-                other_model = Object.const_get(assoc[:class_name])
+                other_model = assoc.associated_class
                 unlinked = value[:unlinked]
                 linked = value[:linked]
                 parent_key = record.primary_key_values
@@ -383,7 +383,7 @@ module Engine2
             assoc = record.model.association_reflections[info[:assoc_name]]
             key = record.model.naked.select(assoc[:key]).where(record.model.primary_keys_hash(record.primary_key_values)).first
             if key
-                blob_model = Object.const_get(assoc[:class_name])
+                blob_model = assoc.associated_class
                 blob_model.where(blob_model.primary_key => key[assoc[:key]]).delete
             end
         }

data/lib/engine2/pre_bootstrap.rb

@@ -24,4 +24,12 @@ module Sequel
           end
         end
     end if defined?(JDBC::AS400)
-end if defined? JRUBY_VERSION
+
+    module SchemaCaching
+      def load_schema_cache(file)
+        @schemas = Marshal.load(File.read(file, mode: 'rb'))
+        nil
+      end
+    end
+
+end if defined? JRUBY_VERSION

data/lib/engine2/scheme.rb

@@ -190,5 +190,9 @@ module Engine2
             end
         end
 
+        define_scheme :array do |name, model|
+            define_action name, ArrayListMeta, model: model do
+            end
+        end
     end
 end

data/lib/engine2/type_info.rb

@@ -19,6 +19,7 @@ module Engine2
 
             info.merge!({
                 name: field,
+                otype: type,
                 type: type,
                 validations: {}
             })
@@ -67,6 +68,11 @@ module Engine2
             end
         end
 
+        def boolean_field field
+            define_field field, :boolean do |info|
+            end
+        end
+
         def date_field field, format, model_format
             define_field field, :date do |info|
                 info[:format] = format
@@ -247,9 +253,10 @@ module Engine2
             end
         end
 
-        def currency field
+        def currency field, symbol = LOCS[:currency_symbol]
             modify_field field do |info|
                 info[:type] = :currency
+                info[:symbol] = symbol
                 info[:validations][:currency] = true
             end
         end

data/lib/engine2/version.rb

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

data/package.json

@@ -0,0 +1,38 @@
+{
+  "name": "engine2",
+  "description": "engine2",
+  "version": "1.0.0",
+  "scripts": {
+    "postinstall": "bower install",
+    "dev": "brunch w",
+    "build": "brunch build --production"
+  },
+  "dependencies": {
+    "angular": "^1.5.8",
+    "angular-animate": "^1.5.8",
+    "angular-cookies": "^1.5.8",
+    "angular-local-storage": "0.1.5",
+    "angular-motion": "^0.4.0",
+    "angular-route": "^1.5.8",
+    "angular-sanitize": "^1.5.8",
+    "angular-ui-tree": "2.22.1",
+    "bootstrap": "^3.3.0",
+    "bootstrap-additions": "0.3.1",
+    "font-awesome": "~4.7.0",
+    "lodash": "~4.17.0",
+    "ng-file-upload": "12.2.12"
+  },
+  "devDependencies": {
+    "auto-reload-brunch": "^2.7.1",
+    "bower": "~1.8.0",
+    "brunch": "^2.9.1",
+    "clean-css-brunch": "^2.0.0",
+    "coffee-script-brunch": "^2.1.0",
+    "copycat-brunch": "^1.1.0",
+    "css-brunch": "^2.6.1",
+    "javascript-brunch": "^2.0.0",
+    "ng-annotate-brunch": "^1.7.2",
+    "replacement-brunch": "^2.0.4",
+    "uglify-js-brunch": "^2.0.1"
+  }
+}

data/views/fields/blob.slim

@@ -1,10 +1,9 @@
 e2-action action="[f + '_blob_store!']"
   .col-lg-11
-    div ng-init="info = action.meta.info[f]"
-      input [
-        type="hidden"
-        ng-model="action.record[f]"
-      ]
+    input [
+      type="hidden"
+      ng-model="action.record[f]"
+    ]
 
     div
       .progress.progress-striped

data/views/fields/bs_select.slim

@@ -2,9 +2,9 @@
   select [
     ng-model="action.record[f]"
     bs-options="v.id as v.value for v in values"
-    select-resource="action.meta.info[f].render.resource"
+    select-resource="info.render.resource"
     bs-select=""
-    ng-disabled="action.meta.info[f].disabled"
+    ng-disabled="info.disabled"
     class="form-control input-sm"
     e2-field=""
   ]

data/views/fields/bsselect_picker.slim

@@ -1,8 +1,7 @@
-e2-action action="[action.meta.info[f].assoc, 'list']"
+e2-action action="[info.assoc, 'list']"
   .col-lg-7.col-md-8.col-sm-12
     button.btn.btn-default.btn-sm [
       type="button"
-      ng-init="info = action.meta.info[f]"
       ng-model="action.selected"
       bs-options="v.id as v.value for v in action.values"
       ng-change="action.change()"

data/views/fields/bsselect_picker_opt.slim

@@ -1,9 +1,8 @@
-e2-action action="[action.meta.info[f].assoc, 'list']"
+e2-action action="[info.assoc, 'list']"
   .col-lg-7.col-md-12.col-sm-12
     .input-group.input-group-sm
       button.btn.btn-default.btn-sm [
         type="button"
-        ng-init="info = action.meta.info[f]"
         ng-model="action.selected"
         bs-options="v.id as v.value for v in action.values"
         ng-change="action.change()"

data/views/fields/checkbox.slim

@@ -1,7 +1,7 @@
 .col-lg-1
   .checkbox
     input [
-      ng-init="info = action.meta.info[f]; action.record[f] = action.record[f] || info.render.false_value"
+      ng-init="action.record[f] = action.record[f] || info.render.false_value"
       type="checkbox"
       ng-model="action.record[f]"
       ng-true-value="{{::info.render.true_value}}"

data/views/fields/checkbox_buttons.slim

@@ -1,5 +1,5 @@
 .col-lg-12
-  .btn-group.btn-group-sm ng-init="info = action.meta.info[f]; (action.record[f] === undefined) && (action.record[f] = info.render.false_value)" ng-model="action.record[f]" e2-field=""
+  .btn-group.btn-group-sm ng-init="(action.record[f] === undefined) && (action.record[f] = info.render.false_value)" ng-model="action.record[f]" e2-field=""
     a.btn.btn-default ng-class="action.record[f] === info.render.true_value && 'active'" ng-click="action.record[f] = info.render.true_value" ng-disabled="info.disabled"
       span.glyphicon.glyphicon-check
     a.btn.btn-default ng-class="action.record[f] === info.render.false_value && 'active'" ng-click="action.record[f] = info.render.false_value" ng-disabled="info.disabled"

data/views/fields/checkbox_buttons_opt.slim

@@ -1,5 +1,5 @@
 .col-lg-12
-  .btn-group.btn-group-sm ng-init="info = action.meta.info[f]" ng-model="action.record[f]" e2-field=""
+  .btn-group.btn-group-sm ng-model="action.record[f]" e2-field=""
     a.btn.btn-default ng-class="action.record[f] === info.render.true_value && 'active'" ng-click="action.record[f] = info.render.true_value" ng-disabled="info.disabled"
       span.glyphicon.glyphicon-check
     a.btn.btn-default ng-class="action.record[f] === info.render.false_value && 'active'" ng-click="action.record[f] = info.render.false_value" ng-disabled="info.disabled"

data/views/fields/currency.slim

@@ -4,7 +4,7 @@
       type="text"
       ng-model="action.record[f]"
       class="form-control"
-      ng-disabled="action.meta.info[f].disabled"
+      ng-disabled="info.disabled"
       e2-field=""
     ]
-    span.input-group-addon zł
+    span.input-group-addon ng-bind="info.render.symbol"

data/views/fields/date.slim

@@ -1,7 +1,6 @@
 .col-lg-3.col-md-3.col-sm-5
   .input-group.input-group-sm
     input.btn.btn-default [
-      ng-init="info = action.meta.info[f]"
       type="text"
       class="form-control"
       ng-model="value"

data/views/fields/date_range.slim

@@ -2,7 +2,6 @@
   .col-lg-3.col-md-3.col-sm-5
     .input-group.input-group-sm
       input.btn.btn-default [
-        ng-init="info = action.meta.info[f]"
         type="text"
         class="form-control"
         ng-model="value.from"