panko_serializer 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe095c4ba577a1757ae1cfde90e6847bb6064753dd34e68aaa0c16d6bb9cc844
-  data.tar.gz: 5b3d50d6dc2191240069fa36733248197a96555a1b130c405d799d9ca982e9ce
+  metadata.gz: b82a221e5207cf94860579c3ae74a5a31b51a50667785f83c6d9311160096792
+  data.tar.gz: e8177737c068e142e2273fdfe70cb367a2b22fe841d4e3c49a63817f59383b25
 SHA512:
-  metadata.gz: c7e73c88806d3195cf9c63aeed87ff67739cc4ff31a6f0121ebe59612627c8f4b020e64eba2aaa55d56242a616e4de177996263c7c18cb5416124e7364f32977
-  data.tar.gz: 91505d9d99eddab0e81e05340ea324c0350507ff9fcc6db77fc9c4efc34c84bd28f9ee69d3b3e876ee23e0258ad785971c1a85893af35307c3882948eb7996b2
+  metadata.gz: 78f1c9ae160336f9d950d2bab9796a1b124674cc4a0e8a2e41b000b38689e4093aa3783d63e64547598e23914c2e7156921f052409efc645d0d46e06d4daddba
+  data.tar.gz: 44d99088e0afad8264c599026df2584d1df58b8c243540001b05f77b4caef9f110cf71b17bf08b15dfe525ef5bb9671125fefe822b5bffc4542e6ab8887e716d

data/.rubocop.yml

@@ -1,6 +1,5 @@
 AllCops:
-  DisabledByDefault: true
-  TargetRubyVersion: 2.4.1
+  TargetRubyVersion: 2.5
   DisplayCopNames: true
   StyleGuideCopsOnly: false
 
@@ -20,3 +19,11 @@ Layout/TrailingBlankLines:
 Layout/TrailingWhitespace:
   Enabled: true
 
+Style/FrozenStringLiteralComment:
+  Enabled: true
+
+Style/RedundantFreeze:
+  Enabled: true
+
+Performance/UnfreezeString:
+  Enabled: true

data/lib/panko/array_serializer.rb

@@ -15,7 +15,6 @@ Please pass valid each_serializer to ArraySerializer, for example:
         }
       end
 
-
       serializer_options = {
         only: options.fetch(:only, []),
         except: options.fetch(:except, []),
@@ -41,7 +40,7 @@ Please pass valid each_serializer to ArraySerializer, for example:
 
     def serialize_to_json(subjects)
       writer = Oj::StringWriter.new(mode: :rails)
-      Panko::serialize_subjects(subjects.to_a, writer, @descriptor)
+      Panko.serialize_subjects(subjects.to_a, writer, @descriptor)
       writer.to_s
     end
   end

data/lib/panko/attribute.rb

@@ -9,9 +9,7 @@ module Panko
 
     def ==(attr)
       return name.to_sym == attr if attr.is_a? Symbol
-      if attr.is_a? Panko::Attribute
-        return name == attr.name && alias_name == attr.alias_name
-      end
+      return name == attr.name && alias_name == attr.alias_name if attr.is_a? Panko::Attribute
       super
     end
 

data/lib/panko/response.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "oj"
 
 module Panko
@@ -6,6 +7,28 @@ module Panko
     def self.from(value)
       JsonValue.new(value)
     end
+
+    def to_json
+      value
+    end
+  end
+
+  class ResponseCreator
+    def self.value(value)
+      Panko::Response.new(value)
+    end
+
+    def self.json(value)
+      Panko::JsonValue.from(value)
+    end
+
+    def self.array_serializer(data, serializer)
+      Panko::ArraySerializer.new(data, each_serializer: serializer)
+    end
+
+    def self.serializer(data, serializer)
+      json serializer.new.serialize_to_json(data)
+    end
   end
 
   class Response
@@ -13,42 +36,51 @@ module Panko
       @data = data
     end
 
-    def to_json(options = nil)
+    def to_json(_options = nil)
       writer = Oj::StringWriter.new(mode: :rails)
+      write(writer, @data)
+      writer.to_s
+    end
 
-      writer.push_object
+    def self.create
+      Response.new(yield ResponseCreator)
+    end
 
-      @data.each do |key, value|
-        key = key.to_s
+    private
 
-        if value.is_a? Array
-          writer.push_array key
-          value.each { |v| write_object(writer, v) }
-          writer.pop
-          next
-        end
+    def write(writer, data, key = nil)
+      return write_array(writer, data, key) if data.is_a?(Array)
 
-        write_object writer, value, key
+      return write_object(writer, data) if data.is_a?(Hash)
 
-      end
+      write_value(writer, data, key)
+    end
 
+    def write_array(writer, value, key = nil)
+      writer.push_array key
+      value.each { |v| write(writer, v) }
       writer.pop
-
-      writer.to_s
     end
 
-    private
-
     def write_object(writer, value, key = nil)
-     if value.is_a?(Panko::ArraySerializer) ||
-        value.is_a?(Panko::Serializer) ||
-        value.is_a?(Panko::Response)
-       writer.push_json(value.to_json, key)
-     elsif value.is_a?(Panko::JsonValue)
-       writer.push_json(value.value, key)
-     else
-       writer.push_value(value, key)
-     end
+      writer.push_object key
+
+      value.each do |entry_key, entry_value|
+        write(writer, entry_value, entry_key.to_s)
+      end
+
+      writer.pop
+    end
+
+    def write_value(writer, value, key = nil)
+      if value.is_a?(Panko::ArraySerializer) ||
+         value.is_a?(Panko::Serializer) ||
+         value.is_a?(Panko::Response) ||
+         value.is_a?(Panko::JsonValue)
+        writer.push_json(value.to_json, key)
+      else
+        writer.push_value(value, key)
+      end
     end
   end
 end

data/lib/panko/serialization_descriptor.rb

@@ -1,16 +1,15 @@
 # frozen_string_literal: true
+
 module Panko
   class SerializationDescriptor
     #
     # Creates new description and apply the options
     # on the new descriptor
     #
-    def self.build(serializer, options={})
+    def self.build(serializer, options = {})
       backend = Panko::SerializationDescriptor.duplicate(serializer._descriptor)
 
-      if serializer.respond_to? :filters_for
-        options.merge! serializer.filters_for(options[:context], options[:scope])
-      end
+      options.merge! serializer.filters_for(options[:context], options[:scope]) if serializer.respond_to? :filters_for
 
       backend.context = options[:context]
       backend.scope = options[:scope]
@@ -32,9 +31,7 @@ module Panko
 
       backend.method_fields = descriptor.method_fields.dup
 
-      unless descriptor.serializer.nil?
-        backend.serializer = descriptor.serializer.reset
-      end
+      backend.serializer = descriptor.serializer.reset unless descriptor.serializer.nil?
 
       backend.has_many_associations = descriptor.has_many_associations.dup
       backend.has_one_associations = descriptor.has_one_associations.dup
@@ -55,30 +52,30 @@ module Panko
       attributes_except_filters, associations_except_filters = resolve_filters(options, :except)
 
       self.attributes = apply_attribute_filters(
-        self.attributes,
+        attributes,
         attributes_only_filters,
         attributes_except_filters
       )
 
       self.method_fields = apply_fields_filters(
-        self.method_fields,
+        method_fields,
         attributes_only_filters,
         attributes_except_filters
       )
 
-      unless self.has_many_associations.empty?
+      unless has_many_associations.empty?
         self.has_many_associations = apply_association_filters(
-          self.has_many_associations,
+          has_many_associations,
           { attributes: attributes_only_filters, associations: associations_only_filters },
-          { attributes: attributes_except_filters, associations: associations_except_filters }
+          attributes: attributes_except_filters, associations: associations_except_filters
         )
       end
 
-      unless self.has_one_associations.empty?
+      unless has_one_associations.empty?
         self.has_one_associations = apply_association_filters(
-          self.has_one_associations,
+          has_one_associations,
           { attributes: attributes_only_filters, associations: associations_only_filters },
-          { attributes: attributes_except_filters, associations: associations_except_filters }
+          attributes: attributes_except_filters, associations: associations_except_filters
         )
       end
     end
@@ -91,7 +88,6 @@ module Panko
         end
       end
 
-
       attributes_except_filters = except_filters[:attributes] || []
       unless attributes_except_filters.empty?
         associations.reject! do |association|
@@ -99,13 +95,10 @@ module Panko
         end
       end
 
-
       associations_only_filters = only_filters[:associations]
       associations_except_filters = except_filters[:associations]
 
-      if associations_only_filters.empty? && associations_except_filters.empty?
-        return associations
-      end
+      return associations if associations_only_filters.empty? && associations_except_filters.empty?
 
       associations.map do |association|
         name = association.name_sym
@@ -132,9 +125,7 @@ module Panko
 
     def resolve_filters(options, filter)
       filters = options.fetch(filter, {})
-      if filters.is_a? Array
-        return filters, {}
-      end
+      return filters, {} if filters.is_a? Array
 
       # hash filters looks like this
       # { instance: [:a], foo: [:b] }
@@ -146,7 +137,7 @@ module Panko
       attributes_filters = filters.fetch(:instance, [])
       association_filters = filters.except(:instance)
 
-      return attributes_filters, association_filters
+      [attributes_filters, association_filters]
     end
 
     def apply_fields_filters(fields, only, except)

data/lib/panko/serializer.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require_relative "serialization_descriptor"
 require "oj"
 
@@ -6,10 +7,7 @@ module Panko
   class Serializer
     class << self
       def inherited(base)
-
-        unless _descriptor.nil?
-          base._descriptor = Panko::SerializationDescriptor.duplicate(_descriptor)
-        else
+        if _descriptor.nil?
           base._descriptor = Panko::SerializationDescriptor.new
 
           base._descriptor.attributes = []
@@ -19,9 +17,10 @@ module Panko
 
           base._descriptor.has_many_associations = []
           base._descriptor.has_one_associations = []
+        else
+          base._descriptor = Panko::SerializationDescriptor.duplicate(_descriptor)
         end
         base._descriptor.type = base
-
       end
 
       attr_accessor :_descriptor
@@ -39,18 +38,14 @@ module Panko
       def method_added(method)
         return if @_descriptor.nil?
         deleted_attr = @_descriptor.attributes.delete(method)
-        unless deleted_attr.nil?
-          @_descriptor.method_fields << method
-        end
+        @_descriptor.method_fields << method unless deleted_attr.nil?
       end
 
       def has_one(name, options = {})
         serializer_const = options[:serializer]
         serializer_const = Panko::SerializerResolver.resolve(name.to_s) if serializer_const.nil?
 
-        if serializer_const.nil?
-          raise "Can't find serializer for #{self.name}.#{name} has_one relationship."
-        end
+        raise "Can't find serializer for #{self.name}.#{name} has_one relationship." if serializer_const.nil?
 
         @_descriptor.has_one_associations << Panko::Association.new(
           name,
@@ -63,9 +58,7 @@ module Panko
         serializer_const = options[:serializer] || options[:each_serializer]
         serializer_const = Panko::SerializerResolver.resolve(name.to_s) if serializer_const.nil?
 
-        if serializer_const.nil?
-          raise "Can't find serializer for #{self.name}.#{name} has_many relationship."
-        end
+        raise "Can't find serializer for #{self.name}.#{name} has_many relationship." if serializer_const.nil?
 
         @_descriptor.has_many_associations << Panko::Association.new(
           name,
@@ -89,7 +82,7 @@ module Panko
 
     def serialize_to_json(object)
       writer = Oj::StringWriter.new(mode: :rails)
-      Panko::serialize_subject(object, writer, @descriptor)
+      Panko.serialize_subject(object, writer, @descriptor)
       writer.to_s
     end
 

data/lib/panko/serializer_resolver.rb

@@ -1,18 +1,16 @@
 # frozen_string_literal: true
 
 class Panko::SerializerResolver
-
   def self.resolve(name)
     serializer_name = "#{name.singularize.camelize}Serializer"
-    serializer_const = self.safe_const_get(serializer_name)
+    serializer_const = safe_const_get(serializer_name)
 
     return nil if serializer_const.nil?
-    return nil unless self.is_serializer(serializer_const)
+    return nil unless is_serializer(serializer_const)
 
     serializer_const
   end
 
-
   private
 
   def self.is_serializer(const)
@@ -24,5 +22,4 @@ class Panko::SerializerResolver
   rescue NameError
     nil
   end
-
 end

data/lib/panko/version.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Panko
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

data/lib/panko_serializer.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require "panko/version"
 require "panko/attribute"
 require "panko/serializer"
@@ -6,7 +7,6 @@ require "panko/array_serializer"
 require "panko/response"
 require "panko/serializer_resolver"
 
-
 # C Extension
 require "oj"
 require "panko/panko_serializer"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panko_serializer
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Yosi Attias
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-16 00:00:00.000000000 Z
+date: 2018-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj