hal_presenter 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af641721e6b137d280c31c60efc6b76e7e1a22dd441a9b65aee3b929954290ec
-  data.tar.gz: 784293b830aeed98f2f1ac1157b0526a8febe8ccbbe40a54dcee85acb8111294
+  metadata.gz: 0d44a7bd34475ea7e7187811e8e3d4447430835e6327440a714315477b8307f2
+  data.tar.gz: fa9bede97a583685589e2cea815be591bbb90c45034baf4697717fb06adc5f2d
 SHA512:
-  metadata.gz: 829846a3e6a6d86e537817585ccfdc929efc758cf9a748b73c4a9c5d54d0760f8735301a7606a90d6279c2dba9efd1b3b9998a646c336a1656628f42ba779c56
-  data.tar.gz: fd10fbc76409d2b1738b2e5abdd75ba68e6a34592ae6b7ed56f2fcac0f83079eba33b524704de4c29ff168040147e89d82fc0466746049c84b4f1df87bafaaeb
+  metadata.gz: df06bf35cd4e145679e0cf40b48d6823e8caa6b72954e1cdf3383797d6925045010ac993aceca7ef29affac6a1b46468ef2c444be6da0a3a60ddae0df2b56b72
+  data.tar.gz: dfdf0f1603bffe9be19f803d18a6e31d83ba9ac0bcf5bdbf566760f29afec09945da2c86f33b4f676afa7ac5b0c6cf9ea63492f3a4146361c6dc32b7fa9de161

checksums.yaml.gz.sig

@@ -1,2 +1 @@
-''4��me�"[�o>O��d��ˆV::�*�@�\�B��lb�%�q
-�i�ǻ���4���2Xx��"S6�A|�PU��5Y�{�;�]� [������Q�ա߲ ~�Ǟ"�4k1�E�F��FK
+��Х��N�E��t��b/+���3�6���ȇ�W�Z�%�� ʐ�2//zF��	$K��򏍽ɏ2n��s�fӃ�?@��a�I�`��&�ve$�_�f)L4�"�h������n�D��~��̗�fd;���(y��KK�������K��y�8W�40�7��0���=�#�;j�`V�	�c����5��k�nO=:o0Jb��O(��
��M���~H���FU.,�X�Ś�if���fϱg!P�`

data/lib/hal_presenter/deserializer.rb

@@ -1,13 +1,12 @@
 require 'json'
 
 module HALPresenter
-  module ClassMethods
-    def from_hal(presenter, payload, resource = nil)
-      presenter.from_hal(payload, resource)
-    end
-  end
-
   module Deserializer
+    module ClassMethods
+      def from_hal(presenter, payload, resource = nil)
+        presenter.from_hal(payload, resource)
+      end
+    end
 
     class Error < StandardError; end
 

data/lib/hal_presenter/links.rb

@@ -2,21 +2,20 @@ require 'hal_presenter/property'
 require 'hal_presenter/super_init'
 
 module HALPresenter
+  module Links
+    include SuperInit
 
-  module ClassMethods
-    def base_href=(base)
-      @base_href = base&.sub(%r(/*$), '')
-    end
+    module ClassMethods
+      def base_href=(base)
+        @base_href = base&.sub(%r(/*$), '')
+      end
 
-    def href(href)
-      return href if (@base_href ||= '').empty?
-      return href if href =~ %r(\A(\w+://)?[^/])
-      @base_href + href
+      def href(href)
+        return href if (@base_href ||= '').empty?
+        return href if href =~ %r(\A(\w+://)?[^/])
+        @base_href + href
+      end
     end
-  end
-
-  module Links
-    include SuperInit
 
     class Link < HALPresenter::Property
       attr_reader :type, :deprecation, :profile, :title
@@ -29,6 +28,7 @@ module HALPresenter
         @deprecation =  kwargs[:deprecation].freeze
         @profile =      kwargs[:profile].freeze
         @title =        kwargs[:title].freeze
+        @templated =    kwargs[:templated].freeze
 
         curie = kwargs[:curie].to_s
         rel = [curie, rel.to_s].join(':') unless curie.empty?
@@ -46,13 +46,16 @@ module HALPresenter
         href = value(resource, options)
         return {} unless href
 
-        {href: HALPresenter.href(href)}.tap do |hash|
-          hash[:type]        = type        if type
-          hash[:deprecation] = deprecation if deprecation
-          hash[:profile]     = profile     if profile
-          hash[:title]       = title       if title
-          hash[:templated]   = templated   if templated
-        end
+        values = href.respond_to?(:to_h) ? href.to_h : {}
+        values[:href] = HALPresenter.href(values[:href] || href)
+
+        {
+          type: type,
+          deprecation: deprecation,
+          profile: profile,
+          title: title,
+          templated: templated
+        }.compact.merge(values)
       end
     end
 

data/lib/hal_presenter/model.rb

@@ -1,36 +1,36 @@
 module HALPresenter
   @presenters = {}
 
-  module ClassMethods
-    def register(model:, presenter:)
-      return unless presenter && model
-      @presenters[presenter] = model
-    end
+  module Model
+    module ClassMethods
+      def register(model:, presenter:)
+        return unless presenter && model
+        @presenters[presenter] = model
+      end
 
-    def unregister(presenter)
-      @presenters.delete_if { |d,_| d == presenter }
-    end
+      def unregister(presenter)
+        @presenters.delete_if { |d,_| d == presenter }
+      end
 
-    def lookup_model(presenter)
-      @presenters[presenter]
-    end
+      def lookup_model(presenter)
+        @presenters[presenter]
+      end
 
-    def lookup_presenter(model)
-      presenters = lookup_presenters(model)
-      return presenters.last unless presenters.empty?
-      lookup_presenters(model.first).last if model.respond_to? :first
-    end
+      def lookup_presenter(model)
+        presenters = lookup_presenters(model)
+        return presenters.last unless presenters.empty?
+        lookup_presenters(model.first).last if model.respond_to? :first
+      end
 
-    def lookup_presenters(model)
-      clazz = model.is_a?(Class) ? model : model.class
-      presenters = @presenters.select { |_d, m| m == clazz }.keys
-      return presenters unless presenters.empty?
-      return [] unless clazz < BasicObject
-      lookup_presenters(clazz.superclass)
+      def lookup_presenters(model)
+        clazz = model.is_a?(Class) ? model : model.class
+        presenters = @presenters.select { |_d, m| m == clazz }.keys
+        return presenters unless presenters.empty?
+        return [] unless clazz < BasicObject
+        lookup_presenters(clazz.superclass)
+      end
     end
-  end
 
-  module Model
     def self.included(base)
       base.extend ClassMethods
     end

data/lib/hal_presenter/pagination.rb

@@ -1,12 +1,9 @@
 module HALPresenter
-  module ClassMethods
+  class << self
     attr_accessor :paginate
   end
 
   class Pagination
-    def self.included(base)
-      base.extend ClassMethods
-    end
 
     class Uri
       def self.parse(str)

data/lib/hal_presenter/serializer.rb

@@ -3,31 +3,29 @@ require 'hal_presenter/pagination'
 require 'hal_presenter/curie_collection'
 
 module HALPresenter
+  module Serializer
+    module ClassMethods
+      def to_hal(resource, **options)
+        options = options.dup
+        presenter!(resource, **options).to_hal(resource, **options)
+      end
 
-  module ClassMethods
-    def to_hal(resource, **options)
-      options = options.dup
-      presenter!(resource, options).to_hal(resource, options)
-    end
-
-    def to_collection(resources, **options)
-      options = options.dup
-      presenter!(resources, options).to_collection(resources, options)
-    end
+      def to_collection(resources, **options)
+        options = options.dup
+        presenter!(resources, **options).to_collection(resources, **options)
+      end
 
-    private
+      private
 
-    def presenter!(resources, **options)
-      raise Serializer::Error, "resources is nil" if resources.nil?
-      presenter = options.delete(:presenter)
-      presenter ||= HALPresenter.lookup_presenter(resources)
-      raise Serializer::Error, "No presenter for #{resources.first.class}" unless presenter
+      def presenter!(resources, **options)
+        raise Serializer::Error, "resources is nil" if resources.nil?
+        presenter = options.delete(:presenter)
+        presenter ||= HALPresenter.lookup_presenter(resources)
+        raise Serializer::Error, "No presenter for #{resources.first.class}" unless presenter
 
-      presenter
+        presenter
+      end
     end
-  end
-
-  module Serializer
 
     class Error < StandardError; end
 
@@ -75,6 +73,7 @@ module HALPresenter
     end
 
     def to_collection_hash(resources, options)
+      resources ||= []
       policy = policy_for(nil, options)
       properties = collection_properties
       attributes = properties.attributes

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: hal_presenter
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Sammy Henningsson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIDVjCCAj6gAwIBAgIBATANBgkqhkiG9w0BAQsFADAqMSgwJgYDVQQDDB9zYW1t
-  eS5oZW5uaW5nc3Nvbi9EQz1oZXkvREM9Y29tMB4XDTIwMDgwNDE4MTAyOVoXDTIx
-  MDgwNDE4MTAyOVowKjEoMCYGA1UEAwwfc2FtbXkuaGVubmluZ3Nzb24vREM9aGV5
+  eS5oZW5uaW5nc3Nvbi9EQz1oZXkvREM9Y29tMB4XDTIyMDEzMTIwNTQxMloXDTI0
+  MDEzMTIwNTQxMlowKjEoMCYGA1UEAwwfc2FtbXkuaGVubmluZ3Nzb24vREM9aGV5
   L0RDPWNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK+SDC1mfyhu
   cJ6Va21rIHUGscEtQrdvyBqxFG1s2TgPMAv4RbqwdJVPa7kjtbCzslADlUE1oru2
   C+rcJsMtVGX02ukMIPHT1OjTyy0/EMqLqSy3WeRI8APyDSxCVbe+h5BMf3zZnYfd
@@ -22,93 +22,93 @@ cert_chain:
   nIxTSJpPr2cCAwEAAaOBhjCBgzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNV
   HQ4EFgQUukjj1Cd2ea6IOHDLZe0ymzs2jWkwJAYDVR0RBB0wG4EZc2FtbXkuaGVu
   bmluZ3Nzb25AaGV5LmNvbTAkBgNVHRIEHTAbgRlzYW1teS5oZW5uaW5nc3NvbkBo
-  ZXkuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQAEtv48barHOksR+CEF+Nu5ZjzXksi0
-  rI2JMmuDTlQBw0/m79+Om1cPzBKKR7ODGytjQ7NAj9VWQcw8Oc/K4z63JbD13G3Y
-  45/GTTCCae5YyO/g8BpkFeFwZTvJBwD1HQvMBjBi8WMk+Yr00EUoiLExuL0VSjJ9
-  grmwk+vA+68PWAkYOAkNOonQ6nT3UgmbK9XGoINSxHwn1Njxyw0dXsuZeaznJzhy
-  D4OCgJwXzne+Jeqc60ISM5a6/eFZGVyfI15X2fnxXXVrGu3EMnrgKuHxTNUfjaBL
-  Xs+28o/7SxG1CNyMq1HAmDvUPP3bMyzXTtVr61Kd2uyS1StS5s9XFedR
+  ZXkuY29tMA0GCSqGSIb3DQEBCwUAA4IBAQCNUrjx1+L5W9R5O5MF3fnnNIyxOXGa
+  qzqpmXpTd7pHUGvSzVxYM/NIkUHSSPyxLAG+RYMPJHjDOSzhLmOUbgpfOsQ8sqUP
+  plABBC03e/+oDwFwlHefonil+sp/AOT9TYZJQbShjKt3/X+VGzjtujJZwvKgiiP0
+  Ht5Q4dvW1ZqUZgvXdYM1LnCX7I3WjoRyhOwdSlaEz5gnD+KYewHiiByK1Jv2n0PG
+  DVzXaUnsmwP+jQ1PkDa5q8ibBzMd2c6Hmm87UDqPxZtML0bF9SjrpbyLMjwtXaMA
+  WDPp0ajpdUZ9GPHsrVNYXiOfQIqcmlmpYVsH1o7vuneUIcIDMrnMDChh
   -----END CERTIFICATE-----
-date: 2020-08-04 00:00:00.000000000 Z
+date: 2022-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '10.0'
     - - "~>"
       - !ruby/object:Gem::Version
         version: '12.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '10.0'
     - - "~>"
       - !ruby/object:Gem::Version
         version: '12.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '4.0'
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.0'
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5.0'
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '9.0'
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '9.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '9.0'
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '9.0'
 - !ruby/object:Gem::Dependency
@@ -183,7 +183,7 @@ homepage: https://github.com/sammyhenningsson/hal_presenter
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -198,8 +198,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: JSON HAL serializer
 test_files: []