pinkman 0.9.8 → 0.9.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 392c59fb9a8c75861fe6db48458e3f3e90602f39
-  data.tar.gz: b3a4795dcb9b432ded4711a2c8cf0721c067d751
+  metadata.gz: 8cc205f11a3f3d39bc61d4f33d7ce30745061d58
+  data.tar.gz: df73337be8d758164de6d80bbbdabeb1fb6102b1
 SHA512:
-  metadata.gz: 422b15670036ea2bcc3a1e91caca10f3fc6dad2f81ec5ae3170a70a6d50fdf8a3f94bb6b158e9c4cbc70a7b28cec7c7501ab192ddeb31690321c4dcefb118ae0
-  data.tar.gz: 6e19c387fc2268f263bb66ca946a1ccb3f09e8ffe4245dded1eb7b290b7b4af3d3764d0233e1e1d4dddc5afe9a8a215753d1f4d753a8501badd18f1fcfdd5140
+  metadata.gz: e633f748f05e4ef7bdbcbe998279f9cfaf44a3a1939137f987ceec8e49f1460fdf33e7c11922e7b1e3e89a7fad2387c005d78c66decdf0dade14b4a1327feefc
+  data.tar.gz: 0de7d512ba641b628dd25ed9b571cc66bad2a2cb88f55c48be3227bad9a87a7d65d1b1160ba610cfda2bb3f1243ad805d2cb85d5c076ec1ffc08d29bb4b1f57c

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

@@ -50,9 +50,10 @@ class window.PinkmanCollection extends window.PinkmanCommon
   # rails/ruby equivalent: each
   # Desc: receive a function and apply it to all members
   # tip: you can chain functions. Example: collection.each(transform).first()
-  each: (transformation='') ->
+  each: (transformation='',callback) ->
     if transformation? and typeof transformation=='function' 
       transformation(o) for o in @collection
+    callback(this) if typeof callback == 'function'
     return this
 
   # rails/ruby equivalent: where/select
@@ -344,6 +345,7 @@ class window.PinkmanCollection extends window.PinkmanCommon
         else 
           return -1
     @collection = if order.toLowerCase()=="asc" then array else array.reverse()
+    return(this)
 
   # Desc: exactly what it suggests
   shuffle: () ->

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

@@ -16,6 +16,11 @@ Pinkman.closest = (jquery,level=0) ->
 
 # --- controller object
 class window.PinkmanController extends window.PinkmanObject
+  
+  clear: ->
+    @actions.each (a) ->
+      a.clear()
+    
 
   constructor: (args...) ->
     @actions = new PinkmanActions
@@ -158,10 +163,23 @@ class window.PinkmanController extends window.PinkmanObject
 
 # --- controller collection
 class window.PinkmanControllers extends window.PinkmanCollection
-
+  
+  clear: (callback) ->
+    @unbindScrolling() if @pinkey == Pinkman.controllers.pinkey
+    @each (c) ->
+      c.clear()
+    , callback
+    
+  unbindScrolling: ->
+    $(window).off('scroll')
+      
 # --- actions object
 class window.PinkmanAction extends window.PinkmanObject
-
+  
+  constructor: (args...) ->
+    super(args...)
+    @events = []
+    
   # Desc: mirrors/redirects a action to another already defined
   mirror: (controllerID,actionName) ->
     # gets all actions named 'action' in all controllers with 'controller' id
@@ -180,10 +198,16 @@ class window.PinkmanAction extends window.PinkmanObject
   redirectTo: (args...) ->
     @mirror(args...)
 
+  # Desc: removes event
+  clear: ->
+    for ev in @events
+      $('body').off ev, @selector
+    
   # Desc: attaches one single event
   attach: (eventName) ->
     if Pinkman.isString(eventName) and $("##{@controller.id}").length
       action = this
+      @events.push(eventName)
       $('body').on eventName, action.selector, (ev) ->
         ev.preventDefault() if eventName != 'keypress' and eventName != 'mousedown'
         obj = window.Pinkman.closest($(this))

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

@@ -12,20 +12,26 @@ class window.PinkmanPath extends Pinkman.object
       a.shift() if a[0] == ''
       a.pop() if a[a.length-1] == ''
       i = 0
+      s = 0
+      d = 0
       for l in a
         i = i + 1
         obj = new Pinkman.object({entry: l, index: i})
         if /:/.test(l[0])
+          d = d + 1
           obj.set('dynamic',yes)
           obj.set('static',no)
           @dynamic.push(obj)
         else
+          s = s + 1
           obj.set('dynamic',no)
           obj.set('static',yes)
           @static.push(obj)
         @levels.push(obj)
-        
+      
       @set('depth',i)
+      @set('staticDepth',s)
+      @set('dynamicDepth',d)
       
   
   @isExternal: (url) ->
@@ -58,7 +64,10 @@ class window.PinkmanRouteMatcher extends Pinkman.object
   
   initialize: ->
     if @controllers.any()?
+      Pinkman.controllers.unbindScrolling()
+      # console.log 'clear dos Pinkman.controllers'
       @controllers.each (c) =>
+        # console.log 'dentro dos controllers desse router'
         c.setParams(@params())
         c.build(yes)
     else
@@ -70,8 +79,7 @@ class window.PinkmanRouteMatcher extends Pinkman.object
       candidates = Pinkman.routes.select(depth: path.depth)
       routes = candidates.select (candidate) ->
         candidate.path.match(path)
-      route = routes.first()
-      
+      route = routes.sortBy('staticDepth','desc').first()
       if route?
         @set('url',url)
         @set('path',path)
@@ -139,6 +147,7 @@ class window.PinkmanRouter
       yieldIn = r.route.yieldIn() || @_config.yield 
       $(yieldIn).html("<div class='pink-yield' id='#{r.controller}'></div>") if r.route.blank
       r.initialize()
+      window.scrollTo(0,0) unless Pinkman.router._config.freeze
       callback() if typeof callback == 'function'
       true
     else
@@ -181,7 +190,7 @@ class window.PinkmanRouter
       route = new PinkmanRoute
       route.set('id',path)
       route.set('url',path)
-      route.set('path',p).set('depth',p.depth)
+      route.set('path',p).set('depth',p.depth).set('staticDepth',p.staticDepth).set('dynamicDepth',p.dynamicDepth)
       route.set('blank',yes)
       route.set('controller', if object? and object.controller? then object.controller else p.level(1).entry)
       if object? and typeof object == 'object' 

data/lib/pinkman/version.rb

@@ -1,3 +1,3 @@
 module Pinkman
-  VERSION = "0.9.8"
+  VERSION = "0.9.8.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pinkman
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.8.1
 platform: ruby
 authors:
 - Agilso Oliveira