pinkman 1.5.0 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: fa1bf2864f22809f8c499dc3437a155460de8f51a24c7c8b37b96b404545ffe7
-  data.tar.gz: 0a2f8064c7976a7e1e531aa07dad167a847e6bd39a782aa0e598cbbd47c4b517
+SHA1:
+  metadata.gz: f5ae7dc5426b1991dfceff32ae73e6c5eb09b12e
+  data.tar.gz: c9e54763e2944487ba19c95d5a09a364eaed822c
 SHA512:
-  metadata.gz: 0e3bf8479041f58f137d70ac296cb7f353db73e1ac73bd4fa912748da5dfde4096b099091498b0d24e474f75609929ffc0d8ff500b5acbb099827fe9f3fe6129
-  data.tar.gz: 93710f4576d813674cfde8feb99420c0cd4f1a0739f13135a373baa621817c95f9affc15a60b8b50b96b3eb48d64ed8e1b90fd4e451cb9fa9f02432eaaa3ad60
+  metadata.gz: 31df578621909b49388c30cedca3a45562e66a77eeec0040f854504e1fe1995e2e76336576f49c36451888bbd78883e38261abfa0d67bb42488b35703aff2ba6
+  data.tar.gz: ff4493e22c00d4318bf9d4ed4f980d2292af75ed19c9cf5eee326a42c11e17be286b78f8a3ac67405fc98f3e3c1e7d286fbf69e59ec4baf278d828088724f2e5

data/.gitignore

@@ -8,3 +8,4 @@
 /spec/reports/
 /tmp/
 /dummy/
+.tool-versions

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

@@ -23,7 +23,7 @@ class window.PinkmanObject extends window.PinkmanCommon
       for instance in @instances
         i = i + 1
         if instance.id? and instance.id == obj.id
-          if obj.isPink then instance.assign(obj.attributes()) else instance.assign(obj)
+          if obj.isPink then instance.assign(obj.json()) else instance.assign(obj)
           each(instance) if $p.isFunction(each) and obj.pinkey != instance.pinkey
         callback() if (length == i) and $p.isFunction(callback)
     else
@@ -187,7 +187,7 @@ class window.PinkmanObject extends window.PinkmanCommon
   update: (callback='') ->
     if @id?
       Pinkman.ajax.patch
-        url: @api() + @id
+        url: @api(@id)
         data: @_data()
         complete: (response) =>
           @default_response_handling(response,callback)
@@ -202,7 +202,7 @@ class window.PinkmanObject extends window.PinkmanCommon
     params = new Object
     params.scope = Pinkman.scope(this)
     Pinkman.ajax.get
-      url: Pinkman.json2url(@api() + @id,params)
+      url: Pinkman.json2url(@api(@id),params)
       complete: (response) =>
         @assign(response)
         if @error? or @errors?
@@ -220,15 +220,39 @@ class window.PinkmanObject extends window.PinkmanCommon
       return false
 
   save: (callback='') ->
-    if @id? and @id!='' then @update(callback) else @create(callback)
+    @handleBeforeSave()
+    callback = @handleAfterSaveCallback(callback)
+    if @id? and @id!='' then @update(callback) else @create(callback)  
+    
+  handleBeforeSave: ->
+    if $p.isArray(@beforeSave)
+      for f in @beforeSave
+        f(this) if $p.isFunction(f)
+    else if $p.isFunction(@beforeSave)
+      @beforeSave(this)
+            
+  handleAfterSaveCallback: (callback) ->
+    if $p.isArray(@afterSave)
+      (obj) =>
+        i = 0
+        for f in @afterSave
+          f(obj) if $p.isFunction(f)
+          i = i + 1
+          callback(obj) if i == @afterSave.length and $p.isFunction(callback)
+    else if $p.isFunction(@afterSave)
+      (obj) =>
+        @afterSave(obj)
+        callback(obj) if $p.isFunction()
+    else
+      callback
 
   # delete and remove from collections
   destroy: (callback='') ->
     if @id?
       @removeFromAllCollections()
       Pinkman.ajax.delete
-        url: @api() + @id
-        data: { scope: Pinkman.scope(this) }
+        url: @api(@id)
+        data: @_data()
         complete: (response) =>
           @assign(response)
           delete @errors unless response.errors?
@@ -242,8 +266,8 @@ class window.PinkmanObject extends window.PinkmanCommon
   delete: (callback='') ->
     if @id?
       Pinkman.ajax.delete
-        url: @api() + @id
-        data: { scope: Pinkman.scope(this) }
+        url: @api(@id)
+        data: @_data()
         complete: (response) =>
           @assign(response)
           delete @errors unless response.errors?

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

@@ -280,12 +280,11 @@ class window.Pinkman
             contentType: false
         ajax.done (response) =>
           if response? and response.errors?
-            options.error(this) if options.error? and typeof options.error == 'function'
-            return false
+            options.error(response) if $p.isFunction(options.error)
           else
-            options.success(response) if options.success? and typeof options.success == 'function'
-          options.complete(response) if options.complete? and typeof options.complete == 'function'
-        return this
+            options.success(response) if $p.isFunction(options.success)
+          options.complete(response) if $p.isFunction(options.complete)
+          return response
       else
         return false
 

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

@@ -235,16 +235,19 @@ class window.PinkmanRouter
   
   @analytics: 
     create: (id) ->
-      # console.log 'chamou'
-      # console.log id
-      ga('create', id, 'auto');
-      ga('send', 'pageview');
+      try
+        ga('create', id, 'auto');
+        ga('send', 'pageview');
+        true
+      catch 
+        console.log('ga blocked')
+        false
+        
       
     send: (route,path) ->
       unless @created? and @created
         # console.log this
-        @create(Pinkman.router._config.analytics)
-        @created = true
+        @created = @create(Pinkman.router._config.analytics)
       else
         host = new RegExp(window.location.origin)
         path = if host.test(path) then path.replace(host,'') else path

data/lib/pinkman/version.rb

@@ -1,3 +1,3 @@
 module Pinkman
-  VERSION = "1.5.0"
+  VERSION = "1.5.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pinkman
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.5
 platform: ruby
 authors:
 - Agilso Oliveira
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-28 00:00:00.000000000 Z
+date: 2021-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -322,7 +322,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubyforge_project: 
+rubygems_version: 2.6.14.4
 signing_key: 
 specification_version: 4
 summary: Small Rails-js framework.