engine2 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc80e81843c9720bf34223f646d6f2bb747e33d0
-  data.tar.gz: d4e47ca39797d61936f7322d3e181db9ba27486b
+  metadata.gz: ee392cd291e6908be3d724216be1ad7f79ece1e1
+  data.tar.gz: 5a198484207426f1596052de6542fe27730fabf1
 SHA512:
-  metadata.gz: 6f2c82ff8b62c2a45745afb59e8095ac27b370d64a2f4ada1c294e403fb456573f719a7de636bc281ec8405190c63029e7afcd48df3f86db287ffcc5848852ee
-  data.tar.gz: f64cf30cacc5c8de8a8f3370b62bc50f9b30b94284da7354bfdf5a29135e188acef864ad71f50782c49723cf5f5b781ebd3cbcb06ab3b32fa4438d9f670c5d97
+  metadata.gz: 0273154703273cbdb46f21a26049dad06ad12924e9e1f10c15fc278b1bbb79f7569e821e7fe1c4db9a93a26d519bc7c716115bf76528bee4c2bf5155cfacccbe
+  data.tar.gz: e53351d9d0af5d5da010f94f28c2a5f73277cc1c92400c56d473d78d595ec3f272db23ef603724440891a2b39f2a2d1c7f7efce7bd048a4946be2bcb56428fa3

data/conf/message.yaml

@@ -6,6 +6,7 @@
 :default_time_format:           HH:mm:ss
 :default_time_model_format:     HH:mm:ss
 
+:error:                         Error
 :no_entry:                      Entry doesnt exist
 :decode_selected:               selected
 
@@ -38,7 +39,7 @@
 :confirm_bulk_unlink:           Detach selected
 :confirm_bulk_unlink_title:     <span class='glyphicon glyphicon-minus'></span> Confirmation
 :debug_info:                    Debug info
-:show_meta:                     Show metainfo
+:show_meta:                     Metainfo
 # :meta:                          Meta
 :view_title:                    <span class='glyphicon glyphicon-book'></span> Details
 :create_title:                  <span class='glyphicon glyphicon-pencil'></span> Create

data/conf/message_pl.yaml

@@ -6,6 +6,7 @@
 :default_time_format:           HH:mm:ss
 :default_time_model_format:     HH:mm:ss
 
+:error:                         Błąd
 :no_entry:                      Wpis nie istnieje
 :decode_selected:               wybranych
 
@@ -38,7 +39,7 @@
 :confirm_bulk_unlink:           Odłącz zaznacznone
 :confirm_bulk_unlink_title:     <span class='glyphicon glyphicon-minus'></span> Potwierdzenie
 :debug_info:                    Debug info
-:show_meta:                     Pokaż metainformacje
+:show_meta:                     Metainfo
 # :meta:                          Meta
 :view_title:                    <span class='glyphicon glyphicon-book'></span> Szczegóły
 :create_title:                  <span class='glyphicon glyphicon-pencil'></span> Utwórz

data/lib/engine2/action.rb

@@ -4,7 +4,7 @@ module Engine2
     class Action < BasicObject
         ACCESS_FORBIDDEN ||= ->h{false}
         attr_reader :parent, :name, :number, :actions, :recheck_access
-        attr_reader :meta_proc
+        attr_reader :meta_proc, :meta_proc_chained
 
         class << self
             attr_accessor :count
@@ -21,12 +21,21 @@ module Engine2
 
         def * &blk
             if blk
-                ::Kernel.raise E2Error.new("Meta #{name} with proc already defined for action #{self.inspect}") if @meta_proc
-                @meta_proc = blk
+                @meta_proc = if meta_proc = @meta_proc
+                    @meta_proc_chained = true
+                    ::Kernel::lambda do |obj|
+                        obj.instance_eval(&meta_proc)
+                        obj.instance_eval(&blk)
+                    end
+                else
+                    blk
+                end
             end
             @meta
         end
 
+        alias :meta :*
+
         def access! &blk
             ::Kernel.raise E2Error.new("Access for action #{name} already defined") if @access_block
             @access_block = blk
@@ -59,6 +68,12 @@ module Engine2
             action
         end
 
+        def define_action_meta name, meta_class = DummyMeta, assets = {}, &blk
+            define_action name, meta_class, assets do
+                self.* &blk
+            end
+        end
+
         def undefine_action name
             ::Kernel.raise E2Error.new("No action #{name} defined") unless @actions[name]
             @actions.delete(name)

data/lib/engine2/core.rb

@@ -285,6 +285,7 @@ module E2Model
 
         def ensure_primary_key
             pk = @model.primary_keys
+            raise Engine2::E2Error.new("No primary key defined for model #{model}") unless pk && pk.all?
 
             if opts_select = @opts[:select]
                 sel_pk = []
@@ -456,15 +457,24 @@ module Engine2
         @boot_blk = blk
     end
 
+    def self.model_boot &blk
+        @model_boot_blk = blk
+    end
+
     def self.bootstrap app = APP_LOCATION
         require 'engine2/pre_bootstrap'
         t = Time.now
         Action.count = 0
         SCHEMES.clear
 
+        Sequel::DATABASES.each do |db|
+            db.models.each{|n, m| Object.send(:remove_const, n) if Object.const_defined?(n)} unless db == E2DB || db == DUMMYDB
+        end
+
         load "#{app}/boot.rb"
 
         Sequel::DATABASES.each &:load_schema_cache_from_file
+        @model_boot_blk.() if @model_boot_blk
         load 'engine2/models/Files.rb'
         load 'engine2/models/UserInfo.rb'
         Dir["#{app}/models/*"].each{|m| load m}

data/lib/engine2/model.rb

@@ -46,6 +46,8 @@ module Engine2
 
             type_info do
                 schema = @model.db_schema
+                @model.primary_keys.each{|pk| (schema[pk]||={})[:primary_key] = true} if @model.primary_key
+
                 schema.each_pair do |name, db_info|
                     @info[name] = {otype: db_info[:type]}
 
@@ -66,7 +68,7 @@ module Engine2
                     when :datetime
                         datetime_field name, LOCS[:default_date_format], LOCS[:default_time_format], LOCS[:default_date_model_format], LOCS[:default_time_model_format]
                     when :decimal
-                        size, scale = db_info[:column_size], db_info[:scale]
+                        size, scale = db_info[:column_size], db_info[:scale].to_i
                         unless size && scale
                             db_info[:db_type] =~ /decimal\((\d+),(\d+)\)/i
                             size, scale = $1.to_i, $2.to_i
@@ -75,6 +77,8 @@ module Engine2
                         decimal_field name, size, scale
                     when :blob
                         blob_field name, 100000
+                    when nil
+                        # ignore nil type
                     else
                         p db_info
                         raise E2Error.new("Unknown column type: #{db_info[:type].inspect} for #{name}")

data/lib/engine2/models/UserInfo.rb

@@ -2,8 +2,8 @@
 
 module Engine2
     class UserInfo < Sequel::Model(DUMMYDB)
-        extend MemoryModel
         set_natural_key :name
+        extend MemoryModel
 
         type_info do
             string_field :name, 10

data/lib/engine2/version.rb

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

data/views/engine2.coffee

@@ -554,4 +554,4 @@ angular.module('Engine2', ['ngRoute', 'ngSanitize', 'ngAnimate', 'ngCookies', 'm
     link: (scope, elem, attr, controller) ->
         controller.$parsers.unshift (v) ->
             vs = v.toString()
-            if vs.match(/^\-?\d+$/) then parseInt(vs) else null
+            if vs.match(/^\-?\d+$/) then parseInt(vs) else (if scope.action.query? then null else vs)

data/views/engine2actions.coffee

@@ -26,7 +26,7 @@ angular.module('Engine2')
         constructor: (response, scope, parent, element, action_info) ->
             @find_action_info = (name, raise = true) ->
                 act = response.actions[name]
-                throw "Undefined action '#{name}' for action #{@action_info().name} (under #{@parent().action_info().action_resource})" if raise && !act
+                throw "Undefined action '#{name}' for action #{@action_info().name} (under #{@parent()?.action_info().action_resource})" if raise && !act
                 act
 
             _.each response.actions, (act, nm) -> act.name = nm
@@ -307,7 +307,7 @@ angular.module('Engine2')
             @ui_state = {}
             @load_state()
 
-            delete @query.order unless _.includes(@meta.fields, @query.order)
+            delete @query.order unless @meta.info[@query.order]?.sort # _.includes(@meta.fields, @query.order)
             _.each @query.search, ((sv, sn) => delete @query.search[sn] unless _.includes(@meta.search_fields, sn))
 
             _.each @meta.info, (info, name) =>

data/views/infra/inspect.slim

@@ -3,7 +3,7 @@ e2-action action="'inspect'"
     br
     div title="API" bs-pane=""
       .row
-        .col-lg-4
+        .col-lg-5
           .panel.panel-default
             .panel-body
               script type="text/ng-template" id="nodes_renderer.html"
@@ -18,7 +18,7 @@ e2-action action="'inspect'"
                 ol ui-tree-nodes="" ng-model="action.tree.actions"
                   li ng-repeat="node in action.tree.actions" ui-tree-node="" data-collapsed="true" ng-include="'nodes_renderer.html'" ng-init="stack = []"
 
-        .col-lg-8
+        .col-lg-7
           .panel.panel-default
             .panel-body
               div bs-tabs="" bs-active-pane="actionTab" ng-init="actionTab = 0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: engine2
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - lopex
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-04-15 00:00:00.000000000 Z
+date: 2016-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -184,6 +184,8 @@ files:
 - lib/engine2/templates.rb
 - lib/engine2/type_info.rb
 - lib/engine2/version.rb
+- public/__sinatra__/404.png
+- public/__sinatra__/500.png
 - public/assets/javascripts.js
 - public/assets/styles.css
 - public/css/angular-motion.css