pinkman 0.9.9.9.10 → 0.9.9.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2578f7ed00a7dbdeb84024113b941e578ce5df966cb3835637879aca2adaae1e
-  data.tar.gz: c04a023cf880c0ff3e4618fb778330f2da7f141a06703bb69d3c0ef1a05512a1
+  metadata.gz: 542f0294f57dc31831c1f3edf26e84eff18a8b52c12dc590a5829e4e32947ad5
+  data.tar.gz: bd5f4831742985e4f214d7a67d4863297cacf8ec9065f8254e0e3e3d1acc0863
 SHA512:
-  metadata.gz: 88f823fd6b206c0bf6027f3cc2ce89deb8da96f7e3d413d5039eb5e20b33c2fc5197d3c00a4b3040414cbbf3ed5a1b9dc99d1dcb7637818d3408eef46e937f63
-  data.tar.gz: 014dcc79ec52d9fd9ee2b1a9b5bdb01389c182c853224409a6160aeffacc53001e93b7475eac6a9b4d3c8b685f7fafcd41c923a32f600c114689a053aea1d2d9
+  metadata.gz: f008682f5279f37b1dfc5007cf5bf185c9dc9cac65226ac709cfd506a93e291b5a3fcd6f4c107b321a87662e38d3d33a2e5deb2d07325e0854de3b76ebf779f1
+  data.tar.gz: 12d8a131e75349686ef9168c6290f51c22684c3900d17ce82aa06c3c605eaca36aae37d18ea2ba74f1c9be19b21eae09d07a9af521362b2f3367ac3941f07f29

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

@@ -212,13 +212,25 @@ class window.PinkmanCollection extends window.PinkmanCommon
   shift: ->
     @remove(@first())
 
+  removeId: (id,callback) ->
+    @find id, (obj) =>
+      if obj?
+        i = @collection.indexOf(obj)
+        @collection.splice(i,1)
+        callback(this) if $p.isFunction(callback)
+        
   # Desc: remove a object from the collection
   remove: (object,callback) ->
-    if typeof object == 'object' and object.id? and (a = @find(object.id))?
-      i = @collection.indexOf a
-      @collection.splice(i,1)
-      value = a
+    if typeof object == 'object' and object.id?
+      # console.log 'id'
+      if (@any (o) -> o.id == object.id)
+        # console.log 'any'
+        value = @find(object.id)
+        # console.log value
+        i = @collection.indexOf(value)
+        @collection.splice(i,1)
     else
+      console.log 'js'
       i = @collection.indexOf object
       @collection.splice(i,1)
       value = object

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

@@ -289,10 +289,15 @@ class window.PinkmanController extends window.PinkmanObject
       callback = if typeof opt == 'function' then opt else opt['callback']
     catch
       throw 'Callback not found.'
+    throw 'Subscriber: blank options param' unless opt
+    throw 'Subscriber: options not a object' unless $p.isObject(opt)
+    throw 'Subscriber: options missing room value' unless opt.room?
+    throw 'Subscriber: options missing scope value' unless opt.scope?
     params = if (typeof opt == 'object' and opt['params']?) then opt['params'] else new Object
     params.channel = channel
     if $p.isObject(opt)
-      params.room = opt.room if opt.room?
+      params.room = opt.room
+      params.scope = opt.scope
       params.filter_by = (opt.filter_by or opt.filterBy ) if (opt.filterBy? or opt.filter_by?)
     Pinkman.cable.subscriptions.create params, received: callback
     

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

@@ -7,7 +7,25 @@ class window.PinkmanObject extends window.PinkmanCommon
     @isObject = true
     @pinkmanType = 'object'
     @collections = new PinkmanCollection
+    if $p.isArray(@constructor.instances)
+      @constructor.instances.push(this)
+    else
+      @constructor.instances = [this]
     Pinkman.objects.push(this)
+    
+  @sync: (obj,callback,each) ->
+    if $p.isArray(@instances) and $p.isObject(obj) and obj.id?
+      length = @instances.length
+      i = 0
+      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)
+          each(instance) if $p.isFunction(each) and obj.pinkey != instance.pinkey
+          callback() if (length == i) and $p.isFunction(callback)
+            
+    else
+      true
 
   # Desc: assign attributes from a pure javascript object
   # Usage: a.assign( {attribute: value} )
@@ -97,7 +115,9 @@ class window.PinkmanObject extends window.PinkmanCommon
 
   # Desc: remove this object from all collections
   clearCollections: ->
-    c.remove(this) for c in @collections.collection
+    @collections.each (c) =>
+      # console.log this
+      c.removeId(@id) if @id?
 
   # alias for clearCollections
   removeFromCollections: ->
@@ -184,6 +204,7 @@ class window.PinkmanObject extends window.PinkmanCommon
   save: (callback='') ->
     if @id? and @id!='' then @update(callback) else @create(callback)
 
+  # delete and remove from collections
   destroy: (callback='') ->
     if @id?
       @removeFromAllCollections()
@@ -199,6 +220,7 @@ class window.PinkmanObject extends window.PinkmanCommon
     else
       return(false)
 
+  # delete and dont touch collections
   delete: (callback='') ->
     if @id?
       Pinkman.ajax.delete

data/app/channels/pinkman_channel.rb

@@ -41,7 +41,7 @@ class PinkmanChannel < ActionCable::Channel::Base
   end
   
   def stream
-    Pinkman::Broadcaster.stream(self,current_scope,params)
+    Pinkman::Broadcaster.stream(self,current_allowed_scopes,params)
   end
 
 

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

@@ -1,8 +1,8 @@
 class <%= channel_name %> < PinkmanChannel
   
-  # TO DO: use connection/params to determine the current scope
-  def current_scope
-    :public
+  # TO DO: use connection/params and return an array of scopes (symbols) the current user can subscribe
+  def current_allowed_scopes
+    [:public]
   end
   
   # broadcast :public do |config|

data/lib/pinkman/broadcaster.rb

@@ -22,24 +22,25 @@ class Pinkman::Broadcaster
     ActionCable.server.broadcast(room_name_from_record(room,record), {action: action, data: record.json_hash(scope)})
   end
   
-  def self.stream channel, scope, params
-    if params[:room].present?
+  def self.stream channel, current_allowed_scopes, params
+    if params[:room].present? and params[:scope].present?
       broadcaster = broadcasters[params[:room].to_sym]
-      if broadcaster.present? and broadcaster.scope == scope
+      raise 'Unknown scope' unless params[:scope].is_a?(String)
+      if broadcaster.present? and params[:scope].to_sym.in?(current_allowed_scopes)
         channel.stream_from(room_name_from_params(broadcaster,params))
       else
         raise "Insuficient permissions or room '#{params[:room]}' not found."
       end
     else
-      raise 'Room not specified through client.'
+      raise 'Room or Scope not specified through client.'
     end
   end
   
   def self.room_name_from_params broadcaster, params
-    if params[:filter_by].is_a? String
-      broadcaster.encrypt(broadcaster.room,params[:filter_by])
+    if params[:filter_by].is_a?(String) or params[:filter_by].is_a?(Numeric)
+      broadcaster.encrypt(broadcaster.room,params[:filter_by].to_s)
     elsif params[:filter_by].is_a? Array
-      broadcaster.encrypt(broadcaster.room, params[:filter_by].join(' '))
+      broadcaster.encrypt(broadcaster.room, params[:filter_by].map(&:to_s).join(' '))
     else
       broadcaster.room
     end

data/lib/pinkman/version.rb

@@ -1,3 +1,3 @@
 module Pinkman
-  VERSION = "0.9.9.9.10"
+  VERSION = "0.9.9.9.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pinkman
 version: !ruby/object:Gem::Version
-  version: 0.9.9.9.10
+  version: 0.9.9.9.11
 platform: ruby
 authors:
 - Agilso Oliveira
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-16 00:00:00.000000000 Z
+date: 2018-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler