pinkman 0.9.1.2 → 0.9.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 247cc59734974a1ef0f56f5ad8b7b993d86226fe
-  data.tar.gz: 24c7e182829bde91cd4a73f5af3a4c6430785f19
+  metadata.gz: f071ffd276a4ffce048f6c50bf45867239a60193
+  data.tar.gz: 7a745e4dfa2cf9d6011b3ef43a8fb694fbddb273
 SHA512:
-  metadata.gz: ffdd02eb13502a3cce266ddc4b9c40025cd9bc53fb675ad4b4c5ac9d296c770fb649cd218f45d6d122a4ff6e1576a1a7eaffc375af9fe1cc889255a598dc3c1c
-  data.tar.gz: 1bffd0181dfe58ebd0775f488484a441b38ffcf2dd561dcf65c40ace9c67f34b8e588407ed0a25caf659c789d411be447ed6e07e7a506012befc25aac1947628
+  metadata.gz: 32ec6ef56b0fb4806b223ec8f157e1effb190db6e6082b0b9955ca6d179cb41b16077d6468a6a49d4a646c384246c49af68fc00677cf0a3587c523b2f9f0a48e
+  data.tar.gz: f8b506709206275f684f6a235339a9f21e7ddf1cf00c7b7c37faa27c02b2e573b6b8282848a7e232f17c01df7e35891b355e07bb3c44eaa3ad3ed29b0f68af91

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

@@ -22,6 +22,14 @@ class window.PinkmanCollection extends window.PinkmanCommon
   attributes: ->
     return @collection
 
+  # Desc: json version of this
+  # desc: used in api comunications
+  json: ->
+    json = []
+    @each (object) ->
+      json.push(object.json()) if object.isPink and object.json? and typeof object.json == 'function'
+    json
+
   # Desc: collection size
   count: (criteria='') ->
     if criteria? and typeof criteria  == 'function'
@@ -255,6 +263,10 @@ class window.PinkmanCollection extends window.PinkmanCommon
         @push(object)
     return(this)
 
+  # Desc: fetch from array alias
+  assign: (array...) ->
+    @fetchFromArray(array...)
+
   # Desc: merges this collection with another
   merge: (collection) ->
     if Pinkman.isArray(collection)

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

@@ -1,5 +1,8 @@
 class window.PinkmanCommon
 
+  constructor: (attributesObject) ->
+    @initialize(attributesObject) if attributesObject?
+
   @privateAttributes = ['isPink','isObject','isCollection','pinkey','config','pinkmanType','collections','renderQueue']
   
   @mixin: (args...) ->
@@ -12,6 +15,12 @@ class window.PinkmanCommon
     object.constructor is this
 
 
+  initialize: (attributesObject) ->
+    if typeof attributesObject == 'object'
+      for key, value of attributesObject
+        @set(key,value) if PinkmanObject.privateAttributes.indexOf(key) is -1
+
+
   # Desc: return api url path
   api: () ->
     if @config? and @config.api?
@@ -53,4 +62,8 @@ class window.PinkmanCommon
     Pinkman.reRender this    
 
   watch: () ->
-    @_watching = yes
+    @_watching = yes
+
+  queue: (options) ->
+    @renderQueue = new PinkmanCollection unless @renderQueue?
+    @renderQueue.directPush(options)

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

@@ -2,8 +2,8 @@ class window.PinkmanObject extends window.PinkmanCommon
 
   @pinkmanType: 'object'
 
-  constructor: (attributesObject) ->
-    
+  constructor: (args...) ->
+    super(args...)
     @isPink = true
     @isObject = true
     @pinkmanType = 'object'
@@ -13,20 +13,13 @@ class window.PinkmanObject extends window.PinkmanCommon
 
     Pinkman.objects.push(this)
     Pinkman.all.push(this)
-    
-    @initialize(attributesObject)
-
-  initialize: (attributesObject) ->
-    if typeof attributesObject == 'object'
-      for key, value of attributesObject
-        @set(key,value) if PinkmanObject.privateAttributes.indexOf(key) is -1
 
   # Desc: assign attributes from a pure javascript object
   # Usage: a.assign( {attribute: value} )
   assign: (obj) ->
     if typeof obj == 'object'
       for k,v of obj
-        if typeof v == 'object' and this[k]? and this[k].isPink? and not v.isPink
+        if typeof v == 'object' and this[k]? and this[k].isPink and not v.isPink
           this[k].assign(v)
         else
           this.set(k,v) 
@@ -45,6 +38,15 @@ class window.PinkmanObject extends window.PinkmanCommon
         else
           a[k] = v
     return a
+
+  # Desc: json version of this
+  # desc: used in api comunications
+  json: () ->
+    a = new Object
+    for k,v of this
+      if PinkmanObject.privateAttributes.indexOf(k) == -1 and typeof v != 'function'
+        a[k] = if v.isPink then v.json() else v
+    return a
   
   # Desc: returns a array of attributes keys
   # Usage:
@@ -131,7 +133,7 @@ class window.PinkmanObject extends window.PinkmanCommon
     unless @id?
       Pinkman.ajax.post
         url: @api()
-        data: { pink_obj: @attributes() }
+        data: { pink_obj: @json() }
         complete: (response) =>
           @assign(response)
           delete @errors unless response.errors?
@@ -139,11 +141,10 @@ class window.PinkmanObject extends window.PinkmanCommon
       return(this)
 
   update: (callback='') ->
-    console.log this
     if @id?
       Pinkman.ajax.patch
         url: @api() + @id
-        data: { pink_obj: @attributes() }
+        data: { pink_obj: @json() }
         complete: (response) =>
           @assign(response)
           delete @errors unless response.errors?

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

@@ -1,6 +1,3 @@
-PinkmanCollection.prototype.renderQueue = new PinkmanCollection
-PinkmanObject.prototype.renderQueue = new PinkmanCollection
-
 Pinkman.templates = new Pinkman.collection
 
 Pinkman.template_engine = '<%= Pinkman.configuration.js_template_engine %>'
@@ -16,6 +13,7 @@ Pinkman.template_engines =
         Pinkman.templates.push(template)
 
       options.object = options.context if options.context?
+      options.object = new Object unless options.object? and typeof options.object == 'object'
       content = template.handlebars(options.object)
 
 
@@ -36,6 +34,7 @@ Pinkman.template_engines =
         Pinkman.templates.push(template)
 
       options.object = options.context if options.context?
+      options.object = new Object unless options.object? and typeof options.object == 'object'
       content = template.hogan.render(options.object)
 
       if options.target?
@@ -55,6 +54,7 @@ Pinkman.template_engines =
         Pinkman.templates.push(template)
 
       options.object = options.context if options.context?
+      options.object = new Object unless options.object? and typeof options.object == 'object'
       content = template.markup($('#'+options.template).html(),options.object)
 
       if options.target?
@@ -70,7 +70,7 @@ Pinkman.render = (options) ->
 
   engine = Pinkman.template_engines[Pinkman.template_engine]
   content = engine(options)
-  options.object.renderQueue.directPush(options) if options.reRender and options.object? and options.object.isPink
+  options.object.queue(options) if options.reRender and options.object? and options.object.isPink
 
 Pinkman.reRender = (object) ->
   engine = Pinkman.template_engines[Pinkman.template_engine]

data/app/helpers/pinkman_helper.rb

@@ -17,8 +17,12 @@ module PinkmanHelper
     wrap_in('collection',&block)
   end
 
+  def each &block
+    collection(&block)
+  end
+
   def write string
-    raw("{{ #{string} }}")
+    raw("{{#{string}}}")
   end
 
   def w *args

data/lib/generators/pinkman/app_base_generator.rb

@@ -13,11 +13,11 @@ module Pinkman
     private
 
     def object_filename
-      app_name.underscore.downcase + '_object.coffee'
+      'app_object.coffee'
     end
 
     def collection_filename
-      app_name.underscore.downcase + '_collection.coffee'
+      'app_collection.coffee'
     end
 
     def app_name

data/lib/pinkman/version.rb

@@ -1,3 +1,3 @@
 module Pinkman
-  VERSION = "0.9.1.2"
+  VERSION = "0.9.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pinkman
 version: !ruby/object:Gem::Version
-  version: 0.9.1.2
+  version: 0.9.1.3
 platform: ruby
 authors:
 - Agilso Oliveira
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-20 00:00:00.000000000 Z
+date: 2017-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler