dryer_routes 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a8e8605f3d6633a41935ff3cc4c41bae7e52d88f64afa6ed95cf8b75e0a4182
-  data.tar.gz: 9c907db2f384c236a9227352697d4578c46f3fec6f5d64dbc17ccdf9aa9a1d5f
+  metadata.gz: 1e1bd1a21ffca48f41fc0006c91c7fb74d5ba63dccaa832243b974fdd83986fa
+  data.tar.gz: 92142801197d90929bdcfa7ac221512558f5a6a42dfbb98c1a422108def8c5b0
 SHA512:
-  metadata.gz: afaf9df048ec4dbafb3dce59b78b37853e345b99d94f9bce63123dae394c25a558d0311d54fd35417ae407d8c7edd3052ef18bda498e80cac0c4550f47f5d9d5
-  data.tar.gz: fe0122aaa65830092dae8a49e311608fab3cff6714722c8ff25c4437e495432a7784e41e41a740f44834493c7ae8ddb24923efa8065cc1505cdce5485d8e9177
+  metadata.gz: d91227c0ff46538dbbc76c25d3e266b1d35ba37aa8c6245d04df5d9be8ccf55dd56eafb5041e88dbc488121a9bb834b5bea25a954517eea82874546460ab9aa4
+  data.tar.gz: 8aa179a4780e0fb5ac9540b24cb2fad708456fb7fb0079b296434ccd51de4e258886bc19a314686378290f57025e671c4ac38f8a7339a266eaf4cbdcc0d2e7b7

data/dryer_routes.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name                  = 'dryer_routes'
-  spec.version               = "0.5.2"
+  spec.version               = "0.6.0"
   spec.authors               = ['John Bernier']
   spec.email                 = ['john.b.bernier@gmail.com']
   spec.summary               = 'Typed routing for rails leveraging dry-validation contracts'

data/lib/dryer/routes/build_from_resource.rb

@@ -11,12 +11,11 @@ module Dryer
         resource[:actions].map do |action, config|
           Route.new(
             controller: resource[:controller],
-            url: Dryer::Routes::UrlBuilder.call(
-              config[:url] || resource[:url]
-            ),
+            url: config[:url] || resource[:url],
             method: config[:method],
             controller_action: action,
             request_contract: config[:request_contract],
+            url_parameters_contract: config[:url_parameters_contract],
             response_contracts: config[:response_contracts]
           )
         end

data/lib/dryer/routes/hash_object.rb

@@ -1,16 +1,25 @@
+require 'dryer_services'
+
 module Dryer
   module Routes
-    class HashObject
-     def initialize(hash)
+    class HashObject < Dryer::Services::SimpleService
+      def initialize(hash)
         hash.each do |k,v|
           key = k.is_a?(Numeric) ? "_#{k}" : k
 
-          self.instance_variable_set(
-            "@#{key}", v.is_a?(Hash) ? HashObject.new(v) : v
-          )
-          self.class.send(
-            :define_method, key, proc{self.instance_variable_get("@#{key}")}
-          )
+          if v.is_a?(Proc)
+            self.send(:define_singleton_method, key, proc do |*args, **kwargs, &block|
+              v.arity != 0 ? v.call(*args, **kwargs, &block) : v.call
+            end)
+          else
+            self.instance_variable_set(
+              "@#{key}", v.is_a?(Hash) ? HashObject.new(v) : v
+            )
+
+            self.send(
+              :define_singleton_method, key, proc{self.instance_variable_get("@#{key}")}
+            )
+          end
         end
       end
     end

data/lib/dryer/routes/registry.rb

@@ -14,7 +14,7 @@ module Dryer
         @routes = resources.map do |r|
           BuildFromResource.call(r)
         end.flatten
-        add_accessors_for_resources(resources)
+        ResourceAccessors.call(object: self, resources: resources)
         @routes
       end
 
@@ -35,6 +35,19 @@ module Dryer
         end
       end
 
+      def validate_url_parameters(request)
+        route_for(
+          controller: request.controller_class,
+          method: request.request_method_symbol
+        ).then do |route|
+          if route && route.url_parameters_contract
+            route.url_parameters_contract.new.call(request.params).errors
+          else
+            []
+          end
+        end
+      end
+
       def validate_response(controller:, method:, status:, body:)
         route_for(
           controller: controller.class,
@@ -55,7 +68,7 @@ module Dryer
         end.first
       end
 
-      def get_validated_values(request)
+      def validated_request_body(request)
         route_for(
           controller: request.controller_class,
           method: request.request_method_symbol
@@ -67,34 +80,22 @@ module Dryer
         end
       end
 
-      attr_reader :routes, :resources
-
-      private
-      attr_writer :routes, :resources
-
-      def add_accessors_for_resources(resources)
-        denormalize_resources(resources).inject(self) do |obj, (key, value)|
-          obj.define_singleton_method(key) { HashObject.new(value) }
-          obj
+      def validated_url_parameters(request)
+        route_for(
+          controller: request.controller_class,
+          method: request.request_method_symbol
+        ).then do |route|
+          ExtractValidatedKeys.call(
+            payload: request.params,
+            contract: route.url_parameters_contract
+          )
         end
       end
 
-      def denormalize_resources(resources)
-        resources.inject({}) do | h, resource |
-          h[
-            resource[:controller].controller_name.to_sym
-          ] = denormalize_resource(resource)
-          h
-        end
-      end
+      attr_reader :routes, :resources
 
-      def denormalize_resource(resource)
-        resource[:actions].each do |key, value|
-          resource[:actions][key][:url] =
-            resource[:actions][key][:url] || resource[:url]
-        end
-        resource.merge(resource[:actions])
-      end
+      private
+      attr_writer :routes, :resources
 
       def validate_resources!(resources)
         errors = resources.map do |r|

data/lib/dryer/routes/resource_accessors.rb

@@ -0,0 +1,41 @@
+require 'dryer_services'
+
+module Dryer
+  module Routes
+    class ResourceAccessors < Dryer::Services::SimpleService
+      
+      def initialize(object:, resources:)
+        @object = object
+        @resources = resources
+      end
+
+      def call
+        denormalize_resources(resources).inject(object) do |obj, (key, value)|
+          obj.define_singleton_method(key) { HashObject.new(value) }
+          obj
+        end
+      end
+
+      private
+      attr_reader :object, :resources
+
+      def denormalize_resources(resources)
+        resources.inject({}) do | h, resource|
+          h[
+            resource[:controller].controller_name.to_sym
+          ] = denormalize_resource(resource)
+          h
+        end
+      end
+
+      def denormalize_resource(resource)
+        resource[:actions].each do |key, value|
+          resource[:actions][key][:url] = UrlBuilder.call(
+            resource[:actions][key][:url] || resource[:url]
+          )
+        end
+        resource.merge(resource[:actions])
+      end
+    end
+  end
+end

data/lib/dryer/routes/resource_schema.rb

@@ -13,18 +13,25 @@ module Dryer
         params do
           required(:method).filled(:symbol)
           optional(:request_contract)
+          optional(:url_parameters_contract)
           optional(:response_contracts).hash()
         end
 
         rule(:request_contract) do
-          if value && !value.ancestors.include?(Dry::Validation::Contract)
+          if value && !(value <= Dry::Validation::Contract)
+            key.failure('must be a dry-validation contract')
+          end
+        end
+
+        rule(:url_parameters_contract) do
+          if value && !(value <= Dry::Validation::Contract)
             key.failure('must be a dry-validation contract')
           end
         end
 
         rule(:response_contracts) do
           values[:response_contracts].each do |key, value|
-            if !value.ancestors.include?(Dry::Validation::Contract)
+            if !(value <= Dry::Validation::Contract)
               key(:response_contracts).failure(
                 'must be a dry-validation contract'
               )

data/lib/dryer/routes/route.rb

@@ -29,6 +29,10 @@ module Dryer
         route_config[:request_contract]
       end
 
+      def url_parameters_contract
+        route_config[:url_parameters_contract]
+      end
+
       def response_contract_for(status)
         route_config[:response_contracts][status]
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dryer_routes
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - John Bernier
@@ -111,6 +111,7 @@ files:
 - lib/dryer/routes/extract_validated_keys.rb
 - lib/dryer/routes/hash_object.rb
 - lib/dryer/routes/registry.rb
+- lib/dryer/routes/resource_accessors.rb
 - lib/dryer/routes/resource_schema.rb
 - lib/dryer/routes/route.rb
 - lib/dryer/routes/url_builder.rb