roda-endpoints 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7372255aca1de1a82109d126d17cf936e6efc0e
-  data.tar.gz: 1ca0b7962cbf1a076da564075699a6798d4f63d2
+  metadata.gz: 4e63ead2c011c6f56649e0e2b415888e59c3da9b
+  data.tar.gz: 1103b4c76e38b565eea322ad02f7e1eda7e0ca90
 SHA512:
-  metadata.gz: 340dd36e447f1b258ba11600adff69f14a6d8d571111aafffc12b28601764b82af8100ca48b81f807166b9870c0455e08b0faee90ba4646e8ed27a19ae1ebc9d
-  data.tar.gz: 218a1625f5ec243816a6901c4da4584a0ef525be2d125932cbbb185980614836154f8766d5b38e2038debe1a6425f7f14a3e88942b76b2879e9eb53652b117c0
+  metadata.gz: 4a5d7d870f36259ffc222e569c8c4b96e71c0107675fdcc0f1912a9ddc82973d96e395e77193c2e60ca29c5233078147907aa86b7b955e57d43521d677e919f1
+  data.tar.gz: c76f5fead6207851a7b0c312f2cefcede79fdda9c258c51567e691073d442b37d190db52b1faebee8fba9d2cb06367cc118f6335d629dd20a8b82f6da2df6dfe

data/lib/roda/endpoints/endpoint/collection.rb

@@ -30,7 +30,12 @@ class Roda
         # @param [Symbol] name
         # @param [Hash] params
         def child(name: item_name, type: Item, **params)
-          super(name: name, type: type, **params)
+          super(
+            name: name,
+            type: type,
+            last_modified: @last_modified || Undefined,
+            **params
+          )
         end
 
         # @return [Symbol]

data/lib/roda/endpoints/endpoint/singleton.rb

@@ -37,7 +37,7 @@ class Roda
 
         # @return [ROM::Struct]
         def entity
-          @entity ||= fetch_entity
+          @entity ||= fetch_entity if id
         end
 
         attr_writer :entity
@@ -49,7 +49,7 @@ class Roda
 
         # @return [Time]
         def last_modified
-          @last_modified ? entity.public_send(@last_modified) : super
+          @last_modified && entity ? entity.public_send(@last_modified) : super
         end
 
         route do |r, endpoint|

data/lib/roda/endpoints/repository.rb

@@ -13,7 +13,7 @@ class Roda
 
       # @return [Time]
       def last_modified
-        root.order(Sequel.desc(:updated_at)).first.updated_at
+        root.order(Sequel.desc(:updated_at)).first&.updated_at
       end
 
       # @param [Integer] id

data/lib/roda/endpoints/version.rb

@@ -2,6 +2,6 @@
 
 class Roda
   module Endpoints
-    VERSION = '0.3.2'
+    VERSION = '0.3.3'
   end
 end

data/lib/roda/plugins/endpoints.rb

@@ -97,11 +97,13 @@ class Roda
                        item: { on: :id },
                        type: Roda::Endpoints::Endpoint::Collection,
                        on: name.to_s,
+                       parent: root_endpoint,
                        **kwargs)
           endpoint name: name,
                    item: item,
                    type: type,
                    on: on,
+                   parent: parent,
                    **kwargs do |endpoint|
             yield endpoint if block_given?
           end
@@ -179,6 +181,7 @@ class Roda
                      parent: current_endpoint,
                      on: name,
                      **kwargs)
+          parent ||= root_endpoint
           on on do |*captures|
             with_current_endpoint parent.child(
               name: name,
@@ -226,11 +229,15 @@ class Roda
 
         # @return [<Endpoint>]
         def endpoints
-          @endpoints ||= [Roda::Endpoints::Endpoint.new(
+          @endpoints ||= [root_endpoint]
+        end
+
+        def root_endpoint
+          @root_endpoint ||= Roda::Endpoints::Endpoint.new(
             name: :root,
             ns: nil,
             container: roda_class.opts[:endpoints][:container]
-          )]
+          )
         end
 
         def with_current_endpoint(endpoint)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roda-endpoints
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Alex Semyonov