engine2 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58f23892775f4ae41feaedf7b372844c6524e8088262d51dd7b91e23ccd136c0
-  data.tar.gz: 3a9350c94bee76c210976c9f06edde30bfb3fec3c0ac56941f40889a193d3f7f
+  metadata.gz: c0f307b0744d535f88e5d14eb1dd02369f0e4968514f6588f2de2c36227ebade
+  data.tar.gz: 9591533bcbb1f6dd0725ea9a4b9a28962bdc592ddb2f39def774e68542267f4c
 SHA512:
-  metadata.gz: 73eb8d90f5701a83888592a80d33874db321756f2b003c3a0359ed2a456d317d38e4c11c307760ed98a708725135b6f03b92d06e2fc2bc2759351ecd8705a939
-  data.tar.gz: a8000d44c3092297f5a50c29ed4e4007e7f1190aefa34cc528b0e7c5375c3d1a0b7bf17321227a159c3585aee49eaf5d13120de7c884fad66e217f255a87d4ae
+  metadata.gz: c0084179549f50cea923512513d748a01bd68df8210b18d13ed941cc2742b8a35dc4bfeb0d39105008f3fb0cb8870354680e380e56131704ce9340f35ba7be1a
+  data.tar.gz: c75817e746bf7e47313bbd8b5e61e3b6e04e2ae79e5c3b40cea82947af0386b13346f3eda78b73f924412c26a76565449bbc59b6e4d6157303c7135660929895

data/app/actions.coffee

@@ -197,6 +197,9 @@ angular.module('Engine2')
         panel_menu_cancel: ->
             @panel_close()
 
+        panel_menu_close: ->
+            @panel_close()
+
         websocket_connect: ->
             l = $location
             ws_meta = @meta.websocket
@@ -244,6 +247,7 @@ angular.module('Engine2')
             @tree = actions: [name: 'api', number: 0, access: true]
             @invoke_action('models')
             @invoke_action('environment')
+            @local_storage = localStorageService
 
         open: (stack, node, collapsed, expand) ->
             tree = @tree

data/conf/message.yaml

@@ -52,6 +52,7 @@
 :save:                          Save
 :approve:                       Approve
 :cancel:                        Cancel
+:close:                         Close
 
 :inspect_modal:                 Inspect
 

data/conf/message_pl.yaml

@@ -52,6 +52,7 @@
 :save:                          Zapisz
 :approve:                       Zatwierdź
 :cancel:                        Anuluj
+:close:                         Zamknij
 
 :inspect_modal:                 Inspekcja
 

data/config.coffee

@@ -10,10 +10,12 @@ exports.config =
         "angular-motion": ["dist/angular-motion.css"]
         "angular-ui-tree": ["dist/angular-ui-tree.css"]
         "fork-awesome": ["css/fork-awesome.css"]
+        "ui-select": ["dist/select.css"]
 
   modules:
     definition: 'commonjs'
     wrapper: false
+    nameCleaner: (path) -> path
 
   paths:
     public: 'public'
@@ -42,7 +44,7 @@ exports.config =
     on: ["ng-annotate-brunch"]
 
     uglify:
-      mangle: true
+      mangle: false
       compress:
         global_defs:
           DEBUG: false

data/engine2.gemspec

@@ -18,14 +18,14 @@ Gem::Specification.new do |spec|
 
     spec.add_dependency "sequel", '~> 5'
     if defined? JRUBY_VERSION
-        spec.add_dependency 'jdbc-sqlite3', '~> 3.8'
+        spec.add_dependency 'jdbc-sqlite3', '~> 3.0'
     else
         spec.add_dependency 'sqlite3', '~> 1.3'
     end
     spec.add_dependency "sinatra", '~> 2.0'
-    spec.add_dependency 'slim', '~> 3.0'
+    spec.add_dependency 'slim', '~> 4.0'
     spec.add_dependency 'faye-websocket', '~> 0.10'
 
     spec.add_development_dependency "bundler", "~> 1.11"
-    spec.add_development_dependency "rake", "~> 11"
+    spec.add_development_dependency "rake", "~> 12"
 end

data/lib/engine2/action.rb

@@ -18,10 +18,13 @@ module Engine2
                 cls.http_method http_method
             end
 
-            def inherit
-                Class.new self do
+            def inherit &blk
+                cls = Class.new self do
                     action_type superclass.action_type
                 end
+
+                cls.instance_eval &blk if block_given?
+                cls
             end
         end
 
@@ -46,9 +49,19 @@ module Engine2
             raise E2Error.new("Static action required") if dynamic?
         end
 
+        def check_anonymous_action_class name
+            raise E2Error.new("Defining method '#{name}'' for named class '#{self.class}', consider using #inherit") if self.class.name
+        end
+
+        def define_method name, &blk
+            check_anonymous_action_class name
+            self.class.class_eval{define_method name, &blk}
+        end
+
         def define_invoke &blk
             check_static_action
-            self.class.class_eval{define_method :invoke, &blk}
+            define_method :invoke, &blk
+            # self.class.class_eval{define_method :invoke, &blk}
         end
 
         def invoke! handler
@@ -154,6 +167,10 @@ module Engine2
         def split_keys id
             Sequel::split_keys(id)
         end
+
+        def join_keys id
+            Sequel::join_keys(id)
+        end
     end
 
     module ActionWebSocketSupport
@@ -901,7 +918,7 @@ module Engine2
             records = hash[node_name].to_a
             unless records.empty?
                 action = node.parent[:"#{assoc_name}!"][node_name].approve.*
-                parent_id = Sequel::join_keys(record.primary_key_values)
+                parent_id = join_keys(record.primary_key_values)
                 records.each do |arec|
                     rec = action.allocate_record(handler, arec)
                     action.validate_and_approve(handler, rec, parent_id, false)
@@ -1099,7 +1116,7 @@ module Engine2
             panel_title "#{LOCS[:view_title]} - #{LOCS[assets[:model].table_name]}"
             panel[:backdrop] = true
 
-            menu(:panel_menu).option :cancel, icon: "remove"
+            menu(:panel_menu).option :close, icon: "remove"
             node.parent.*.menu(:item_menu).option node.name, icon: "file", button_loc: false
         end
 

data/lib/engine2/action/array.rb

@@ -11,7 +11,16 @@ module Engine2
                 entries.select{|e|e[name] == value}
             },
             string: lambda{|entries, name, value, type_info, hash|
-                entries.select{|e|e[name].to_s[value]}
+                if type_info[:type] == :list_select
+                    if type_info[:multiselect]
+                        entries.select{|e|value.include?(e[name].to_s)}
+                    else
+                        entries.select{|e|e[name].to_s == value}
+                    end
+                else
+                    entries.select{|e|e[name].to_s[value]}
+                end
+
             },
             boolean: lambda{|*args| DefaultFilters[:exact].(*args)},
             integer: lambda{|entries, name, value, type_info, hash|
@@ -34,6 +43,10 @@ module Engine2
             []
         end
 
+        def page_frame handler, entries
+            entries
+        end
+
         def invoke handler
             params = handler.params
             # if params[:initial] || params[:refresh]
@@ -54,7 +67,7 @@ module Engine2
                 entries = list_search(entries, handler, search)
             end
 
-            {entries: entries.drop(page).take(per_page), count: entries.size}
+            {entries: page_frame(handler, entries[page, per_page]), count: entries.size}
         end
 
         def list_search entries, handler, search

data/lib/engine2/action/delete.rb

@@ -22,7 +22,7 @@ module Engine2
                             unsupported_association assoc[:type]
                         end
 
-                        if assoc[:cascade] || from_assoc == assoc.associated_class.table_name
+                        if assoc[:delete] == :cascade || from_assoc == assoc.associated_class.table_name
                             ds.delete
                         else
                             raise Sequel::DestroyFailed.new("#{LOCS[:delete_restricted]}: #{name}") unless ds.empty?

data/lib/engine2/action/infra.rb

@@ -251,7 +251,7 @@ module Engine2
             panel_title "#{:wrench.icon} Inspect"
             panel_class "modal-huge"
             panel[:backdrop] = true
-            menu(:panel_menu).option :cancel, icon: "remove"
+            menu(:panel_menu).option :close, icon: "remove"
         end
     end
 

data/lib/engine2/action/list.rb

@@ -164,7 +164,7 @@ module Engine2
         action_type :star_to_many_list
         def pre_run
             super
-            menu(:panel_menu).option_at 0, :cancel, icon: "remove"
+            menu(:panel_menu).option_at 0, :close, icon: "remove"
             panel_title "#{:list.icon} #{LOCS[assets[:assoc][:name]]}"
         end
 
@@ -208,13 +208,14 @@ module Engine2
 
         def post_run
             super
+            nd = node.parent.nodes[:decode_entry]
             request do |h|
-                if h.initial? && nd = node.parent.nodes[:decode_entry]
+                if h.initial?
                     action = nd.*
-                    rec = action.invoke_decode(h, [[h.params[:parent_id]]]).first
+                    rec = action.invoke_decode(h, [split_keys(h.params[:parent_id])]).first
                     panel_title "#{static.panel[:title]} - #{action.meta[:decode_fields].map{|f|rec[f]}.join(action.meta[:separator])}"
                 end
-            end
+            end if nd
         end
     end
 
@@ -241,7 +242,7 @@ module Engine2
         def list_context query, handler
             changes = handler.param_to_json(:changes)
             model = assets[:model]
-            unlinked = changes[:unlink].to_a + changes[:delete].to_a + changes[:modify].to_a.map{|m|Sequel::join_keys(model.primary_keys.map{|k|m[k]})}
+            unlinked = changes[:unlink].to_a + changes[:delete].to_a + changes[:modify].to_a.map{|m|join_keys(model.primary_keys.map{|k|m[k]})}
             linked = changes[:link]
             query = super(query, handler)
 

data/lib/engine2/core.rb

@@ -141,6 +141,10 @@ class Symbol
     def q col
         col.qualify self
     end
+
+    def loc
+        Engine2::LOCS[self]
+    end
 end
 
 module Faye
@@ -199,6 +203,10 @@ module E2Model
     module InstanceMethods
         attr_accessor :skip_save_refresh, :validate_fields
 
+        def key? key
+            @values.key? key
+        end
+
         def has_primary_key?
             pk = self.pk
             pk.is_a?(Array) ? !pk.all?{|k|k.nil?} : !pk.nil?

data/lib/engine2/pre_bootstrap.rb

@@ -36,11 +36,4 @@ module Sequel
         end
     end if defined?(JDBC::AS400)
 
-    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

@@ -33,6 +33,14 @@ module Engine2
     SCHEMES.builtin.clear
     SCHEMES.instance_eval do
 
+        define_scheme :confirm do |name, action, options|
+            define_node :"confirm_#{name}", ConfirmAction do
+                self.*.panel_title options[:title]
+                self.*.message options[:message]
+                define_node name, action
+            end
+        end
+
         define_scheme :view do |name = :view|
             define_node name, ViewAction
         end
@@ -50,19 +58,13 @@ module Engine2
         end
 
         define_scheme :delete do
-            define_node :confirm_delete, ConfirmAction do
-                self.*.message LOCS[:delete_question]
-                self.*.panel_title LOCS[:confirm_delete_title]
-                define_node :delete, DeleteAction
-            end
+            run_scheme :confirm, :delete, DeleteAction,
+                message: LOCS[:delete_question], title: LOCS[:confirm_delete_title]
         end
 
         define_scheme :bulk_delete do
-            define_node :confirm_bulk_delete, ConfirmAction do
-                self.*.message LOCS[:delete_question]
-                self.*.panel_title LOCS[:confirm_bulk_delete_title]
-                define_node :bulk_delete, BulkDeleteAction
-            end
+            run_scheme :confirm, :bulk_delete, BulkDeleteAction,
+                message: LOCS[:delete_question], title: LOCS[:confirm_bulk_delete_title]
         end
 
         define_scheme :default do |name, model, options|
@@ -114,19 +116,13 @@ module Engine2
         # * to Many
         #
         define_scheme :star_to_many_unlink do
-            define_node :confirm_unlink, ConfirmAction do
-                self.*.message LOCS[:unlink_question]
-                self.*.panel_title LOCS[:confirm_unlink_title]
-                define_node :unlink, StarToManyUnlinkAction
-            end
+            run_scheme :confirm, :unlink, StarToManyUnlinkAction,
+                message: LOCS[:unlink_question], title: LOCS[:confirm_unlink_title]
         end
 
         define_scheme :star_to_many_bulk_unlink do
-            define_node :confirm_bulk_unlink, ConfirmAction do
-                self.*.message LOCS[:unlink_question]
-                self.*.panel_title LOCS[:confirm_bulk_unlink_title]
-                define_node :bulk_unlink, StarToManyBulkUnlinkAction
-            end
+            run_scheme :confirm, :bulk_unlink, StarToManyBulkUnlinkAction,
+                message: LOCS[:unlink_question], title: LOCS[:confirm_bulk_unlink_title]
         end
 
         define_scheme :star_to_many_link do

data/lib/engine2/version.rb

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

data/package.json

@@ -10,21 +10,21 @@
   },
   "dependencies": {
     "@uirouter/angularjs": "^1.0.5",
-    "angular": "^1.6.0",
-    "angular-animate": "^1.6.0",
-    "angular-cookies": "^1.6.0",
+    "angular": "^1.7.5",
+    "angular-animate": "^1.7.5",
+    "angular-cookies": "^1.7.5",
     "angular-drag-and-drop-lists": "^2.1.0",
     "angular-load": "^0.5.0",
     "angular-local-storage": "^0.7.0",
     "angular-motion": "^0.4.0",
-    "angular-sanitize": "^1.6.0",
+    "angular-sanitize": "^1.7.5",
     "angular-ui-tree": "^2.22.0",
     "bootstrap": "^3.3.0",
     "bootstrap-additions": "0.3.1",
-    "fork-awesome": "^1.0.1",
-    "lodash": "~4.17.0",
+    "fork-awesome": "^1.1.5",
+    "lodash": "^4.17.11",
     "ng-file-upload": "^12.2.0",
-    "push.js": "^1.0.1",
+    "push.js": "^1.0.8",
     "ui-select": "^0.19.8"
   },
   "devDependencies": {

data/views/infra/inspect.slim

@@ -89,6 +89,14 @@ e2-action action="'inspect'"
         .panel-body
           pre ng-bind="action.environment | json"
 
+    div title="Local storage" bs-pane=""
+      .panel.panel-default
+        .panel-body
+          pre ng-bind="action.local_storage | json"
+          pre ng-bind="action.local_storage.keys() | json"
+          a.btn.btn-default ng-click="action.local_storage.clearAll()"
+            | Clear
+
     div title="Diagnostics" bs-pane=""
       .panel.panel-default
         .panel-body

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: engine2
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - lopex
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-25 00:00:00.000000000 Z
+date: 2018-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: faye-websocket
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '12'
 description: Tree based routing framework with scaffolding support
 email:
 - lopx@gazeta.pl
@@ -248,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 3.0.0.beta1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Tree based routing framework with scaffolding support