restpack_serializer 0.6.10 → 0.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60afb1f28b3e59bc186b2efb8b5223b7d786821d541a561d735a0bfa4242c6e7
-  data.tar.gz: ca2792a37310881b422b1a32529685c2097f90966c3e2e1e60cc8b389fb3bb8d
+  metadata.gz: bc9e5ce33121a450eefdd7af1aba1f70d6bc6a5d013f544b553dee69f22db41d
+  data.tar.gz: 259cca75737c8c32da93b489d9162cc49807bf7deafd2fcf86b06e508779a93a
 SHA512:
-  metadata.gz: dfaee9ec499864a7937726f54035ced857bbfd18a173946cec88d7a9984eec90a4618f9762c238e752cb4bf4fe57ca6c3017dabb74c00d081de2491c23d034d4
-  data.tar.gz: ff864cb5c5488f451fcfb33d42c2e0ed61d0a02cea28c50395afacaa8430ec34e1c1b347c08cd901d6f60c4a037af71b86aa56ea8b40d622e5c0ccc2f523fa4d
+  metadata.gz: 9b507e519351d23fbfa540950f90b2f7a625d04d313d80baf5e500c67a63498ceb44efac4c356e91eaf074a3df1f56b19819fffff9daf299a956b15813272a5f
+  data.tar.gz: 2748b0bc4dae717f07697326e61d5f9077dcc55075cf0b5416dee5c172da810565dfb2d6a65bb31dac0196510483839be3e5245f835d4c75b5c4d0b52998d5b3

data/Gemfile

@@ -3,3 +3,4 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'coveralls', require: false
+gem 'memory_profiler', require: false

data/Rakefile

@@ -4,4 +4,5 @@ RestPack::Gem::Tasks.load_tasks
 desc "Run some performance tests"
 task :perf do
   require_relative 'performance/perf.rb'
+  require_relative 'performance/mem.rb'
 end

data/lib/restpack_serializer/serializable.rb

@@ -57,11 +57,15 @@ module RestPack
       end
 
       add_custom_attributes(data)
-      add_links(model, data) unless self.class.associations.empty?
+      add_links(model, data) if self.class.has_associations?
 
       data
     end
 
+    def to_json(model, context = {})
+      as_json(model, context).to_json
+    end
+
     def custom_attributes
       nil
     end
@@ -140,9 +144,13 @@ module RestPack
       end
 
       def has_user_defined_method?(method_name)
-        user_defined_methods = self.user_defined_methods || []
-        return true if user_defined_methods.include?(method_name)
-        return self.superclass.try(:has_user_defined_method?, method_name)
+        if user_defined_methods && user_defined_methods.include?(method_name)
+          true
+        elsif superclass.respond_to?(:has_user_defined_method?)
+          superclass.has_user_defined_method?(method_name)
+        else
+          false
+        end
       end
 
       def memoized_has_user_defined_method?(method_name)
@@ -165,6 +173,10 @@ module RestPack
         new.as_json(model, context)
       end
 
+      def to_json(model, context = {})
+        new.as_json(model, context).to_json
+      end
+
       def serialize(models, context = {})
         models = [models] unless models.kind_of?(Array)
 

data/lib/restpack_serializer/serializable/side_loading.rb

@@ -44,8 +44,12 @@ module RestPack::Serializer::SideLoading
       end
     end
 
+    def has_associations?
+      @can_includes
+    end
+
     def associations
-      return [] unless @can_includes
+      return [] unless has_associations?
       can_includes.map do |include|
         association = association_from_include(include)
         association if supported_association?(association.macro)

data/lib/restpack_serializer/version.rb

@@ -1,5 +1,5 @@
 module RestPack
   module Serializer
-    VERSION = '0.6.10'
+    VERSION = '0.6.11'
   end
 end

data/performance/mem.rb

@@ -0,0 +1,49 @@
+require 'memory_profiler'
+require_relative '../lib/restpack_serializer'
+
+class SimpleSerializer
+  include RestPack::Serializer
+  attributes :id, :title
+end
+
+simple_model = {
+  id: "123",
+  title: 'This is the title',
+}
+
+# warmup
+SimpleSerializer.as_json(simple_model)
+
+report = MemoryProfiler.report do
+  SimpleSerializer.as_json(simple_model)
+end
+
+puts "="*64
+puts "Simple Serializer:"
+puts "="*64
+
+report.pretty_print(detailed_report: false)
+
+class ComplexSerializer
+  include RestPack::Serializer
+
+  attributes :a, :b, :c, :d, :e, :f, :g, :h, :i, :j, :k, :l, :m, :n, :o, :p, :q, :r, :s, :t
+end
+
+complex_model = {
+  a: 1, b: 2, c: 3, d: 4, e: 5, f: 6, g: 7, h: 8, i: 9, j: 10,
+  k: 11, l: 12, m: 13, n: 14, o: 15, p: 16, q: 17, r: 18, s: 19, t: 20,
+}
+
+# warmup
+ComplexSerializer.as_json(complex_model)
+
+report = MemoryProfiler.report do
+  ComplexSerializer.as_json(complex_model)
+end
+
+puts "="*64
+puts "Complex Serializer:"
+puts "="*64
+
+report.pretty_print(detailed_report: false)

data/restpack_serializer.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'activesupport', ['>= 4.0.3', '< 6.1']
   gem.add_dependency 'activerecord', ['>= 4.0.3', '< 6.1']
   gem.add_dependency 'kaminari', '~> 0.17.0'
-  gem.add_dependency 'kaminari-mongoid', '~> 0.1'
 
   gem.add_development_dependency 'restpack_gem', '~> 0.0.9'
   gem.add_development_dependency 'rake', '~> 11.3'
@@ -30,5 +29,4 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'database_cleaner', '~> 1.5'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'bump'
-  gem.add_development_dependency 'protected_attributes_continued', '~> 1.2'
 end

data/spec/fixtures/db.rb

@@ -1,6 +1,5 @@
 require 'sqlite3'
 require 'active_record'
-require 'protected_attributes_continued'
 
 ActiveRecord::Base.establish_connection(
   :adapter => 'sqlite3',
@@ -66,8 +65,6 @@ end
 
 module MyApp
   class Artist < ActiveRecord::Base
-    attr_accessible :name, :website
-
     has_many :albums
     has_many :songs
     has_many :payments
@@ -76,7 +73,6 @@ module MyApp
   end
 
   class Album < ActiveRecord::Base
-    attr_accessible :title, :year, :artist
     scope :classic, -> { where("year < 1950") }
 
     belongs_to :artist
@@ -85,34 +81,27 @@ module MyApp
   end
 
   class AlbumReview < ActiveRecord::Base
-    attr_accessible :message
     belongs_to :album
   end
 
   class Song < ActiveRecord::Base
     default_scope -> { order(id: :asc) }
 
-    attr_accessible :title, :artist, :album
-
     belongs_to :artist
     belongs_to :album
   end
 
   class Payment < ActiveRecord::Base
-    attr_accessible :amount, :artist
-
     belongs_to :artist
     belongs_to :fan
   end
 
   class Fan < ActiveRecord::Base
-    attr_accessible :name
     has_many :payments
     has_many :artists, :through => :albums
   end
 
   class Stalker < ActiveRecord::Base
-    attr_accessible :name
     has_and_belongs_to_many :artists
   end
 end

data/spec/serializable/serializer_spec.rb

@@ -313,6 +313,20 @@ describe RestPack::Serializer do
     end
   end
 
+  describe "to_json" do
+    context "class method" do
+      it "delegates to as_json" do
+        expect(PersonSerializer.as_json(person).to_json).to eq(PersonSerializer.to_json(person))
+      end
+    end
+
+    context "instance method" do
+      it "delegates to as_json" do
+        expect(serializer.as_json(person).to_json).to eq(serializer.to_json(person))
+      end
+    end
+  end
+
   describe "#model_class" do
     it "extracts the Model name from the Serializer name" do
       expect(PersonSerializer.model_class).to eq(Person)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restpack_serializer
 version: !ruby/object:Gem::Version
-  version: 0.6.10
+  version: 0.6.11
 platform: ruby
 authors:
 - Gavin Joyce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-21 00:00:00.000000000 Z
+date: 2020-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -64,20 +64,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.17.0
-- !ruby/object:Gem::Dependency
-  name: kaminari-mongoid
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: restpack_gem
   requirement: !ruby/object:Gem::Requirement
@@ -190,20 +176,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: protected_attributes_continued
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
 description: Model serialization, paging, side-loading and filtering
 email:
 - gavinjoyce@gmail.com
@@ -235,6 +207,7 @@ files:
 - lib/restpack_serializer/serializable/single.rb
 - lib/restpack_serializer/serializable/sortable.rb
 - lib/restpack_serializer/version.rb
+- performance/mem.rb
 - performance/perf.rb
 - restpack_serializer.gemspec
 - spec/factory/factory_spec.rb
@@ -274,8 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Model serialization, paging, side-loading and filtering