pinkman 0.9.1.9 → 0.9.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28b5e2aee68bfcbb2e5df9fa35c8eaa336de6ad2
-  data.tar.gz: c66a229e145856407ab7c2e1b27cc9b2cecdfa0d
+  metadata.gz: f316922107a3535edc3a1ea9dc9a93d251ef031b
+  data.tar.gz: f41cf712bbe140b9c8a672bbd59599f4643eb5e2
 SHA512:
-  metadata.gz: 16e3a2e863e14057b5aae53642d74e2c6f3e012c809d2fb28b3fbfe3616809a530a6e9ea3de749ce91f64e117890adb3cb6562df1f30cc0e2fbf5358edbf921e
-  data.tar.gz: 8504a6a5a5d04c221df84d4d7d55baf4c3eb5d6fc27b1d82cee8637a34166e91d026a2aa5a9bcbaf8dc5f16edf53307b02ae2a39dc3c8a6e2af549f2505e7403
+  metadata.gz: ab8c4c332254a397fffbd7583039bbcbf5eac6285bace521c5b7ccec6246b033626bcb797b504b0202374f5b30eb7e2b021ef145043fc30b5f12c68f1ba2706c
+  data.tar.gz: 4120498837285cb74c6316b65eac0ac2cac155dba03f984132f10b0fb4d2e850e93df7686bd89fdcb905454dca2ef1bf6451551b059c0de85c43ac90f770525a

data/app/assets/javascripts/pinkman.js

@@ -1,4 +1,3 @@
-//= require pinkman_base/handlebars
 //= require pinkman_base/tools
 //= require pinkman_base/pinkman
 //= require pinkman_base/mixins

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

@@ -331,7 +331,6 @@ class window.PinkmanCollection extends window.PinkmanCommon
     else
       return false
 
-
   # --- Ajax related --- #
 
   # Desc: Fetch records from API_URL
@@ -359,37 +358,44 @@ class window.PinkmanCollection extends window.PinkmanCommon
   # request:  get /api/API_URL/
   fetchFromUrl: (options) ->
     if options? and typeof options == 'object' and options.url?
+      @emptyResponse = null
       @fetchingFrom = options.url
       Pinkman.ajax.get
         url: Pinkman.json2url(options.url,options.params) 
         complete: (response) =>
-          if response.errors? or response.error?
-            [@errors, @error] = [response.errors, response.error]
-            if response.errors? then (throw new Error('Oh no... I could not fetch your records, bitch. (jk... about the "bitch" part)')) else (throw new Error(response.error))
-            return false
-          else
+          if response?
+            [@errors, @error] = [response.errors, response.error] if response.errors? or response.error?
+            
+            # separate recent when this collection is already populated
+            if @any()
+              @_recent = new this.constructor
+              @_recent.fetchFromArray(response)
+
             @fetchFromArray(response).emptyResponse = response.length == 0
-            options.callback(this) if options.callback? and typeof options.callback == 'function'
+
+          @emptyResponse = true unless response?
+          options.callback(this) if options.callback? and typeof options.callback == 'function'
       return(this)
 
   # Desc: Fetch next records from last fetched URL or main API_URl
   # request:  get /api/API_URL/?offset="COLLECTION_SIZE"&limit=n
   # in rails: api::controller#index
   fetchMore: (n=10,callback='') ->
-    if @fetchingFrom?
-      @fetchFromUrl
-        url: @fetchingFrom
-        params:
-          limit: n
-          offset: @count()
-        callback: callback
-    else
-      @fetchFromUrl 
-        url: @api()
-        params:
-          limit: n
-          offset: @count()
-        callback: callback
+    unless @emptyResponse
+      if @fetchingFrom?
+        @fetchFromUrl
+          url: @fetchingFrom
+          params:
+            limit: n
+            offset: @count()
+          callback: callback
+      else
+        @fetchFromUrl 
+          url: @api()
+          params:
+            limit: n
+            offset: @count()
+          callback: callback
 
   # Desc: Fetch next n records from a action
   # request:  get /api/API_URL/:action/?offset="COLLECTION_SIZE"&limit=n
@@ -403,6 +409,6 @@ class window.PinkmanCollection extends window.PinkmanCommon
   # assume models to have a Model.search("YOUR_QUERY") method.
   search: (query,callback='') ->
     @removeAll()
-    @fetchFromUrl { url: @api(), params: {query: query}, callback: callback }
+    @fetchFromUrl { url: @api() + 'search', params: {query: query}, callback: callback }
 
 window.Pinkman.collection = window.PinkmanCollection

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

@@ -58,8 +58,24 @@ class window.PinkmanCommon
       opts = {object: this, target: options, template: options + '-template'}
       Pinkman.render opts
 
-  reRender: () ->
-    Pinkman.reRender this    
+  reRender: (callback='') ->
+    Pinkman.reRender(this)    
+    callback(this) if typeof callback == 'function'
+    return this
+
+
+  append: (options) ->
+    if options? and typeof options == 'object' and options.template? and options.target?
+      newOptions = new Object
+      for k,v of options
+        newOptions[k] = v if k != 'target' and k != 'callback'
+      newOptions.reRender = no
+      target = options.target
+      newOptions.object = this
+      newOptions.callback = (object,content) ->
+        $('#'+target).append(content)
+        options.callback(object,content) if options.callback? and typeof options.callback == 'function'
+      Pinkman.render(newOptions)
 
   watch: () ->
     @_watching = yes

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

@@ -74,13 +74,13 @@ class window.Pinkman
             dataType: 'json'
             data: options.data
         ajax.done (response) =>
-          if response.errors?
+          if response? and response.errors?
             options.error(this) if options.error? and typeof options.error == 'function'
-            return(false)
           else
             options.success(response) if options.success? and typeof options.success == 'function'
-            options.complete(response) if options.complete? and typeof options.complete == 'function'
-            return(true)
+            
+          options.complete(response) if options.complete? and typeof options.complete == 'function'
+          return(true)
       else
         return false
 

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

@@ -3,80 +3,91 @@ Pinkman.templates = new Pinkman.collection
 Pinkman.template_engine = '<%= Pinkman.configuration.js_template_engine %>'
 
 Pinkman.template_engines =
-  handlebars: (options) ->
-    if options? and options.template? and $('#' + options.template).length
-      if Pinkman.templates.include(template: options.template, engine: Pinkman.template_engine)
-        template = Pinkman.templates.get(template: options.template, engine: Pinkman.template_engine)
-      else
-        template = new Pinkman.object(template: options.template, engine: Pinkman.template_engine)
-        template.handlebars = Handlebars.compile $('#' + options.template).html()
-        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)
-
-
-      if options.target?
-        $('#' + options.target).html(content)
-        $('#' + options.target).attr('data-pinkey',options.object.pinkey) if options.object? and typeof options.object == 'object' and options.object.isPink
-
-      options.callback(options.object,content) if options.callback? and typeof options.callback == 'function'
-      return(content)
 
-  hogan: (options) ->
+  handlebars: (template,html) ->
+    if Handlebars?
+      template.handlebars = Handlebars.compile(html)
+      template.render = (context) ->
+        @handlebars(context)
+      template
+    else
+
+
+  hogan: (template,html) ->
+    if Hogan?
+      template.hogan = Hogan.compile(html)
+      template.render = (context) ->
+        @hogan.render(context)
+      template
+    else
+
+
+  markup: (template,html) ->
+    if Mark?
+      template.render = (context) -> Mark.up(html,context)
+      template
+    else
+
+  template: (options) ->
+    if Pinkman.templates.include(template: options.template, engine: options.engine)
+      template = Pinkman.templates.get(template: options.template, engine: options.engine)
+    else
+      template = new Pinkman.object(template: options.template, engine: options.engine)
+      @compile(options.engine, template, $('#' + options.template).html())
+      Pinkman.templates.push(template)
+    return(template)
+
+  context: (options) ->
+    options.object = options.context if options.context?
+    options.object = new Object unless options.object? and typeof options.object == 'object'
+    return(options.object)
+
+  compile: (engine, template, html) ->
+    e = Pinkman.template_engines[engine]
+    e(template,html)
+    template
+
+  renderOntarget: (options,content) ->
+    if options.target?
+      $('#' + options.target).html(content)
+      $('#' + options.target).attr('data-pinkey',options.object.pinkey) if options.object? and typeof options.object == 'object' and options.object.isPink
+
+      # checks and sync select options with the pinkman object
+      $("##{options.target} select").each (i,el) ->
+        obj = Pinkman.get($(el).data('pinkey'))
+        $(el).find("option[value='#{obj[$(el).attr('name')]}']").attr('selected','selected')
+
+  render: (options) ->
+    # 1 check if template exists
     if options? and options.template? and $('#' + options.template).length
-      if Pinkman.templates.include(template: options.template, engine: Pinkman.template_engine)
-        template = Pinkman.templates.get(template: options.template, engine: Pinkman.template_engine)
-      else
-        template = new Pinkman.object(template: options.template, engine: Pinkman.template_engine)
-        template.hogan = Hogan.compile $('#' + options.template).html()
-        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)
+      # 2 check if compiled template exists. Create one otherwise.
+      template = @template(options)
 
-      if options.target?
-        $('#' + options.target).html(content)
-        $('#' + options.target).attr('data-pinkey',options.object.pinkey) if options.object? and typeof options.object == 'object' and options.object.isPink
+      # 3 render template within the context
+      content = template.render(@context(options))
 
-      options.callback(options.object,content) if options.callback? and typeof options.callback == 'function'
-      return(content)
-
-  markup: (options) ->
-    if options? and options.template? and $('#' + options.template).length
-      if Pinkman.templates.include(template: options.template, engine: Pinkman.template_engine)
-        template = Pinkman.templates.get(template: options.template, engine: Pinkman.template_engine)
-      else
-        template = new Pinkman.object(template: options.template, engine: Pinkman.template_engine)
-        template.markup = (args...) -> Mark.up(args...)
-        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?
-        $('#' + options.target).html(content)
-        $('#' + options.target).attr('data-pinkey',options.object.pinkey) if options.object? and typeof options.object == 'object' and options.object.isPink
+      # 4 insert html on target
+      @renderOntarget(options,content)
 
+      # 5 callback function
       options.callback(options.object,content) if options.callback? and typeof options.callback == 'function'
       return(content)
 
 Pinkman.render = (options) ->
   options.reRender = true unless options.reRender? and options.reRender == false
   options.collectionReRender = true unless options.collectionReRender? and options.collectionReRender == false
-
-  engine = Pinkman.template_engines[Pinkman.template_engine]
-  content = engine(options)
+  options.engine = Pinkman.template_engine unless options.engine? and options.engine != ''
+  Pinkman.template_engines.render(options) 
   options.object.queue(options) if options.reRender and options.object? and options.object.isPink
 
 Pinkman.reRender = (object) ->
   if object.renderQueue?
-    engine = Pinkman.template_engines[Pinkman.template_engine]
-    engine(options) for options in object.renderQueue.collection
-    Pinkman.reRender(collection) for collection in object.collections.collection if object.collections? and options.collectionReRender
+    collectionReRender = false
+    for options in object.renderQueue.collection
+      Pinkman.template_engines.render(options)
+      collectionReRender = true if options.collectionReRender
+    collection.reRender() for collection in object.collections.collection if collectionReRender and object.collections?
     object.renderQueue.any()
   else
     true

data/app/assets/javascripts/pinkman_with_handlebars.js

@@ -0,0 +1,2 @@
+//= require pinkman/engines/handlebars
+//= require pinkman

data/app/assets/javascripts/pinkman_with_hogan.js

@@ -0,0 +1,2 @@
+//= require pinkman/engines/hogan
+//= require pinkman

data/app/assets/javascripts/pinkman_with_markup.js

@@ -0,0 +1,2 @@
+//= require pinkman/engines/markup
+//= require pinkman

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

@@ -1,14 +1,8 @@
 class Api::<%= controller_name %> < ApiController
 
-  before_action :current_scope
   before_action :permissions
   before_action :set_objects
 
-  # To do: define the current scope the way you want
-  def current_scope
-    :all
-  end
-
   # get api/<%= api_name %>
   def index
     <%= collection_name %> = <%= active_record_model_name %>.limit(params[:limit]).offset(params[:offset])
@@ -48,7 +42,6 @@ class Api::<%= controller_name %> < ApiController
     end
   end
 
-
   # delete api/<%= api_name %>/:id
   def destroy
     @<%= instance_name %>.destroy

data/lib/generators/pinkman/templates/api_controller.rb

@@ -6,5 +6,15 @@ class ApiController < ApplicationController
     params[:limit] = 20 if params[:limit].blank?
     params[:offset] = 0 if params[:offset].blank?
   end
+
+  # To do: define the current scope the way you want
+  # Example:
+  # def current_scope
+  #   current_user.admin? ? :admin : :public
+  # end
+  def current_scope
+    :public
+  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)
+        read.include?(:all) or read.include?(attribute.to_sym) or attribute == :error or attribute == :errors
       end
 
       def can_write? attribute

data/lib/pinkman/version.rb

@@ -1,3 +1,3 @@
 module Pinkman
-  VERSION = "0.9.1.9"
+  VERSION = "0.9.1.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pinkman
 version: !ruby/object:Gem::Version
-  version: 0.9.1.9
+  version: 0.9.1.10
 platform: ruby
 authors:
 - Agilso Oliveira
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-26 00:00:00.000000000 Z
+date: 2017-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -179,18 +179,21 @@ files:
 - README.md
 - Rakefile
 - app/assets/javascripts/pinkman.js
+- app/assets/javascripts/pinkman/engines/handlebars.js
+- app/assets/javascripts/pinkman/engines/hogan.js
+- app/assets/javascripts/pinkman/engines/markup.js
 - app/assets/javascripts/pinkman_base/collection.coffee
 - app/assets/javascripts/pinkman_base/common.coffee
 - app/assets/javascripts/pinkman_base/controller.coffee
 - app/assets/javascripts/pinkman_base/glue.coffee
-- app/assets/javascripts/pinkman_base/handlebars.js
-- app/assets/javascripts/pinkman_base/hogan.js
-- app/assets/javascripts/pinkman_base/markup.js
 - app/assets/javascripts/pinkman_base/mixins.coffee
 - app/assets/javascripts/pinkman_base/object.js.coffee.erb
 - app/assets/javascripts/pinkman_base/pinkman.coffee
 - app/assets/javascripts/pinkman_base/render.coffee.erb
 - app/assets/javascripts/pinkman_base/tools.coffee
+- app/assets/javascripts/pinkman_with_handlebars.js
+- app/assets/javascripts/pinkman_with_hogan.js
+- app/assets/javascripts/pinkman_with_markup.js
 - app/helpers/pinkman_helper.rb
 - bin/console
 - bin/setup