restpack_serializer 0.6.7 → 0.6.12

data/spec/serializable/side_loading/belongs_to_spec.rb

@@ -17,15 +17,15 @@ describe RestPack::Serializer::SideLoading do
           let(:options) { RestPack::Serializer::Options.new(MyApp::SongSerializer) }
 
           it "returns a hash with no data" do
-            side_loads.should == { :meta => {} }
+            expect(side_loads).to eq(meta: {})
           end
         end
 
         context "when including :albums" do
-          let(:options) { RestPack::Serializer::Options.new(MyApp::SongSerializer, { "include" => "albums" }) }
+          let(:options) { RestPack::Serializer::Options.new(MyApp::SongSerializer, "include" => "albums") }
 
           it "returns a hash with no data" do
-            side_loads.should == { :meta => {} }
+            expect(side_loads).to eq(meta: {})
           end
         end
       end
@@ -34,13 +34,13 @@ describe RestPack::Serializer::SideLoading do
         let(:models) { [MyApp::Song.first] }
 
         context "when including :albums" do
-          let(:options) { RestPack::Serializer::Options.new(MyApp::SongSerializer, { "include" => "albums" }) }
+          let(:options) { RestPack::Serializer::Options.new(MyApp::SongSerializer, "include" => "albums") }
 
           it "returns side-loaded albums" do
-            side_loads.should == {
+            expect(side_loads).to eq(
               albums: [MyApp::AlbumSerializer.as_json(MyApp::Song.first.album)],
-              meta: { }
-            }
+              meta: {}
+            )
           end
         end
       end
@@ -53,16 +53,16 @@ describe RestPack::Serializer::SideLoading do
         let(:models) { [song1, song2] }
 
         context "when including :albums" do
-          let(:options) { RestPack::Serializer::Options.new(MyApp::SongSerializer, { "include" => "albums" }) }
+          let(:options) { RestPack::Serializer::Options.new(MyApp::SongSerializer, "include" => "albums") }
 
           it "returns side-loaded albums" do
-            side_loads.should == {
+            expect(side_loads).to eq(
               albums: [
                 MyApp::AlbumSerializer.as_json(song1.album),
                 MyApp::AlbumSerializer.as_json(song2.album)
               ],
-              :meta => { }
-            }
+              meta: {}
+            )
           end
         end
       end
@@ -72,10 +72,13 @@ describe RestPack::Serializer::SideLoading do
         let(:models) { [b_side] }
 
         context 'when including :albums' do
-          let(:options) { RestPack::Serializer::Options.new(MyApp::SongSerializer, { "include" => "albums" }) }
+          let(:options) { RestPack::Serializer::Options.new(MyApp::SongSerializer, "include" => "albums") }
 
           it 'return a hash with no data' do
-            side_loads.should == { :meta => {}, :albums => [] }
+            expect(side_loads).to eq(
+              albums: [],
+              meta: {}
+            )
           end
         end
       end

data/spec/serializable/side_loading/has_and_belongs_many_spec.rb

@@ -15,13 +15,13 @@ describe RestPack::Serializer::SideLoading do
         let(:models) { [@artist1] }
 
         context "when including :albums" do
-          let(:options) { RestPack::Serializer::Options.new(MyApp::ArtistSerializer, { "include" => "stalkers" }) }
+          let(:options) { RestPack::Serializer::Options.new(MyApp::ArtistSerializer, "include" => "stalkers") }
           let(:stalker_count) { @artist1.stalkers.count }
 
           it "returns side-loaded albums" do
-            side_loads[:stalkers].count.should == stalker_count
-            side_loads[:meta][:stalkers][:page].should == 1
-            side_loads[:meta][:stalkers][:count].should == stalker_count
+            expect(side_loads[:stalkers].count).to eq(stalker_count)
+            expect(side_loads[:meta][:stalkers][:page]).to eq(1)
+            expect(side_loads[:meta][:stalkers][:count]).to eq(stalker_count)
           end
         end
       end
@@ -30,12 +30,12 @@ describe RestPack::Serializer::SideLoading do
         let(:models) { [@artist1, @artist2] }
 
         context "when including :albums" do
-          let(:options) { RestPack::Serializer::Options.new(MyApp::ArtistSerializer, { "include" => "stalkers" }) }
+          let(:options) { RestPack::Serializer::Options.new(MyApp::ArtistSerializer, "include" => "stalkers") }
           let(:stalker_count) { @artist1.stalkers.count + @artist2.stalkers.count }
 
           it "returns side-loaded albums" do
-            side_loads[:stalkers].count.should == stalker_count
-            side_loads[:meta][:stalkers][:count].should == stalker_count
+            expect(side_loads[:stalkers].count).to eq(stalker_count)
+            expect(side_loads[:meta][:stalkers][:count]).to eq(stalker_count)
           end
         end
       end

data/spec/serializable/side_loading/has_many_spec.rb

@@ -15,12 +15,12 @@ describe RestPack::Serializer::SideLoading do
         let(:models) { [@artist1] }
 
         context "when including :albums" do
-          let(:options) { RestPack::Serializer::Options.new(MyApp::ArtistSerializer, { "include" => "albums" }) }
+          let(:options) { RestPack::Serializer::Options.new(MyApp::ArtistSerializer, "include" => "albums") }
 
           it "returns side-loaded albums" do
-            side_loads[:albums].count.should == @artist1.albums.count
-            side_loads[:meta][:albums][:page].should == 1
-            side_loads[:meta][:albums][:count].should == @artist1.albums.count
+            expect(side_loads[:albums].count).to eq(@artist1.albums.count)
+            expect(side_loads[:meta][:albums][:page]).to eq(1)
+            expect(side_loads[:meta][:albums][:count]).to eq(@artist1.albums.count)
           end
         end
       end
@@ -29,12 +29,12 @@ describe RestPack::Serializer::SideLoading do
         let(:models) { [@artist1, @artist2] }
 
         context "when including :albums" do
-          let(:options) { RestPack::Serializer::Options.new(MyApp::ArtistSerializer, { "include" => "albums" }) }
+          let(:options) { RestPack::Serializer::Options.new(MyApp::ArtistSerializer, "include" => "albums") }
 
           it "returns side-loaded albums" do
             expected_count = @artist1.albums.count + @artist2.albums.count
-            side_loads[:albums].count.should == expected_count
-            side_loads[:meta][:albums][:count].should == expected_count
+            expect(side_loads[:albums].count).to eq(expected_count)
+            expect(side_loads[:meta][:albums][:count]).to eq(expected_count)
           end
         end
       end
@@ -42,28 +42,27 @@ describe RestPack::Serializer::SideLoading do
 
     describe '.has_many through' do
       context 'when including :fans' do
-        let(:options) { RestPack::Serializer::Options.new(MyApp::ArtistSerializer, { "include" => "fans" }) }
-        let(:artist_1) {FactoryGirl.create :artist_with_fans}
-        let(:artist_2) {FactoryGirl.create :artist_with_fans}
+        let(:options) { RestPack::Serializer::Options.new(MyApp::ArtistSerializer, "include" => "fans") }
+        let(:artist_1) { FactoryGirl.create :artist_with_fans }
+        let(:artist_2) { FactoryGirl.create :artist_with_fans }
 
         context "with a single model" do
-          let(:models) {[artist_1]}
+          let(:models) { [artist_1] }
 
           it 'returns side-loaded fans' do
-            side_loads[:fans].count.should == artist_1.fans.count
-            side_loads[:meta][:fans][:page].should == 1
-            side_loads[:meta][:fans][:count].should == artist_1.fans.count
+            expect(side_loads[:fans].count).to eq(artist_1.fans.count)
+            expect(side_loads[:meta][:fans][:page]).to eq(1)
+            expect(side_loads[:meta][:fans][:count]).to eq(artist_1.fans.count)
           end
         end
         context "with a multiple models" do
-          let(:models) {[artist_1, artist_2]}
+          let(:models) { [artist_1, artist_2] }
 
           it 'returns side-loaded fans' do
-            expected_count = artist_1.fans.count  + artist_2.fans.count
-
-            side_loads[:fans].count.should == expected_count
-            side_loads[:meta][:fans][:page].should == 1
-            side_loads[:meta][:fans][:count].should == expected_count
+            expected_count = artist_1.fans.count + artist_2.fans.count
+            expect(side_loads[:fans].count).to eq(expected_count)
+            expect(side_loads[:meta][:fans][:page]).to eq(1)
+            expect(side_loads[:meta][:fans][:count]).to eq(expected_count)
           end
 
           context "when there are shared fans" do

data/spec/serializable/side_loading/side_loading_spec.rb

@@ -12,7 +12,7 @@ describe RestPack::Serializer::SideLoading do
         message = ":wrong is not a valid include for MyApp::Song"
 
         expect do
-          MyApp::SongSerializer.side_loads([MyApp::Song.first], RestPack::Serializer::Options.new(MyApp::SongSerializer, { "include" => "wrong" }))
+          MyApp::SongSerializer.side_loads([MyApp::Song.first], RestPack::Serializer::Options.new(MyApp::SongSerializer, "include" => "wrong"))
         end.to raise_error(exception, message)
       end
     end
@@ -24,7 +24,7 @@ describe RestPack::Serializer::SideLoading do
         message = ":payments is not a valid include for MyApp::Artist"
 
         expect do
-          MyApp::ArtistSerializer.side_loads([payment.artist], RestPack::Serializer::Options.new(MyApp::ArtistSerializer, { "include" => "payments" }))
+          MyApp::ArtistSerializer.side_loads([payment.artist], RestPack::Serializer::Options.new(MyApp::ArtistSerializer, "include" => "payments"))
         end.to raise_error(exception, message)
       end
     end
@@ -36,7 +36,7 @@ describe RestPack::Serializer::SideLoading do
       attributes :a, :b, :c
     end
     it "defaults to empty array" do
-      CustomSerializer.can_includes.should == []
+      expect(CustomSerializer.can_includes).to eq([])
     end
 
     it "allows includes to be specified" do
@@ -45,33 +45,35 @@ describe RestPack::Serializer::SideLoading do
         can_include :model2, :model3
       end
 
-      CustomSerializer.can_includes.should == [:model1, :model2, :model3]
+      expect(CustomSerializer.can_includes).to eq([:model1, :model2, :model3])
     end
   end
 
   describe "#links" do
-    MyApp::AlbumSerializer.links.should == {
-      "albums.artist" => {
-        :href => "/artists/{albums.artist}",
-        :type => :artists
-      },
-      "albums.songs" => {
-        :href => "/songs?album_id={albums.id}",
-        :type => :songs
-      }
-    }
+    it do
+      expect(MyApp::AlbumSerializer.links).to eq(
+        "albums.artist" => {
+          href: "/artists/{albums.artist}",
+          type: :artists
+        },
+        "albums.songs" => {
+          href: "/songs?album_id={albums.id}",
+          type: :songs
+        }
+      )
+    end
 
     it "applies custom RestPack::Serializer.config.href_prefix" do
       original = RestPack::Serializer.config.href_prefix
       RestPack::Serializer.config.href_prefix = "/api/v1"
-      MyApp::AlbumSerializer.links["albums.artist"][:href].should == "/api/v1/artists/{albums.artist}"
+      expect(MyApp::AlbumSerializer.links["albums.artist"][:href]).to eq("/api/v1/artists/{albums.artist}")
       RestPack::Serializer.config.href_prefix = original
     end
 
     it "applies custom serializer  href_prefix" do
       original = RestPack::Serializer.config.href_prefix
       MyApp::AlbumSerializer.href_prefix = '/api/v2'
-      MyApp::AlbumSerializer.links["albums.artist"][:href].should == "/api/v2/artists/{albums.artist}"
+      expect(MyApp::AlbumSerializer.links["albums.artist"][:href]).to eq("/api/v2/artists/{albums.artist}")
       MyApp::AlbumSerializer.href_prefix = original
     end
   end
@@ -79,17 +81,17 @@ describe RestPack::Serializer::SideLoading do
   describe "#filterable_by" do
     context "a model with no :belongs_to relations" do
       it "is filterable by :id only" do
-        MyApp::ArtistSerializer.filterable_by.should == [:id]
+        expect(MyApp::ArtistSerializer.filterable_by).to eq([:id])
       end
     end
     context "a model with a single :belongs_to relations" do
       it "is filterable by primary key and foreign keys" do
-        MyApp::AlbumSerializer.filterable_by.should =~ [:id, :artist_id, :year]
+        expect(MyApp::AlbumSerializer.filterable_by).to eq([:id, :artist_id, :year])
       end
     end
     context "a model with multiple :belongs_to relations" do
       it "is filterable by primary key and foreign keys" do
-        MyApp::SongSerializer.filterable_by.should =~ [:id, :artist_id, :album_id, :title]
+        expect(MyApp::SongSerializer.filterable_by).to eq([:id, :artist_id, :album_id, :title])
       end
     end
   end

data/spec/serializable/single_spec.rb

@@ -12,15 +12,15 @@ describe RestPack::Serializer::Single do
   let(:context) { { } }
 
   it "returns a resource by id" do
-    resource[:id].should == @song.id.to_s
-    resource[:title].should == @song.title
+    expect(resource[:id]).to eq(@song.id.to_s)
+    expect(resource[:title]).to eq(@song.title)
   end
 
   context "with context" do
     let(:context) { { reverse_title?: true } }
 
     it "returns reversed titles" do
-      resource[:title].should == @song.title.reverse
+      expect(resource[:title]).to eq(@song.title.reverse)
     end
   end
 
@@ -28,7 +28,7 @@ describe RestPack::Serializer::Single do
     let(:params) { { id: @song.id + 100 } }
 
     it "returns nil" do
-      resource.should == nil
+      expect(resource).to eq(nil)
     end
   end
 end

data/spec/serializable/sortable_spec.rb

@@ -9,6 +9,6 @@ describe RestPack::Serializer::Sortable do
   end
 
   it 'captures the specified sorting attributes' do
-    CustomSerializer.serializable_sorting_attributes.should == [:a, :c]
+    expect(CustomSerializer.serializable_sorting_attributes).to eq([:a, :c])
   end
 end

data/spec/spec_helper.rb

@@ -10,6 +10,7 @@ FactoryGirl.find_definitions
 
 RSpec.configure do |config|
   config.include FactoryGirl::Syntax::Methods
+  config.raise_errors_for_deprecations!
 
   config.before(:suite) do
     DatabaseCleaner.clean_with(:truncation)

data/spec/support/factory.rb

@@ -1,14 +1,12 @@
 require 'factory_girl'
 
 FactoryGirl.define do
-  factory :artist, :class => MyApp::Artist do
-    sequence(:name) {|n| "Artist ##{n}" }
-    sequence(:website) {|n| "http://website#{n}.com/" }
+  factory :artist, class: MyApp::Artist do
+    sequence(:name) { |n| "Artist ##{n}" }
+    sequence(:website) { |n| "http://website#{n}.com/" }
 
     factory :artist_with_albums do
-      ignore do
-        album_count 3
-      end
+      transient { album_count 3 }
 
       after(:create) do |artist, evaluator|
         create_list(:album_with_songs, evaluator.album_count, artist: artist)
@@ -16,33 +14,29 @@ FactoryGirl.define do
     end
 
     factory :artist_with_fans do
-      ignore do
-        fans_count 3
-      end
+      transient { fans_count 3 }
+
       after(:create) do |artist, evaluator|
         create_list(:payment, evaluator.fans_count, artist: artist)
       end
     end
 
     factory :artist_with_stalkers do
-      ignore do
-        stalker_count 2
-      end
+      transient { stalker_count 2 }
+
       after(:create) do |artist, evaluator|
-        create_list(:stalker, evaluator.stalker_count, artists: [ artist ])
+        create_list(:stalker, evaluator.stalker_count, artists: [artist])
       end
     end
   end
 
-  factory :album, :class => MyApp::Album do
-    sequence(:title) {|n| "Album ##{n}" }
-    sequence(:year) {|n| 1960 + n }
+  factory :album, class: MyApp::Album do
+    sequence(:title) { |n| "Album ##{n}" }
+    sequence(:year) { |n| 1960 + n }
     artist
 
     factory :album_with_songs do
-      ignore do
-        song_count 10
-      end
+      transient { song_count 10 }
 
       after(:create) do |album, evaluator|
         create_list(:song, evaluator.song_count, album: album, artist: album.artist)
@@ -50,23 +44,23 @@ FactoryGirl.define do
     end
   end
 
-  factory :song, :class => MyApp::Song do
-    sequence(:title) {|n| "Song ##{n}" }
+  factory :song, class: MyApp::Song do
+    sequence(:title) { |n| "Song ##{n}" }
     artist
     album
   end
 
-  factory :payment, :class => MyApp::Payment do
+  factory :payment, class: MyApp::Payment do
     amount 999
     artist
     fan
   end
 
-  factory :fan, :class => MyApp::Fan do
-    sequence(:name) {|n| "Fan ##{n}"}
+  factory :fan, class: MyApp::Fan do
+    sequence(:name) { |n| "Fan ##{n}" }
   end
 
-  factory :stalker, :class => MyApp::Stalker do
-    sequence(:name) {|n| "Stalker ##{n}"}
+  factory :stalker, class: MyApp::Stalker do
+    sequence(:name) { |n| "Stalker ##{n}" }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: restpack_serializer
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.12
 platform: ruby
 authors:
 - Gavin Joyce
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-05-31 00:00:00.000000000 Z
+date: 2020-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -19,7 +19,7 @@ dependencies:
         version: 4.0.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 4.0.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
         version: 4.0.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,21 +49,27 @@ dependencies:
         version: 4.0.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: 0.17.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.17.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.16.1
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: restpack_gem
   requirement: !ruby/object:Gem::Requirement
@@ -84,70 +90,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.1.2
+        version: '11.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 11.1.2
+        version: '11.3'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.6.4
+        version: '4.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.6.4
+        version: '4.7'
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.7.0
+        version: '4.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.7.0
+        version: '4.7'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.7
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.7
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -176,20 +182,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: protected_attributes
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.1.3
 description: Model serialization, paging, side-loading and filtering
 email:
 - gavinjoyce@gmail.com
@@ -221,6 +213,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
@@ -245,7 +238,7 @@ files:
 homepage: https://github.com/RestPack
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -260,9 +253,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Model serialization, paging, side-loading and filtering
 test_files:
@@ -285,4 +277,3 @@ test_files:
 - spec/serializable/sortable_spec.rb
 - spec/spec_helper.rb
 - spec/support/factory.rb
-has_rdoc: