restpack_serializer 0.6.15 → 0.6.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c2af7afe83c0c640c9085cd34c30f330399878d71f2dea9d879aa4a92074093
-  data.tar.gz: 41f425d7e75b6d6c2f88ad9e8061c077f9ece21743e7b15ee64285b67e53fb84
+  metadata.gz: 84f27b3643c5e1f5edeb5fc3d33fbcf867a7cb77a76a0be7b833f064b6932b9f
+  data.tar.gz: be05daf8bca2393be7a09601e736f1728916ee24d269151db30f977bad48f630
 SHA512:
-  metadata.gz: d8c496a0cf0e39b32615004ce5288b6301203b15d34be0c69f3f4211db1d81aa63f59028e6a8029a513dba1daa8b50822af4f7b09735a69c6115f2bc1673f685
-  data.tar.gz: afc2db82579616bf87e19a7fa768713997b37904fffab340e8346d7594d18987edf0acdcdd62c4d9daa6b1407d045a295e00e02c512f54d67bc75d7e47649416
+  metadata.gz: 0c58c5caae160d9180f47af9dff1196d368d3dda20ff034aad54dc6beea2f6c20d662a9c1adcdb25a6c1c0e0b4366754d915f8e5f6c91f56561bdfb69b1bba61
+  data.tar.gz: 14a8625373457a42b9e29582a25ec0b10826537b5be650c33e725c7d2923b294ba1fb3542f6299b4109aaef0f1272ea1d4af72c48c9070abf3efbf57068f6174

data/.github/workflows/ci.yml

@@ -11,8 +11,6 @@ jobs:
 
       matrix:
         ruby-version:
-          - 2.1
-          - 2.2
           - 2.3
           - 2.4
           - 2.5
@@ -21,9 +19,11 @@ jobs:
           - "3.0"
           - 3.1
           - 3.2
+          - 3.3
+          - 3.4
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby-version }}

data/.ruby-version

@@ -1 +1 @@
-3.2.2
+3.4.4

data/Gemfile

@@ -7,4 +7,9 @@ gem 'memory_profiler', require: false
 
 if RUBY_VERSION < "2.2"
   gem "sqlite3", "~> 1.3.0"
+elsif RUBY_VERSION < "3.1"
+  gem "sqlite3", "~> 1.4.0"
+  gem "term-ansicolor", "< 1.10.3"
+elsif RUBY_VERSION >= "3.4"
+  gem "factory_bot", "~> 6.0"
 end

data/lib/restpack_serializer/version.rb

@@ -1,5 +1,5 @@
 module RestPack
   module Serializer
-    VERSION = '0.6.15'
+    VERSION = '0.6.16'
   end
 end

data/restpack_serializer.gemspec

@@ -17,15 +17,15 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'activesupport', ['>= 4.0.3', '< 7.2']
-  gem.add_dependency 'activerecord', ['>= 4.0.3', '< 7.2']
+  gem.add_dependency 'activesupport', ['>= 4.0.3', '< 8.1']
+  gem.add_dependency 'activerecord', ['>= 4.0.3', '< 8.1']
   gem.add_dependency 'kaminari', ['>= 0.17.0', '< 2.0']
 
   gem.add_development_dependency 'restpack_gem', '~> 0.0.9'
   gem.add_development_dependency 'rake', '~> 13'
   gem.add_development_dependency 'guard-rspec', '~> 4.7'
-  gem.add_development_dependency 'factory_girl', '~> 4.7'
-  gem.add_development_dependency 'sqlite3', '~> 1.3'
+  gem.add_development_dependency 'sqlite3', '~> 2.1'
+  gem.add_development_dependency 'factory_bot', '~> 5.0'
   gem.add_development_dependency 'database_cleaner'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'bump'

data/spec/serializable/attributes_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'ostruct'
 
 describe RestPack::Serializer::Attributes do
   class CustomSerializer

data/spec/serializable/paging_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe RestPack::Serializer::Paging do
   before(:each) do
-    @album1 = FactoryGirl.create(:album_with_songs, song_count: 11)
-    @album2 = FactoryGirl.create(:album_with_songs, song_count: 7)
+    @album1 = FactoryBot.create(:album_with_songs, song_count: 11)
+    @album2 = FactoryBot.create(:album_with_songs, song_count: 7)
   end
 
   context "#page" do
@@ -229,8 +229,8 @@ describe RestPack::Serializer::Paging do
 
     context "with custom scope" do
       before do
-        FactoryGirl.create(:album, year: 1930)
-        FactoryGirl.create(:album, year: 1948)
+        FactoryBot.create(:album, year: 1930)
+        FactoryBot.create(:album, year: 1948)
       end
       let(:page) { MyApp::AlbumSerializer.page(params, scope) }
       let(:scope) { MyApp::Album.classic }

data/spec/serializable/resource_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe RestPack::Serializer::Resource do
   before(:each) do
-    @album = FactoryGirl.create(:album_with_songs, song_count: 11)
+    @album = FactoryBot.create(:album_with_songs, song_count: 11)
     @song = @album.songs.first
   end
 
@@ -50,7 +50,7 @@ describe RestPack::Serializer::Resource do
   end
 
   describe "song with no artist" do
-    let(:song) { FactoryGirl.create(:song, artist: nil) }
+    let(:song) { FactoryBot.create(:song, artist: nil) }
     let(:resource) { MyApp::SongSerializer.resource(id: song.id.to_s) }
 
     it "should not have an artist link" do

data/spec/serializable/serializer_spec.rb

@@ -266,7 +266,7 @@ describe RestPack::Serializer do
         let(:serializer) { MyApp::SongSerializer.new }
 
         it "includes 'links' data for :belongs_to associations" do
-          @album1 = FactoryGirl.create(:album_with_songs, song_count: 11)
+          @album1 = FactoryBot.create(:album_with_songs, song_count: 11)
           json = serializer.as_json(@album1.songs.first)
           expect(json[:links]).to eq(
             artist: @album1.artist_id.to_s,
@@ -276,7 +276,7 @@ describe RestPack::Serializer do
       end
 
       context "with a serializer with has_* associations" do
-        let(:artist_factory) { FactoryGirl.create :artist_with_fans }
+        let(:artist_factory) { FactoryBot.create :artist_with_fans }
         let(:artist_serializer) { MyApp::ArtistSerializer.new }
         let(:json) { artist_serializer.as_json(artist_factory) }
         let(:side_load_ids) { artist_has_association.map { |obj| obj.id.to_s } }
@@ -302,7 +302,7 @@ describe RestPack::Serializer do
         end
 
         describe "'has_and_belongs_to_many' associations" do
-          let(:artist_factory) { FactoryGirl.create :artist_with_stalkers }
+          let(:artist_factory) { FactoryBot.create :artist_with_stalkers }
           let(:artist_has_association) { artist_factory.stalkers }
 
           it "includes 'links' data when there are associated records" do

data/spec/serializable/side_loading/belongs_to_spec.rb

@@ -5,8 +5,8 @@ describe RestPack::Serializer::SideLoading do
     describe ".belongs_to" do
 
       before(:each) do
-        FactoryGirl.create(:artist_with_albums, album_count: 2)
-        FactoryGirl.create(:artist_with_albums, album_count: 1)
+        FactoryBot.create(:artist_with_albums, album_count: 2)
+        FactoryBot.create(:artist_with_albums, album_count: 1)
       end
       let(:side_loads) { MyApp::SongSerializer.side_loads(models, options) }
 
@@ -68,7 +68,7 @@ describe RestPack::Serializer::SideLoading do
       end
 
       context 'without an associated model' do
-        let!(:b_side) { FactoryGirl.create(:song, album: nil) }
+        let!(:b_side) { FactoryBot.create(:song, album: nil) }
         let(:models) { [b_side] }
 
         context 'when including :albums' do

data/spec/serializable/side_loading/has_and_belongs_many_spec.rb

@@ -7,8 +7,8 @@ describe RestPack::Serializer::SideLoading do
     describe ".has_and_belongs_to_many" do
 
       before(:each) do
-        @artist1 = FactoryGirl.create(:artist_with_stalkers, stalker_count: 2)
-        @artist2 = FactoryGirl.create(:artist_with_stalkers, stalker_count: 3)
+        @artist1 = FactoryBot.create(:artist_with_stalkers, stalker_count: 2)
+        @artist2 = FactoryBot.create(:artist_with_stalkers, stalker_count: 3)
       end
 
       context "with a single model" do

data/spec/serializable/side_loading/has_many_spec.rb

@@ -7,8 +7,8 @@ describe RestPack::Serializer::SideLoading do
     describe ".has_many" do
 
       before(:each) do
-        @artist1 = FactoryGirl.create(:artist_with_albums, album_count: 2)
-        @artist2 = FactoryGirl.create(:artist_with_albums, album_count: 1)
+        @artist1 = FactoryBot.create(:artist_with_albums, album_count: 2)
+        @artist2 = FactoryBot.create(:artist_with_albums, album_count: 1)
       end
 
       context "with a single model" do
@@ -43,8 +43,8 @@ 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(:artist_1) { FactoryBot.create :artist_with_fans }
+        let(:artist_2) { FactoryBot.create :artist_with_fans }
 
         context "with a single model" do
           let(:models) { [artist_1] }

data/spec/serializable/side_loading/side_loading_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe RestPack::Serializer::SideLoading do
   context "invalid :include" do
     before(:each) do
-      FactoryGirl.create(:song)
+      FactoryBot.create(:song)
     end
 
     context "an include to an inexistent model" do
@@ -19,7 +19,7 @@ describe RestPack::Serializer::SideLoading do
 
     context "an include to a model which has not been whitelisted with 'can_include'" do
       it "raises an exception" do
-        payment = FactoryGirl.create(:payment)
+        payment = FactoryBot.create(:payment)
         exception = RestPack::Serializer::InvalidInclude
         message = ":payments is not a valid include for MyApp::Artist"
 

data/spec/serializable/single_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe RestPack::Serializer::Single do
   before(:each) do
-    @album = FactoryGirl.create(:album_with_songs, song_count: 11)
+    @album = FactoryBot.create(:album_with_songs, song_count: 11)
     @song = @album.songs.first
   end
 

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 require 'rspec'
+require 'logger'
 require './lib/restpack_serializer'
 require './spec/fixtures/db'
 require './spec/fixtures/serializers'
@@ -8,10 +9,10 @@ require 'coveralls'
 
 Coveralls::Output.silent = true unless ENV["CI"]
 Coveralls.wear!
-FactoryGirl.find_definitions
+FactoryBot.find_definitions
 
 RSpec.configure do |config|
-  config.include FactoryGirl::Syntax::Methods
+  config.include FactoryBot::Syntax::Methods
   config.raise_errors_for_deprecations!
 
   config.before(:suite) do

data/spec/support/factory.rb

@@ -1,12 +1,12 @@
-require 'factory_girl'
+require 'factory_bot'
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :artist, class: MyApp::Artist do
     sequence(:name) { |n| "Artist ##{n}" }
     sequence(:website) { |n| "http://website#{n}.com/" }
 
     factory :artist_with_albums do
-      transient { album_count 3 }
+      transient { album_count { 3 } }
 
       after(:create) do |artist, evaluator|
         create_list(:album_with_songs, evaluator.album_count, artist: artist)
@@ -14,7 +14,7 @@ FactoryGirl.define do
     end
 
     factory :artist_with_fans do
-      transient { fans_count 3 }
+      transient { fans_count { 3 } }
 
       after(:create) do |artist, evaluator|
         create_list(:payment, evaluator.fans_count, artist: artist)
@@ -22,7 +22,7 @@ FactoryGirl.define do
     end
 
     factory :artist_with_stalkers do
-      transient { stalker_count 2 }
+      transient { stalker_count { 2 } }
 
       after(:create) do |artist, evaluator|
         create_list(:stalker, evaluator.stalker_count, artists: [artist])
@@ -36,7 +36,7 @@ FactoryGirl.define do
     artist
 
     factory :album_with_songs do
-      transient { song_count 10 }
+      transient { song_count { 10 } }
 
       after(:create) do |album, evaluator|
         create_list(:song, evaluator.song_count, album: album, artist: album.artist)
@@ -51,7 +51,7 @@ FactoryGirl.define do
   end
 
   factory :payment, class: MyApp::Payment do
-    amount 999
+    amount { 999 }
     artist
     fan
   end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: restpack_serializer
 version: !ruby/object:Gem::Version
-  version: 0.6.15
+  version: 0.6.16
 platform: ruby
 authors:
 - Gavin Joyce
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-12 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -19,7 +18,7 @@ dependencies:
         version: 4.0.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +28,7 @@ dependencies:
         version: 4.0.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.1'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +38,7 @@ dependencies:
         version: 4.0.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +48,7 @@ dependencies:
         version: 4.0.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.2'
+        version: '8.1'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
@@ -113,33 +112,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.7'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -238,7 +237,6 @@ files:
 homepage: https://github.com/RestPack
 licenses: []
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -253,8 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Model serialization, paging, side-loading and filtering
 test_files: