engine2 1.0.7 → 1.0.8
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/engine2.coffee +7 -5
- data/config.coffee +1 -1
- data/engine2.gemspec +2 -2
- data/lib/engine2/action.rb +4 -4
- data/lib/engine2/action_node.rb +6 -3
- data/lib/engine2/handler.rb +4 -2
- data/lib/engine2/scheme.rb +3 -3
- data/lib/engine2/version.rb +1 -1
- data/package.json +11 -11
- metadata +5 -6
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: c7de9cf2c556b8224ab4bdf70f0fd45ddb3f2f5b54dac443eac49184fc553633
|
4
|
+
data.tar.gz: b515c7f5b0af25479c54fa6e9459a1484efbd99ce270e78ba206f7e11480ca67
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: d8ff090077415370c9c1d885aa791462a2b44a69c4794be276016665e6d743ef15de579781becbb77ab02f43e17ed8bda3e1965b63052c237778bb5b230e10f9
|
7
|
+
data.tar.gz: 7cf93650cf3a106d54c95df0a49c7dd8a49e491f2e9185a45b8e14fa1577af77fc808b464c3c7e84ffaa2c2a20179d1c81f3cdd000987c8b4f3892e940b39f5a
|
data/app/engine2.coffee
CHANGED
@@ -4,15 +4,16 @@ require 'angular-animate'
|
|
4
4
|
require 'angular-cookies'
|
5
5
|
require 'angular-local-storage'
|
6
6
|
require 'angular-ui-tree'
|
7
|
+
require '@uirouter/core'
|
7
8
|
require '@uirouter/angularjs'
|
8
9
|
require 'ng-file-upload'
|
9
10
|
require 'angular-load'
|
10
11
|
require 'angular-drag-and-drop-lists'
|
11
|
-
require 'ui-select'
|
12
|
+
# require 'ui-select'
|
12
13
|
|
13
14
|
_.templateSettings.interpolate = /{{([\s\S]+?)}}/g;
|
14
15
|
|
15
|
-
angular.module('Engine2', ['ngSanitize', 'ngAnimate', 'ngCookies', 'mgcrea.ngStrap', 'ngFileUpload', 'ui.tree', 'LocalStorageModule', 'angularLoad', 'ngWebSocket', 'ui.router', 'dndLists'
|
16
|
+
angular.module('Engine2', ['ngSanitize', 'ngAnimate', 'ngCookies', 'mgcrea.ngStrap', 'ngFileUpload', 'ui.tree', 'LocalStorageModule', 'angularLoad', 'ngWebSocket', 'ui.router', 'dndLists']) # 'ui.select'
|
16
17
|
.config ($httpProvider, $compileProvider, localStorageServiceProvider, $logProvider, $qProvider, $locationProvider, $provide) ->
|
17
18
|
$httpProvider.interceptors.push 'e2HttpInterceptor'
|
18
19
|
$provide.decorator '$httpBackend', ($delegate) ->
|
@@ -354,9 +355,10 @@ angular.module('Engine2', ['ngSanitize', 'ngAnimate', 'ngCookies', 'mgcrea.ngStr
|
|
354
355
|
title = if info.title then "title=\"#{info.title}\"" else ""
|
355
356
|
if info.sort
|
356
357
|
thead += "<a ng-click=\"action.order('#{f}')\" #{title}><strong>#{info.loc}</strong></a>"
|
357
|
-
if action.ui.order == f
|
358
|
-
|
359
|
-
|
358
|
+
thead += if action.ui.order == f
|
359
|
+
" <span class=\"fa fa-arrow-#{if action.ui.asc then "up" else "down"}\"></span>"
|
360
|
+
else
|
361
|
+
" <span class=\"fa fa-sort\"></span>"
|
360
362
|
else
|
361
363
|
thead += "<span #{title}>#{info.loc}</span>"
|
362
364
|
thead += "</th>"
|
data/config.coffee
CHANGED
@@ -10,7 +10,7 @@ exports.config =
|
|
10
10
|
"angular-motion": ["dist/angular-motion.css"]
|
11
11
|
"angular-ui-tree": ["dist/angular-ui-tree.css"]
|
12
12
|
"fork-awesome": ["css/fork-awesome.css"]
|
13
|
-
"ui-select": ["dist/select.css"]
|
13
|
+
# "ui-select": ["dist/select.css"]
|
14
14
|
|
15
15
|
modules:
|
16
16
|
definition: 'commonjs'
|
data/engine2.gemspec
CHANGED
@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
|
|
13
13
|
spec.homepage = "http://none.for.now"
|
14
14
|
spec.license = 'MIT'
|
15
15
|
|
16
|
-
spec.files = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
|
16
|
+
spec.files = `git ls-files`.split($INPUT_RECORD_SEPARATOR) rescue []
|
17
17
|
spec.require_paths = ["lib"]
|
18
18
|
|
19
19
|
spec.add_dependency "sequel", '~> 5'
|
@@ -26,6 +26,6 @@ Gem::Specification.new do |spec|
|
|
26
26
|
spec.add_dependency 'slim', '~> 4.0'
|
27
27
|
spec.add_dependency 'faye-websocket', '~> 0.10'
|
28
28
|
|
29
|
-
spec.add_development_dependency "bundler", "~>
|
29
|
+
spec.add_development_dependency "bundler", "~> 2.00"
|
30
30
|
spec.add_development_dependency "rake", "~> 12"
|
31
31
|
end
|
data/lib/engine2/action.rb
CHANGED
@@ -378,12 +378,8 @@ module Engine2
|
|
378
378
|
|
379
379
|
case at
|
380
380
|
when :list #, :star_to_many_list, :many_to_one_list # list dropdowns
|
381
|
-
divider = false
|
382
381
|
model.one_to_many_associations.merge(model.many_to_many_associations).each do |assoc_name, assoc|
|
383
382
|
unless assoc[:propagate] == false
|
384
|
-
menu(:item_menu).divider unless divider
|
385
|
-
divider ||= true
|
386
|
-
menu(:item_menu).option :"#{assoc_name}!", icon: "list" # , click: "action.show_assoc($index, \"#{assoc_name}!\")"
|
387
383
|
node.run_scheme :star_to_many, :"#{assoc_name}!", assoc
|
388
384
|
end
|
389
385
|
end
|
@@ -907,6 +903,7 @@ module Engine2
|
|
907
903
|
nd.confirm_unlink.unlink.*.invoke_unlink_db(handler, record.primary_key_values, hash[:unlink].to_a) unless hash[:unlink].to_a.empty?
|
908
904
|
end
|
909
905
|
end
|
906
|
+
after_save(handler, record)
|
910
907
|
result
|
911
908
|
end
|
912
909
|
end
|
@@ -928,6 +925,9 @@ module Engine2
|
|
928
925
|
end
|
929
926
|
end
|
930
927
|
end
|
928
|
+
|
929
|
+
def after_save handler, record
|
930
|
+
end
|
931
931
|
end
|
932
932
|
|
933
933
|
module ActionInsertSupport
|
data/lib/engine2/action_node.rb
CHANGED
@@ -171,6 +171,7 @@ module Engine2
|
|
171
171
|
end
|
172
172
|
|
173
173
|
thefts = 0
|
174
|
+
panels = 0
|
174
175
|
each_node do |node|
|
175
176
|
action = node.*
|
176
177
|
model = action.assets[:model]
|
@@ -193,12 +194,14 @@ module Engine2
|
|
193
194
|
end
|
194
195
|
|
195
196
|
each_node do |node|
|
196
|
-
node
|
197
|
-
|
197
|
+
meta = node.*
|
198
|
+
meta.post_run
|
199
|
+
meta.freeze_action
|
200
|
+
panels += 1 if node.*.is_a? ActionPanelSupport
|
198
201
|
true
|
199
202
|
end
|
200
203
|
|
201
|
-
::Kernel::puts "ACTION NODES: #{ActionNode.count}, Time: #{::Time.now - time}, Thefts: #{thefts}"
|
204
|
+
::Kernel::puts "ACTION NODES: #{ActionNode.count}, Panels: #{panels}, Time: #{::Time.now - time}, Thefts: #{thefts}"
|
202
205
|
end
|
203
206
|
|
204
207
|
def p *args
|
data/lib/engine2/handler.rb
CHANGED
@@ -119,8 +119,10 @@ module Engine2
|
|
119
119
|
slim name.to_sym
|
120
120
|
end
|
121
121
|
|
122
|
-
|
123
|
-
|
122
|
+
production = environment == :production
|
123
|
+
|
124
|
+
set :slim, pretty: !production, sort_attrs: false
|
125
|
+
set :sessions, expire_after: 3600, httponly: production # , secure: production
|
124
126
|
|
125
127
|
helpers do
|
126
128
|
def find_template(views, name, engine, &block)
|
data/lib/engine2/scheme.rb
CHANGED
@@ -132,11 +132,11 @@ module Engine2
|
|
132
132
|
end
|
133
133
|
end
|
134
134
|
|
135
|
-
define_scheme :star_to_many do |
|
135
|
+
define_scheme :star_to_many do |assoc_name, assoc, model|
|
136
|
+
action.menu(:item_menu).option assoc_name, icon: "list" # , click: "action.show_assoc($index, \"#{assoc_name}!\")"
|
136
137
|
options = assoc[:options] || Schemes::LINK
|
137
|
-
define_node
|
138
|
+
define_node assoc_name, StarToManyListAction, model: model, assoc: assoc do
|
138
139
|
options.each{|k, v| run_scheme(k) if v}
|
139
|
-
|
140
140
|
define_node_bundle :form, :create, :modify if options[:create] && options[:modify]
|
141
141
|
end
|
142
142
|
end
|
data/lib/engine2/version.rb
CHANGED
data/package.json
CHANGED
@@ -9,31 +9,31 @@
|
|
9
9
|
"build": "brunch build --production"
|
10
10
|
},
|
11
11
|
"dependencies": {
|
12
|
-
"@uirouter/angularjs": "^1.0.
|
13
|
-
"
|
14
|
-
"angular
|
15
|
-
"angular-
|
12
|
+
"@uirouter/angularjs": "^1.0.22",
|
13
|
+
"@uirouter/core": "^5.0.23",
|
14
|
+
"angular": "^1.7.8",
|
15
|
+
"angular-animate": "^1.7.8",
|
16
|
+
"angular-cookies": "^1.7.8",
|
16
17
|
"angular-drag-and-drop-lists": "^2.1.0",
|
17
18
|
"angular-load": "^0.5.0",
|
18
19
|
"angular-local-storage": "^0.7.0",
|
19
20
|
"angular-motion": "^0.4.0",
|
20
|
-
"angular-sanitize": "^1.7.
|
21
|
+
"angular-sanitize": "^1.7.8",
|
21
22
|
"angular-ui-tree": "^2.22.0",
|
22
|
-
"bootstrap": "^3.
|
23
|
+
"bootstrap": "^3.4.1",
|
23
24
|
"bootstrap-additions": "0.3.1",
|
24
|
-
"fork-awesome": "^1.1.
|
25
|
+
"fork-awesome": "^1.1.7",
|
25
26
|
"lodash": "^4.17.11",
|
26
27
|
"ng-file-upload": "^12.2.0",
|
27
|
-
"push.js": "^1.0.
|
28
|
-
"ui-select": "^0.19.8"
|
28
|
+
"push.js": "^1.0.9"
|
29
29
|
},
|
30
30
|
"devDependencies": {
|
31
31
|
"auto-reload-brunch": "^2.7.1",
|
32
|
-
"bower": "
|
32
|
+
"bower": "^1.8.8",
|
33
33
|
"brunch": "^2.10.0",
|
34
34
|
"clean-css-brunch": "^2.0.0",
|
35
35
|
"coffee-script-brunch": "^2.10.2",
|
36
|
-
"copycat-brunch": "^1.1.
|
36
|
+
"copycat-brunch": "^1.1.1",
|
37
37
|
"css-brunch": "^2.6.1",
|
38
38
|
"javascript-brunch": "^2.0.0",
|
39
39
|
"ng-annotate-brunch": "^1.7.2",
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: engine2
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.0.
|
4
|
+
version: 1.0.8
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- lopex
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2019-03-20 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: sequel
|
@@ -86,14 +86,14 @@ dependencies:
|
|
86
86
|
requirements:
|
87
87
|
- - "~>"
|
88
88
|
- !ruby/object:Gem::Version
|
89
|
-
version: '
|
89
|
+
version: '2.00'
|
90
90
|
type: :development
|
91
91
|
prerelease: false
|
92
92
|
version_requirements: !ruby/object:Gem::Requirement
|
93
93
|
requirements:
|
94
94
|
- - "~>"
|
95
95
|
- !ruby/object:Gem::Version
|
96
|
-
version: '
|
96
|
+
version: '2.00'
|
97
97
|
- !ruby/object:Gem::Dependency
|
98
98
|
name: rake
|
99
99
|
requirement: !ruby/object:Gem::Requirement
|
@@ -247,8 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
247
247
|
- !ruby/object:Gem::Version
|
248
248
|
version: '0'
|
249
249
|
requirements: []
|
250
|
-
|
251
|
-
rubygems_version: 2.7.6
|
250
|
+
rubygems_version: 3.0.2
|
252
251
|
signing_key:
|
253
252
|
specification_version: 4
|
254
253
|
summary: Tree based routing framework with scaffolding support
|