engine2 1.0.3 → 1.0.4

data/views/scaffold/view_tabs.slim

@@ -0,0 +1,11 @@
+div
+  div bs-tabs="" bs-active-pane="action.activeTab" ng-init="action.activeTab = 0"
+    div ng-repeat="t in ::action.meta.tabs" title="{{::t.loc}}" bs-pane=""
+      br
+      table.table.table-striped.table-condensed.table-hover
+        tr ng-repeat="f in t.fields" ng-hide="::action.meta.info[f].hidden"
+          td ng-bind="::action.meta.info[f].loc"
+          td
+            div ng-bind-html="action.view_cell(action.record, f)"
+
+  span ng-if="::action.alert": .alert.alert-danger ng-bind="action.alert"

data/views/search_fields/bsmselect_picker.slim

@@ -1,10 +1,9 @@
-e2-action action="[action.meta.info[f].assoc, 'list']"
+e2-action action="[info.assoc, 'list']"
   .col-lg-3.col-md-4.col-sm-5
     .form-group
       .input-group.input-group-sm
         button.btn.btn-default [
           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/search_fields/bsselect_picker.slim

@@ -1,10 +1,9 @@
-e2-action action="[action.meta.info[f].assoc, 'list']"
+e2-action action="[info.assoc, 'list']"
   .col-lg-3.col-md-4.col-sm-5
     .form-group
       .input-group.input-group-sm
         button.btn.btn-default [
           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/search_fields/checkbox.slim

@@ -1,11 +1,11 @@
 input [
   type="checkbox"
   ng-model="action.query.search[f]"
-  ng-true-value="{{::action.meta.info[f].render.true_value}}"
-  ng-false-value="{{::action.meta.info[f].render.false_value}}"
+  ng-true-value="{{::info.render.true_value}}"
+  ng-false-value="{{::info.render.false_value}}"
 
   xe2-search-field=""
 ]
 
-/ ng-false-value="{{action.meta.info[f].render.false_value}}"
+/ ng-false-value="{{info.render.false_value}}"
 / ng-init="action.record[f] = '0'"

data/views/search_fields/checkbox2.slim

@@ -4,11 +4,11 @@
     bs-buttons-radio=""
     ng-change="action.search_field_change(f)"
   ]
-    button.btn.btn-default type="button" value="{{action.meta.info[f].render.true_value}}": span.glyphicon.glyphicon-ok
-    button.btn.btn-default type="button" value="{{action.meta.info[f].render.false_value}}": span.glyphicon.glyphicon-remove
+    button.btn.btn-default type="button" value="{{info.render.true_value}}": span.glyphicon.glyphicon-ok
+    button.btn.btn-default type="button" value="{{info.render.false_value}}": span.glyphicon.glyphicon-remove
     button.btn.btn-default type="button" ng-disabled="!action.query.search[f]": span.glyphicon.glyphicon-off
-  span ng-bind="::action.meta.info[f].loc"
+  span ng-bind="::info.loc"
 
-/input type="checkbox" id="{{f}}" ng-model="action.query.search[f]" ng-true-value="{{action.meta.info[f].render.true_value}}" ng-false-value="{{action.meta.info[f].render.false_value}}"
-/ ng-false-value="{{action.meta.info[f].render.false_value}}"
+/input type="checkbox" id="{{f}}" ng-model="action.query.search[f]" ng-true-value="{{info.render.true_value}}" ng-false-value="{{info.render.false_value}}"
+/ ng-false-value="{{info.render.false_value}}"
 / ng-init="action.record[f] = '0'"

data/views/search_fields/checkbox_buttons.slim

@@ -1,10 +1,10 @@
 .col-lg-3.col-md-3.col-sm-3
   .form-group
-    .btn-group.btn-group-sm ng-init="info = action.meta.info[f]" xe2-search-field=""
+    .btn-group.btn-group-sm xe2-search-field=""
       a.btn.btn-default ng-class="action.query.search[f] == info.render.true_value && 'active'" ng-click="action.query.search[f] = info.render.true_value; action.search_field_change(f)"
         span.glyphicon.glyphicon-ok
       a.btn.btn-default ng-class="action.query.search[f] == info.render.false_value && 'active'" ng-click="action.query.search[f] = info.render.false_value; action.search_field_change(f)"
         span.glyphicon.glyphicon-remove
       a.btn.btn-default ng-disabled="action.query.search[f] == null" ng-click="action.query.search[f] = null; action.search_field_change(f)"
-        span ng-bind="::action.meta.info[f].loc"
+        span ng-bind="::info.loc"
         span.glyphicon.glyphicon-off<

data/views/search_fields/date_range.slim

@@ -3,7 +3,6 @@ span ng-init="action.query.search[f] = action.query.search[f] || {}; value = val
     .form-group
       .input-group.input-group-sm
         input.btn.btn-default [
-          ng-init="info = action.meta.info[f]"
           type="text"
           class="form-control"
           placeholder="{{::info.loc}} <"
@@ -26,7 +25,6 @@ span ng-init="action.query.search[f] = action.query.search[f] || {}; value = val
     .form-group
       .input-group.input-group-sm
         input.btn.btn-default [
-          ng-init="info = action.meta.info[f]"
           type="text"
           class="form-control"
           placeholder="{{::info.loc}} >"

data/views/search_fields/decimal_date_range.slim

@@ -5,13 +5,13 @@ span ng-init="action.query.search[f] = action.query.search[f] || {}"
         input.btn.btn-default [
           type="text"
           class="form-control"
-          placeholder="{{::action.meta.info[f].loc}} <"
+          placeholder="{{::info.loc}} <"
           xng-model="value"
           ng-model="action.query.search[f].from"
           ng-change="action.search_field_change(f)"
           xe2-decimal-date-picker="" range="from"
           data-max-date="{{action.query.search[f].to}}"
-          data-date-format="{{::action.meta.info[f].render.format}}"
+          data-date-format="{{::info.render.format}}"
           data-model-date-format="yyyyMMdd"
           bs-datepicker=""
           data-autoclose="1"
@@ -28,15 +28,15 @@ span ng-init="action.query.search[f] = action.query.search[f] || {}"
         input.btn.btn-default [
           type="text"
           class="form-control"
-          placeholder="{{::action.meta.info[f].loc}} >"
+          placeholder="{{::info.loc}} >"
           xng-model="value"
           ng-model="action.query.search[f].to"
           ng-change="action.search_field_change(f)"
           xe2-decimal-date-picker="" range="to"
           data-min-date="{{action.query.search[f].from}}"
-          data-date-format="{{::action.meta.info[f].render.format}}"
+          data-date-format="{{::info.render.format}}"
           data-model-date-format="yyyyMMdd"
-          data-animation="{{::action.meta.info[f].render.animation}}"
+          data-animation="{{::info.render.animation}}"
           bs-datepicker=""
           data-autoclose="1"
           data-date-type="string"

data/views/search_fields/input_text.slim

@@ -7,9 +7,9 @@
         ng-model-options="{debounce: 200}"
         maxlength="15"
         ng-change="action.search_field_change(f)"
-        ng-class="action.meta.info[f].render.class"
+        ng-class="info.render.class"
         class="form-control"
-        placeholder="{{::action.meta.info[f].loc}}"
+        placeholder="{{::info.loc}}"
         e2-search-field=""
       ]
       .input-group-btn

data/views/search_fields/integer.slim

@@ -7,7 +7,7 @@
         ng-model-options="{debounce: 200}"
         ng-change="action.search_field_change(f)"
         class="form-control"
-        placeholder="{{::action.meta.info[f].loc}}"
+        placeholder="{{::info.loc}}"
         e2-search-field=""
         e2-integer=""
       ]

data/views/search_fields/integer_range.slim

@@ -6,7 +6,7 @@ span ng-init="action.query.search[f] = action.query.search[f] || {}"
           type="text"
           ng-model="action.query.search[f].from"
           class="form-control"
-          placeholder="{{::action.meta.info[f].loc}} <"
+          placeholder="{{::info.loc}} <"
           e2-search-field=""
           e2-integer=""
         ]
@@ -19,7 +19,7 @@ span ng-init="action.query.search[f] = action.query.search[f] || {}"
           type="text"
           ng-model="action.query.search[f].to"
           class="form-control"
-          placeholder="{{::action.meta.info[f].loc}} >"
+          placeholder="{{::info.loc}} >"
           e2-search-field=""
           e2-integer=""
         ]

data/views/search_fields/list_bsmselect.slim

@@ -3,7 +3,7 @@
     .input-group.input-group-sm
       button.btn.btn-default [
         type="button"
-        ng-init="info = action.meta.info[f]; action.query.search[f] = action.query.search[f] || []"
+        ng-init="action.query.search[f] = action.query.search[f] || []"
         ng-model="action.query.search[f]"
         bs-options="v[0] as v[1] for v in info.render.list"
         data-html="true"

data/views/search_fields/list_bsselect.slim

@@ -3,7 +3,6 @@
     .input-group.input-group-sm
       button.btn.btn-default [
         type="button"
-        ng-init="info = action.meta.info[f]"
         ng-model="action.query.search[f]"
         bs-options="v[0] as v[1] for v in info.render.list"
         data-html="true"

data/views/search_fields/list_buttons.slim

@@ -1,8 +1,8 @@
 .col-lg-3.col-md-4.col-sm-5
   /.container
   .form-group
-    .btn-group.btn-group-sm ng-init="info = action.meta.info[f]" ng-model="action.query.search[f]" e2-search-field=""
+    .btn-group.btn-group-sm ng-model="action.query.search[f]" e2-search-field=""
       a.btn.btn-default ng-class="action.query.search[f] == v[0] && 'active'" ng-click="action.query.search[f] = v[0]; action.search_field_change(f)" ng-repeat="v in info.render.list" ng-bind-html="v[1]"
       a.btn.btn-default ng-disabled="action.query.search[f] == null" ng-click="action.query.search[f] = null; action.search_field_change(f)"
-        span ng-bind="::action.meta.info[f].loc"
+        span ng-bind="::info.loc"
         span.glyphicon.glyphicon-off<

data/views/search_fields/list_select.slim

@@ -2,7 +2,6 @@
   .form-group
     .input-group.input-group-sm
       select.btn.btn-default [
-        ng-init="info = action.meta.info[f]"
         ng-model="action.query.search[f]"
         ng-options="v[0] as v[1] for v in info.render.list"
         ng-change="action.search_field_change(f)"
@@ -10,7 +9,7 @@
         class="form-control"
         e2-search-field=""
       ]
-        option value="" ng-bind="::action.meta.info[f].loc"
+        option value="" ng-bind="::info.loc"
 
       .input-group-btn
         a.btn.btn-default ng-disabled="action.query.search[f] == null" ng-click="action.query.search[f] = null; action.search_field_change(f)"

data/views/search_fields/scaffold_picker.slim

@@ -1,9 +1,8 @@
-e2-action action="[action.meta.info[f].assoc, 'decode']"
+e2-action action="[info.assoc, 'decode']"
   .col-lg-3.col-md-4.col-sm-5
     .form-group
       .input-group.input-group-sm
         a.btn.btn-default [
-          ng-init="info = action.meta.info[f]"
           class="form-control"
           ng-click="action.open()"
           xe2-search-field=""

data/views/search_fields/select_picker.slim

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

data/views/search_fields/typeahead_picker.slim

@@ -1,10 +1,9 @@
-e2-action action="[action.meta.info[f].assoc, 'typeahead']"
+e2-action action="[info.assoc, 'typeahead']"
   .col-lg-3.col-md-4.col-sm-5
     .form-group
       .input-group.input-group-sm
         input.btn.btn-default [
           type="text"
-          ng-init="info = action.meta.info[f]"
           ng-model="action.decode"
           bs-options="v.value for v in action.load($viewValue)"
           ng-keypress="action.key_pressed = true"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: engine2
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - lopex
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-06-03 00:00:00.000000000 Z
+date: 2016-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -24,27 +24,13 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.8'
-  name: jdbc-sqlite3
-  prerelease: false
-  type: :runtime
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.8'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-  name: sinatra
+  name: rack-contrib
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
@@ -57,43 +43,43 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-  name: slim
+        version: '3.8'
+  name: jdbc-sqlite3
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
-  name: execjs
+        version: '1.4'
+  name: sinatra
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
-  name: coffee-script
+        version: '3.0'
+  name: slim
   prerelease: false
   type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -113,7 +99,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '11'
   name: rake
   prerelease: false
   type: :development
@@ -121,35 +107,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  name: uglifier
-  prerelease: false
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.12'
-  name: yui-compressor
-  prerelease: false
-  type: :development
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '11'
 description: Tree based routing framework with scaffolding support
 email:
 - lopx@gazeta.pl
@@ -159,14 +117,21 @@ extra_rdoc_files: []
 files:
 - Gemfile
 - Rakefile
+- app/app.coffee
+- app/app.css
+- app/engine2.coffee
+- app/engine2actions.coffee
+- bower.json
 - conf/message.yaml
 - conf/message_pl.yaml
+- config.coffee
 - engine2.gemspec
 - lib/engine2.rb
 - lib/engine2/action.rb
 - lib/engine2/core.rb
 - lib/engine2/handler.rb
 - lib/engine2/meta.rb
+- lib/engine2/meta/array_meta.rb
 - lib/engine2/meta/decode_meta.rb
 - lib/engine2/meta/delete_meta.rb
 - lib/engine2/meta/form_meta.rb
@@ -184,57 +149,12 @@ files:
 - lib/engine2/templates.rb
 - lib/engine2/type_info.rb
 - lib/engine2/version.rb
+- package.json
 - public/__sinatra__/404.png
 - public/__sinatra__/500.png
-- public/assets/javascripts.js
-- public/assets/styles.css
-- public/css/angular-motion.css
-- public/css/angular-ui-tree.min.css
-- public/css/app.css
-- public/css/bootstrap-additions.css
-- public/css/bootstrap.min.css
-- public/css/font-awesome.min.css
 - public/favicon.ico
-- public/fonts/FontAwesome.otf
-- public/fonts/fontawesome-webfont.eot
-- public/fonts/fontawesome-webfont.svg
-- public/fonts/fontawesome-webfont.ttf
-- public/fonts/fontawesome-webfont.woff
-- public/fonts/fontawesome-webfont.woff2
-- public/fonts/glyphicons-halflings-regular.eot
-- public/fonts/glyphicons-halflings-regular.svg
-- public/fonts/glyphicons-halflings-regular.ttf
-- public/fonts/glyphicons-halflings-regular.woff
-- public/fonts/glyphicons-halflings-regular.woff2
-- public/images/file.png
-- public/images/folder-closed.png
-- public/images/folder.png
-- public/images/node-closed-2.png
-- public/images/node-closed-light.png
-- public/images/node-closed.png
-- public/images/node-opened-2.png
-- public/images/node-opened-light.png
-- public/images/node-opened.png
 - public/img/ajax-loader-dark.gif
-- public/img/ajax-loader-light.gif
 - public/img/ajax-loader.gif
-- public/js/angular-animate.js
-- public/js/angular-cookies.js
-- public/js/angular-local-storage.js
-- public/js/angular-route.js
-- public/js/angular-sanitize.js
-- public/js/angular-strap.js
-- public/js/angular-strap.tpl.js
-- public/js/angular-ui-tree.js
-- public/js/angular.js
-- public/js/i18n/angular-locale_pl.js
-- public/js/lodash.custom.min.js
-- public/js/ng-file-upload-shim.min.js
-- public/js/ng-file-upload.min.js
-- views/app.coffee
-- views/engine2.coffee
-- views/engine2actions.coffee
-- views/engine2templates.coffee
 - views/fields/blob.slim
 - views/fields/bs_select.slim
 - views/fields/bsselect_picker.slim
@@ -281,10 +201,16 @@ files:
 - views/scaffold/confirm.slim
 - views/scaffold/fields.slim
 - views/scaffold/form.slim
+- views/scaffold/form_collapse.slim
+- views/scaffold/form_tabs.slim
 - views/scaffold/list.slim
 - views/scaffold/message.slim
 - views/scaffold/search.slim
+- views/scaffold/search_collapse.slim
+- views/scaffold/search_tabs.slim
 - views/scaffold/view.slim
+- views/scaffold/view_collapse.slim
+- views/scaffold/view_tabs.slim
 - views/search_fields/bsmselect_picker.slim
 - views/search_fields/bsselect_picker.slim
 - views/search_fields/checkbox.slim
@@ -322,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key:
 specification_version: 4
 summary: Tree based routing framework with scaffolding support