yaks 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 776238668b4fdadb94093d0238f2c70410839554
-  data.tar.gz: 9f0a6759d926591facf1e6e1e76ea8f74502744b
+  metadata.gz: 45ba297e354c237fe7dac7c3570c9405b1235c03
+  data.tar.gz: b8d1873f4e2bb1b4103608a48660a13a970babf0
 SHA512:
-  metadata.gz: 27ab2fc145cc3e3cbc64f9cc78bc941268a41858f1ccac9d3a45735b1f779299edb91aa2d9f7ae07f31ab81b4d74b549113477bbcc8468c2f8300b62d9179346
-  data.tar.gz: cec0a45406bdfbfa0906ba696d21753e25797360a6505eca8ba1b7b773dd5591fc2e18e7fbe0085c941677f5d833a64bc14d4b262130d635606daa763a705249
+  metadata.gz: 44d29bbb7d61bb15939d6b8d14ee7267d95c6c52003fdd560d3046a7484d344b3e1c7b0fb0ba4bb220bb06475b78305033506e9192da7c4f3df0f74a7665e654
+  data.tar.gz: 9b5c263fa66d6c519087164de7b1c0d6d626dc99b221efcc83ca103361e983b474e1116472ebc5af620fb7471d2d294a892754f775948a9549e0ebbaafe55a19

data/lib/yaks/mapper/link.rb

@@ -35,7 +35,11 @@ module Yaks
       def add_to_resource(resource, mapper, _context)
         resource_link = map_to_resource_link(mapper)
         return resource unless resource_link
-        resource.add_link(resource_link)
+        if options[:replace]
+          resource.links(resource.links.reject {|link| link.rel?(rel)} << resource_link)
+        else
+          resource.add_link(resource_link)
+        end
       end
 
       def rel?(rel)
@@ -62,7 +66,7 @@ module Yaks
         options = options()
         options = options.merge(title: Resolve(options[:title], mapper)) if options.key?(:title)
         options = options.merge(templated: true) if templated?
-        options.reject{|key| key.equal? :expand }
+        options.reject{|key| [:expand, :replace].include? key }
       end
 
     end

data/lib/yaks/resource/link.rb

@@ -10,6 +10,10 @@ module Yaks
       def templated?
         options.fetch(:templated) { false }
       end
+
+      def rel?(rel)
+        rel().eql? rel
+      end
     end
   end
 end

data/lib/yaks/version.rb

@@ -1,3 +1,3 @@
 module Yaks
-  VERSION = '0.7.4'
+  VERSION = '0.7.5'
 end

data/lib/yaks.rb

@@ -23,8 +23,8 @@ require 'yaks/errors'
 require 'yaks/default_policy'
 
 module Yaks
-  # A PORO
-  Undefined = Object.new
+  Undefined = Module.new.freeze
+
   # Set the Root constant as the gems root path
   Root = Pathname(__FILE__).join('../..')
 

data/spec/unit/yaks/mapper/link_spec.rb

@@ -44,6 +44,19 @@ RSpec.describe Yaks::Mapper::Link do
         )
       end
     end
+
+    context 'with :replace => true' do
+      let(:options) { { replace: true } }
+      let(:resource) {
+        Yaks::Resource.new.add_link(Yaks::Resource::Link.new(rel: :next, uri: '/api/next'))
+      }
+
+      it 'should replace earlier links of the same rel' do
+        expect(link.add_to_resource(resource, mapper, yaks_context)).to eql(
+          Yaks::Resource.new(links: [Yaks::Resource::Link.new(rel: :next, uri: "/foo/bar/3/4")])
+        )
+      end
+    end
   end
 
   describe '#rel?' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yaks
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - Arne Brasseur