dryer_routes 0.4.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6a00c3b22caa974de5bec04599dc6b40a32523eaaa484d6d571834d778646ca
-  data.tar.gz: 7cdb3a01b272969893c262d41766e1a5da1267f80862d21e0f96644811fe9a0d
+  metadata.gz: db3c5e4d0a5b6da6c17cd4c52744a5ef90382e6de723d17a3b8661408033c4df
+  data.tar.gz: 409d7ba0396eea7e623d719861cd030438fa7dde30fbe7b71c72536acb962d6b
 SHA512:
-  metadata.gz: 8665e3876446c5dc83971571917abfdc6aab99ebba6966d4a4a9e926121bdf30ce36118c653602250b1be30fe3dece2af7eb35219e6fea9e966e4284ee63211d
-  data.tar.gz: 28f31b3bbd90f85cef8d04e843607544bd234c512817d07a5ccfe2a501f23db66a9394aaa51be489d36de8c947348656d6462d95b812aa7c5252878b481bc0f4
+  metadata.gz: 062e66fb4a47a501e52bc88764c774ff8a2715b5fe0445bf33c3ca11436ada9846c79cc734f984f219b668845a41087b48614b04004d0fec82db8fc0b73e6861
+  data.tar.gz: cecbf962ae3c78329a2a0aa2bc8da858cc15942ca1f07b60d1178bb32c86226b2aa69a6ed15b13c4d90617b83f441a00b37287227e6ace70770227224d5c57af

data/dryer_routes.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name                  = 'dryer_routes'
-  spec.version               = "0.4.0"
+  spec.version               = "0.5.1"
   spec.authors               = ['John Bernier']
   spec.email                 = ['john.b.bernier@gmail.com']
   spec.summary               = 'Typed routing for rails leveraging dry-validation contracts'
@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "dry-validation", "~> 1.10"
   spec.add_dependency "dry-types", "~> 1.7"
   spec.add_dependency "dryer_services", "~> 2.0"
+  spec.add_dependency "zeitwerk", "~> 2.6"
   spec.add_development_dependency "rspec", "~> 3.10"
   spec.add_development_dependency "debug", "~> 1.8"
 end

data/lib/dryer/routes/build_from_resource.rb

@@ -1,4 +1,3 @@
-require_relative "./route"
 require "dryer_services"
 
 module Dryer
@@ -12,7 +11,9 @@ module Dryer
         resource[:actions].map do |action, config|
           Route.new(
             controller: resource[:controller],
-            url: config[:url] || resource[:url],
+            url: Dryer::Routes::UrlBuilder.call(
+              config[:url] || resource[:url]
+            ),
             method: config[:method],
             controller_action: action,
             request_contract: config[:request_contract],

data/lib/dryer/routes/registry.rb

@@ -1,8 +1,3 @@
-require_relative "./build_from_resource.rb"
-require_relative "./hash_object.rb"
-require_relative "./resource_schema.rb"
-require_relative "./extract_validated_keys.rb"
-
 module Dryer
   module Routes
     class Registry

data/lib/dryer/routes/route.rb

@@ -33,8 +33,12 @@ module Dryer
         route_config[:response_contracts][status]
       end
 
-      def url
-        route_config[:url]
+      def url(*args)
+        if route_config[:url].is_a?(Proc)
+          route_config[:url].call(*args)
+        else
+          route_config[:url]
+        end
       end
 
       private

data/lib/dryer/routes/url_builder.rb

@@ -0,0 +1,42 @@
+require "dryer_services"
+
+module Dryer
+  module Routes
+    class UrlBuilder < Dryer::Services::SimpleService
+      def initialize(url)
+        @url = url
+      end
+
+      def call
+        if contains_path_variables?
+          url_function
+        else
+          url
+        end
+      end
+
+      private
+      attr_reader :url
+      
+      def path_variables
+        @path_variables ||= url.match(/(:\w*)/)
+      end
+
+      def contains_path_variables?
+        path_variables ? path_variables.length > 0  : false
+      end
+
+      def url_function
+        -> (*args) do
+          path_variables.to_a.zip(args).inject(url) do |path, (key, value)|
+            if key && value
+              path.sub(key.to_s, value.to_s)
+            else
+              path
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dryer/routes.rb

@@ -0,0 +1,23 @@
+require "zeitwerk"
+require "rubygems"
+
+module Dryer
+  module Routes
+    VERSION = Gem::Specification::load(
+      "./dryer_routes.gemspec"
+    ).version
+
+    def self.loader
+      @loader ||= Zeitwerk::Loader.new.tap do |loader|
+        root = File.expand_path("..", __dir__)
+        loader.tag = "dryer_routes"
+        loader.inflector = Zeitwerk::GemInflector.new("#{root}/dry_routes.rb")
+        loader.push_dir(root)
+        loader.ignore(
+          "#{root}/dry_routes.rb",
+        )
+      end
+    end
+    loader.setup
+  end
+end

data/lib/dryer_routes.rb

@@ -1 +1 @@
-require_relative "./dryer/routes/registry.rb"
+require_relative "./dryer/routes.rb"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dryer_routes
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.1
 platform: ruby
 authors:
 - John Bernier
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +106,14 @@ files:
 - LICENSE
 - README.md
 - dryer_routes.gemspec
+- lib/dryer/routes.rb
 - lib/dryer/routes/build_from_resource.rb
 - lib/dryer/routes/extract_validated_keys.rb
 - lib/dryer/routes/hash_object.rb
-- lib/dryer/routes/registries/create.rb
 - lib/dryer/routes/registry.rb
 - lib/dryer/routes/resource_schema.rb
 - lib/dryer/routes/route.rb
-- lib/dryer/routes/version.rb
+- lib/dryer/routes/url_builder.rb
 - lib/dryer_routes.rb
 homepage: https://github.com/jbernie2/dryer-routes
 licenses:

data/lib/dryer/routes/registries/create.rb

@@ -1,11 +0,0 @@
-module Dryer
-  module Routes
-    module Registries
-      class Create < SimpleService
-        def call
-
-        end
-      end
-    end
-  end
-end

data/lib/dryer/routes/version.rb

@@ -1,9 +0,0 @@
-require "rubygems"
-
-module Dryer
-  module Routes
-    VERSION = Gem::Specification::load(
-      "./dryer_routes.gemspec"
-    ).version
-  end
-end