oat 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fc6d823ab477ce6ea91958585093f23afb9d0d2
-  data.tar.gz: 84bf255fd575dd07ad62d6e942c8948ec44b20f0
+  metadata.gz: 7d444b3c170713aa0e2ff5c54fec3d55303560de
+  data.tar.gz: 2b0619de2dc37f28043a0d641f96fbc428145cc1
 SHA512:
-  metadata.gz: 4ac3ea124a6cc06fcd3e21130e0ad99af95a59e92c113f8596298a093cc3bc34c879efb36a815ac0b388a77e231beecc8de8306bb2f12722d64c5bd7d17e7286
-  data.tar.gz: cf27b4fd9ca4dcb4d6b7e6d335d5d1055ee643b4f1a6e94d808724cbfa15d50d0120cba18b34e23cc1332df1bd259957920bdda06290ac1dcb70e3e5fb383c58
+  metadata.gz: 5622ecddbad73ddbf6c390fcca1ac44cdd282ab1efc69bac16ea6962b7eea76008461a47eefc549962fb99f1346b928f7622f6e9e9f3d269e420bc23e5bdb6e7
+  data.tar.gz: 8f63e0662b6526536d79c4a07d2aadcb0c91b7ca90b25aa183a92c9b5b566d79b6a18c98807e5b816173ccd431f9cb1c9aae6dac7a99b0952e2396e7d412bb94

data/lib/oat/adapters/json_api.rb

@@ -34,14 +34,15 @@ module Oat
 
       def entity(name, obj, serializer_class = nil, context_options = {}, &block)
         ent = serializer_from_block_or_class(obj, serializer_class, context_options, &block)
-        entity_hash[name.to_s.pluralize.to_sym] ||= []
         if ent
+          entity_hash[name.to_s.pluralize.to_sym] ||= []
           link name, :href => ent[:id]
           entity_hash[name.to_s.pluralize.to_sym] << ent
         end
       end
 
       def entities(name, collection, serializer_class = nil, context_options = {}, &block)
+        return if collection.nil? || collection.empty?
         link_name = name.to_s.pluralize.to_sym
         data[:links][link_name] = []
 

data/lib/oat/version.rb

@@ -1,3 +1,3 @@
 module Oat
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/spec/adapters/json_api_spec.rb

@@ -52,8 +52,7 @@ describe Oat::Adapters::JsonAPI do
         it 'contains the correct links' do
           expect(linked_friends.first.fetch(:links)).to include(
             :self => "http://foo.bar.com/#{friend.id}",
-            :empty => nil,
-            :friends => []
+            :empty => nil
           )
         end
       end
@@ -94,7 +93,33 @@ describe Oat::Adapters::JsonAPI do
       end
 
       it 'excludes the entity from the linked hash' do
-        hash.fetch(:linked).fetch(:managers).should be_empty
+        expect(hash.fetch(:linked)).not_to include(:managers)
+      end
+    end
+
+    context 'with a nil entities relationship' do
+      let(:user) { user_class.new('Ismael', 35, 1, nil, manager) }
+      let(:users) { hash.fetch(:users) }
+
+      it 'excludes the entity from user links' do
+        expect(users.first.fetch(:links)).not_to include(:friends)
+      end
+
+      it 'excludes the entity from the linked hash' do
+        expect(hash.fetch(:linked)).not_to include(:friends)
+      end
+    end
+
+    context 'when an empty entities relationship' do
+      let(:user) { user_class.new('Ismael', 35, 1, [], manager) }
+      let(:users) { hash.fetch(:users) }
+
+      it 'excludes the entity from user links' do
+        expect(users.first.fetch(:links)).not_to include(:friends)
+      end
+
+      it 'excludes the entity from the linked hash' do
+        expect(hash.fetch(:linked)).not_to include(:friends)
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oat
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Ismael Celis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-24 00:00:00.000000000 Z
+date: 2014-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport