postgres_ext-serializers 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61294d65edd43184592eb2ab0ca4e42c4690278a
-  data.tar.gz: cfd8ede4cb32dc07585a17444f63d169feb2fe9d
+  metadata.gz: 7c65ff204b1d7c5941a9679535713be9f99b0c61
+  data.tar.gz: e38459d4a7b894d293ff5ed16b512576bc85b66c
 SHA512:
-  metadata.gz: 0f509bce9cbdabc6d2bbce95f43e438ff52f8564133ed43adb9bad3b7f3a64f23d090c7870b411830f92593d3518ab2300b2e34a7b362b9a279c75641008934a
-  data.tar.gz: 52c02264863554eb1b7be75a98f004916a702347cdfa7df6b4bff1354b25ae320e02f202f05de824e794976456ff95e0f84fb35b247749f99f6957ea67f1e5d2
+  metadata.gz: c3dd09d901a3c1d8108dd66ab79f173af229f6c29ffdb0d37d239074e0ca4984b1d57e4177feb2f0df0f6c0083b5d87dcae9a76fe981f1d6e71b78942058d2dc
+  data.tar.gz: ba691771d191a19c8766a573f4473e906cab143c32153ba59a3be6b7c0fb31855619127235bfa28124f15c72f6f39e6c0c1becd13a5fcf6dd1f469cd746c8215

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # CHANGELOG
 
+## 0.0.3 - 2014-09-01
+
+### Added
+- Nothing.
+
+### Deprecated
+- Nothing.
+
+### Removed
+- Nothing.
+
+### Fixed
+- Supports options `each_serializer` and `serializer` when specified in
+  the controller or in the serializers
+
 ## 0.0.2 - 2014-08-22
 
 ### Added

data/Gemfile

@@ -5,4 +5,5 @@ gemspec
 
 unless ENV['CI'] || RUBY_PLATFORM =~ /java/
   gem 'byebug'
+  gem 'm'
 end

data/README.md

@@ -8,8 +8,8 @@ Climate](https://codeclimate.com/github/dockyard/postgres_ext-serializers.png)](
 [![Gem
 Version](https://badge.fury.io/rb/postgres_ext-serializers.png)](http://badge.fury.io/rb/postgres_ext-serializers)
 
-# Note: Current release is Rails 4.0.x compatible
-There will be updates to postgres_ext coming soon to make it 4.1 compatible
+# Note: Current release is AMS 0.8.x compatible
+There will be updates coming to make it 0.9.x compatible
 
 ## Looking for help? ##
 

data/lib/postgres_ext/serializers/active_model/array_serializer.rb

@@ -24,7 +24,7 @@ module PostgresExt::Serializers::ActiveModel
     private
 
     def _postgres_serializable_array
-      _include_relation_in_root(object)
+      _include_relation_in_root(object, serializer: @options[:each_serializer])
 
       jsons_select_manager = _results_table_arel
       jsons_select_manager.with @_ctes
@@ -32,13 +32,22 @@ module PostgresExt::Serializers::ActiveModel
       object.klass.connection.select_value _visitor.accept(jsons_select_manager)
     end
 
-    def _include_relation_in_root(relation, foreign_key_column = nil, constraining_table = nil)
+    def _include_relation_in_root(relation, *args)
+      local_options = args.extract_options!
+      foreign_key_column = args[0]
+      constraining_table = args[1]
+
       relation_query = relation.dup
       relation_query_arel = relation_query.arel_table
       @_embedded << relation.table_name
 
       klass = ActiveRecord::Relation === relation ? relation.klass : relation
-      serializer_class = _serializer_class(klass)
+      if local_options[:serializer].present?
+        serializer_class = local_options[:serializer]
+      else
+        serializer_class = _serializer_class(klass)
+      end
+
       _serializer = serializer_class.new klass.new, options
 
       attributes = serializer_class._attributes
@@ -87,9 +96,11 @@ module PostgresExt::Serializers::ActiveModel
         end
 
         if association.embed_in_root? && !@_embedded.member?(key.to_s)
-          _include_relation_in_root(association_reflection.klass,association_reflection.foreign_key,ids_table_arel)
+          _include_relation_in_root(association_reflection.klass, association_reflection.foreign_key, ids_table_arel,
+                                    serializer: association.target_serializer)
         end
       end
+
       arel = relation_query.arel.dup
 
       association_sql_tables.each do |assoc_hash|

data/lib/postgres_ext/serializers/version.rb

@@ -1,5 +1,5 @@
 module PostgresExt
   module Serializers
-    VERSION = '0.0.2'
+    VERSION = '0.0.3'
   end
 end

data/postgres_ext-serializers.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency     'postgres_ext', '~> 2.1'
-  spec.add_runtime_dependency     'active_model_serializers'
+  spec.add_runtime_dependency     'active_model_serializers', '~> 0.8.0'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'actionpack', '~> 4.0'

data/test/serializer_test.rb

@@ -2,12 +2,29 @@ require 'test_helper'
 
 
 describe 'ArraySerializer patch' do
-  let(:json_data)  { ActiveModel::Serializer.build_json(controller, relation, {}).to_json }
+  let(:json_data)  { ActiveModel::Serializer.build_json(controller, relation, options).to_json }
+
+  context 'specify serializer' do
+    let(:relation)   { Note.all }
+    let(:controller) { NotesController.new }
+    let(:options)    { { each_serializer: OtherNoteSerializer } }
+
+    before do
+      @note = Note.create content: 'Test', name: 'Title'
+      @tag = Tag.create name: 'My tag', note: @note
+    end
+
+    it 'generates the proper json output' do
+      json_expected = %{{"tags":[{"id":#{@tag.id},"name":"My tag"}],"notes":[{"id":#{@note.id},"name":"Title","tag_ids":[#{@tag.id}]}]}}
+      json_data.must_equal json_expected
+    end
+  end
 
   context 'computed value methods' do
     let(:relation)   { Person.all }
     let(:controller) { PeopleController.new }
     let(:person)     { Person.create first_name: 'Test', last_name: 'User' }
+    let(:options)    { }
 
     it 'generates the proper json output for the serializer' do
       json_expected = %{{"people":[{"id":#{person.id},"full_name":"Test User","attendance_name":"User, Test"}]}}

data/test/test_helper.rb

@@ -50,11 +50,18 @@ class NoteSerializer < ActiveModel::Serializer
   embed      :ids, include: true
 end
 
-class Tag < ActiveRecord::Base
-  belongs_to :note
+class ShortTagSerializer < ActiveModel::Serializer
+  attributes :id, :name
 end
 
+class OtherNoteSerializer < ActiveModel::Serializer
+  attributes :id, :name
+  has_many   :tags, serializer: ShortTagSerializer, embed: :ids, include: true
+end
 
+class Tag < ActiveRecord::Base
+  belongs_to :note
+end
 
 class TagSerializer < ActiveModel::Serializer
   attributes :id, :name
@@ -62,6 +69,7 @@ class TagSerializer < ActiveModel::Serializer
   has_one :note
 end
 
+
 DatabaseCleaner.strategy = :deletion
 
 class Minitest::Spec

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: postgres_ext-serializers
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Dan McClain
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-22 00:00:00.000000000 Z
+date: 2014-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: postgres_ext
@@ -28,16 +28,16 @@ dependencies:
   name: active_model_serializers
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement