panko_serializer 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73b05629bbbeb18415188b8c70e316f678f604ba
-  data.tar.gz: 95922dc138d747c5fa0ca282ff6b9eda4e004d55
+  metadata.gz: 191ab315beed684a1a584eccdcfb500521e5f3b5
+  data.tar.gz: bdc4bf8c0bdc1e66b09a0221d640ec033b21463c
 SHA512:
-  metadata.gz: 1b6489dc3d9532d01766a38cbb6d0652275883d8ea8ad7b8dc6b82494f1d5035f5c95a925b2b0908bdcaf3a6807ec7afaca3c5982a1a894e102ac9aa7ae35243
-  data.tar.gz: 83c2b331d7acb26d4bbf6e851b5f30250b7074195c2f8a722bea053db867aa34af23a05dc015a0ceec098cfbc747b9f892516f9a8d534c50f5189180bcd5cf82
+  metadata.gz: 1075d2458fc18945ece197e3c1b45ed19d7c37cfcad48beed72ee38d0b147b1a338b756ddce9a740d24681192a3a7159953daee5816d182678921d5c818b72ca
+  data.tar.gz: 278b97815ce09041391744fd01c385e92b0b8bcc54edeecc1250a7f9cc459f19fe5df0d43d77e955e5b6d717677fd81ee67baaa2c5dc87da4b68551da28b921e

data/lib/panko/array_serializer.rb

@@ -14,7 +14,7 @@ module Panko
         except: options.fetch(:except, [])
       }
 
-      @descriptor = SerializationDescriptorBuilder.build(@each_serializer, serializer_options)
+      @descriptor = Panko::SerializationDescriptor.build(@each_serializer, serializer_options)
       @context = options.fetch(:context, nil)
     end
 

data/lib/panko/serialization_descriptor.rb

@@ -1,43 +1,20 @@
 # frozen_string_literal: true
 module Panko
-  module SerializationDescriptorBuilder
-    def self.apply_filters(backend, options)
-      serializer_only_filters, attributes_only_filters = resolve_filters(options, :only)
-      serializer_except_filters, attributes_except_filters = resolve_filters(options, :except)
-
-      backend.fields = apply_fields_filters(
-        backend.fields,
-        serializer_only_filters,
-        serializer_except_filters
-      )
-
-      backend.method_fields = apply_fields_filters(
-        backend.method_fields,
-        serializer_only_filters,
-        serializer_except_filters
-      )
-
-      backend.has_many_associations = build_associations(
-        apply_association_filters(
-          backend.has_many_associations,
-          serializer_only_filters,
-          serializer_except_filters
-        ),
-        attributes_only_filters,
-        attributes_except_filters
-      )
-
-      backend.has_one_associations = build_associations(
-        apply_association_filters(
-          backend.has_one_associations,
-          serializer_only_filters,
-          serializer_except_filters
-        ),
-        attributes_only_filters,
-        attributes_except_filters
-      )
+  class SerializationDescriptor
+    #
+    # Creates new description and apply the options
+    # on the new descriptor
+    #
+    def self.build(serializer, options={})
+      backend = Panko::SerializationDescriptor.duplicate(serializer._descriptor)
+      backend.apply_filters(options)
+      backend
     end
 
+    #
+    # Create new descriptor with same properties
+    # useful when you want to apply filters
+    #
     def self.duplicate(descriptor)
       backend = Panko::SerializationDescriptor.new
 
@@ -52,30 +29,61 @@ module Panko
       backend
     end
 
-    def self.build(serializer, options={})
-      backend = duplicate(serializer._descriptor)
+    #
+    # Applies attributes and association filters
+    #
+    def apply_filters(options)
+      attributes_only_filters, associations_only_filters = resolve_filters(options, :only)
+      attributes_except_filters, associations_except_filters = resolve_filters(options, :except)
 
-      apply_filters(backend, options)
+      self.fields = apply_fields_filters(
+        self.fields,
+        attributes_only_filters,
+        attributes_except_filters
+      )
 
-      backend
+      self.method_fields = apply_fields_filters(
+        self.method_fields,
+        attributes_only_filters,
+        attributes_except_filters
+      )
+
+      self.has_many_associations = apply_association_filters(
+        self.has_many_associations,
+        { attributes: attributes_only_filters, associations: associations_only_filters },
+        { attributes: attributes_except_filters, associations: associations_except_filters }
+      )
+
+      self.has_one_associations = apply_association_filters(
+        self.has_one_associations,
+        { attributes: attributes_only_filters, associations: associations_only_filters },
+        { attributes: attributes_except_filters, associations: associations_except_filters }
+      )
     end
 
-    def self.build_associations(associations, attributes_only_filters, attributes_except_filters)
-      associations.each do |association|
+    def apply_association_filters(associations, only_filters, except_filters)
+      attributes_only_filters = only_filters[:attributes]
+      attributes_only_filters = associations.map(&:first) if attributes_only_filters.empty?
+      attributes_except_filters = except_filters[:attributes] || []
+
+
+      associations.map do |association|
         name = association.first
-        descriptor = association.last
+        next if attributes_except_filters.include? name
+        next unless attributes_only_filters.include? name
 
+        descriptor = association.last
 
-        options = {
-          only: attributes_only_filters.fetch(name, []),
-          except: attributes_except_filters.fetch(name, [])
-        }
+        descriptor.apply_filters({
+          only: only_filters[:associations].fetch(name, []),
+          except: except_filters[:associations].fetch(name, [])
+        })
 
-        apply_filters(descriptor, options)
-      end
+        association
+      end.compact
     end
 
-    def self.resolve_filters(options, filter)
+    def resolve_filters(options, filter)
       filters = options.fetch(filter, {})
       if filters.is_a? Array
         return filters, {}
@@ -88,30 +96,19 @@ module Panko
 
       return [], {} if filters.empty?
 
-      serializer_filters = filters.fetch(:instance, [])
+      attributes_filters = filters.fetch(:instance, [])
       association_filters = filters.except(:instance)
 
-      return serializer_filters, association_filters
+      return attributes_filters, association_filters
     end
 
-    def self.apply_fields_filters(fields, only, except)
+    def apply_fields_filters(fields, only, except)
       return fields & only unless only.empty?
       return fields - except unless except.empty?
 
       fields
     end
 
-    def self.apply_association_filters(associations, only, except)
-      unless only.empty?
-        return associations.select { |assoc| only.include?(assoc.first) }
-      end
-
-      unless except.empty?
-        return associations.reject { |assoc| except.include?(assoc.first) }
-      end
-
-      associations
-    end
 
     def self.resolve_serializer(serializer)
       Object.const_get(serializer.name)

data/lib/panko/serializer.rb

@@ -28,26 +28,26 @@ module Panko
       end
 
       def has_one(name, options)
-        serializer_const = SerializationDescriptorBuilder.resolve_serializer(options[:serializer])
+        serializer_const = Panko::SerializationDescriptor.resolve_serializer(options[:serializer])
 
         @_descriptor.has_one_associations << [
           name,
-          SerializationDescriptorBuilder.build(serializer_const, options)
+          Panko::SerializationDescriptor.build(serializer_const, options)
         ]
       end
 
       def has_many(name, options)
-        serializer_const = SerializationDescriptorBuilder.resolve_serializer(options[:serializer])
+        serializer_const = Panko::SerializationDescriptor.resolve_serializer(options[:serializer])
 
         @_descriptor.has_many_associations << [
           name,
-          SerializationDescriptorBuilder.build(serializer_const, options)
+          Panko::SerializationDescriptor.build(serializer_const, options)
         ]
       end
     end
 
     def initialize(options = {})
-      @descriptor = SerializationDescriptorBuilder.build(self.class, options)
+      @descriptor = Panko::SerializationDescriptor.build(self.class, options)
       @context = options[:context]
     end
 

data/lib/panko/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Panko
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/panko_serializer.gemspec

@@ -26,5 +26,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rake-compiler"
 
-  spec.add_dependency "oj", "~> 3.2.0"
+  spec.add_dependency "oj", "~> 3.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panko_serializer
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Yosi Attias
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-15 00:00:00.000000000 Z
+date: 2017-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.3.0
 description: 
 email:
 - yosy101@gmail.com