restpack_serializer 0.2.11 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d854b833f2b83d257bdf24cd7b81730a62dfa4e
-  data.tar.gz: ea7b5d586a067f1b3bdae4ec2d46687015b319b0
+  metadata.gz: 5d32bb32927a51cf68e6f76910199fc343c1f545
+  data.tar.gz: e531717bffc615184c588e1523fb461874a5b402
 SHA512:
-  metadata.gz: 49e5e2654db7e93b2654a993754e65d699ff9110c117ab287baf51fc8091d8c9d46eee5245c5251a5f11844cd57c7cfb77fe4c64c024f17fd170ffd33d7c9920
-  data.tar.gz: 7d19b08a58a2675dd0fba237d3577ea69160506be25e1f013219e8746fc71aa299a00f1cf6c0767fa801cc81e3d7780da4e35d530273e3866d650e1916c94e7c
+  metadata.gz: b7a53fd767fff3671ba6818ffbeab9a43cff08b27f6424e39e2427b7be65cde6be6402bb54cc703c593c2f4e60697ce9b89bac53912728892bbaa015eeea2a52
+  data.tar.gz: 4c68c689127a698f04f82670f241188cb621ae38fb600631c337b5967620de9f361bdeb03a548418bbe9506ee04edf83d0c19adbc8fd6636cdb1f0ebd468f527

data/lib/restpack_serializer/options.rb

@@ -1,15 +1,16 @@
 module RestPack::Serializer
   class Options
-    attr_accessor :page, :page_size, :includes, :filters, :model_class, :scope, :include_links
+    attr_accessor :page, :page_size, :includes, :filters, :serializer, :model_class, :scope, :include_links
 
-    def initialize(model_class, params = {}, scope = nil)
+    def initialize(serializer, params = {}, scope = nil)
       params.symbolize_keys! if params.respond_to?(:symbolize_keys!)
 
       @page = 1
       @page_size = RestPack::Serializer.config.page_size
       @includes = []
-      @filters = filters_from_params(params, model_class)
-      @model_class = model_class
+      @filters = filters_from_params(params, serializer)
+      @serializer = serializer
+      @model_class = serializer.model_class
       @scope = scope || model_class.send(:scoped)
       @include_links = true
 
@@ -41,10 +42,9 @@ module RestPack::Serializer
 
     private
 
-    def filters_from_params(params, model_class)
-      serializer = RestPack::Serializer::Factory.create(model_class)
+    def filters_from_params(params, serializer)
       filters = {}
-      serializer.class.filterable_by.each do |filter|
+      serializer.filterable_by.each do |filter|
         [filter, "#{filter}s".to_sym].each do |key|
           filters[filter] = params[key].split(',') if params[key]
         end

data/lib/restpack_serializer/serializable/paging.rb

@@ -3,7 +3,7 @@ module RestPack::Serializer::Paging
 
   module ClassMethods
     def page(params = {}, scope = nil)
-      page_with_options RestPack::Serializer::Options.new(self.model_class, params, scope)
+      page_with_options RestPack::Serializer::Options.new(self, params, scope)
     end
 
     def page_with_options(options)

data/lib/restpack_serializer/serializable/resource.rb

@@ -3,7 +3,7 @@ module RestPack::Serializer::Resource
 
   module ClassMethods
     def resource(params = {}, scope = nil)
-      page_with_options RestPack::Serializer::Options.new(self.model_class, params, scope)
+      page_with_options RestPack::Serializer::Options.new(self, params, scope)
     end
   end
 end

data/lib/restpack_serializer/serializable/side_loading.rb

@@ -91,7 +91,7 @@ module RestPack::Serializer::SideLoading
 
     def side_load_has_many(association, models, serializer)
       return {} if models.empty?
-      options = RestPack::Serializer::Options.new(serializer.class.model_class)
+      options = RestPack::Serializer::Options.new(serializer.class)
       options.filters = { association.foreign_key.to_sym => models.map(&:id) }
       options.include_links = false
       return serializer.class.page_with_options(options)

data/lib/restpack_serializer/version.rb

@@ -1,5 +1,5 @@
 module RestPack
   module Serializer
-    VERSION = '0.2.11'
+    VERSION = '0.2.12'
   end
 end

data/spec/serializable/options_spec.rb

@@ -1,7 +1,7 @@
 require './spec/spec_helper'
 
 describe RestPack::Serializer::Options do
-  let(:subject) { RestPack::Serializer::Options.new(Song, params, scope) }
+  let(:subject) { RestPack::Serializer::Options.new(SongSerializer, params, scope) }
   let(:params) { {} }
   let(:scope) { nil }
 

data/spec/serializable/paging_spec.rb

@@ -157,7 +157,7 @@ describe RestPack::Serializer::Paging do
   context "#page_with_options" do
     let(:page) { SongSerializer.page_with_options(options) }
     let(:params) { {} }
-    let(:options) { RestPack::Serializer::Options.new(Song, params) }
+    let(:options) { RestPack::Serializer::Options.new(SongSerializer, params) }
 
     context "with defaults" do
       it "includes valid paging meta data" do
@@ -179,7 +179,7 @@ describe RestPack::Serializer::Paging do
 
   context "paging with paged side-load" do
     let(:page) { AlbumSerializer.page_with_options(options) }
-    let(:options) { RestPack::Serializer::Options.new(Album, { includes: 'songs' }) }
+    let(:options) { RestPack::Serializer::Options.new(AlbumSerializer, { includes: 'songs' }) }
 
     it "includes side-loaded paging data in meta data" do
       page[:meta][:albums].should_not == nil
@@ -191,7 +191,7 @@ describe RestPack::Serializer::Paging do
 
   context "paging with two paged side-loads" do
     let(:page) { ArtistSerializer.page_with_options(options) }
-    let(:options) { RestPack::Serializer::Options.new(Artist, { includes: 'albums,songs' }) }
+    let(:options) { RestPack::Serializer::Options.new(ArtistSerializer, { includes: 'albums,songs' }) }
 
     it "includes side-loaded paging data in meta data" do
       page[:meta][:albums].should_not == nil

data/spec/serializable/side_loading/belongs_to_spec.rb

@@ -14,7 +14,7 @@ describe RestPack::Serializer::SideLoading do
         let(:models) { [] }
 
         context "no side-loads" do
-          let(:options) { RestPack::Serializer::Options.new(Song) }
+          let(:options) { RestPack::Serializer::Options.new(SongSerializer) }
 
           it "returns a hash with no data" do
             side_loads.should == { :meta => {} }
@@ -22,7 +22,7 @@ describe RestPack::Serializer::SideLoading do
         end
 
         context "when including :albums" do
-          let(:options) { RestPack::Serializer::Options.new(Song, { "includes" => "albums" }) }
+          let(:options) { RestPack::Serializer::Options.new(SongSerializer, { "includes" => "albums" }) }
 
           it "returns a hash with no data" do
             side_loads.should == { :meta => {} }
@@ -34,7 +34,7 @@ describe RestPack::Serializer::SideLoading do
         let(:models) { [Song.first] }
 
         context "when including :albums" do
-          let(:options) { RestPack::Serializer::Options.new(Song, { "includes" => "albums" }) }
+          let(:options) { RestPack::Serializer::Options.new(SongSerializer, { "includes" => "albums" }) }
 
           it "returns side-loaded albums" do
             side_loads.should == {
@@ -53,7 +53,7 @@ describe RestPack::Serializer::SideLoading do
         let(:models) { [song1, song2] }
 
         context "when including :albums" do
-          let(:options) { RestPack::Serializer::Options.new(Song, { "includes" => "albums" }) }
+          let(:options) { RestPack::Serializer::Options.new(SongSerializer, { "includes" => "albums" }) }
 
           it "returns side-loaded albums" do
             side_loads.should == {

data/spec/serializable/side_loading/has_many_spec.rb

@@ -14,7 +14,7 @@ describe RestPack::Serializer::SideLoading do
         let(:models) { [@artist1] }
 
         context "when including :albums" do
-          let(:options) { RestPack::Serializer::Options.new(Artist, { "includes" => "albums" }) }
+          let(:options) { RestPack::Serializer::Options.new(ArtistSerializer, { "includes" => "albums" }) }
 
           it "returns side-loaded albums" do
             side_loads[:albums].count.should == @artist1.albums.count
@@ -28,7 +28,7 @@ describe RestPack::Serializer::SideLoading do
         let(:models) { [@artist1, @artist2] }
 
         context "when including :albums" do
-          let(:options) { RestPack::Serializer::Options.new(Artist, { "includes" => "albums" }) }
+          let(:options) { RestPack::Serializer::Options.new(ArtistSerializer, { "includes" => "albums" }) }
 
           it "returns side-loaded albums" do
             expected_count = @artist1.albums.count + @artist2.albums.count

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 Song"
 
         expect do
-          SongSerializer.side_loads([Song.first], RestPack::Serializer::Options.new(Song, { "includes" => "wrong" }))
+          SongSerializer.side_loads([Song.first], RestPack::Serializer::Options.new(SongSerializer, { "includes" => "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 Artist"
 
         expect do
-          ArtistSerializer.side_loads([payment.artist], RestPack::Serializer::Options.new(Artist, { "includes" => "payments" }))
+          ArtistSerializer.side_loads([payment.artist], RestPack::Serializer::Options.new(ArtistSerializer, { "includes" => "payments" }))
         end.to raise_error(exception, message)
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restpack_serializer
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.12
 platform: ruby
 authors:
 - Gavin Joyce