encore 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 67ae9330944ea710370dd8ea1032b1a7b47267dd
-  data.tar.gz: 5a6156f14a3d3c1d753b6d5e9ce31ca8a365b6e3
+  metadata.gz: 723164fd61a92235eaac47843e2ed972c2d5c57b
+  data.tar.gz: 0fdfba4c4088a0cdfad32b9549951138befeff20
 SHA512:
-  metadata.gz: e4c6e0c8c5e7868808950430b841eee3a5bf6390491eadd41d96910399a01aed48d8436bec65871da3bcf10481b6440ab4d18daffdcb98071b07a045da9b2344
-  data.tar.gz: d4a85a515aec1882439173b62004239fe8e0adcfafde0f0bde7d49b801f813839f9f469f52987c40e11cee1d87a6691074b63f443f227efb249a1b1d06a9759c
+  metadata.gz: a1da57f4c3ccaa478dec254bbd1c2058c722c7212d3e0fac524f4db11541a2297ad75db4e2176b50d8483fd3cdb9f0ccf5c5ad7557cee5531747d152606ddf17
+  data.tar.gz: e901741536ae58e5e1529e6e92e62d89cc70c6f00eb0d0663481d0b283e23f6077fde90306ac920c11437c70a8daac154d10193eff7b77d34aff87d8b2feaffd

data/.travis.yml

@@ -6,9 +6,12 @@ rvm:
 
 gemfile:
   - gemfiles/Gemfile.activerecord-4.0
-  - gemfiles/Gemfile.activerecord-4.1
+  - gemfiles/Gemfile.activerecord-4.1.3
+  - gemfiles/Gemfile.activerecord-4.1.4
 
-script: "echo 'DO IT' && bundle exec rake spec"
+script:
+  - 'echo "Checking code style" && bundle exec phare'
+  - 'echo "Running specs" && RAILS_ENV=test bundle exec rake spec'
 
 notifications:
   hipchat:

data/encore.gemspec

@@ -20,11 +20,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'activemodel', '>= 4.0.0'
   spec.add_dependency 'activerecord', '>= 4.0.0'
   spec.add_dependency 'active_model_serializers', '~> 0.8.0'
-  spec.add_dependency 'kaminari', '~> 0.15.1'
+  spec.add_dependency 'kaminari', '>= 0.15'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake', '~> 10.3'
-  spec.add_development_dependency 'rspec', '3.0.0beta2'
+  spec.add_development_dependency 'rspec', '~> 3.0.0'
   spec.add_development_dependency 'sqlite3', '>= 1.3.8', '< 1.4'
   spec.add_development_dependency 'rubocop', '0.22'
   spec.add_development_dependency 'phare'

data/gemfiles/{Gemfile.activerecord-4.1 → Gemfile.activerecord-4.1.3}

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 gemspec path: '../'
 
-gem 'activerecord', '~> 4.1.0'
+gem 'activerecord', '4.1.3'

data/gemfiles/Gemfile.activerecord-4.1.4

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec path: '../'
+
+gem 'activerecord', '~> 4.1.4'

data/lib/encore/persister/links_parser.rb

@@ -7,7 +7,8 @@ module Encore
         links = args.delete(:links) || []
 
         links.each do |link, value|
-          reflection = @model.reflections[link.to_sym]
+          reflections = @model.try(:_reflections) || @model.reflections
+          reflection = reflections[link.to_sym]
           key = fetch_key(reflection)
           value = fetch_value(value, reflection)
 

data/lib/encore/serializer/base.rb

@@ -10,7 +10,8 @@ module Encore
       end
 
       def links
-        object.reflections.each_with_object({}) do |(_, reflection), memo|
+        reflections = object.try(:_reflections) || object.reflections
+        reflections.each_with_object({}) do |(_, reflection), memo|
           if object.association(reflection.name).loaded?
             fetcher = LinksReflectionIncluder::Loaded
           else

data/lib/encore/serializer/instance.rb

@@ -34,7 +34,9 @@ module Encore
     private
 
       def reflections
-        @reflections ||= @collection.klass.reflections
+        @reflections ||= begin
+          @collection.klass.try(:_reflections) || @collection.klass.reflections
+        end
       end
 
       def serializer

data/lib/encore/serializer/linked_resource_manager.rb

@@ -14,7 +14,8 @@ module Encore
           serializer = Utils.fetch_serializer(klass)
 
           collection = klass.where(id: ids.to_a)
-          available_includes = klass.reflections.map do |key, _|
+          reflections = klass.try(:_reflections) || klass.reflections
+          available_includes = reflections.map do |key, _|
             next unless included_models.include?(key.to_s)
             key
           end.compact

data/lib/encore/serializer/links_reflection_includer.rb

@@ -17,33 +17,46 @@ module Encore
 
       module NotLoaded
         def self.reflection_has_many(object, reflection)
-          reflection_type = reflection.name.to_s.pluralize
+          reflection_type = plural_path(reflection.klass)
 
           {
-            href: "/#{reflection_type}?#{object.class.name.downcase}_id=#{object.id}",
+            href: "/#{reflection_type}?#{object.class.name.underscore}_id=#{object.id}",
             type: reflection_type
           }
         end
 
         def self.reflection_has_one(object, reflection)
-          reflection_type = reflection.name.to_s
+          root_type = plural_path(object.class)
+          reflection_type = singular_path(reflection.klass)
 
           {
-            href: "/#{object.class.name.downcase.pluralize}/#{object.id}/#{reflection_type}",
+            href: "/#{root_type}/#{object.id}/#{reflection_type}",
             type: reflection_type.pluralize
           }
         end
 
         def self.reflection_belongs_to(object, reflection)
-          reflection_type = reflection.name.to_s.pluralize
+          reflection_type = plural_path(reflection.klass)
           reflection_id = object.send(reflection.foreign_key).try(:to_s)
 
+          return nil if reflection_id.blank?
+
           {
             href: "/#{reflection_type}/#{reflection_id}",
             id: reflection_id,
             type: reflection_type
           }
         end
+
+      private
+
+        def self.plural_path(klass)
+          klass.active_model_serializer.root_key.to_s
+        end
+
+        def self.singular_path(klass)
+          plural_path(klass).singularize
+        end
       end
     end
   end

data/lib/encore/version.rb

@@ -1,3 +1,3 @@
 module Encore
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

data/spec/encore/serializer/linked/links_includes/links_includes_has_many_spec.rb

@@ -71,8 +71,8 @@ describe Encore::Serializer do
   end
 
   context 'already included resource' do
-    it { expect(serialized[:linked][:projects][0][:links][:users]).to eq({ href: '/users?project_id=1', type: 'users' }) }
-    it { expect(serialized[:linked][:projects][1][:links][:users]).to eq({ href: '/users?project_id=2', type: 'users' }) }
+    it { expect(serialized[:linked][:projects][0][:links][:users]).to eq(href: '/users?project_id=1', type: 'users') }
+    it { expect(serialized[:linked][:projects][1][:links][:users]).to eq(href: '/users?project_id=2', type: 'users') }
   end
 
   context 'not included resource' do

data/spec/encore/serializer/links_resources/belongs_to_spec.rb

@@ -0,0 +1,83 @@
+require 'spec_helper'
+
+describe Encore::Serializer do
+  let(:serializer) { Encore::Serializer::Instance }
+  let(:objects) { User.all }
+  let(:serialized) { serializer.new(objects, include: include).as_json }
+
+  before do
+    run_migrations!
+    spawn_objects!
+    create_records!
+  end
+
+  let(:run_migrations!) do
+    run_migration do
+      create_table(:users, force: true) do |t|
+        t.string :name, default: nil
+        t.integer :project_id
+        t.integer :event_result_id
+      end
+      create_table(:projects, force: true) do |t|
+        t.string :name, default: nil
+        t.integer :user_id
+      end
+      create_table(:event_results, force: true) do |t|
+        t.string :score, default: nil
+        t.integer :user_id
+      end
+    end
+  end
+
+  let(:spawn_objects!) do
+    spawn_model('User') do
+      belongs_to :project
+    end
+    spawn_serializer('UserSerializer') do
+      attributes :name, :links
+
+      can_include :project
+    end
+    spawn_model('Project') do
+      has_many :users
+    end
+    spawn_serializer('ProjectSerializer') do
+      attributes :name
+    end
+
+  end
+  let(:create_records!) do
+    User.create name: 'Allan', project_id: 1
+    User.create name: 'Doe', project_id: 2
+    User.create name: 'Bar', project_id: nil
+  end
+
+  context 'not included' do
+    let(:include) { '' }
+    let(:expected_project) do
+      {
+        href: '/projects/1',
+        id: '1',
+        type: 'projects'
+      }
+    end
+
+    it { expect(serialized[:users][0][:links][:project]).to eq(expected_project) }
+  end
+
+  context 'empty association' do
+    let(:include) { '' }
+    let(:expected_project) do
+      nil
+    end
+
+    it { expect(serialized[:users][2][:links][:project]).to eq(expected_project) }
+  end
+
+  context 'included' do
+    let(:include) { 'project' }
+    let(:expected_project) { '1' }
+
+    it { expect(serialized[:users][0][:links][:project]).to eq(expected_project) }
+  end
+end

data/spec/encore/serializer/links_resources/can_access_spec.rb

@@ -0,0 +1,147 @@
+require 'spec_helper'
+
+describe Encore::Serializer do
+  let(:serializer) { Encore::Serializer::Instance }
+  let(:objects) { User.all }
+  let(:serialized) { serializer.new(objects, include: include).as_json }
+
+  before do
+    run_migrations!
+    spawn_objects!
+    create_records!
+  end
+
+  let(:run_migrations!) do
+    run_migration do
+      create_table(:users, force: true) do |t|
+        t.string :name, default: nil
+        t.integer :project_id
+        t.integer :event_result_id
+      end
+      create_table(:projects, force: true) do |t|
+        t.string :name, default: nil
+        t.integer :user_id
+      end
+      create_table(:event_results, force: true) do |t|
+        t.string :score, default: nil
+        t.integer :user_id
+      end
+    end
+  end
+
+  context 'default' do
+    let(:spawn_objects!) do
+      spawn_model('User') do
+        belongs_to :project
+        belongs_to :irrelevant_reflection
+      end
+      spawn_serializer('UserSerializer') do
+        attributes :name, :links
+
+        can_include :project
+      end
+      spawn_model('Project') do
+        has_many :users
+      end
+      spawn_serializer('ProjectSerializer') do
+        attributes :name
+      end
+
+    end
+    let(:create_records!) do
+      User.create name: 'Allan', project_id: 1
+      User.create name: 'Doe', project_id: 2
+    end
+    let(:include) { '' }
+
+    it { expect(serialized[:users][0][:links][:irrelevant_reflection]).to eq(nil) }
+  end
+
+  context 'not loaded with access' do
+    let(:spawn_objects!) do
+      spawn_model('User') do
+        belongs_to :project
+        belongs_to :irrelevant_reflection
+      end
+      spawn_serializer('UserSerializer') do
+        attributes :name, :links
+
+        can_include :project
+      end
+      spawn_model('Project') do
+        has_many :users
+      end
+      spawn_serializer('ProjectSerializer') do
+        attributes :name
+      end
+
+    end
+    let(:create_records!) do
+      User.create name: 'Allan', project_id: 1
+      User.create name: 'Doe', project_id: 2
+    end
+    let(:include) { '' }
+
+    it { expect(serialized[:users][0][:links][:project].present?).to eq(true) }
+  end
+
+  context 'not loaded without access' do
+    let(:spawn_objects!) do
+      spawn_model('User') do
+        belongs_to :project
+        belongs_to :irrelevant_reflection
+      end
+      spawn_serializer('UserSerializer') do
+        attributes :name, :links
+
+        can_include :project
+
+        can_access []
+      end
+      spawn_model('Project') do
+        has_many :users
+      end
+      spawn_serializer('ProjectSerializer') do
+        attributes :name
+      end
+
+    end
+    let(:create_records!) do
+      User.create name: 'Allan', project_id: 1
+      User.create name: 'Doe', project_id: 2
+    end
+    let(:include) { '' }
+
+    it { expect(serialized[:users][0][:links][:project].present?).to eq(false) }
+  end
+
+  context 'loaded without access' do
+    let(:spawn_objects!) do
+      spawn_model('User') do
+        belongs_to :project
+        belongs_to :irrelevant_reflection
+      end
+      spawn_serializer('UserSerializer') do
+        attributes :name, :links
+
+        can_include :project
+
+        can_access []
+      end
+      spawn_model('Project') do
+        has_many :users
+      end
+      spawn_serializer('ProjectSerializer') do
+        attributes :name
+      end
+
+    end
+    let(:create_records!) do
+      User.create name: 'Allan', project_id: 1
+      User.create name: 'Doe', project_id: 2
+    end
+    let(:include) { 'project' }
+
+    it { expect(serialized[:users][0][:links][:project].present?).to eq(true) }
+  end
+end

data/spec/encore/serializer/links_resources/custom_association_names_spec.rb

@@ -0,0 +1,151 @@
+require 'spec_helper'
+
+describe Encore::Serializer do
+  let(:serializer) { Encore::Serializer::Instance }
+  let(:serialized) { serializer.new(objects).as_json }
+
+  before do
+    run_migrations!
+    spawn_models!
+    spawn_serializers!
+    create_records!
+  end
+
+  let(:run_migrations!) do
+    run_migration do
+      create_table(:users, force: true) do |t|
+        t.string :name, default: nil
+        t.integer :organization_id
+      end
+      create_table(:projects, force: true) do |t|
+        t.string :name, default: nil
+        t.integer :creator_id
+        t.integer :user_id
+      end
+      create_table(:organizations, force: true)
+    end
+  end
+
+  let(:spawn_models!) do
+    spawn_model('Organization') do
+      has_many :artists, class_name: 'User'
+    end
+    spawn_model('User') do
+      has_one :awesome_project, class_name: 'Project'
+    end
+    spawn_model('Project') do
+      belongs_to :creator, class_name: 'User'
+    end
+  end
+
+  let(:create_records!) do
+    Organization.create
+    p1 = Project.create name: 'p1', creator_id: 1
+    p2 = Project.create name: 'p2', creator_id: 2
+    User.create name: 'Allan', awesome_project: p1, organization_id: 1
+    User.create name: 'Doe', awesome_project: p2, organization_id: 1
+  end
+
+  context 'default root key' do
+    let(:spawn_serializers!) do
+      spawn_serializer('OrganizationSerializer') do
+        can_include :artists
+      end
+      spawn_serializer('UserSerializer') do
+        can_include :awesome_project
+      end
+      spawn_serializer('ProjectSerializer') do
+        can_include :creator
+      end
+    end
+    context 'has_one' do
+      let(:objects) { User.all }
+      let(:expected_project) do
+        {
+          href: '/users/1/project',
+          type: 'projects'
+        }
+      end
+
+      it { expect(serialized[:users][0][:links][:awesome_project]).to eq(expected_project) }
+    end
+
+    context 'has_many' do
+      let(:objects) { Organization.all }
+      let(:expected_artists) do
+        {
+          href: '/users?organization_id=1',
+          type: 'users'
+        }
+      end
+
+      it { expect(serialized[:organizations][0][:links][:artists]).to eq(expected_artists) }
+    end
+
+    context 'belongs_to' do
+      let(:objects) { Project.all }
+      let(:expected_creator) do
+        {
+          href: '/users/1',
+          id: '1',
+          type: 'users'
+        }
+      end
+
+      it { expect(serialized[:projects][0][:links][:creator]).to eq(expected_creator) }
+    end
+  end
+
+  context 'custom root key' do
+    let(:spawn_serializers!) do
+      spawn_serializer('OrganizationSerializer') do
+        can_include :artists
+        root_key :super_organizations
+      end
+      spawn_serializer('UserSerializer') do
+        can_include :awesome_project
+        root_key :creators
+      end
+      spawn_serializer('ProjectSerializer') do
+        can_include :creator
+        root_key :awesome_projects
+      end
+    end
+    context 'has_one' do
+      let(:objects) { User.all }
+      let(:expected_project) do
+        {
+          href: '/creators/1/awesome_project',
+          type: 'awesome_projects'
+        }
+      end
+
+      it { expect(serialized[:creators][0][:links][:awesome_project]).to eq(expected_project) }
+    end
+
+    context 'has_many' do
+      let(:objects) { Organization.all }
+      let(:expected_artists) do
+        {
+          href: '/creators?organization_id=1',
+          type: 'creators'
+        }
+      end
+
+      it { expect(serialized[:super_organizations][0][:links][:artists]).to eq(expected_artists) }
+    end
+
+    context 'belongs_to' do
+      let(:objects) { Project.all }
+      let(:expected_creator) do
+        {
+          href: '/creators/1',
+          id: '1',
+          type: 'creators'
+        }
+      end
+
+      it { expect(serialized[:awesome_projects][0][:links][:creator]).to eq(expected_creator) }
+    end
+  end
+end

data/spec/encore/serializer/links_resources/has_many_spec.rb

@@ -0,0 +1,74 @@
+require 'spec_helper'
+
+describe Encore::Serializer do
+  let(:serializer) { Encore::Serializer::Instance }
+  let(:objects) { User.all }
+  let(:serialized) { serializer.new(objects, include: include).as_json }
+
+  before do
+    run_migrations!
+    spawn_objects!
+    create_records!
+  end
+
+  let(:run_migrations!) do
+    run_migration do
+      create_table(:users, force: true) do |t|
+        t.string :name, default: nil
+        t.integer :project_id
+        t.integer :event_result_id
+      end
+      create_table(:projects, force: true) do |t|
+        t.string :name, default: nil
+        t.integer :user_id
+      end
+      create_table(:event_results, force: true) do |t|
+        t.string :score, default: nil
+        t.integer :user_id
+      end
+    end
+  end
+
+  let(:spawn_objects!) do
+    spawn_model('User') do
+      has_many :projects
+    end
+    spawn_serializer('UserSerializer') do
+      attributes :name, :links
+
+      can_include :projects
+    end
+    spawn_model('Project') do
+      belongs_to :user
+    end
+    spawn_serializer('ProjectSerializer') do
+      attributes :name
+    end
+  end
+
+  let(:create_records!) do
+    User.create name: 'Allan'
+    User.create name: 'Doe'
+    Project.create name: 'p1', user_id: 1
+    Project.create name: 'p2', user_id: 1
+  end
+
+  context 'not included' do
+    let(:include) { '' }
+    let(:expected_project) do
+      {
+        href: '/projects?user_id=1',
+        type: 'projects'
+      }
+    end
+
+    it { expect(serialized[:users][0][:links][:projects]).to eq(expected_project) }
+  end
+
+  context 'included' do
+    let(:include) { 'projects' }
+    let(:expected_project) { %w(1 2) }
+
+    it { expect(serialized[:users][0][:links][:projects]).to eq(expected_project) }
+  end
+end

data/spec/encore/serializer/links_resources/has_one_spec.rb

@@ -0,0 +1,72 @@
+require 'spec_helper'
+
+describe Encore::Serializer do
+  let(:serializer) { Encore::Serializer::Instance }
+  let(:objects) { User.all }
+  let(:serialized) { serializer.new(objects, include: include).as_json }
+
+  before do
+    run_migrations!
+    spawn_objects!
+    create_records!
+  end
+
+  let(:run_migrations!) do
+    run_migration do
+      create_table(:users, force: true) do |t|
+        t.string :name, default: nil
+        t.integer :project_id
+        t.integer :event_result_id
+      end
+      create_table(:projects, force: true) do |t|
+        t.string :name, default: nil
+        t.integer :user_id
+      end
+      create_table(:event_results, force: true) do |t|
+        t.string :score, default: nil
+        t.integer :user_id
+      end
+    end
+  end
+
+  let(:spawn_objects!) do
+    spawn_model('User') do
+      has_one :project
+    end
+    spawn_serializer('UserSerializer') do
+      attributes :name, :links
+
+      can_include :project
+    end
+    spawn_model('Project')
+    spawn_serializer('ProjectSerializer') do
+      attributes :name
+    end
+  end
+
+  let(:create_records!) do
+    User.create name: 'Allan'
+    User.create name: 'Doe'
+    Project.create name: 'p1', user_id: 1
+    Project.create name: 'p2', user_id: 2
+  end
+
+  context 'not included' do
+    let(:include) { '' }
+    let(:expected_project) do
+      {
+        href: '/users/1/project',
+        type: 'projects'
+      }
+    end
+
+    it { expect(serialized[:users][0][:links][:project]).to eq(expected_project) }
+  end
+
+  context 'included' do
+    let(:include) { 'project' }
+    let(:expected_project) { '1' }
+
+    it { expect(serialized[:users][0][:links][:project]).to eq(expected_project) }
+  end
+end

data/spec/encore/serializer/links_resources/underscore_names_spec.rb

@@ -0,0 +1,106 @@
+require 'spec_helper'
+
+describe Encore::Serializer do
+  let(:serializer) { Encore::Serializer::Instance }
+  let(:objects) { User.all }
+  let(:serialized) { serializer.new(objects, include: include).as_json }
+
+  before do
+    run_migrations!
+    spawn_objects!
+    create_records!
+  end
+
+  let(:run_migrations!) do
+    run_migration do
+      create_table(:users, force: true) do |t|
+        t.string :name, default: nil
+        t.integer :project_id
+        t.integer :event_result_id
+      end
+      create_table(:projects, force: true) do |t|
+        t.string :name, default: nil
+        t.integer :user_id
+      end
+      create_table(:event_results, force: true) do |t|
+        t.string :score, default: nil
+        t.integer :user_id
+      end
+    end
+  end
+
+  context 'underscore route name' do
+    let(:spawn_objects!) do
+      spawn_model('User') do
+        has_many :event_results
+      end
+      spawn_serializer('UserSerializer') do
+        attributes :name, :links
+
+        def can_include
+          %i(event_results)
+        end
+      end
+      spawn_model('EventResult') do
+        belongs_to :user
+      end
+      spawn_serializer('EventResultSerializer') do
+        attributes :score
+      end
+    end
+
+    let(:create_records!) do
+      User.create name: 'Allan'
+      User.create name: 'Doe'
+      EventResult.create score: 'p1', user_id: 1
+      EventResult.create score: 'p2', user_id: 1
+    end
+
+    let(:include) { '' }
+    let(:expected_event_results) do
+      {
+        href: '/event_results?user_id=1',
+        type: 'event_results'
+      }
+    end
+
+    it { expect(serialized[:users][0][:links][:event_results]).to eq(expected_event_results) }
+  end
+
+  context 'underscore id' do
+    let(:spawn_objects!) do
+      spawn_model('User')
+      spawn_serializer('UserSerializer') do
+        attributes :name, :links
+      end
+      spawn_model('EventResult') do
+        has_many :users
+      end
+      spawn_serializer('EventResultSerializer') do
+        attributes :score
+
+        def can_include
+          %i(users)
+        end
+      end
+    end
+
+    let(:create_records!) do
+      EventResult.create score: 'p1'
+      EventResult.create score: 'p2'
+      User.create name: 'Allan', event_result_id: 1
+      User.create name: 'Doe', event_result_id: 1
+    end
+
+    let(:objects) { EventResult.all }
+    let(:include) { '' }
+    let(:expected_users) do
+      {
+        href: '/users?event_result_id=1',
+        type: 'users'
+      }
+    end
+
+    it { expect(serialized[:event_results][0][:links][:users]).to eq(expected_users) }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: encore
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Simon Prévost
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-09 00:00:00.000000000 Z
+date: 2014-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -56,16 +56,16 @@ dependencies:
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: '0.15'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -98,16 +98,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0beta2
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0beta2
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -174,7 +174,8 @@ files:
 - Rakefile
 - encore.gemspec
 - gemfiles/Gemfile.activerecord-4.0
-- gemfiles/Gemfile.activerecord-4.1
+- gemfiles/Gemfile.activerecord-4.1.3
+- gemfiles/Gemfile.activerecord-4.1.4
 - lib/encore.rb
 - lib/encore/config.rb
 - lib/encore/persister/errors_parser.rb
@@ -209,7 +210,12 @@ files:
 - spec/encore/serializer/linked/linked_resources_spec.rb
 - spec/encore/serializer/linked/links_includes/links_includes_has_many_spec.rb
 - spec/encore/serializer/linked/links_includes/links_includes_has_one_spec.rb
-- spec/encore/serializer/links_resource_spec.rb
+- spec/encore/serializer/links_resources/belongs_to_spec.rb
+- spec/encore/serializer/links_resources/can_access_spec.rb
+- spec/encore/serializer/links_resources/custom_association_names_spec.rb
+- spec/encore/serializer/links_resources/has_many_spec.rb
+- spec/encore/serializer/links_resources/has_one_spec.rb
+- spec/encore/serializer/links_resources/underscore_names_spec.rb
 - spec/encore/serializer/main_meta_spec.rb
 - spec/encore/serializer/main_resource_spec.rb
 - spec/encore/serializer/no_paging_spec.rb

data/spec/encore/serializer/links_resource_spec.rb

@@ -1,276 +0,0 @@
-require 'spec_helper'
-
-describe Encore::Serializer do
-  let(:serializer) { Encore::Serializer::Instance }
-  let(:objects) { User.all }
-  let(:serialized) { serializer.new(objects, include: include).as_json }
-
-  let(:run_migrations!) do
-    run_migration do
-      create_table(:users, force: true) do |t|
-        t.string :name, default: nil
-        t.integer :project_id
-      end
-      create_table(:projects, force: true) do |t|
-        t.string :name, default: nil
-        t.integer :user_id
-      end
-    end
-  end
-
-  before do
-    run_migrations!
-    spawn_objects!
-    create_records!
-  end
-
-  context 'can access' do
-    context 'default' do
-      let(:spawn_objects!) do
-        spawn_model('User') do
-          belongs_to :project
-          belongs_to :irrelevant_reflection
-        end
-        spawn_serializer('UserSerializer') do
-          attributes :name, :links
-
-          can_include :project
-        end
-        spawn_model('Project') do
-          has_many :users
-        end
-        spawn_serializer('ProjectSerializer') do
-          attributes :name
-        end
-
-      end
-      let(:create_records!) do
-        User.create name: 'Allan', project_id: 1
-        User.create name: 'Doe', project_id: 2
-      end
-      let(:include) { '' }
-
-      it { expect(serialized[:users][0][:links][:irrelevant_reflection]).to eq(nil) }
-    end
-
-    context 'not loaded with access' do
-      let(:spawn_objects!) do
-        spawn_model('User') do
-          belongs_to :project
-          belongs_to :irrelevant_reflection
-        end
-        spawn_serializer('UserSerializer') do
-          attributes :name, :links
-
-          can_include :project
-        end
-        spawn_model('Project') do
-          has_many :users
-        end
-        spawn_serializer('ProjectSerializer') do
-          attributes :name
-        end
-
-      end
-      let(:create_records!) do
-        User.create name: 'Allan', project_id: 1
-        User.create name: 'Doe', project_id: 2
-      end
-      let(:include) { '' }
-
-      it { expect(serialized[:users][0][:links][:project].present?).to eq(true) }
-    end
-
-    context 'not loaded without access' do
-      let(:spawn_objects!) do
-        spawn_model('User') do
-          belongs_to :project
-          belongs_to :irrelevant_reflection
-        end
-        spawn_serializer('UserSerializer') do
-          attributes :name, :links
-
-          can_include :project
-
-          can_access []
-        end
-        spawn_model('Project') do
-          has_many :users
-        end
-        spawn_serializer('ProjectSerializer') do
-          attributes :name
-        end
-
-      end
-      let(:create_records!) do
-        User.create name: 'Allan', project_id: 1
-        User.create name: 'Doe', project_id: 2
-      end
-      let(:include) { '' }
-
-      it { expect(serialized[:users][0][:links][:project].present?).to eq(false) }
-    end
-
-    context 'loaded without access' do
-      let(:spawn_objects!) do
-        spawn_model('User') do
-          belongs_to :project
-          belongs_to :irrelevant_reflection
-        end
-        spawn_serializer('UserSerializer') do
-          attributes :name, :links
-
-          can_include :project
-
-          can_access []
-        end
-        spawn_model('Project') do
-          has_many :users
-        end
-        spawn_serializer('ProjectSerializer') do
-          attributes :name
-        end
-
-      end
-      let(:create_records!) do
-        User.create name: 'Allan', project_id: 1
-        User.create name: 'Doe', project_id: 2
-      end
-      let(:include) { 'project' }
-
-      it { expect(serialized[:users][0][:links][:project].present?).to eq(true) }
-    end
-  end
-
-  context 'belongs_to' do
-    let(:spawn_objects!) do
-      spawn_model('User') do
-        belongs_to :project
-      end
-      spawn_serializer('UserSerializer') do
-        attributes :name, :links
-
-        can_include :project
-      end
-      spawn_model('Project') do
-        has_many :users
-      end
-      spawn_serializer('ProjectSerializer') do
-        attributes :name
-      end
-
-    end
-    let(:create_records!) do
-      User.create name: 'Allan', project_id: 1
-      User.create name: 'Doe', project_id: 2
-    end
-
-    context 'not included' do
-      let(:include) { '' }
-      let(:expected_project) do
-        {
-          href: '/projects/1',
-          id: '1',
-          type: 'projects'
-        }
-      end
-
-      it { expect(serialized[:users][0][:links][:project]).to eq(expected_project) }
-    end
-
-    context 'included' do
-      let(:include) { 'project' }
-      let(:expected_project) { '1' }
-
-      it { expect(serialized[:users][0][:links][:project]).to eq(expected_project) }
-    end
-  end
-
-  context 'has_many' do
-    let(:spawn_objects!) do
-      spawn_model('User') do
-        has_many :projects
-      end
-      spawn_serializer('UserSerializer') do
-        attributes :name, :links
-
-        can_include :projects
-      end
-      spawn_model('Project') do
-        belongs_to :user
-      end
-      spawn_serializer('ProjectSerializer') do
-        attributes :name
-      end
-    end
-
-    let(:create_records!) do
-      User.create name: 'Allan'
-      User.create name: 'Doe'
-      Project.create name: 'p1', user_id: 1
-      Project.create name: 'p2', user_id: 1
-    end
-
-    context 'not included' do
-      let(:include) { '' }
-      let(:expected_project) do
-        {
-          href: '/projects?user_id=1',
-          type: 'projects'
-        }
-      end
-
-      it { expect(serialized[:users][0][:links][:projects]).to eq(expected_project) }
-    end
-
-    context 'included' do
-      let(:include) { 'projects' }
-      let(:expected_project) { %w(1 2) }
-
-      it { expect(serialized[:users][0][:links][:projects]).to eq(expected_project) }
-    end
-  end
-
-  context 'has_one' do
-    let(:spawn_objects!) do
-      spawn_model('User') do
-        has_one :project
-      end
-      spawn_serializer('UserSerializer') do
-        attributes :name, :links
-
-        can_include :project
-      end
-      spawn_model('Project')
-      spawn_serializer('ProjectSerializer') do
-        attributes :name
-      end
-    end
-
-    let(:create_records!) do
-      User.create name: 'Allan'
-      User.create name: 'Doe'
-      Project.create name: 'p1', user_id: 1
-      Project.create name: 'p2', user_id: 2
-    end
-
-    context 'not included' do
-      let(:include) { '' }
-      let(:expected_project) do
-        {
-          href: '/users/1/project',
-          type: 'projects'
-        }
-      end
-
-      it { expect(serialized[:users][0][:links][:project]).to eq(expected_project) }
-    end
-
-    context 'included' do
-      let(:include) { 'project' }
-      let(:expected_project) { '1' }
-
-      it { expect(serialized[:users][0][:links][:project]).to eq(expected_project) }
-    end
-  end
-end