restpack_serializer 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d9ebc87b6344eadafb83a213f41bbf0cff31ba8
-  data.tar.gz: c4f02a1c7357fda3564d4914283a661b68993309
+  metadata.gz: 999010d07a5c68b823e2f2c36496dd1a8b2adbcc
+  data.tar.gz: 16eca8065b150b5694aa041564f8598361004544
 SHA512:
-  metadata.gz: 0ba7ae1a03d00c7bb84653881165c4765f9f1177249c119025d370084b70dba5d589470ceb280c09e82374a1805a68f61c494613f5e1e430adf2651b13e0c53e
-  data.tar.gz: bad906f6db7243f1aec6e248917c8120606a841509968eb417e08140f180bb15a36e0e6dd50f9730223d6e63db2dcd1e0ad74f64e07c1471c163f4f394fd86c3
+  metadata.gz: a0be747ac4aa315149718107badbfc1327c2c70fc772679deae2c533ed24442a6be4199249644f1aa35eaaabbe408f053530dbc477a28fa88a3e694379ba1bbd
+  data.tar.gz: b0a43b5d5423e078ce5d521aa8853882f50c7d2d5329ffdc70e21a79bf15aeada5f53fa74299cb3cdefb6a511c5a1233a1428a5a8e3286e73497b3e873aebaf5

data/lib/restpack_serializer/options.rb

@@ -9,7 +9,7 @@ module RestPack::Serializer
 
       @page = params[:page] ? params[:page].to_i : 1
       @page_size = params[:page_size] ? params[:page_size].to_i : RestPack::Serializer.config.page_size
-      @include = params[:include] ? params[:include].split(',').map(&:to_sym) : []
+      @include = params[:include] ? params[:include].split(',') : []
       @filters = filters_from_params(params, serializer)
       @sorting = sorting_from_params(params, serializer)
       @serializer = serializer

data/lib/restpack_serializer/serializable/side_load_data_builder.rb

@@ -9,8 +9,8 @@ module RestPack
       end
 
       def side_load_belongs_to
-        foreign_keys = @models.map { |model| model.send(@association.foreign_key) }.uniq
-        side_load = @association.klass.find(foreign_keys)
+        foreign_keys = @models.map { |model| model.send(@association.foreign_key) }.uniq.compact
+        side_load = foreign_keys.any? ? @association.klass.find(foreign_keys) : []
         json_model_data = side_load.map { |model| @serializer.as_json(model) }
         { @association.plural_name.to_sym => json_model_data, meta: { } }
       end
@@ -18,7 +18,7 @@ module RestPack
       def side_load_has_many
         has_association_relation do |options|
           if join_table = @association.options[:through]
-            options.scope = options.scope.joins(join_table)
+            options.scope = options.scope.joins(join_table).distinct
             association_fk = @association.through_reflection.foreign_key.to_sym
             options.filters = { join_table => { association_fk => model_ids } }
           else

data/lib/restpack_serializer/serializable/side_loading.rb

@@ -68,7 +68,7 @@ module RestPack::Serializer::SideLoading
     end
 
     def association_from_include(include)
-      raise_invalid_include(include) unless self.can_includes.include?(include)
+      raise_invalid_include(include) unless can_include?(include)
       possible_relations = [include.to_s.singularize.to_sym, include]
       select_association_from_possibles(possible_relations)
     end
@@ -82,6 +82,12 @@ module RestPack::Serializer::SideLoading
       raise_invalid_include(include)
     end
 
+    def can_include?(include)
+      !!self.can_includes.index do |can_include|
+        can_include == include || can_include.to_s == include
+      end
+    end
+
     def raise_invalid_include(include)
       raise RestPack::Serializer::InvalidInclude.new,
         ":#{include} is not a valid include for #{self.model_class}"

data/lib/restpack_serializer/version.rb

@@ -1,5 +1,5 @@
 module RestPack
   module Serializer
-    VERSION = '0.5.6'
+    VERSION = '0.5.7'
   end
 end

data/spec/serializable/options_spec.rb

@@ -24,7 +24,7 @@ describe RestPack::Serializer::Options do
 
   describe 'with include' do
     let(:params) { { 'include' => 'model1,model2' } }
-    it { subject.include.should == [:model1, :model2] }
+    it { subject.include.should == ["model1", "model2"] }
   end
 
   context 'with filters' do

data/spec/serializable/paging_spec.rb

@@ -135,7 +135,7 @@ describe RestPack::Serializer::Paging do
       end
 
       it "includes the side-loads in the main meta data" do
-        page[:meta][:songs][:include].should == [:albums]
+        page[:meta][:songs][:include].should == ["albums"]
       end
 
       it "includes the side-loads in page hrefs" do

data/spec/serializable/resource_spec.rb

@@ -33,7 +33,7 @@ describe RestPack::Serializer::Resource do
     end
 
     it "includes the side-loads in the main meta data" do
-      resource[:meta][:songs][:include].should == [:albums]
+      resource[:meta][:songs][:include].should == ["albums"]
     end
   end
 

data/spec/serializable/side_loading/belongs_to_spec.rb

@@ -67,6 +67,19 @@ describe RestPack::Serializer::SideLoading do
         end
       end
 
+      context 'without an associated model' do
+        let!(:b_side) { FactoryGirl.create(:song, album: nil) }
+        let(:models) { [b_side] }
+
+        context 'when including :albums' do
+          let(:options) { RestPack::Serializer::Options.new(MyApp::SongSerializer, { "include" => "albums" }) }
+
+          it 'return a hash with no data' do
+            side_loads.should == { :meta => {}, :albums => [] }
+          end
+        end
+      end
+
     end
   end
 end

data/spec/serializable/side_loading/has_many_spec.rb

@@ -65,6 +65,17 @@ describe RestPack::Serializer::SideLoading do
             side_loads[:meta][:fans][:page].should == 1
             side_loads[:meta][:fans][:count].should == expected_count
           end
+
+          context "when there are shared fans" do
+            before do
+              artist_1.fans << artist_2.fans.first
+            end
+            it "should not include duplicates in the linked resource collection" do
+              expected_count = (artist_1.fans + artist_2.fans).uniq.count
+              expect(side_loads[:fans].count).to eq(expected_count)
+              expect(side_loads[:meta][:fans][:count]).to eq(expected_count)
+            end
+          end
         end
       end
     end

metadata

@@ -1,207 +1,207 @@
 --- !ruby/object:Gem::Specification
 name: restpack_serializer
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors:
 - Gavin Joyce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-02 00:00:00.000000000 Z
+date: 2015-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.3
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.3
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.3
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.3
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.16.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.16.1
 - !ruby/object:Gem::Dependency
   name: restpack_gem
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.9
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.0.3
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.5.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.5.4
 - !ruby/object:Gem::Dependency
   name: growl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.7
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bump
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !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.0.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.5
 description: Model serialization, paging, side-loading and filtering
@@ -211,10 +211,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - LICENSE
@@ -265,12 +265,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -299,3 +299,4 @@ test_files:
 - spec/serializable/sortable_spec.rb
 - spec/spec_helper.rb
 - spec/support/factory.rb
+has_rdoc: