pinkman 0.9.1.24 → 0.9.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb10d76bda62a949e93ea052899855079e0a7aa1
-  data.tar.gz: 932cd458e17d3534e935a833f6ed34f7f5249c39
+  metadata.gz: 0e67efb282a22795bcde07d95c93c2875b520be7
+  data.tar.gz: bd67054d547e3ab8a3c302149371dd0969ed7c39
 SHA512:
-  metadata.gz: 95319f0e82e999d1f748484cf5e7a65a9438fd2c3ce045c79b60065f65c0894696f12af71f2f63d47a5618cb206aba7a9bac7db06bde9310d9a128cb678b1f08
-  data.tar.gz: d1761e54da101e5423ff2ee76befd6c97cd6600c863a04bd767bfecc71af42179f25d5ecf251f08f5786e41ab085bb35c445a92513c26a62af9cbc83756b7f33
+  metadata.gz: 076ceb22a7d302bf17bc98f243299da856f3bdc4d26267a9dbf58ebcda873df033deea4501413bda02000bcd76f7d5bde059dd407def5c1d8fe11dd66a2264de
+  data.tar.gz: d61a793ed823ee530998b4445b5c94347af179561d850798dc90d199ebd40b155a7b204415ff82594e0fade7ee4e98324631c4ad0d584f10f529f228b8bd42ea

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

@@ -157,7 +157,6 @@ class window.PinkmanObject extends window.PinkmanCommon
   reload: (callback) ->
     params = new Object
     params.scope = Pinkman.scope(this)
-
     Pinkman.ajax.get 
       url: Pinkman.json2url(@api() + @id,params)
       complete: (response) =>
@@ -186,15 +185,26 @@ class window.PinkmanObject extends window.PinkmanCommon
       @removeFromAllCollections()
       Pinkman.ajax.delete
         url: @api() + @id
+        data: { scope: Pinkman.scope(this) }
         complete: (response) =>
           @assign(response)
           delete @errors unless response.errors?
-          if @errors?
-            throw new Error(@firstError())
-            return(false)
-          else
-            @id = null
-            callback(this) if typeof callback=='function'
+          @id = null unless @errors?
+          callback(this) if callback? and typeof callback=='function'
+      return(this)
+    else
+      return(false)
+
+  delete: (callback='') ->
+    if @id?
+      Pinkman.ajax.delete
+        url: @api() + @id
+        data: { scope: Pinkman.scope(this) }
+        complete: (response) =>
+          @assign(response)
+          delete @errors unless response.errors?
+          @id = null unless @errors?
+          callback(this) if callback? and typeof callback=='function'
       return(this)
     else
       return(false)

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

@@ -93,16 +93,13 @@ Pinkman.saveElementScrollPosition = (id) ->
   a = Pinkman.scrolling.find(id)
   a = new Pinkman.object unless a?
   a.set('id',id)
-  element = $("##{id}")
-  elementPos = if element? then element.offset().top else 0
-  referencePos = if element.children()? then element.children().first().offset().top else 0
-  position = elementPos - referencePos
-
+  position = if document.getElementById(id) then document.getElementById(id).scrollTop else 0
   a.set('position', position)
   Pinkman.scrolling.push(a)
 
 Pinkman.restoreElementScrollPosition = (id) ->
-  document.getElementById(id).scrollTop = Pinkman.scrolling.find(id).position
+  if Pinkman.scrolling.include(id: id)
+    document.getElementById(id).scrollTop = Pinkman.scrolling.find(id).position
 
 Pinkman.reRender = (object) ->
   if object.renderQueue?

data/lib/generators/pinkman/templates/api.rb.erb

@@ -25,21 +25,14 @@ class Api::<%= controller_name %> < ApiController
   # post api/<%= api_name %>
   def create
     @<%= instance_name %>.assign_attributes <%= params_method_name %>
-    if @<%= instance_name %>.save
-      render json: @<%= instance_name %>.json_for(current_scope)
-    else
-      render json: {errors: @<%= instance_name %>.errors}
-    end
+    @<%= instance_name %>.save
+    render json: @<%= instance_name %>.json_for(current_scope)
   end
 
   # put/patch api/<%= api_name %>/:id
   def update
-    @<%= instance_name %>.assign_attributes <%= params_method_name %>
-    if @<%= instance_name %>.save
-      render json: @<%= instance_name %>.json_for(current_scope)
-    else
-      render json: {errors: @<%= instance_name %>.errors}
-    end
+    @<%= instance_name %>.update <%= params_method_name %>
+    render json: @<%= instance_name %>.json_for(current_scope)
   end
 
   # delete api/<%= api_name %>/:id

data/lib/pinkman/serializer/base.rb

@@ -6,14 +6,16 @@ module Pinkman
   module Serializer
 
     class Base < ActiveModel::Serializer
+      attr_accessor :errors
+      attr_accessor :params
 
       def initialize *args
         super(*args)
+        @errors = Base.format_errors(args.first.errors.to_h) if args.first.errors.present? and args.first.errors.any?
         @params = OpenStruct.new(args[1][:params]) if args.length > 1 and args[1].is_a?(Hash) and args[1][:params]
         self
       end
 
-      attr_accessor :params
 
       self.root = false
 
@@ -65,6 +67,12 @@ module Pinkman
         end
       end
 
+      def self.format_errors errors
+        e = Hash.new
+        errors.each {|k,v| e[k] = [v].flatten}
+        e
+      end
+
       def attributes *args
         hash = super(*args)
         if scope
@@ -74,6 +82,7 @@ module Pinkman
           model.column_names.each {|attribute| hash[attribute] = object.send(attribute) } if include_all && model && model.methods.include?(:column_names)
           pinkmanscope.read.each {|attribute| hash[attribute] = object.send(attribute) if object.methods.include?(attribute)}
           pinkmanscope.read.each {|attribute| hash[attribute] = send(attribute) if self.methods.include?(attribute)}
+          hash[:errors] = self.class.format_errors(errors) if errors.present? and errors.any?
           hash
         end
       end

data/lib/pinkman/serializer/scope.rb

@@ -27,7 +27,7 @@ module Pinkman
       end
 
       def can_read? attribute
-        read.include?(:all) or read.include?(attribute.to_sym) or attribute == :error or attribute == :errors
+        read.include?(:all) or read.include?(attribute.to_sym) or attribute.to_sym == :error or attribute.to_sym == :errors
       end
 
       def can_write? attribute

data/lib/pinkman/version.rb

@@ -1,3 +1,3 @@
 module Pinkman
-  VERSION = "0.9.1.24"
+  VERSION = "0.9.1.26"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pinkman
 version: !ruby/object:Gem::Version
-  version: 0.9.1.24
+  version: 0.9.1.26
 platform: ruby
 authors:
 - Agilso Oliveira
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-22 00:00:00.000000000 Z
+date: 2017-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler