pinkman 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c25bae9a1ae443e0c447ac5811d44abb935e6ffb58aad10a2b2271e8e69c46b
-  data.tar.gz: bf705ab6cf39a314115680d707be7d52a6ed5ee4658c67f31bb05812d99998f0
+  metadata.gz: f86938283023ea352bf26a15f24d6fab77bfec2a92cec7ad839ec338b3eb4e4e
+  data.tar.gz: 66bdc74ad7b9e3e15f02549bcd63ef280c73d884017a47d06e44d0c6bdd3a77d
 SHA512:
-  metadata.gz: b3be985a092e5fb10c4d954b4e4fbe635593bffc58e555bf6f7248b72d062006c93f6e8392d4e1de68fcaa54b052c4fa78b2a18c0936f1599aede9a85b1eb87e
-  data.tar.gz: 203a212d72659b8618b71c7e38009dacb6f0842b7c1724677994e9327086f2a7b5c9468d3c6821a5c220bd8e38e03fd338d3790cb7c8601fccc9aaabb3fa4f53
+  metadata.gz: 9ce750515695c361e2c306a1466e2105e21f9f26de207f83a93b03fa405ab9a90fef47d4aed2b7de8bb1054838626738091da7e86c555888cc873a4953110595
+  data.tar.gz: 1a00bb98b28bc45eb77eee2dded5af6308e9afc65f1558af9d81ff44f035072af09eb18574df9ae11023fa068f59731e1ad6ac3b8793d3d654dc2443f6f06442

data/app/assets/javascripts/pinkman_base/router.coffee

@@ -100,7 +100,7 @@ class window.PinkmanRouteMatcher extends Pinkman.object
       @controllers.each (c) =>
         # console.log 'dentro dos controllers desse router'
         c.setParams(@params())
-        c.build(yes,this)
+        c.build(yes, this)
       , =>
         callback(this.route, this.url) if typeof callback == 'function'
     else
@@ -131,13 +131,13 @@ class window.PinkmanRouteMatcher extends Pinkman.object
         .sortBy('staticDepth','desc').first()
       return(PinkmanCache.cache("p-router-#{url}", r))
   
-  setup: (route,url) ->
+  setup: (route, url) ->
     if route? and url?
       # console.log "PinkmanRouterMatcher#setup - url arg: #{url}"
       urlPath = new PinkmanPath(url) 
       route.path.matchParams(urlPath)
-      @set('url',url)
-      @set('path',urlPath)
+      @set('url', url)
+      @set('path', urlPath)
       @set 'route', route
       @set 'controller', @route.controller
       @set('controllers', Pinkman.controllers.select(id: @controller))
@@ -257,7 +257,7 @@ class window.PinkmanRouter
     r.initialize (args...) =>
       @analytics.send(args...) if @_config.analytics?
       callback() if typeof callback == 'function'
-      @_config.callback(args...) if typeof @_config.callback == 'function'
+      @_config.after(@currentMatcher, @previousMatcher) if typeof @_config.after == 'function'
     Pinkman.routes.set('current',r.route)
     unless Pinkman.router._config.freeze or (r.options? and r.options.freeze)
       # console.log 'topo'
@@ -268,17 +268,19 @@ class window.PinkmanRouter
     true
     
   # Search path throughout routes. On match, activate respective controllers: clears template and execute main(s) function(s)
-  @activate: (path,callback,options) ->
+  @activate: (path, callback, options) ->
     r = Pinkman.routes.match(path)
     if r? and r
+      @previousMatcher = @currentMatcher if @currentMatcher?
+      @currentMatcher = r
       # console.log r
       r.options = options
-      @_config.beforeRender(r) if $p.isFunction(@_config.beforeRender)
+      @_config.before(@currentMatcher, @previousMatcher) if $p.isFunction(@_config.before)
       if @_config.transition? and typeof @_config.transition == 'function'
         @_config.transition =>
-          @render(r,callback)
+          @render(r, callback)
       else
-        @render(r,callback)
+        @render(r, callback)
     else
       # console.log 'route not found'
       false

data/lib/pinkman/version.rb

@@ -1,3 +1,3 @@
 module Pinkman
-  VERSION = "1.1.2"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pinkman
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Agilso Oliveira
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-25 00:00:00.000000000 Z
+date: 2019-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler