pinkman 1.3.7 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 277037c6ebdf2b0d1aa89843d34f024b17f9c1ceeb4f8e6a0242cd9585a2e336
-  data.tar.gz: dbb4eab44a12bdd5245ec69ee29e5911ce87b437068cfa70e045969c38dc34d7
+  metadata.gz: 291782b4b04a02a359d5cecaccf2c67b3c4d2c3f2b269e6bb607d949e6ecd180
+  data.tar.gz: 58a64ecaf2dab1df27e8d1d3d07563efcec47cd7e318fc38b2b9c52302cdecc4
 SHA512:
-  metadata.gz: 12f60a37950707411fa5b7609b876aa6d20a293afdff00bff96bdc7f6fb64984ac455bd882c886c23feb15eed349afcb563dc567275a5cf2e2acf50541151032
-  data.tar.gz: e225bf5db201fa1f5bd123145e7d0beb270575e250788e3ff5a62ce563d0b0f2576c167b683927177a36934f56da564ff719a78e9aa766cd13f5b22f8d5db28a
+  metadata.gz: 609f4254349dbcc6b21a164d7cfd4c998d92daa64df054ea20318f977feaa759bb0a128627c1f2eb6070a7dea2d4eb837e5d6a368ec43135185e2e416203a3ee
+  data.tar.gz: 3715ca1976c898dc5bd8151dc954ab9bb453ff99e224fd7b158ebdbad99ebda66238a3251b8f58145a29ec9e5af88192be2c953e1067b669fbb2878cfa6bd3c6

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

@@ -94,6 +94,18 @@ class window.PinkmanCollection extends window.PinkmanCommon
         transformation(o)
         callback(this) if (i == @count()) and typeof callback == 'function'
     return this
+    
+  # rails/ruby equivalent: map
+  # Desc: receive a function and apply it to all members and returns an array of values
+  map: (transformation='',callback) ->
+    array = []
+    if transformation? and typeof transformation=='function' 
+      i = 0
+      for o in @collection
+        i = i+1
+        array.push(transformation(o))
+        callback(array) if (i == @count()) and typeof callback == 'function'
+    return array
 
   # rails/ruby equivalent: where/select
   # Desc: returns a new collection of all members that satisfies a criteria (criteria(obj) returns true)
@@ -519,10 +531,23 @@ class window.PinkmanCollection extends window.PinkmanCommon
   
   # --- Cache Related --- #
   
+  @mangleKey: (key) ->
+    @startCaching() unless @_name_md5
+    @_name_md5 + key
+    
+  @cache: (key, value) ->
+    $c.cache(@mangleKey(key), value)
+  
+  @hasCache: (key) ->
+    $c.has(@mangleKey(key))
+    
+  @getCache: (key, callback) ->
+    $c.get(@mangleKey(key), callback)
+  
   @startCaching: () ->
     # cache structure
     @_name_md5 = md5(if @name then @name else @toString()) unless @_name_md5?
-    $c.cache(@_name_md5, new this) unless $c.has(@_name_md5)
+    # $c.cache(@_name_md5, new this) unless $c.has(@_name_md5)
 
   # --- Ajax related --- #
   
@@ -542,25 +567,23 @@ class window.PinkmanCollection extends window.PinkmanCommon
   
   @get: (options) ->
     if $p.isObject(options) and (options.query? or options.params?) and $p.isFunction(options.callback)
-      @startCaching()
-      options.cache = yes unless options.cache?
-      query = Pinkman.mergeObjects(options.scope, Pinkman.mergeObjects(options.query, options.params))
-      query_md5 = md5(JSON.stringify(query) + @_name_md5)
-      if options.cache and $c.has(query_md5)
-        $c.get(query_md5, options.callback)
+      options.cache = false unless options.cache?
+      query_md5 = $p.objHash(options)
+      if options.cache and @hasCache(query_md5)
+        @getCache(query_md5, options.callback)
       else
         col = new this
         obj = new col.config.memberClass
         params = new Object
         params.scope = options.scope || Pinkman.scope(obj)
         params.query = options.query
-        params = Pinkman.mergeObjects(params, options.params)
-        Pinkman.ajax.get
+        params = $p.mergeObjects(params, options.params)
+        $p.ajax.get
           url: options.url || obj.api('get')
           data: params
           complete: (response) =>
             col.fetchFromArray(response)
-            $c.cache(query_md5, col)
+            @cache(query_md5, col)
             options.callback(col)
     else
       throw "Pinkman Error: collection.get invalid options #{options.toString()}"
@@ -622,7 +645,6 @@ class window.PinkmanCollection extends window.PinkmanCommon
     if options? and typeof options == 'object' and options.url?
       options_md5 = md5(JSON.stringify(options) + @className())
       options.params = new Object unless options.params?
-      options.cache = yes unless options.cache?
       if options.scope?
         options.params.scope = options.scope
       else
@@ -633,12 +655,11 @@ class window.PinkmanCollection extends window.PinkmanCommon
       Pinkman.ajax.get
         url: Pinkman.json2url(options.url, options.params) 
         complete: (response) =>
-          $c.cache(options_md5, response) if options.cache
           @handleFetchResponse(response, options)
       return(this)
       
-  handleFetchResponse: (response,options) ->
-    @constructor.startCaching()
+  handleFetchResponse: (response, options) ->
+    # @constructor.startCaching()
     if response?
       [@errors, @error] = [response.errors, response.error] if response.errors? or response.error?
       
@@ -652,7 +673,7 @@ class window.PinkmanCollection extends window.PinkmanCommon
 
       if response.length > 0
         # CACHING INSTANCES
-        $c.get(@constructor._name_md5).fetchFromArray(response)
+        # $c.get(@constructor._name_md5).fetchFromArray(response)
         
         @_recent.fetchFromArray(response) 
         @fetchFromArray(response)

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

@@ -72,13 +72,14 @@ class window.PinkmanController extends window.PinkmanObject
     if args.length == 1
       @actions.getBy('name',args[0])
     else
-      [name, eventName,callback,unknown...] = args
+      [name, eventName, callback, preventDefault, unknown...] = args
       PinkmanAction.define
         id: "#{@pinkey}-#{name}-#{eventName}"
         name: name
         eventName: eventName
         callback: callback
         controller: this
+        preventDefault: if preventDefault? then preventDefault else true
         selector: "##{this.id} [data-action='#{name}']"
       
   
@@ -406,6 +407,11 @@ class window.PinkmanAction extends window.PinkmanObject
       a.set 'controller', options.controller
       a.set 'selector', options.selector
       a.set 'eventName', options.eventName
+      
+      # default value for preventDefault: yes
+      # console.log options.preventDefault
+      a.set 'preventDefault', options.preventDefault
+      
       # a.log 'eventName'
       a.set 'call', options.callback if options.callback
       Pinkman.actions.push(a)
@@ -455,7 +461,15 @@ class window.PinkmanAction extends window.PinkmanObject
       $('body').on eventName, action.selector, (ev) ->
         # debugger
         # console.log "#{action.id}: called - #{action.name}"
-        ev.preventDefault() if eventName != 'keypress' and eventName != 'mousedown'
+        
+        ev.preventDefault()  if (eventName != 'keypress' and eventName != 'mousedown') and action.preventDefault
+        # debug mode
+        # if (eventName != 'keypress' and eventName != 'mousedown') and action.preventDefault
+        #   console.log 'chamou prevent default'
+        #   ev.preventDefault() 
+        # else
+        #   console.log 'não chamou prevent default'
+        
         obj = window.Pinkman.closest($(this))
         action.call(obj,$(this),ev)
 

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

@@ -62,6 +62,12 @@ class window.Pinkman
     
   # --- tools and facilities
   
+  @md5: (args...) ->
+    md5(args...)
+    
+  @objHash: (obj) ->
+    @md5(JSON.stringify(obj))
+  
   @top: ->
     window.scrollTo(0,0)
 

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

@@ -44,7 +44,7 @@ class window.PinkmanPath extends Pinkman.object
         @set('depth',i)
         @set('staticDepth',s)
         @set('dynamicDepth',d)
-        PinkmanCache.cache("p-path-#{url}",this)
+        PinkmanCache.cache("p-path-#{url}", this)
       
   @depth: (url) ->
     a = url.split('/')

data/lib/pinkman/version.rb

@@ -1,3 +1,3 @@
 module Pinkman
-  VERSION = "1.3.7"
+  VERSION = "1.4.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pinkman
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.4.3
 platform: ruby
 authors:
 - Agilso Oliveira
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-01 00:00:00.000000000 Z
+date: 2019-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -322,7 +322,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Small Rails-js framework.