pinkman 1.3.0 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4969c611478b01b2eb3a9d42d1c29b8e9ffb5d9ac93af2782a06bab6338f7c5
-  data.tar.gz: 45f10ea26c2b7f42768159d6568270c19b4214010be57c4db81bf6e13a0d18bc
+  metadata.gz: 0f74ed907906d1095d6b0f68f5f63f12a325ee3884573d6ab0440c9e4f9989e1
+  data.tar.gz: be891bb1ca37ab68918b35a334f55fb34142549b7550f4d6800cdab125b1e73b
 SHA512:
-  metadata.gz: '0908aaf60135006c81c700a532d330a14b2cbe562f39defccf16cf219b11fd323ddd6ce6b6e0daef8c838dd2b5d6d1a5833d8d968161080bd79434e57884518f'
-  data.tar.gz: 1e5a27236dec947b92fadab1be8ab5a1419b81e8863a49a76a50d9bbb698b4aa8602496cd576e5f138a47d592d9ee917f3c91380010cb86dba19ec494022aaee
+  metadata.gz: c9e629665aa5cb717b2e1a50fcd275171b4aa3dcb56556daebd593b12fd418c5ee1a3ca5d6b7ea1811992930563927d3996f4ea15e03e2ff86fcb6aee6958c93
+  data.tar.gz: 7875d63d6c2c88851cb48c4456ceedc063bf4377ac8f344213d4e4a9022da6c86d959cbc16f03362224a31126d758164be250c6dfffa3bdb7c8e79e8e885a68d

data/lib/pinkman/serializer/base.rb

@@ -65,7 +65,7 @@ module Pinkman
             define_method attribute do
               reflection = object.class.reflections[attribute.to_s] 
               if reflection
-                Pinkman::Serializer::array(object.send(attribute), scope: @scope, params: @params)
+                Pinkman::Serializer::array(object.send(attribute), scope: get_assoc_scope(attribute, @scope), params: @params)
               end
             end
           end
@@ -78,7 +78,7 @@ module Pinkman
             define_method attribute do
               reflection = object.class.reflections[attribute.to_s] 
               if reflection
-                reflection.klass.serializer.new(object.send(attribute), scope: @scope, params: @params)
+                reflection.klass.serializer.new(object.send(attribute), scope: get_assoc_scope(attribute, @scope), params: @params)
               end
             end
           end
@@ -96,6 +96,15 @@ module Pinkman
       def self.reflections
         model.reflections
       end
+      
+      def get_assoc_scope assoc, scope
+        assoc_scopes = begin self.class.scope(scope).assoc_scopes rescue nil end
+        if assoc_scopes.is_a?(Hash) and assoc_scopes[assoc]
+          assoc_scopes[assoc]
+        else
+          scope
+        end
+      end
 
       def attributes *args
         hash = super(*args)

data/lib/pinkman/serializer/scope.rb

@@ -2,7 +2,7 @@ module Pinkman
   module Serializer
     class Scope
       
-      attr_accessor :name, :read, :write, :access, :serializer
+      attr_accessor :name, :read, :write, :access, :serializer, :assoc_scopes
 
       def initialize hash
        if hash.is_a?(Hash)
@@ -21,8 +21,18 @@ module Pinkman
       end
 
       def read_attributes *args
-        self.read = args
-        self.read = [] unless args.first
+        read_attrs = []
+        assoc_scopes = {}
+        args.each do |field|
+          if field.is_a?(Hash)
+           assoc_scopes.merge!(field)
+           read_attrs = read_attrs + field.keys
+          else
+           read_attrs << field
+          end
+        end
+        self.read = read_attrs
+        self.assoc_scopes = assoc_scopes
         query_optimizer
         read
       end

data/lib/pinkman/version.rb

@@ -1,3 +1,3 @@
 module Pinkman
-  VERSION = "1.3.0"
+  VERSION = "1.3.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pinkman
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.5
 platform: ruby
 authors:
 - Agilso Oliveira
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-15 00:00:00.000000000 Z
+date: 2019-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -322,8 +322,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Small Rails-js framework.