pinkman 0.9.9.1 → 0.9.9.2.fix

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8594d71908248b387d76ae776ee2645a0260a5a8
-  data.tar.gz: fda03fd83b397414f49792eff5936d119c31359c
+  metadata.gz: c2026e4d3d78024833d6de5d1673787649d49893
+  data.tar.gz: 2d2c250b32799088f81a17e1abced7ed53098f63
 SHA512:
-  metadata.gz: c135c46bf27d68423c2515ef4134ddecfb34583d47a0c80f662f0e87110b0020756a8067432540353b3a943fe339c8f9ec928e56262983b3ff83fc712d216a82
-  data.tar.gz: 98f3eeee9cb5e77389c6e6cc7006aa0a165c928f68ef9b4d0a7aee2274b04c899f837fa2faa40fe9140fbb32a532d94f3a4860355acbee5c67f1ac84a01946fa
+  metadata.gz: b0770bfd824f5d45ec4a7372947cf77015a26497b4a82e31145d3c87bd467e91e15b3e42519fa56bc192670cff60b40bf83691c578eb5c29f6aa7bf029c243e4
+  data.tar.gz: 824a087f1fa19265e597d263e31853cc6a6a34c6f98b11009b187bd81ed07bd23997cf46c80dfa808b63a477839492874cd9dca928d724c3394c9168d31af3f9

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

@@ -52,8 +52,11 @@ class window.PinkmanCollection extends window.PinkmanCommon
   # tip: you can chain functions. Example: collection.each(transform).first()
   each: (transformation='',callback) ->
     if transformation? and typeof transformation=='function' 
-      transformation(o) for o in @collection
-    callback(this) if typeof callback == 'function'
+      i = 0
+      for o in @collection
+        i = i+1
+        transformation(o)
+        callback(this) if (i == @count()) and typeof callback == 'function'
     return this
 
   # rails/ruby equivalent: where/select
@@ -79,6 +82,23 @@ class window.PinkmanCollection extends window.PinkmanCommon
     callback(selection) if typeof callback == 'function'
     return(selection)
 
+  # every element of this collection will be substituted by the element of the collection passed
+  absorb: (collection, callback) ->
+    if typeof collection == 'object' and collection.isPink and collection.isCollection
+      @each (obj) =>
+        o = collection.find(obj.id)
+        if o?
+          @remove obj, =>
+            @forceUnshift(o)
+      , callback
+    
+  # substitute element a by element b
+  substitute: (a,b,callback) ->
+    if a? and b?
+      @remove(a)
+      @push(b)
+      callback() if typeof callback == 'function'
+    
   # Desc: insert in last position
   push: (arg) ->
     if Pinkman.isArray(arg)
@@ -109,6 +129,12 @@ class window.PinkmanCollection extends window.PinkmanCommon
 
   forcePush: (object) ->
     @collection.push(object)
+    
+  directUnshift: (object) ->
+    @collection.unshift(object) unless @include(object)
+
+  forceUnshift: (object) ->
+    @collection.unshift(object)
 
   unshiftIndividually: (object) ->
     if object? and typeof object == 'object' and not @include(object)
@@ -136,15 +162,17 @@ class window.PinkmanCollection extends window.PinkmanCommon
     @remove(@first())
 
   # Desc: remove a object from the collection
-  remove: (object) ->
+  remove: (object,callback) ->
     if typeof object == 'object' and object.id? and (a = @find(object.id))?
       i = @collection.indexOf a
       @collection.splice(i,1)
-      return a
+      value = a
     else
       i = @collection.indexOf object
       @collection.splice(i,1)
-      return object
+      value = object
+    callback(this) if typeof callback == 'function'
+    return(value)
 
   # Desc: remove the first object that matches
   removeBy: (attribute,value) ->
@@ -204,7 +232,7 @@ class window.PinkmanCollection extends window.PinkmanCommon
 
   # Desc: return trues if has at least one member. If a criteria is specificied, returns true if at least one member satisfies it.
   any: (criteria='') ->
-    if criteria? and typeof criteria == 'function'
+    if criteria? and (typeof criteria == 'function' or typeof criteria == 'object')
       @select(criteria).count() > 0
     else
       @count() > 0

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

@@ -57,11 +57,11 @@ class window.PinkmanController extends window.PinkmanObject
       @actions.getBy('name',args[0])
     else
       [name, eventName,callback,unknown...] = args
-      a = new PinkmanAction(name: name, eventName: eventName, call: callback, controller: this)
+      id = "#{@pinkey}-#{name}-#{eventName}"
+      a = new PinkmanAction(id: id, name: name, eventName: eventName, call: callback, controller: this)
       a.set('selector',"##{a.controller.id} [data-action='#{a.name}']")
       Pinkman.actions.push(a)
-      @actions.push(a)
-      a.listen() if a.call? and typeof a.call == 'function'
+      a.listen() if @actions.push(a) and a.call? and typeof a.call == 'function'
       return(a)
       
       
@@ -205,10 +205,12 @@ class window.PinkmanAction extends window.PinkmanObject
     
   # Desc: attaches one single event
   attach: (eventName) ->
-    if Pinkman.isString(eventName) and $("##{@controller.id}").length
+    if Pinkman.isString(eventName)
       action = this
       @events.push(eventName)
       $('body').on eventName, action.selector, (ev) ->
+        # debugger
+        # console.log "#{action.id}: called - #{action.name}"
         ev.preventDefault() if eventName != 'keypress' and eventName != 'mousedown'
         obj = window.Pinkman.closest($(this))
         action.call(obj,$(this),ev)

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

@@ -4,5 +4,5 @@ Pinkman.css = (selector,property,value) ->
 
 $(document).ready ->
   unless $('style#pinkman-css-injector').length
-    $('body').append('<style id="pinkman-css-injector" type="text/css">pink{display: inline; margin: 0; padding: 0; color: inherit; background-color: inherit; font: inherit;}</style>')
+    $('head').append('<style id="pinkman-css-injector" type="text/css">pink{display: inline; margin: 0; padding: 0; color: inherit; background-color: inherit; font: inherit;} template, template *{ display: none !important;}</style>')
     document.createElement('pink') if document.createElement?

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

@@ -91,7 +91,19 @@ class window.Pinkman
       i = i+1
     a
 
-
+  # i hated that i had to do this
+  @unescape: (string) ->
+    if Pinkman.isString(string)
+      map = { '&amp;': '&', '&lt;': '<', '&gt;': '>', '&quot;': '"', '&#39;': "'", '&#x2F;': '/', '&#x60;': '`', '&#x3D;': '=' }
+      keys = []
+      keys.push("(?:#{k})") for k,v of map
+      window.regexp = new RegExp(keys.join('+|') + '+','gm')
+      string.replace regexp, (match) ->
+        map[match]
+    else
+      ''
+    
+  
   @calledFunctions = []
 
   # --- Scope

data/app/assets/javascripts/pinkman_base/render.coffee.erb

@@ -33,9 +33,17 @@ Pinkman.template_engines =
       template = Pinkman.templates.get(template: options.template, engine: options.engine)
     else
       template = new Pinkman.object(template: options.template, engine: options.engine)
-      @compile(options.engine, template, @templateAdapter($('#' + options.template).html()))
+      @compile(options.engine, template, @templateModifier($('#' + options.template).html()))
       Pinkman.templates.push(template)
     return(template)
+  
+  # templateModifier
+  # apply all pinkman modifiers to templates
+  templateModifier: (templateBody) ->
+    # content = templateBody
+    # content = @partialAdapter(templateBody)
+    # content = @templateAdapter(templateBody)
+    Pinkman.unescape(@templateAdapter(@partialAdapter(templateBody)))
     
   
   # attrAdapterHelper: helper for templateAdapter
@@ -49,7 +57,7 @@ Pinkman.template_engines =
     array.push('pinkey')
     pinkey = array.join('.')
     "#{$1}<pink data-pinkey=\"{{ #{pinkey} }}\" data-attribute=\"#{attr}\">{{ #{$2} }}</pink>#{$3}"
-    
+        
   # changes templates html to insert binders so pinkman can make realtime updates
   templateAdapter: (templateBody) ->
     if templateBody? and templateBody != ''
@@ -59,6 +67,21 @@ Pinkman.template_engines =
       content.replace(escapeSyncingRegex,'{{')
     else
       ''
+  
+  # modifies templates inserting partials before sending them to rendering the engines
+  partialAdapter: (templateBody) ->
+    if templateBody? and templateBody != ''
+      partialRegex = /{{(?:\s)*partial\((?:\s)*(.*)(?:\s)*\)(?:\s)*}}/gm
+      templateBody.replace(partialRegex,@partialInception)
+    else
+      ''
+  
+  partialInception: (match,id) ->
+    p = $("template##{id}.p")
+    if p.length
+      p.html()
+    else
+      match
 
   context: (options) ->
     options.object = options.context if options.context?
@@ -128,8 +151,9 @@ Pinkman.render = (options) ->
   Pinkman.template_engines.render(options) 
   options.object.queue(options) if options.reRender and options.object? and options.object.isPink
 
+Pinkman.scrolling = new PinkmanCollection unless Pinkman.scrolling?
+
 Pinkman.saveElementScrollPosition = (id) ->
-  Pinkman.scrolling = new PinkmanCollection unless Pinkman.scrolling?
   a = Pinkman.scrolling.find(id)
   a = new Pinkman.object unless a?
   a.set('id',id)

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

@@ -138,20 +138,38 @@ class window.PinkmanRouter
     routes(router) if typeof routes == 'function'
     return(router)
   
+  @scrolling = new PinkmanCollection
+  
+  @saveWindowScroll = (id) ->
+    @scrolling.firstOrInitialize(id: id).set('position', window.scrollY)
  
+  @restoreWindowScroll = (id) ->
+    o = @scrolling.firstOrInitialize(id: id)
+    # console.log o.position
+    o.position = 0 unless o.position?
+    window.scrollTo(0,o.position)
+    
   @render: (r, callback) ->
+    @saveWindowScroll(Pinkman.routes.current.controller) if Pinkman.routes.current?
     Pinkman.state.initialize()
     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
+    Pinkman.routes.set('current',r.route)
+    unless Pinkman.router._config.freeze or (r.options? and r.options.freeze)
+      # console.log 'topo'
+      window.scrollTo(0,0)
+    else
+      sleep 0.15, =>
+        @restoreWindowScroll(r.route.controller)
     callback() if typeof callback == 'function'
     true
     
   # Search path throughout routes. On match, activate respective controllers: clears template and execute main(s) function(s)
-  @activate: (path,callback) ->
+  @activate: (path,callback,options) ->
     r = Pinkman.routes.match(path)
     if r? and r
+      r.options = options
       if @_config.transition? and typeof @_config.transition == 'function'
         @_config.transition =>
           @render(r,callback)
@@ -164,12 +182,12 @@ class window.PinkmanRouter
   @visit: (path) ->
     @activate path, ->
       Pinkman.state.push(path)
-      
+  
   @force: (path) ->
     (window.location=path) unless @visit(path)
       
   @restore: (path) ->
-    (window.location=path) unless @activate(path)
+    (window.location=path) unless @activate(path,null,{freeze: yes})
   
   @redirect: (args...) ->
     @force(args...)
@@ -179,6 +197,12 @@ class window.PinkmanRouter
     
   @go: (args...) ->
     @force(args...)
+  
+  @forward: ->
+    window.history.forward() if window.history?
+  
+  @back: ->
+    window.history.back() if window.history?
     
   @start: ->
     Pinkman.ready =>

data/app/helpers/pinkman_helper.rb

@@ -13,18 +13,31 @@ module PinkmanHelper
     end
   end
   
+  
   def template path, &block
     # definition mode
     if block_given?
       name = path.to_s
       id = (/(?:-template)$/ =~ name) ? name : (name +'-template')
-      content_tag('script',{id: id, type: 'text/p-template'}, &block)
+      content_tag('template',{id: id, type: 'text/p-template'}, &block)
     # rendering template partial mode
     else
       render partial: "pinkman/#{path}"
     end
   end
   
+  def partial path, &block
+    # definition mode
+    name = path.to_s
+    id = (/(?:-template)$/ =~ name) ? name : (name +'-template')
+    if block_given?
+      content_tag('template',{id: id, type: 'text/p-partial', class: 'p'}, &block)
+    # rendering template partial mode
+    else
+      raw("{{ partial(#{id}) }}")
+    end
+  end
+  
   def load_templates
     if Rails
       dir = Rails.root.join('app','views','pinkman')

data/lib/pinkman/version.rb

@@ -1,3 +1,3 @@
 module Pinkman
-  VERSION = "0.9.9.1"
+  VERSION = "0.9.9.2.fix"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pinkman
 version: !ruby/object:Gem::Version
-  version: 0.9.9.1
+  version: 0.9.9.2.fix
 platform: ruby
 authors:
 - Agilso Oliveira
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-18 00:00:00.000000000 Z
+date: 2017-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -239,9 +239,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1