pinkman 0.9.1.3 → 0.9.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f071ffd276a4ffce048f6c50bf45867239a60193
-  data.tar.gz: 7a745e4dfa2cf9d6011b3ef43a8fb694fbddb273
+  metadata.gz: 399b3c9f42d0fcb24b807a240ad12aa788db9331
+  data.tar.gz: df42a3182412ac46d3f9b9dc5ca7500e8b82f719
 SHA512:
-  metadata.gz: 32ec6ef56b0fb4806b223ec8f157e1effb190db6e6082b0b9955ca6d179cb41b16077d6468a6a49d4a646c384246c49af68fc00677cf0a3587c523b2f9f0a48e
-  data.tar.gz: f8b506709206275f684f6a235339a9f21e7ddf1cf00c7b7c37faa27c02b2e573b6b8282848a7e232f17c01df7e35891b355e07bb3c44eaa3ad3ed29b0f68af91
+  metadata.gz: cb465a093d630bdf86a411f81d2d4215a0209bdf3463acdc3c8b219d0fbc90017bcb0257189c67be6c75c2731c99432bbd77b7f2191db0ddf0d77e1580865c08
+  data.tar.gz: 2479695b881b68b6d3ee1e7f1e1f05bf9a392817a94e7496b57e30794b045cb4e30f8da22eec2e402dc6421781d5b32af14f70e9c317ed79e420dd94ec282539

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

@@ -347,22 +347,21 @@ class window.PinkmanCollection extends window.PinkmanCommon
   # Example: fetching all orders of a user
   # coffee: orders.fetchFrom 'user', user.id
   # api::controler#order: render json: User.find(params[:id]).orders.to_json
-  fetchFrom: (action,id,callback = '') ->
+  fetchFrom: (action,id,callback) ->
     if action? and id?
-      @fetchFromUrl(@api() +  "#{action}/#{id}", callback)
+      @fetchFromUrl
+        url: @api() +  "#{action}/#{id}"
+        callback: callback
     else
       return false
 
-
   # Desc: Fetch records from URL
   # request:  get /api/API_URL/
   fetchFromUrl: (options) ->
     if options? and typeof options == 'object' and options.url?
-      limit = if options.limit? then options.limit else 1000
-      offset = if options.offset? then options.offset else 0
       @fetchingFrom = options.url
       Pinkman.ajax.get
-        url: options.url + "?limit=#{limit}&offset=#{offset}"
+        url: Pinkman.json2url(options.url,options.params) 
         complete: (response) =>
           if response.errors? or response.error?
             [@errors, @error] = [response.errors, response.error]
@@ -378,15 +377,25 @@ class window.PinkmanCollection extends window.PinkmanCommon
   # in rails: api::controller#index
   fetchMore: (n=10,callback='') ->
     if @fetchingFrom?
-      @fetchFromUrl url: @fetchingFrom, limit: n, offset: @count(), callback: callback
+      @fetchFromUrl
+        url: @fetchingFrom
+        params:
+          limit: n
+          offset: @count()
+        callback: callback
     else
-      @fetchFromUrl url: @api(), limit: n, offset: @count(), callback: callback
+      @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
   # in rails: api::controller#action
   fetchMoreFrom: (n,action,id,callback='') ->
-    @fetchFromUrl {url: @api() + "#{action}/#{id}", limit: n, offset: @count(), callback: callback}
+    @fetchFromUrl {url: @api() + "#{action}/#{id}", params: {limit: n, offset: @count()}, callback: callback}
 
   # Desc: Connect to api to search in this model a query
   # request:  get /api/API_URL/search?query=YOUR_QUERY
@@ -394,6 +403,6 @@ class window.PinkmanCollection extends window.PinkmanCommon
   # assume models to have a Model.search("YOUR_QUERY") method.
   search: (query,callback='') ->
     @removeAll()
-    @fetchFromUrl { url: @api() + "search?query=#{query}", callback: callback }
+    @fetchFromUrl { url: @api(), params: {query: query}, callback: callback }
 
 window.Pinkman.collection = window.PinkmanCollection

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

@@ -45,6 +45,20 @@ class window.Pinkman
         @calledFunctions.push(func)
         f(args...)
 
+  @json2url: (url,opts) ->
+    if url?
+      if opts? and typeof opts == 'object'
+        params = []
+        keysCount = Object.keys(opts).length
+        if keysCount >= 1
+          params.push("#{k}=#{v}") for k,v of opts
+          url = url + '?'
+          url = url + params.join('&')
+      return(url)
+    else
+      ''
+
+
   @calledFunctions = []
 
   # --- Ajax

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

@@ -1,2 +1,10 @@
 class ApiController < ApplicationController
+
+  before_action :default_limit_and_offset
+
+  def default_limit_and_offset
+    params[:limit] = 20 if params[:limit].blank?
+    params[:offset] = 0 if params[:offset].blank?
+  end
+  
 end

data/lib/pinkman.rb

@@ -39,18 +39,28 @@ module Pinkman
 
       # Active Record Relation: json_for
       ActiveRecord::Relation.class_eval do 
-        def json_for scope_name
-          a = ActiveModel::ArraySerializer.new(self, each_serializer: model.serializer, scope: scope_name)
-          a.to_json
+        def json_for scope_name, params_hash = {}
+          serialize_for(scope_name,params_hash).to_json
+        end
+        
+        def serialize_for scope_name, params_hash = {}
+          options = {scope: scope_name}.merge(params: params_hash)
+          s = Pinkman::Serializer::array(self, options)
+          s
         end
       end
 
       # Instance method: json_for
       ActiveRecord::Base.class_eval do
-        def json_for scope_name
-          s = self.class.serializer.new(self,scope: scope_name)
-          s.to_json
+        def serialize_for scope_name, params_hash = {}
+          options = {scope: scope_name}.merge(params: params_hash)
+          self.class.serializer.new(self,options)
+        end
+
+        def json_for scope_name, params_hash={}
+          serialize_for(scope_name,params_hash).to_json
         end
+
       end
     end
   end

data/lib/pinkman/serializer.rb

@@ -2,5 +2,10 @@
 
  module Pinkman
   module Serializer
+
+    def self.array *args
+      args.first.map {|obj| obj.serialize_for(args[1][:scope],args[1][:params])} if args.first.methods.include?(:map) and args.length > 1 and args[1].is_a?(Hash) and args[1][:scope]
+    end
+
   end
 end

data/lib/pinkman/serializer/base.rb

@@ -3,20 +3,33 @@ require_relative 'scope'
 
 module Pinkman
   module Serializer
+
     class Base < ActiveModel::Serializer
-      @@scopes = {}
+
+      def initialize *args
+        super(*args)
+        @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
 
       def self.scope name=:all, &block
+        @scopes ||= {}
         if block_given?
-          @@scopes[name.to_sym] ||= Pinkman::Serializer::Scope.new(serializer: self)
-          yield(@@scopes[name.to_sym]) 
+          @scopes[name.to_sym] = Pinkman::Serializer::Scope.new(serializer: self)
+          yield(@scopes[name.to_sym]) 
         else
-          @@scopes[name.to_sym]
+          @scopes[name.to_sym]
         end
       end
 
+      def self.scopes
+        @scopes
+      end
+
       def self.model
         @model || (begin eval(self.to_s.sub('Serializer','')) rescue nil end)
       end
@@ -25,6 +38,32 @@ module Pinkman
         @model = value
       end
 
+      def self.has_many *args
+        args.each do |attribute|
+          self.class_eval do |c|
+            define_method attribute do
+              reflection = object.class.reflections[attribute.to_s] 
+              if reflection
+                Pinkman::Serializer::Array.new(object.send(attribute), each_serializer: reflection.klass.serializer, scope: @scope)
+              end
+            end
+          end
+        end
+      end
+
+      def self.has_one *args
+        args.each do |attribute|
+          self.class_eval do |c|
+            define_method attribute do
+              reflection = object.class.reflections[attribute.to_s] 
+              if reflection
+                reflection.klass.serializer.new(object.send(attribute), scope: @scope)
+              end
+            end
+          end
+        end
+      end
+
       def attributes *args
         hash = super(*args)
         if scope

data/lib/pinkman/serializer/scope.rb

@@ -9,15 +9,21 @@ module Pinkman
       attr_accessor :read, :write, :access, :serializer
 
       def read_attributes *args
-        self.read = (args.size > 0 and args.first) ? args : []
+        self.read = args
+        self.read = [] unless args.first
+        read
       end
 
       def write_attributes *args
-        self.write = (args.size > 0 and args.first) ? args : []
+        self.write = args
+        self.write = [] unless args.first
+        write
       end
 
       def access_actions *args
-        self.access = (args.size > 0 and args.first) ? args : []
+        self.access = args
+        self.access = [] unless args.first
+        access
       end
 
       def can_read? attribute

data/lib/pinkman/version.rb

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

metadata

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