pinkman 0.9.9.9.0 → 0.9.9.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e07ead0e5cc58bc710c373c978561d76526e652119a348a593b7b38ca6b5da18
-  data.tar.gz: 76158be83a618863576e6daf9a0048c2d9ec4e7d58310cb1d3a761e89f860e6f
+  metadata.gz: a881ee79d0d66ed3ebc8f82b1b5d596ef5d373a5215a446bcf6e72166f81a8c0
+  data.tar.gz: b47389d23b0a46031a0404f12d0dfd94a43cd630d3d2c99af179e25d89d6a66e
 SHA512:
-  metadata.gz: 2db85458e813b66546265bcf95f17bd80311c1af7fffdd36416f5a1c51f254779495ac217057ede54989cfb0abd55d764e7a386aa46b044cd02e67c54e713c33
-  data.tar.gz: 11a82138515a4e61a81d2f340020f19dc7e12340388d80c0daab9c0822af7244f886e67b494f9262bf1cc6b0bd1116bac61bb4f70fff0703ac22d0c37f03bcd6
+  metadata.gz: 432dd76d2feaf437c60e2c636948442c429a2294d9794d2ce5bfcb89f6b5e614611104319a5ea0e40a87c1c2a64baaf2c98de182dc610834fff96a0fd5ab02ee
+  data.tar.gz: c6210ddc7fa530694879c6d9e50ef3eabad31f118393b8e1415d1029fdee8a592d40c6cf35c23ab93acb53e11d953854fc56c9cc901771040c9f3bdab819ceae

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

@@ -159,6 +159,112 @@ class window.PinkmanController extends window.PinkmanObject
         callback(obj,$j,args...) if callback? and typeof callback == 'function'
       # else
       #   console.log 'mesmo valor'
+      
+      
+  # === Autocomplete ===
+
+  # -- Usage: autocomplete(input_name,options)
+
+  # -- Overview
+  # 1: User types something
+  # 2: Pinkman searchs through a collection and then renders the result
+  # 3: User selects a record
+  # 4: Pinkman sends the selected record to callback function
+
+  # -- Parameters & Options
+  # @autocomplete(attribute,options)
+  # options:
+    # with: [collection] 
+    # pinkman collection responsible for filtering/searching the results
+    
+    # method: [search|yourCustomMethod] 
+    # Search is the default. Anythings that filters by a 'query'.
+    # You can define a yourCustomMethod inside the collection model like this:
+    # yourCustomMethod: (user_query, callback) ->
+      # -- perform a selection based on user_query
+      # callback(this) if $p.isFunction(callback)
+    
+    # template: [template-id] (optional)
+    # Any template that has a 'select-attribute' action
+    # If you don't specify a template, Pinkman will try "attribute-autocomplete-template" by default
+    
+    # target: [target-id]
+    # Where pinkman should yield results
+    # If you don't specify a target, Pinkman will try "attribute-autocomplete" by default
+    
+    # loading: loading function
+    # Run something before searching (you can use it for some loading animation)
+    
+    # call: callback function. 
+    # What to do when user selects something?
+  autocomplete: (attr_name, options) ->
+    # error handling / verifing args
+    throw 'Pinkman Autocomplete: Missing options object' unless $p.isObject(options)
+    throw 'Pinkman Autocomplete: Missing "with" collection' unless options.with?
+    throw 'Pinkman Autocomplete: Missing "call" callback function' unless $p.isFunction(options.call)
+    
+    # variables // user options // default options
+    collection = options.with
+    callback = options.call
+    template = if options.template? then options.template else "#{attr_name}-autocomplete"
+    target = if options.target? then options.target else "#{attr_name}-autocomplete"
+    method = if options.method? then options.method else 'search'
+    loading = options.loading if $p.isFunction(options.loading)
+    autoHide = if options.autoHide? then options.autoHide else yes
+    autoWidth = if options.autoWidth? then options.autoWidth else yes
+    wait = if options.wait? then options.wait else 0.75
+    waitTimerName = "#{attr_name}AutocompleteTimer"
+    
+    # hide initially
+    $("##{target}").hide() if autoHide
+    
+    # resize autocomplete
+    if autoWidth
+      $(window).resize ->
+        $("##{target}").width($("input[name='#{attr_name}']").innerWidth() - ($("##{target}").innerWidth() - $("##{target}").width()))
+    
+    # responding to user typing
+    @bind attr_name, (obj,j) ->  
+      
+      # loading
+      loading(obj,j,attr_name) if loading?
+      
+      # removes autocompleted Class
+      j.removeClass('autocompleted')
+      
+      # wait until user finish typing
+      clearTimeout(window[waitTimerName]) if window[waitTimerName]?
+      window[waitTimerName] = $p.sleep wait, =>
+        
+        # calls the filter method (search)
+        collection[method] obj[attr_name], (collection) ->
+          
+          # render results
+          collection.render
+            template: template
+            target: target
+            callback: ->
+              # Hide or show autocomplete
+              if autoHide
+                if obj[attr_name]? and obj[attr_name] != ''
+                  $("##{target}").fadeIn()
+                else
+                  $("##{target}").fadeOut()
+              
+              # Set the autocomplete target width to same as the input
+              if autoWidth
+                $("##{target}").width($("input[name='#{attr_name}']").innerWidth() - ($("##{target}").innerWidth() - $("##{target}").width()))
+    
+    # user chooses something and click
+    @action "select-#{attr_name}", 'click', (args...) =>
+      # console.log "#{@selector()} input[action='#{attr_name}']"
+      $input = $("#{@selector()} input[data-action='#{attr_name}']")
+      $input.addClass('autocompleted')
+      obj = Pinkman.get($input.data('pinkey'))
+      $("##{target}").fadeOut() if autoHide
+      callback(obj,$input,args...)
+      
+
 
   bottom: (callback) -> 
     if $("##{@id}").length
@@ -172,7 +278,7 @@ class window.PinkmanController extends window.PinkmanObject
             Pinkman._lastEndOfPage = t
             callback()
       , 50
-
+      
   endBottom: () ->
     Pinkman._bottomTriggered = false
  
@@ -190,7 +296,7 @@ class window.PinkmanController extends window.PinkmanObject
     
   scrolling: (callback) -> 
     if $("##{@id}").length
-      $(window).scroll ->
+      $("window,.pink-yield").scroll ->
         unless Pinkman._stopScroll
           Pinkman._stopScroll = yes
           callback(window.scrollY) 

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

@@ -33,7 +33,12 @@ class window.PinkmanPath extends Pinkman.object
       @set('staticDepth',s)
       @set('dynamicDepth',d)
       
-  
+  @depth: (url) ->
+    a = url.split('/')
+    a.shift() if a[0] == ''
+    a.pop() if a[a.length-1] == ''
+    a.length
+    
   @isExternal: (url) ->
     urlRegex = new RegExp('^(?:[a-z]+:)?//', 'i')
     hostRegex = new RegExp(window.location.origin,'i')
@@ -54,13 +59,13 @@ class window.PinkmanPath extends Pinkman.object
       match = true
       @static.each (level) ->
         match = false if level.entry != path.level(level.index).entry
-      if match
-        @dynamic.each (level) ->
-          path.params[level.entry.replace(/:/g,"")] = path.level(level.index).entry
       return(match)
     else
       false
-    
+  
+  matchParams: (path) ->
+    @dynamic.each (level) ->
+      path.params[level.entry.replace(/:/g,"")] = path.level(level.index).entry
   
   deduceControllerName: ->
     @static.extract('entry').join('-').replace(/[\/_]/g,'-').replace(/^-/,'')
@@ -86,24 +91,35 @@ class window.PinkmanRouteMatcher extends Pinkman.object
     $(@yieldIn).html("<div class='pink-yield' id='#{@controller}'></div>") if @yieldIn and @route.blank
     
   match: (url) ->
-    path = new PinkmanPath(url)
-    if path?
-      candidates = Pinkman.routes.select(depth: path.depth)
-      routes = candidates.select (candidate) ->
-        candidate.path.match(path)
-      route = routes.sortBy('staticDepth','desc').first()
+    if url?
+      route = @findRouteFor(url)
       if route?
-        @set('url',url)
-        @set('path',path)
-        @set 'route', route
-        @set 'controller', @route.controller
-        @set('controllers', Pinkman.controllers.select(id: @controller))
-        if @controllers.any()
-          return(this) 
-        else 
-          throw "(Pinkman Route) Controller '#{@route.controller}' not found."
+        return(@setup(route,url))
       else
-        return(false)
+        return(false)  
+    
+  findRouteFor: (url) ->
+    url = url.replace(window.location.origin,'') if PinkmanPath.isInternal(url)
+    return Pinkman.routes
+      .select(depth: PinkmanPath.depth(url))
+      .select((candidate) -> candidate.path.match(url))
+      .sortBy('staticDepth','desc').first()
+  
+  setup: (route,url) ->
+    if route? and url?
+      urlPath = new PinkmanPath(url) 
+      route.path.matchParams(urlPath)
+      @set('url',url)
+      @set('path',urlPath)
+      @set 'route', route
+      @set 'controller', @route.controller
+      @set('controllers', Pinkman.controllers.select(id: @controller))
+      if @controllers.any()
+        return(this) 
+      else 
+        throw "(Pinkman Route) Controller '#{@route.controller}' not found."
+    else
+      return(false)
     
   params: ->
     # console.log @path
@@ -230,6 +246,7 @@ class window.PinkmanRouter
   @activate: (path,callback,options) ->
     r = Pinkman.routes.match(path)
     if r? and r
+      # console.log r
       r.options = options
       if @_config.transition? and typeof @_config.transition == 'function'
         @_config.transition =>
@@ -274,10 +291,10 @@ class window.PinkmanRouter
       App.router = this
       window.$r = App.router
       @activate(window.location.pathname)
-      $('body').on 'click', 'a:not([data-pinkman="false"])', (ev) =>
+      $('body').on 'click', 'a:not([data-pinkman="false"],[target="blank"],[target="_blank"])', (ev) =>
         ev.preventDefault()
         path = ev.currentTarget.href
-        (window.location = path) unless path? and @visit(path)
+        @location(path) unless path? and @visit(path)
   
   namespace: (namespace, rules) ->
     namespace = namespace.replace(/^\//,'')

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

@@ -13,8 +13,8 @@ class window.PinkmanState extends Pinkman.object
   
   @initialize: ->
     if Pinkman.states.empty() and window? and history? and history.replaceState?
-      state = Pinkman.states.forceNew(path: window.location.pathname)
-      history.replaceState({pinkey: state.pinkey}, "", state.path)
+      state = Pinkman.states.forceNew(path: window.location.href.replace(window.location.origin,''))
+      # history.replaceState({pinkey: state.pinkey}, "", state.path)
     
   @push: (path) ->
     if Pinkman.isString(path)

data/app/views/pinkman/pinkman/_form_input.html.slim

@@ -1,4 +1,4 @@
 .form-field
   label for=attr_name = label
-  == p.input input_options
+  == p.input html_attributes
   == p.error_for attr_name, label

data/app/views/pinkman/pinkman/_form_select.html.slim

@@ -1,6 +1,6 @@
 .form-field
   label for=attr_name = label
-  == p.select attr_name, html_options
+  == p.select attr_name, html_attributes
     - if placeholder
       - if obligatory.present?
         option value="" selected='selected' disabled='disabled' = placeholder

data/lib/pinkman/form_helper/form_helpers.rb

@@ -9,55 +9,48 @@ module Pinkman
       
       include Pinkman::ViewsHelpers::FormHelper
       
-      define_helper :string do |attr_name,label=nil|
-        label ||= attr_name.titleize
-        render partial: 'pinkman/pinkman/form_input', locals: {attr_name: attr_name, label: label, input_options: {name: attr_name}}
+      define_helper :string do |attr_name,label=nil,html_attributes={}|
+        p.input_helper attr_name, label, html_attributes.merge(type: 'text')
       end
       
-      define_helper :text do |attr_name,label=nil|
+      define_helper :text do |attr_name,label=nil,html_attributes={}|
         label ||= attr_name.titleize
-        render partial: 'pinkman/pinkman/form_textarea', locals: {attr_name: attr_name, label: label, textarea_options: {name: attr_name}}
+        render partial: 'pinkman/pinkman/form_textarea', locals: {attr_name: attr_name, label: label, textarea_options: {name: attr_name}.merge(html_attributes) }
       end
       
-      define_helper :date do |attr_name,label=nil|
-        label ||= attr_name.titleize
-        render partial: 'pinkman/pinkman/form_input', locals: {attr_name: attr_name, label: label, input_options: {name: attr_name, type: 'date'}}
+      define_helper :date do |attr_name,label=nil,html_attributes={}|
+        p.input_helper attr_name, label, html_attributes.merge(type: 'date')
       end
       
-      define_helper :datetime do |attr_name,label=nil|
-        label ||= attr_name.titleize
-        render partial: 'pinkman/pinkman/form_input', locals: {attr_name: attr_name, label: label, input_options: {name: attr_name}, type: 'time'}
+      define_helper :datetime do |attr_name,label=nil,html_attributes={}|
+        p.input_helper attr_name, label, html_attributes.merge(type: 'time')
       end
       
-      define_helper :color do |attr_name,label=nil|
-        label ||= attr_name.titleize
-        render partial: 'pinkman/pinkman/form_input', locals: {attr_name: attr_name, label: label, input_options: {name: attr_name}}
+      define_helper :color do |attr_name,label=nil,html_attributes={}|
+        p.input_helper attr_name, label, html_attributes
       end
       
-      define_helper :select do |attr_name,label,options_hash,html_options={}|
-        if html_options.has_key?(:placeholder)
-          placeholder = html_options[:placeholder]
-          obligatory = html_options[:obligatory]
-          html_options.delete(:placeholder)
+      define_helper :select do |attr_name,label,options_hash,html_attributes={}|
+        if html_attributes.has_key?(:placeholder)
+          placeholder = html_attributes[:placeholder]
+          obligatory = html_attributes[:obligatory]
+          html_attributes.delete(:placeholder)
         end
         obligatory = true if obligatory.nil?
         label ||= attr_name.titleize
-        render partial: 'pinkman/pinkman/form_select', locals: {attr_name: attr_name, label: label, options_hash: options_hash, html_options: html_options, placeholder: placeholder, obligatory: obligatory}
+        render partial: 'pinkman/pinkman/form_select', locals: {attr_name: attr_name, label: label, options_hash: options_hash, html_attributes: html_attributes, placeholder: placeholder, obligatory: obligatory}
       end
       
-      define_helper :password do |attr_name,label=nil|
-        label ||= attr_name.titleize
-        render partial: 'pinkman/pinkman/form_input', locals: {attr_name: attr_name, label: label, input_options: {name: attr_name, type: 'password'}}
+      define_helper :password do |attr_name,label=nil,html_attributes={}|
+        p.input_helper attr_name, label, html_attributes.merge(type: 'password')
       end
       
-      define_helper :number do |attr_name,label=nil|
-        label ||= attr_name.titleize
-        render partial: 'pinkman/pinkman/form_input', locals: {attr_name: attr_name, label: label, input_options: {name: attr_name, type: 'number'}}
+      define_helper :number do |attr_name,label=nil,html_attributes={}|
+        p.input_helper attr_name, label, html_attributes.merge(type: 'number')
       end
       
-      define_helper :money do |attr_name,label=nil|
-        label ||= attr_name.titleize
-        render partial: 'pinkman/pinkman/form_input', locals: {attr_name: attr_name, label: label, input_options: {name: attr_name, type: 'number', min: 0, step: 0.01}}
+      define_helper :money do |attr_name,label=nil,html_attributes={}|
+        p.input_helper attr_name, label, html_attributes.merge(type: 'number', min: '0', step: '0.01')
       end
       
     end

data/lib/pinkman/version.rb

@@ -1,3 +1,3 @@
 module Pinkman
-  VERSION = "0.9.9.9.0"
+  VERSION = "0.9.9.9.1"
 end

data/lib/pinkman/views_helpers/form_helper.rb

@@ -6,6 +6,11 @@ module Pinkman
       
       extend Pinkman::BaseHelper
       
+      define_helper :input_helper do |attr_name,label=nil,html_attributes={}|
+        label ||= attr_name.titleize
+        render partial: 'pinkman/pinkman/form_input', locals: {attr_name: attr_name, label: label, html_attributes: html_attributes.merge(name: attr_name)}
+      end
+      
       define_helper :textfield do |attr_name,label=nil|
         label ||= attr_name.titleize
         render partial: 'pinkman/pinkman/form_input', locals: {attr_name: attr_name, label: label, input_options: {name: attr_name}}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pinkman
 version: !ruby/object:Gem::Version
-  version: 0.9.9.9.0
+  version: 0.9.9.9.1
 platform: ruby
 authors:
 - Agilso Oliveira
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-06 00:00:00.000000000 Z
+date: 2018-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler