roda-endpoints 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4c0a8fcc37a1cbc7990da886c1222bac0409c40
-  data.tar.gz: 05d751cf1cbb8ee521d75e31a74d4fbcd431c8b4
+  metadata.gz: d27908a4d47343597580a44f31b0b70ffe4f4989
+  data.tar.gz: a3133effde967ed1f347b7f0d32193c3535d78c5
 SHA512:
-  metadata.gz: 97d1319b4411dae6b2b2e8b3945e5931d8c66f1b287eded402807dd35432038db8ba1b0d6ef13dcd5f943596e1d1334d95571a71ddcfc191fa754dd866366332
-  data.tar.gz: '05785933922272fb8d9bec0e39e73358be4472bc4a09434ca8923b5ddc0122984c4ae6b5ffb04f09af3845c17059f6cbdc7230d9a2739de90773573a0ad985e3'
+  metadata.gz: 48fc583f0aa6e9e8b2ffa32df5767f3cffde042f4f75aa3a8f1d11a98854e27c988c65fecf969ec7bbec6f8ccf2d646f7ae6d8bd4b78cf497eb44a9a4a0de98b
+  data.tar.gz: 62f7f1602928453c90ad979f695940c041aefc1f507971d0972ac9e0d273a70ad10700a5379425101b9972f4ad467f0cbae59afd9a226297f0dba5b972bedd70

data/.rubocop.yml

@@ -13,6 +13,10 @@ Metrics/BlockLength:
   - spec/**/*.rb
   - vendor/**/*.rb
 
+Metrics/ModuleLength:
+  Exclude:
+  - lib/roda/plugins/endpoints.rb
+
 # It is 2017, UTF time!
 Style/AsciiComments:
   Enabled: false

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

@@ -38,13 +38,6 @@ class Roda
           child.defaults = defaults.dup
           child.statuses = statuses.dup
           child.verbs = verbs.dup
-          # child.verbs.each do |verb|
-          #  key = "operations.#{child.type}.#{verb}"
-          #  implementation = "operations.#{type}.#{verb}"
-          #  container.register key do
-          #    Endpoints.container.resolve implementation
-          #  end
-          # end
           child.transactions = transactions.dup
           child.route(&@route_block)
           super
@@ -76,7 +69,8 @@ class Roda
             end
           end
           define_method(verb, &block)
-          container.register "operations.#{type}.#{verb}", block
+          key = "operations.#{type}.#{verb}"
+          container.register key, block
         end
 
         # @param [String, Symbol] key

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
+require 'roda/endpoints/endpoint'
 require 'roda/endpoints/endpoint/data'
 require 'roda/endpoints/endpoint/caching'
-require 'roda/endpoints/endpoint'
 require 'inflecto'
 require 'rom/sql'
 
@@ -11,8 +11,8 @@ class Roda
     class Endpoint
       # HTTP endpoint representing a collection of items of the same type.
       class Collection < Roda::Endpoints::Endpoint
-        prepend Data
-        prepend Caching
+        include Data
+        include Caching
 
         self.attributes += %i(item)
         self.defaults = defaults.merge(

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

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'roda/endpoints'
+require 'inflecto'
+
 class Roda
   module Endpoints
     # Generic HTTP endpoint abstraction.
@@ -21,12 +24,11 @@ class Roda
 
         # @return [ROM::Repository]
         def repository
-          container[@repository_key] if @repository_key
-        end
-
-        # @return [{Symbol=>Object}]
-        def to_hash
-          super.merge(repository: @repository_key)
+          if @repository_key.is_a?(String)
+            container[@repository_key]
+          else
+            @repository_key
+          end
         end
       end
     end

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

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'roda/endpoints/endpoint/singleton'
-require 'roda/endpoints/endpoint/data'
 require 'forwardable'
 
 class Roda
@@ -12,23 +11,6 @@ class Roda
       class Item < Singleton
         extend Forwardable
 
-        prepend Data
-
-        self.attributes += %i(id by on)
-        self.defaults = defaults.merge(
-          by: :fetch,
-          on: :id,
-          finder: -> { repository.public_send(by, id) }
-        )
-
-        # @return [Symbol]
-        attr_reader :by
-
-        # @return [Integer]
-        def id
-          @id ||= captures.first
-        end
-
         # @return [Endpoint::Collection]
         def collection
           parent

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

@@ -10,15 +10,31 @@ class Roda
       # HTTP endpoint representing a specific item of collection uniquely
       # identified by some parameter.
       class Singleton < Roda::Endpoints::Endpoint
-        prepend Data
-        prepend Caching
+        include Data
+        include Caching
 
         self.attributes += %i(finder last_modified)
-        self.defaults = defaults.merge(last_modified: :updated_at)
+        self.defaults = defaults.merge(
+          last_modified: :updated_at,
+          by: :fetch,
+          on: :id,
+          finder: -> { repository.public_send(by, id) }
+        )
+
+        # @return [Symbol]
+        attr_reader :by
+
+        # @return [Symbol]
+        attr_reader :on
 
         # @return [Symbol]
         attr_reader :finder
 
+        # @return [Integer]
+        def id
+          @id ||= captures.first
+        end
+
         # @return [ROM::Struct]
         def entity
           @entity ||= fetch_entity

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

@@ -10,19 +10,30 @@ class Roda
       module Transactions
         # @return [Endpoints::Transactions]
         def transactions
-          endpoint = self
-          @transactions ||=
-            begin
-              transactions = Endpoints::Transactions.new(endpoint: self)
-              self.class.transactions.each do |(name, block)|
-                transactions.define(name) { instance_exec(endpoint, &block) }
-              end
-              transactions
-            end
+          @transactions ||= Endpoints::Transactions.new(endpoint: self)
           yield @transaction if block_given?
           @transactions
         end
 
+        def prepare_transactions!
+          return if @transactions_prepared
+          endpoint = self
+          self.class.transactions.each do |(name, block)|
+            transactions.define(name) do
+              instance_exec(endpoint, &block)
+            end
+          end
+          verbs.each do |verb|
+            key = "operations.#{ns}.#{verb}"
+            next if container.key?(key)
+            operation = method(verb)
+            container.register key do |*args|
+              endpoint.instance_exec(*args, &operation)
+            end
+          end
+          @transactions_prepared = true
+        end
+
         # @param [Symbol, String] name
         # @param [Proc] block
         def step(name, only: [], **kwargs, &block)

data/lib/roda/endpoints/endpoint.rb

@@ -7,6 +7,8 @@ require 'roda/endpoints/endpoint/namespace'
 require 'roda/endpoints/endpoint/transactions'
 require 'roda/endpoints/endpoint/validations'
 require 'roda/endpoints/endpoint/verbs'
+require 'roda/endpoints/endpoint/data'
+require 'roda/endpoints/endpoint/caching'
 require 'dry/monads'
 
 class Roda
@@ -40,13 +42,16 @@ class Roda
         end
       end
 
-      prepend Namespace
+      include Namespace
       prepend Verbs
-      prepend Validations
+      include Validations
       include Transactions
-      prepend Lookup
+      include Lookup
 
-      attr_accessor :captures
+      # @return [Array]
+      attr_reader :captures
+      # @return [String, Symbol]
+      attr_reader :on
 
       # @return [Symbol]
       def type
@@ -74,6 +79,7 @@ class Roda
       def route
         prepare_validations!
         prepare_verbs!
+        prepare_transactions!
         self.class.route
       end
 

data/lib/roda/endpoints/repository.rb

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

data/lib/roda/endpoints/version.rb

@@ -2,6 +2,6 @@
 
 class Roda
   module Endpoints
-    VERSION = '0.3.0'
+    VERSION = '0.3.1'
   end
 end

data/lib/roda/plugins/endpoints.rb

@@ -159,6 +159,7 @@ class Roda
             name: name,
             entity: entity,
             type: type,
+            on: name.to_s,
             **kwargs
           ) do |endpoint|
             yield endpoint if block_given?

metadata

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