dryer_routes 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a8e8605f3d6633a41935ff3cc4c41bae7e52d88f64afa6ed95cf8b75e0a4182
-  data.tar.gz: 9c907db2f384c236a9227352697d4578c46f3fec6f5d64dbc17ccdf9aa9a1d5f
+  metadata.gz: 5c692380d53fff96240d6883e92c95894cd6eaf16ba0d18de34ae70eed293c0c
+  data.tar.gz: 3ce4ca0aa75e253a70f994c86efca79491257bd4562deff01f1621c3eff78d0c
 SHA512:
-  metadata.gz: afaf9df048ec4dbafb3dce59b78b37853e345b99d94f9bce63123dae394c25a558d0311d54fd35417ae407d8c7edd3052ef18bda498e80cac0c4550f47f5d9d5
-  data.tar.gz: fe0122aaa65830092dae8a49e311608fab3cff6714722c8ff25c4437e495432a7784e41e41a740f44834493c7ae8ddb24923efa8065cc1505cdce5485d8e9177
+  metadata.gz: 1fb38fc119af2c46a455ebe7e647060c02de3abff1604dd40ae2e63a324b44ee74180630d3d84f068866572db658b5cbfef4a30d6b28e7cd7648c63fb37523df
+  data.tar.gz: cc9083eb11bd03929b09e40be4cc1d6c33f824c0ba3fc91cee0f30f9b23d70287a13a2b590519aa9863775d29bfd6c9736c7b36a5028ec4812a2ef0981806d6e

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.5.3"
   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,9 +11,7 @@ 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],

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
 
@@ -72,30 +72,6 @@ module Dryer
       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
-        end
-      end
-
-      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] =
-            resource[:actions][key][:url] || resource[:url]
-        end
-        resource.merge(resource[:actions])
-      end
-
       def validate_resources!(resources)
         errors = resources.map do |r|
           ResourceSchema.new.call(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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dryer_routes
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 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