pinkman 1.3.7 → 1.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 277037c6ebdf2b0d1aa89843d34f024b17f9c1ceeb4f8e6a0242cd9585a2e336
-  data.tar.gz: dbb4eab44a12bdd5245ec69ee29e5911ce87b437068cfa70e045969c38dc34d7
+  metadata.gz: 77969e0086edd331ff68a4ab02d1a3fae64117c1aa0b6801cb9f49e8c6ca7235
+  data.tar.gz: 1b102738539bdec1878260ec63a9183b4ae22dfc217686c8c3c7a2616c55e0c2
 SHA512:
-  metadata.gz: 12f60a37950707411fa5b7609b876aa6d20a293afdff00bff96bdc7f6fb64984ac455bd882c886c23feb15eed349afcb563dc567275a5cf2e2acf50541151032
-  data.tar.gz: e225bf5db201fa1f5bd123145e7d0beb270575e250788e3ff5a62ce563d0b0f2576c167b683927177a36934f56da564ff719a78e9aa766cd13f5b22f8d5db28a
+  metadata.gz: e74eb5d9bbc15701b0c378f2016a784066539d8f819ea516e518c06253f3cc46bddb22968c189f8a18dffefb44ee444cf0c87947a64e30dff8078316556971bb
+  data.tar.gz: de9f9cc1deefe6f1a07e1fcb402de22d0753ced97c954d74b2fa9cddfed648cb29221f9df042cb3a18f6b6d1eef7e452538eae7eb3d72d2f953c8991154dd9d0

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

@@ -519,10 +519,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 +555,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 +633,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 +643,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 +661,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/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.3.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pinkman
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.3.8
 platform: ruby
 authors:
 - Agilso Oliveira
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-01 00:00:00.000000000 Z
+date: 2019-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler