engine2 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c0f307b0744d535f88e5d14eb1dd02369f0e4968514f6588f2de2c36227ebade
-  data.tar.gz: 9591533bcbb1f6dd0725ea9a4b9a28962bdc592ddb2f39def774e68542267f4c
+  metadata.gz: c7de9cf2c556b8224ab4bdf70f0fd45ddb3f2f5b54dac443eac49184fc553633
+  data.tar.gz: b515c7f5b0af25479c54fa6e9459a1484efbd99ce270e78ba206f7e11480ca67
 SHA512:
-  metadata.gz: c0084179549f50cea923512513d748a01bd68df8210b18d13ed941cc2742b8a35dc4bfeb0d39105008f3fb0cb8870354680e380e56131704ce9340f35ba7be1a
-  data.tar.gz: c75817e746bf7e47313bbd8b5e61e3b6e04e2ae79e5c3b40cea82947af0386b13346f3eda78b73f924412c26a76565449bbc59b6e4d6157303c7135660929895
+  metadata.gz: d8ff090077415370c9c1d885aa791462a2b44a69c4794be276016665e6d743ef15de579781becbb77ab02f43e17ed8bda3e1965b63052c237778bb5b230e10f9
+  data.tar.gz: 7cf93650cf3a106d54c95df0a49c7dd8a49e491f2e9185a45b8e14fa1577af77fc808b464c3c7e84ffaa2c2a20179d1c81f3cdd000987c8b4f3892e940b39f5a

data/app/engine2.coffee

@@ -4,15 +4,16 @@ require 'angular-animate'
 require 'angular-cookies'
 require 'angular-local-storage'
 require 'angular-ui-tree'
+require '@uirouter/core'
 require '@uirouter/angularjs'
 require 'ng-file-upload'
 require 'angular-load'
 require 'angular-drag-and-drop-lists'
-require 'ui-select'
+# require 'ui-select'
 
 _.templateSettings.interpolate = /{{([\s\S]+?)}}/g;
 
-angular.module('Engine2', ['ngSanitize', 'ngAnimate', 'ngCookies', 'mgcrea.ngStrap', 'ngFileUpload', 'ui.tree', 'LocalStorageModule', 'angularLoad', 'ngWebSocket', 'ui.router', 'dndLists', 'ui.select'])
+angular.module('Engine2', ['ngSanitize', 'ngAnimate', 'ngCookies', 'mgcrea.ngStrap', 'ngFileUpload', 'ui.tree', 'LocalStorageModule', 'angularLoad', 'ngWebSocket', 'ui.router', 'dndLists']) # 'ui.select'
 .config ($httpProvider, $compileProvider, localStorageServiceProvider, $logProvider, $qProvider, $locationProvider, $provide) ->
     $httpProvider.interceptors.push 'e2HttpInterceptor'
     $provide.decorator '$httpBackend', ($delegate) ->
@@ -354,9 +355,10 @@ angular.module('Engine2', ['ngSanitize', 'ngAnimate', 'ngCookies', 'mgcrea.ngStr
                     title = if info.title then "title=\"#{info.title}\"" else ""
                     if info.sort
                         thead += "<a ng-click=\"action.order('#{f}')\" #{title}><strong>#{info.loc}</strong></a>"
-                        if action.ui.order == f
-                            cls = if action.ui.asc then "glyphicon-chevron-up" else "glyphicon-chevron-down"
-                            thead += " <span class=\"glyphicon #{cls}\"></span>"
+                        thead += if action.ui.order == f
+                            " <span class=\"fa fa-arrow-#{if action.ui.asc then "up" else "down"}\"></span>"
+                        else
+                            " <span class=\"fa fa-sort\"></span>"
                     else
                         thead += "<span #{title}>#{info.loc}</span>"
                     thead += "</th>"

data/config.coffee

@@ -10,7 +10,7 @@ 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"]
+        # "ui-select": ["dist/select.css"]
 
   modules:
     definition: 'commonjs'

data/engine2.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
     spec.homepage      = "http://none.for.now"
     spec.license       = 'MIT'
 
-    spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+    spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR) rescue []
     spec.require_paths = ["lib"]
 
     spec.add_dependency "sequel", '~> 5'
@@ -26,6 +26,6 @@ Gem::Specification.new do |spec|
     spec.add_dependency 'slim', '~> 4.0'
     spec.add_dependency 'faye-websocket', '~> 0.10'
 
-    spec.add_development_dependency "bundler", "~> 1.11"
+    spec.add_development_dependency "bundler", "~> 2.00"
     spec.add_development_dependency "rake", "~> 12"
 end

data/lib/engine2/action.rb

@@ -378,12 +378,8 @@ module Engine2
 
             case at
             when :list #, :star_to_many_list, :many_to_one_list # list dropdowns
-                divider = false
                 model.one_to_many_associations.merge(model.many_to_many_associations).each do |assoc_name, assoc|
                     unless assoc[:propagate] == false
-                        menu(:item_menu).divider unless divider
-                        divider ||= true
-                        menu(:item_menu).option :"#{assoc_name}!", icon: "list" # , click: "action.show_assoc($index, \"#{assoc_name}!\")"
                         node.run_scheme :star_to_many, :"#{assoc_name}!", assoc
                     end
                 end
@@ -907,6 +903,7 @@ module Engine2
                                 nd.confirm_unlink.unlink.*.invoke_unlink_db(handler, record.primary_key_values, hash[:unlink].to_a) unless hash[:unlink].to_a.empty?
                             end
                         end
+                        after_save(handler, record)
                         result
                     end
                 end
@@ -928,6 +925,9 @@ module Engine2
                 end
             end
         end
+
+        def after_save handler, record
+        end
     end
 
     module ActionInsertSupport

data/lib/engine2/action_node.rb

@@ -171,6 +171,7 @@ module Engine2
             end
 
             thefts = 0
+            panels = 0
             each_node do |node|
                 action = node.*
                 model = action.assets[:model]
@@ -193,12 +194,14 @@ module Engine2
             end
 
             each_node do |node|
-                node.*.post_run
-                node.*.freeze_action
+                meta = node.*
+                meta.post_run
+                meta.freeze_action
+                panels += 1 if node.*.is_a? ActionPanelSupport
                 true
             end
 
-            ::Kernel::puts "ACTION NODES: #{ActionNode.count}, Time: #{::Time.now - time}, Thefts: #{thefts}"
+            ::Kernel::puts "ACTION NODES: #{ActionNode.count}, Panels: #{panels},  Time: #{::Time.now - time}, Thefts: #{thefts}"
         end
 
         def p *args

data/lib/engine2/handler.rb

@@ -119,8 +119,10 @@ module Engine2
             slim name.to_sym
         end
 
-        set :slim, pretty: true, sort_attrs: false
-        set :sessions, expire_after: 3600 # , :httponly => true, :secure => production?
+        production = environment == :production
+
+        set :slim, pretty: !production, sort_attrs: false
+        set :sessions, expire_after: 3600, httponly: production # , secure: production
 
         helpers do
             def find_template(views, name, engine, &block)

data/lib/engine2/scheme.rb

@@ -132,11 +132,11 @@ module Engine2
             end
         end
 
-        define_scheme :star_to_many do |act, assoc, model|
+        define_scheme :star_to_many do |assoc_name, assoc, model|
+            action.menu(:item_menu).option assoc_name, icon: "list" # , click: "action.show_assoc($index, \"#{assoc_name}!\")"
             options = assoc[:options] || Schemes::LINK
-            define_node act, StarToManyListAction, model: model, assoc: assoc do
+            define_node assoc_name, StarToManyListAction, model: model, assoc: assoc do
                 options.each{|k, v| run_scheme(k) if v}
-
                 define_node_bundle :form, :create, :modify if options[:create] && options[:modify]
             end
         end

data/lib/engine2/version.rb

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

data/package.json

@@ -9,31 +9,31 @@
     "build": "brunch build --production"
   },
   "dependencies": {
-    "@uirouter/angularjs": "^1.0.5",
-    "angular": "^1.7.5",
-    "angular-animate": "^1.7.5",
-    "angular-cookies": "^1.7.5",
+    "@uirouter/angularjs": "^1.0.22",
+    "@uirouter/core": "^5.0.23",
+    "angular": "^1.7.8",
+    "angular-animate": "^1.7.8",
+    "angular-cookies": "^1.7.8",
     "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.7.5",
+    "angular-sanitize": "^1.7.8",
     "angular-ui-tree": "^2.22.0",
-    "bootstrap": "^3.3.0",
+    "bootstrap": "^3.4.1",
     "bootstrap-additions": "0.3.1",
-    "fork-awesome": "^1.1.5",
+    "fork-awesome": "^1.1.7",
     "lodash": "^4.17.11",
     "ng-file-upload": "^12.2.0",
-    "push.js": "^1.0.8",
-    "ui-select": "^0.19.8"
+    "push.js": "^1.0.9"
   },
   "devDependencies": {
     "auto-reload-brunch": "^2.7.1",
-    "bower": "~1.8.0",
+    "bower": "^1.8.8",
     "brunch": "^2.10.0",
     "clean-css-brunch": "^2.0.0",
     "coffee-script-brunch": "^2.10.2",
-    "copycat-brunch": "^1.1.0",
+    "copycat-brunch": "^1.1.1",
     "css-brunch": "^2.6.1",
     "javascript-brunch": "^2.0.0",
     "ng-annotate-brunch": "^1.7.2",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: engine2
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - lopex
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-25 00:00:00.000000000 Z
+date: 2019-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.00'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.00'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -247,8 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Tree based routing framework with scaffolding support