encore 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 723164fd61a92235eaac47843e2ed972c2d5c57b
-  data.tar.gz: 0fdfba4c4088a0cdfad32b9549951138befeff20
+  metadata.gz: 21758c507cf16a19783160bbe8def677e038051d
+  data.tar.gz: 9ea74add7b1302b2ea1494cbd34230d14ac99e6d
 SHA512:
-  metadata.gz: a1da57f4c3ccaa478dec254bbd1c2058c722c7212d3e0fac524f4db11541a2297ad75db4e2176b50d8483fd3cdb9f0ccf5c5ad7557cee5531747d152606ddf17
-  data.tar.gz: e901741536ae58e5e1529e6e92e62d89cc70c6f00eb0d0663481d0b283e23f6077fde90306ac920c11437c70a8daac154d10193eff7b77d34aff87d8b2feaffd
+  metadata.gz: 64ec538a05a209fce5b03f3bc082a14a7561bb948fc4330196a25022587a594138b1d7dcd61614578d537fec7d5755ef55238231aa114366fa957f97d0b2f3d0
+  data.tar.gz: d528113ef87bad63d5b0a848e16e6925d38e0ad642f4c57ea1a89ffc5e43b8e2c1e9326f0cf7493697cff562eb390ea55e26d34cfc46855d2e1b36f0a181618e

data/.travis.yml

@@ -8,6 +8,7 @@ gemfile:
   - gemfiles/Gemfile.activerecord-4.0
   - gemfiles/Gemfile.activerecord-4.1.3
   - gemfiles/Gemfile.activerecord-4.1.4
+  - gemfiles/Gemfile.activerecord-4.2
 
 script:
   - 'echo "Checking code style" && bundle exec phare'

data/lib/encore/persister/links_parser.rb

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

data/lib/encore/serializer/main_resource_links_manager.rb

@@ -19,7 +19,7 @@ module Encore
     private
 
       def self.association_collection(item, inclusion, reflections)
-        reflection = reflections[inclusion]
+        reflection = reflections[inclusion.to_s] || reflections[inclusion.to_sym]
         class_name = fetch_class_name(item, reflection)
 
         collection = begin

data/lib/encore/version.rb

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

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

@@ -44,8 +44,8 @@ describe Encore::Serializer do
     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

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

@@ -46,7 +46,6 @@ describe Encore::Serializer do
       spawn_serializer('ProjectSerializer') do
         attributes :name
       end
-
     end
     let(:create_records!) do
       User.create name: 'Allan', project_id: 1
@@ -74,12 +73,13 @@ describe Encore::Serializer do
       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) }
@@ -104,12 +104,13 @@ describe Encore::Serializer do
       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) }
@@ -134,12 +135,13 @@ describe Encore::Serializer do
       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) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: encore
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Simon Prévost
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-28 00:00:00.000000000 Z
+date: 2015-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel