engine2 1.0.4 → 1.0.5

data/lib/engine2/models/UserInfo.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 module Engine2
     class UserInfo < Sequel::Model(DUMMYDB)
@@ -6,15 +7,17 @@ module Engine2
         extend MemoryModel
 
         type_info do
-            string_field :name, 10
+            string_field :name, 100
             required :name, LOCS[:user_required]
-            string_field :password, 20
+            string_field :password, 100
             required :password, LOCS[:password_required]
             password :password
         end
 
         def to_hash
-            {name: @values[:name]}
+            hash = @values.dup
+            hash.delete(:password)
+            hash
         end
     end
 end

data/lib/engine2/post_bootstrap.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 module Sequel
     module SequelFixes
@@ -31,10 +32,10 @@ module Sequel
           columns = SequelFixes.fix_aliased_expression(clone(:append_sql=>'', :placeholder_literal_null=>true))
           dsa1 = dataset_alias(1)
           rn = row_number_column
-          sql = @opts[:append_sql] || ''
+          sql = @opts[:append_sql] || String.new
           subselect_sql_append(sql, unlimited.
             unordered.
-            select_append{ROW_NUMBER{}.over(:order=>order).as(rn)}.
+            select_append{:ROW_NUMBER.sql_function.over(:order=>order).as(rn)}.
             from_self(:alias=>dsa1).
             select(*columns).
             limit(@opts[:limit]).

data/lib/engine2/pre_bootstrap.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 module Sequel
     class JDBC::Database

data/lib/engine2/scheme.rb

@@ -1,10 +1,14 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 module Engine2
     class Schemes
         CRUD ||= {create: true, view: true, modify: true, delete: true}.freeze # bulk_delete: true
         VIEW ||= {view: true}.freeze
         LINK ||= {star_to_many_link: true, view: true, star_to_many_unlink: true}.freeze # star_to_many_bulk_unlink: true
+        STMF_CRUD ||= {star_to_many_field_create: true, star_to_many_field_view: true, star_to_many_field_modify: true, star_to_many_field_delete: true}.freeze
+        STMF_VIEW ||= {star_to_many_field_view: true}.freeze
+        STMF_LINK ||= {star_to_many_field_view: true, star_to_many_field_link: true ,star_to_many_field_unlink: true, star_to_many_field_link_list: true}.freeze
 
         attr_reader :builtin, :user
         def initialize
@@ -30,49 +34,49 @@ module Engine2
     SCHEMES.instance_eval do
 
         define_scheme :view do |name = :view|
-            define_action name, ViewMeta
+            define_node name, ViewAction
         end
 
         define_scheme :create do |name = :create|
-            define_action name, CreateMeta do
-                define_action :approve, InsertMeta
+            define_node name, CreateAction do
+                define_node :approve, InsertAction
             end
         end
 
         define_scheme :modify do |name = :modify|
-            define_action name, ModifyMeta do
-                define_action :approve, UpdateMeta
+            define_node name, ModifyAction do
+                define_node :approve, UpdateAction
             end
         end
 
         define_scheme :delete do
-            define_action :confirm_delete, ConfirmMeta do
+            define_node :confirm_delete, ConfirmAction do
                 self.*.message LOCS[:delete_question]
                 self.*.panel_title LOCS[:confirm_delete_title]
-                define_action :delete, DeleteMeta
+                define_node :delete, DeleteAction
             end
         end
 
         define_scheme :bulk_delete do
-            define_action :confirm_bulk_delete, ConfirmMeta do
+            define_node :confirm_bulk_delete, ConfirmAction do
                 self.*.message LOCS[:delete_question]
                 self.*.panel_title LOCS[:confirm_bulk_delete_title]
-                define_action :bulk_delete, BulkDeleteMeta
+                define_node :bulk_delete, BulkDeleteAction
             end
         end
 
         define_scheme :default do |name, model, options|
             options ||= Schemes::CRUD
-            define_action name, ListMeta, model: model do
+            define_node name, ListAction, model: model do
                 options.each{|k, v| run_scheme(k) if v}
 
-                define_action_bundle :form, :create, :modify if options[:create] && options[:modify]
-                # define_action_bundle :decode, :decode_entry, :decode_list, :typahead
+                define_node_bundle :form, :create, :modify if options[:create] && options[:modify]
+                # define_node_bundle :decode, :decode_entry, :decode_list, :typahead
 
                 # if ?
-                define_action :decode_entry, DecodeEntryMeta
-                define_action :decode_list, DecodeListMeta
-                define_action :typeahead, TypeAheadMeta
+                define_node :decode_entry, DecodeEntryAction
+                define_node :decode_list, DecodeListAction
+                define_node :typeahead, TypeAheadAction
             end
         end
 
@@ -80,7 +84,7 @@ module Engine2
         # Many to One
         #
         define_scheme :many_to_one do
-            define_action :list, ManyToOneListMeta do
+            define_node :list, ManyToOneListAction do
                 run_scheme :view
             end
         end
@@ -89,18 +93,18 @@ module Engine2
             assoc = model.association_reflections[assoc_name]
             ::Kernel::raise E2Error.new("Association '#{assoc_name}' not found for model '#{model}'") unless assoc
 
-            if self.*.assets[:model] != model && self.*.is_a?(ListMeta)
+            if self.*.assets[:model] != model && self.*.is_a?(ListAction)
                 # verify relations ?
                 mdl = assoc[:model]
                 info = mdl.type_info[assoc[:keys].first]
                 options = info[:decode][:search]
             end
 
-            define_action :"#{assoc_name}!" do
+            define_node :"#{assoc_name}!" do
                 # iterate over options like in :default ?
-                define_action :list, DecodeListMeta, assoc: assoc if options[:list]
-                define_action :typeahead, TypeAheadMeta, assoc: assoc if options[:typeahead]
-                define_action :decode, DecodeEntryMeta, assoc: assoc do
+                define_node :list, DecodeListAction, assoc: assoc if options[:list]
+                define_node :typeahead, TypeAheadAction, assoc: assoc if options[:typeahead]
+                define_node :decode, DecodeEntryAction, assoc: assoc do
                     run_scheme :many_to_one
                 end if options[:scaffold]
             end
@@ -110,34 +114,34 @@ module Engine2
         # * to Many
         #
         define_scheme :star_to_many_unlink do
-            define_action :confirm_unlink, ConfirmMeta do
+            define_node :confirm_unlink, ConfirmAction do
                 self.*.message LOCS[:unlink_question]
                 self.*.panel_title LOCS[:confirm_unlink_title]
-                define_action :unlink, StarToManyUnlinkMeta
+                define_node :unlink, StarToManyUnlinkAction
             end
         end
 
         define_scheme :star_to_many_bulk_unlink do
-            define_action :confirm_bulk_unlink, ConfirmMeta do
+            define_node :confirm_bulk_unlink, ConfirmAction do
                 self.*.message LOCS[:unlink_question]
                 self.*.panel_title LOCS[:confirm_bulk_unlink_title]
-                define_action :bulk_unlink, StarToManyBulkUnlinkMeta
+                define_node :bulk_unlink, StarToManyBulkUnlinkAction
             end
         end
 
         define_scheme :star_to_many_link do
-            define_action :link_list, StarToManyLinkListMeta do
+            define_node :link_list, StarToManyLinkListAction do
                 run_scheme :view
-                define_action :link, StarToManyLinkMeta
+                define_node :link, StarToManyLinkAction
             end
         end
 
         define_scheme :star_to_many do |act, assoc, model|
             options = assoc[:options] || Schemes::LINK
-            define_action act, StarToManyListMeta, model: model, assoc: assoc do
+            define_node act, StarToManyListAction, model: model, assoc: assoc do
                 options.each{|k, v| run_scheme(k) if v}
 
-                define_action_bundle :form, :create, :modify if options[:create] && options[:modify]
+                define_node_bundle :form, :create, :modify if options[:create] && options[:modify]
             end
         end
 
@@ -145,11 +149,11 @@ module Engine2
         # arbitrary files per form
         #
         define_scheme :file_store do |model, field|
-            define_action :"#{field}_file_store!", FileStoreMeta do
+            define_node :"#{field}_file_store!", FileStoreAction do
                 self.*.model = model
                 self.*.field = field
-                define_action :download, DownloadFileStoreMeta
-                define_action :upload, UploadFileStoreMeta
+                define_node :download, DownloadFileStoreAction
+                define_node :upload, UploadFileStoreAction
             end
         end
 
@@ -157,11 +161,11 @@ module Engine2
         # blob field in source table
         #
         define_scheme :blob_store do |model, field|
-            define_action :"#{field}_blob_store!", BlobStoreMeta do
+            define_node :"#{field}_blob_store!", BlobStoreAction do
                 self.*.model = model
                 self.*.field = field # model.type_info[field][:field]
-                define_action :download, DownloadBlobStoreMeta
-                define_action :upload, UploadBlobStoreMeta
+                define_node :download, DownloadBlobStoreAction
+                define_node :upload, UploadBlobStoreAction
             end
         end
 
@@ -169,29 +173,76 @@ module Engine2
         # blob field in foreign (one to one) table
         #
         define_scheme :foreign_blob_store do |model, field|
-            define_action :"#{field}_blob_store!", ForeignBlobStoreMeta do
+            define_node :"#{field}_blob_store!", ForeignBlobStoreAction do
                 self.*.model = model
                 self.*.field = field # model.type_info[field][:field]
-                define_action :download, DownloadForeignBlobStoreMeta
-                define_action :upload, UploadBlobStoreMeta
+                define_node :download, DownloadForeignBlobStoreAction
+                define_node :upload, UploadBlobStoreAction
             end
         end
 
-        define_scheme :star_to_many_field do |assoc, field|
-            define_action :"#{field}!", StarToManyFieldMeta, assoc: assoc do
-                run_scheme :view
-                define_action :confirm_unlink, ConfirmMeta do
-                    self.*.message LOCS[:unlink_question]
-                    define_action :unlink, StarToManyFieldUnlinkMeta
+        define_scheme :star_to_many_field_view do
+            define_node :view, ViewAction do
+                action{@action_type = :star_to_many_field_view}
+            end
+        end
+
+        define_scheme :star_to_many_field_link do
+            define_node :link, StarToManyLinkAction
+        end
+
+        define_scheme :star_to_many_field_unlink do
+            define_node :confirm_unlink, ConfirmAction do
+                self.*.message LOCS[:unlink_question]
+                define_node :unlink, StarToManyUnlinkAction do
+                    action{@action_type = :star_to_many_field_unlink}
                 end
-                define_action :link_list, StarToManyFieldLinkListMeta do
-                    run_scheme :view
+            end
+        end
+
+        define_scheme :star_to_many_field_link_list do
+            define_node :link_list, StarToManyFieldLinkListAction do
+                run_scheme :view
+            end
+        end
+
+        #
+        # *_to_many_field
+        #
+        define_scheme :star_to_many_field do |assoc, field|
+            schemes = assoc[:model].type_info.fetch(field)[:schemes]
+            define_node :"#{field}!", StarToManyFieldAction, assoc: assoc do
+                schemes.each{|k, v| run_scheme(k) if v}
+
+                define_node_bundle :form, :star_to_many_field_create, :star_to_many_field_modify if schemes[:star_to_many_field_create] && schemes[:star_to_many_field_modify]
+            end
+        end
+
+        define_scheme :star_to_many_field_create do
+            define_node :create, CreateAction do
+                define_node :approve, StarToManyFieldInsertAction
+            end
+        end
+
+        define_scheme :star_to_many_field_modify do
+            define_node :modify, ModifyAction do
+                action{@action_type = :star_to_many_field_modify}
+                define_node :approve, StarToManyFieldUpdateAction
+            end
+        end
+
+        define_scheme :star_to_many_field_delete do
+            define_node :confirm_delete, ConfirmAction do
+                self.*.message LOCS[:delete_question]
+                self.*.panel_title LOCS[:confirm_delete_title]
+                define_node :delete, DeleteAction do
+                    action{@action_type = :star_to_many_field_delete}
                 end
             end
         end
 
         define_scheme :array do |name, model|
-            define_action name, ArrayListMeta, model: model do
+            define_node name, ArrayListAction, model: model do
             end
         end
     end

data/lib/engine2/templates.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 module Engine2
     BS_ANIMATION ||= "am-flip-x" # "am-fade"

data/lib/engine2/type_info.rb

@@ -1,4 +1,5 @@
 # coding: utf-8
+# frozen_string_literal: true
 
 module Engine2
 
@@ -215,8 +216,8 @@ module Engine2
                 info[:multiple] = multiple
                 info[:table] = table
                 info[:store] = store
-                info[:store][:upload] ||= "#{Engine2::app}/store/upload"
-                info[:store][:files] ||= "#{Engine2::app}/store/files"
+                info[:store][:upload] ||= "#{Engine2::SETTINGS[:path]}/store/upload"
+                info[:store][:files] ||= "#{Engine2::SETTINGS[:path]}/store/files"
                 info[:transaction] = true
             end
         end
@@ -294,14 +295,15 @@ module Engine2
             end
         end
 
-        def star_to_many_field assoc_name
+        def star_to_many_field assoc_name, schemes = Schemes::STMF_LINK
             assoc = @model.one_to_many_associations[assoc_name] || @model.many_to_many_associations[assoc_name]
             raise E2Error.new("'*_to_many' association '#{assoc_name}' not found for model '#{@model}'") unless assoc
             define_field assoc_name, :string do |info|
                 info[:type] = :star_to_many_field
+                info[:schemes] = schemes
                 info[:keys] = assoc[:keys]
                 info[:assoc_name] = assoc_name
-                info[:transaction] = true # ?
+                info[:transaction] = true
             end
         end
 

data/lib/engine2/version.rb

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

data/package.json

@@ -3,31 +3,33 @@
   "description": "engine2",
   "version": "1.0.0",
   "scripts": {
-    "postinstall": "bower install",
+    "postinstall": "bower install --allow-root",
     "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",
+    "@uirouter/angularjs": "^1.0.5",
+    "angular": "^1.6.0",
+    "angular-animate": "^1.6.0",
+    "angular-cookies": "^1.6.0",
+    "angular-load": "^0.4.0",
+    "angular-local-storage": "^0.5.0",
     "angular-motion": "^0.4.0",
-    "angular-route": "^1.5.8",
-    "angular-sanitize": "^1.5.8",
-    "angular-ui-tree": "2.22.1",
+    "angular-sanitize": "^1.6.0",
+    "angular-ui-tree": "^2.22.0",
     "bootstrap": "^3.3.0",
     "bootstrap-additions": "0.3.1",
     "font-awesome": "~4.7.0",
     "lodash": "~4.17.0",
-    "ng-file-upload": "12.2.12"
+    "ng-file-upload": "^12.2.0",
+    "push.js": "^0.0.13"
   },
   "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",
+    "coffee-script-brunch": "^2.10.2",
     "copycat-brunch": "^1.1.0",
     "css-brunch": "^2.6.1",
     "javascript-brunch": "^2.0.0",