hal_presenter 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9322632b515fd679f3bde7bcd8f0c3725330a66f3e4d8439f3223c3bc70f2e4e
-  data.tar.gz: 56e87ad4268c7bf247d9bf593fb0c6c91358a2d0d61a39824085075c4cbd9944
+  metadata.gz: 9f8372f743b3ec9c521a91fcae3b076e895aded53ec5a2c8f1f5aca5dd49cc57
+  data.tar.gz: 0132bffe7bf54366e0c0029d6ad36ab4835157bb122eeb345711554977eabea5
 SHA512:
-  metadata.gz: 7c1663fc6ba1427c4a30162892dd3ccc4ae551b299990657d3cbac06566d32483112a77527baab2c05316c57bc2ac65e3b5cc4ee91ddfb8317fd8b0afaf4da51
-  data.tar.gz: f99e735e37406ec5c7e370e9cc08fa74babbd135c6ceb60160c980e5a132c8c70d1412c7e0b585c868f6eece599bd2e88220ef2be26e8671e08b5236472c3200
+  metadata.gz: fd1ad4fda24796029a64d81339c5271dd55a82079afc0425fab5b5c443af1fe8b12411fe2f13c29ec4fa8cd818b48b991808bceb8d5951846668cc06ebd6180c
+  data.tar.gz: 64f688d70ac9489f3d867e29514cc9c99a4356ae10dafb6417ed37a24a412ee1800f842689a71afc5e8e9c911c301f2d30877cf90b9d0913e6185918b0aefcc4

data/lib/hal_presenter/collection.rb

@@ -7,17 +7,31 @@ module HALPresenter
       include Attributes
       include Links
       include Curies
+      include Embedded
 
-      attr_reader :name
+      attr_reader :name, :scope
 
-      def initialize(name, &block)
+      def initialize(name, scope, &block)
         @name = name
-        instance_exec(&block) if block_given?
+        return unless block_given?
+        @scope = scope
+        instance_exec(&block)
+      end
+
+      def method_missing(method, *args, &block)
+        return super unless scope&.respond_to? method
+        define_singleton_method(method) { |*a, &b| scope.public_send method, *a, &b }
+        public_send(method, *args, &block)
+      end
+
+      def respond_to_missing?(method, include_private = false)
+        return true if scope&.respond_to? method
+        super
       end
     end
 
     def collection(of:, &block)
-      @_parameters = CollectionParameters.new(of, &block)
+      @_parameters = CollectionParameters.new(of, self, &block)
     end
 
     protected

data/lib/hal_presenter/embedded.rb

@@ -5,9 +5,9 @@ module HALPresenter
     class Embed < HALPresenter::Property
       attr_reader :presenter_class
 
-      def initialize(name, value = nil, presenter_class: nil, &block)
+      def initialize(name, value = nil, presenter_class: nil, decorator_class: nil, &block)
         super(name, value, &block)
-        @presenter_class = presenter_class
+        @presenter_class = presenter_class || decorator_class
       end
     end
 

data/lib/hal_presenter/policy/dsl.rb

@@ -92,6 +92,7 @@ module HALPresenter
       end
 
       def link?(rel)
+        return true if rel == :self
         run self.class.rules.link_rule_for(rel)
       end
 

data/lib/hal_presenter/serializer.rb

@@ -54,16 +54,22 @@ module HALPresenter
     end
 
     def to_collection_hash(resources, options)
+      policy = policy_class&.new(options[:current_user], nil, options)
       parameters = collection_parameters
       links = parameters.links
       curies = parameters.curies
       {}.tap do |serialized|
-        serialized.merge!  _serialize_attributes(parameters.attributes, resources, nil, options)
-        serialized.merge! _serialize_links(links, curies, resources, nil, options)
+        serialized.merge!  _serialize_attributes(parameters.attributes, resources, policy, options)
+        serialized.merge! _serialize_links(links, curies, resources, policy, options)
         Pagination.paginate!(serialized, resources) if options[:paginate]
 
+        # Embedded from collection block
+        embedded = _serialize_embedded(parameters.embedded, resources, policy, options)
+        serialized[:_embedded] = embedded[:_embedded] || {}
+
+        # Embedded resources
         serialized_resources = resources.map { |resource| to_hash(resource, options) }
-        serialized[:_embedded] = { parameters.name => serialized_resources }
+        serialized[:_embedded].merge!({parameters.name => serialized_resources })
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hal_presenter
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Sammy Henningsson
@@ -31,7 +31,7 @@ cert_chain:
   CNZdF8Vavp6xMQbPHZwqjaeZz2WRXYS7jyYSvCunjwa3OtvXtfbIEGEWE6IM+t9k
   H1g6Q+B6qk9O6g==
   -----END CERTIFICATE-----
-date: 2018-01-28 00:00:00.000000000 Z
+date: 2018-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -198,5 +198,5 @@ rubyforge_project:
 rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
-summary: HAL serializer
+summary: JSON HAL serializer
 test_files: []