yaks 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a415152eaf3824112c62b53dcdfb88956ec50b7
-  data.tar.gz: 2ec4dcbe85142f36ab9205015596225c4119e4c6
+  metadata.gz: 64f29f0a260835544b10149465159018b6c4c3cf
+  data.tar.gz: 89cbcaece5f55c9cbc24a570318f68d5740867d5
 SHA512:
-  metadata.gz: 31371421b3370326cbad06b8384e07f92a926e87d4795e62637e7591cde56e2fc6029c3f9be677109e0e9854ed7dc2a380345579dd01a04cbe441f70e0ea34cc
-  data.tar.gz: 45bb2d027f706bf0047ace14ed34e875bc74b0eab0cdb103496c8c24a55c58cddfe66775ce9e28524a3c5401a742e62790501400bfcb738187a532367826a654
+  metadata.gz: dd0847555ab0d6907f2883acc4ef58d2c6fbf5abc40b07ef45a2f78018d9db62b8eae4ad52877df3ca5882f79d0e197859064ac272dc7d9d38de480a97a7ce55
+  data.tar.gz: ff1c2fd464fd5ec9faea3233bde76d0a12f55023fb25d9c4b53bb0f25c38f8b8a2739d5397a804b55c0afa934c6876eb4ea117a578594059e06c50de9e39b458

data/lib/yaks/mapper.rb

@@ -55,6 +55,33 @@ module Yaks
     end
     alias load_association load_attribute
 
+    def expand_uri(uri, expand)
+      case uri
+      when nil
+        return
+      when Symbol
+        return load_attribute(uri)
+      when Method, Proc
+        return Resolve(uri, self)
+      end
+
+      template = URITemplate.new(uri)
+      expand_vars = case expand
+                    when true
+                      template.variables
+                    when false
+                      []
+                    else
+                      expand
+                    end
+
+      mapping = expand_vars.each_with_object({}) do |name, hsh|
+        hsh[name] = load_attribute(name)
+      end
+
+      template.expand_partial(mapping).to_s
+    end
+
     private
 
     def map_attributes(resource)

data/lib/yaks/mapper/control.rb

@@ -10,10 +10,20 @@ module Yaks
         new({name: name}.merge(options))
       end
 
-      def add_to_resource(resource, _parent_mapper, _context)
-        resource.add_control(
-          Resource::Control.new(to_h.merge(fields: fields.map(&:to_resource_control_field)))
-        )
+      def add_to_resource(resource, parent_mapper, _context)
+        resource.add_control(map_to_resource_control(resource, parent_mapper))
+      end
+
+      def map_to_resource_control(resource, parent_mapper)
+        attrs = {
+          fields: resource_fields,
+          href: parent_mapper.expand_uri(href, true)
+        }
+        Resource::Control.new(to_h.merge(attrs))
+      end
+
+      def resource_fields
+        fields.map(&:to_resource_field)
       end
 
       class Field
@@ -27,7 +37,7 @@ module Yaks
           new(attrs)
         end
 
-        def to_resource_control_field
+        def to_resource_field
           Resource::Control::Field.new(to_h)
         end
       end

data/lib/yaks/mapper/link.rb

@@ -28,8 +28,6 @@ module Yaks
       include Attributes.new(:rel, :template, options: {})
       include Util
 
-      def_delegators :uri_template, :expand_partial
-
       def self.create(rel, template, options = {})
         new(rel: rel, template: template, options: options)
       end
@@ -49,29 +47,8 @@ module Yaks
         !options.fetch(:expand) { true }.equal? true
       end
 
-      def template_variables
-        case options.fetch(:expand) { true }
-        when true
-          uri_template.variables
-        when false
-          []
-        else
-          options[:expand]
-        end.map(&:to_sym)
-      end
-
-      def expansion_mapping(lookup)
-        template_variables.each_with_object({}) do |name, hsh|
-          hsh[name] = lookup[name]
-        end
-      end
-
-      def uri_template
-        URITemplate.new(template)
-      end
-
       def map_to_resource_link(mapper)
-        uri = expand_with(mapper.method(:load_attribute))
+        uri = mapper.expand_uri(template, options.fetch(:expand, true))
         return if uri.nil?
 
         Resource::Link.new(
@@ -81,12 +58,6 @@ module Yaks
         )
       end
 
-      def expand_with(lookup)
-        return lookup[template] if template.instance_of? Symbol
-
-        expand_partial(expansion_mapping(lookup)).to_s
-      end
-
       def resource_link_options(mapper)
         options = options()
         options = options.merge(title: Resolve(options[:title], mapper)) if options.key?(:title)

data/lib/yaks/version.rb

@@ -1,3 +1,3 @@
 module Yaks
-  VERSION = '0.7.1'
+  VERSION = '0.7.2'
 end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+$VERBOSE=true
+
 require 'rspec/its'
 require 'bogus/rspec'
 require 'timeout'

data/spec/unit/yaks/mapper/control/field_spec.rb

@@ -26,9 +26,9 @@ RSpec.describe Yaks::Mapper::Control::Field do
     end
   end
 
-  describe 'to_resource_field' do
+  describe '#to_resource_field' do
     it 'creates a Yaks::Resource::Control::Field with the same attributes' do
-      expect(field.to_resource_control_field).to eql Yaks::Resource::Control::Field.new(full_args)
+      expect(field.to_resource_field).to eql Yaks::Resource::Control::Field.new(full_args)
     end
   end
 end

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

@@ -27,7 +27,7 @@ RSpec.describe Yaks::Mapper::Control do
   end
 
   describe '#add_to_resource' do
-    let(:resource) { control.add_to_resource(Yaks::Resource.new, nil, nil) }
+    let(:resource) { control.add_to_resource(Yaks::Resource.new, Yaks::Mapper.new(nil), nil) }
 
     it 'should add a control to the resource' do
       expect(resource.controls.length).to be 1

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

@@ -9,9 +9,6 @@ RSpec.describe Yaks::Mapper::Link do
   let(:template) { '/foo/bar/{x}/{y}' }
   let(:options)  { {} }
 
-  its(:template_variables) { should eq [:x, :y] }
-  its(:uri_template) { should eq URITemplate.new(template) }
-
   let(:object) { Struct.new(:x, :y, :returns_nil).new(3, 4, nil) }
 
   let(:mapper_class) do
@@ -71,44 +68,6 @@ RSpec.describe Yaks::Mapper::Link do
     end
   end
 
-  describe '#expand_with' do
-    it 'should look up expansion values through the provided callable' do
-      expect(link.expand_with(->(var){ var.upcase })).to eq '/foo/bar/X/Y'
-    end
-
-    context 'with expansion turned off' do
-      let(:options) { {expand: false} }
-
-      it 'should keep the template in the response' do
-        expect(link.expand_with(->{ })).to eq '/foo/bar/{x}/{y}'
-      end
-    end
-
-    context 'with a URI without expansion variables' do
-      let(:template) { '/orders' }
-
-      it 'should return the link as is' do
-        expect(link.expand_with(->{ })).to eq '/orders'
-      end
-    end
-
-    context 'with partial expansion' do
-      let(:options) { { expand: [:y] } }
-
-      it 'should only expand the given variables' do
-        expect(link.expand_with({:y => 7}.method(:[]))).to eql '/foo/bar/{x}/7'
-      end
-    end
-
-    context 'with a symbol for a template' do
-      let(:template) { :a_symbol }
-
-      it 'should use the lookup mechanism for finding the link' do
-        expect(link.expand_with({:a_symbol => '/foo/foo'}.method(:[]))).to eq '/foo/foo'
-      end
-    end
-  end
-
   describe '#map_to_resource_link' do
     subject(:resource_link) { link.map_to_resource_link(mapper) }
 

data/spec/unit/yaks/mapper_spec.rb

@@ -329,4 +329,48 @@ RSpec.describe Yaks::Mapper do
       expect(mapper.mapper_stack).to eql [:foo]
     end
   end
+
+  describe '#expand_uri' do
+    let(:template) { '/foo/bar/{x}/{y}' }
+    let(:expand)   { true }
+
+    subject(:expanded) { mapper.expand_uri(template, expand) }
+
+    before do
+      mapper.call( Struct.new(:x, :y) { def foo ; '/foo/foo' ; end }.new(6, 7) )
+    end
+
+    context 'with expansion turned off' do
+      let(:expand) { false }
+
+      it 'should keep the template in the response' do
+        expect(expanded).to eq '/foo/bar/{x}/{y}'
+      end
+    end
+
+    context 'with a URI without expansion variables' do
+      let(:template) { '/orders' }
+
+      it 'should return the link as is' do
+        expect(expanded).to eq '/orders'
+      end
+    end
+
+    context 'with partial expansion' do
+      let(:expand) { [:y] }
+
+      it 'should only expand the given variables' do
+        expect(expanded).to eql '/foo/bar/{x}/7'
+      end
+    end
+
+    context 'with a symbol for a template' do
+      let(:template) { :foo }
+
+      it 'should use the lookup mechanism for finding the link' do
+        expect(expanded).to eq '/foo/foo'
+      end
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yaks
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Arne Brasseur
@@ -346,18 +346,7 @@ homepage: https://github.com/plexus/yaks
 licenses:
 - MIT
 metadata: {}
-post_install_message: |2
-
-  Breaking Changes in Yaks 0.7.0
-  ==============================
-  Yaks::Resource#subresources is now an array, not a hash. The rel is
-  stored on the resource itself as Yaks::Resource#rels (an array). This
-  should only be of concern if you implement custom output formats
-
-  The general signature of all processing steps (mapper, formatter,
-  hooks) has changed to incldue a second parameter, the rack env. If you
-  have custom implementations of any of these, or hooks that are not
-  specified as ruby blocks, you will need to take this into account
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib