roda-flow 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ee7c883d4158905abdd4ca1aaffee0915628492
-  data.tar.gz: db5ec8f480bafebf5c2bdd1265b94209941bbec0
+  metadata.gz: b4d4b0303ce594d2a42f684180275547d9e11032
+  data.tar.gz: 510747bc0c24a158d2149db5575607721a92b862
 SHA512:
-  metadata.gz: 8f4f00f2bacad1c8469f8d4a05ee274ce702ca1108c83c3408a1fccc517e41d6b59337e165869e81191805fc5e21d898198512a66128560f488e19e2e80b5b8e
-  data.tar.gz: bd5c579521e4d4140b10f0d8fec3edf2e03a6d4fd904fd47e04669f31153a11f3484f0372217c3dd0d65ddfc3cd24161e57e393db178ed9e4653f86a1a35a501
+  metadata.gz: 9b3b29ef6f199663fed4ef668a3cac41204320bc975d6262e9dc2664bf4d28b0d379b902543e3776e02ad3beff391d2010660a97a3c9be3c6a3e748d5cd1c7f7
+  data.tar.gz: 8f92a3583f9c52bd3de118e0f3fb7548b9f6e417c12140320b518e1ac6d753add978328ff146f783bbb1a709748076d72fc2f4836dfb51cbfa31d19a124decc4

data/README.md

@@ -103,33 +103,35 @@ class App < Roda
   plugin :flow
 
   route do |r|
-    r.on 'users', resolve: 'repositories.user' do |user_repository|
-      r.is do
-        r.get to: 'controllers.users#index', inject: [response, user_repository]
-        r.post(
-          to: 'controllers.users#create',
-          inject: [response, user_repository],
-          call_with: [r.params]
-        )
-      end
-
-      r.on :user_id do |user_id|
-        r.get(
-          to: 'controllers.users#show',
-          inject: [response, user_repository],
-          call_with: [user_id]
-        )
-        r.put(
-          to: 'controllers.users#update',
-          inject: [response, user_repository],
-          call_with: [user_id, r.params]
-        )
-        r.delete(
-          # to: can also be a registered proc, just omit the "#" and method name
-          to: 'controllers.users#destroy',
-          inject: [response, user_repository],
-          call_with: [user_id]
-        )
+    r.on 'users' do
+      r.resolve 'repositories.user' do |user_repository| do
+        r.is do
+          r.get to: 'controllers.users#index', inject: [response, user_repository]
+          r.post(
+            to: 'controllers.users#create',
+            inject: [response, user_repository],
+            call_with: [r.params]
+          )
+        end
+
+        r.on :user_id do |user_id|
+          r.get(
+            to: 'controllers.users#show',
+            inject: [response, user_repository],
+            call_with: [user_id]
+          )
+          r.put(
+            to: 'controllers.users#update',
+            inject: [response, user_repository],
+            call_with: [user_id, r.params]
+          )
+          r.delete(
+            # to: can also be a registered proc, just omit the "#" and method name
+            to: 'controllers.users#destroy',
+            inject: [response, user_repository],
+            call_with: [user_id]
+          )
+        end
       end
     end
   end

data/lib/roda/plugins/flow.rb

@@ -6,49 +6,65 @@ class Roda
       end
 
       module RequestMethods
-        def if_match(args, &block)
-          path = @remaining_path
-          # For every block, we make sure to reset captures so that
-          # nesting matchers won't mess with each other's captures.
-          @captures.clear
+        def resolve(*args, &block)
+          on(resolve: args, &block)
+        end
 
-          kwargs = {}
+        private
 
-          if args.last === Base::RequestMethods::TERM && args.first.is_a?(::Hash)
-            kwargs = args.shift
+        def match_resolve(resolve)
+          Array(resolve).flatten.each do |key|
+            @captures << roda_class.resolve(key)
           end
+        end
 
-          kwargs = args.pop if args.last.is_a?(::Hash)
+        def match_to(to)
+          container_key, @block_method = to.to_s.split('#')
+          @block_arg = roda_class.resolve(container_key)
+        end
 
-          return unless match_all(args)
+        def match_inject(inject)
+          @block_arg = @block_arg.call(*inject) if @block_arg
+        end
 
-          container_keys = Array(kwargs.fetch(:resolve, []))
+        def match_call_with(call_with)
+          @captures.concat(call_with)
+        end
 
-          resolutions = container_keys.map do |resolution|
-            if resolution.respond_to?(:call)
-              resoltion.call(captures)
-            else
-              roda_class.resolve(resolution)
-            end
-          end
+        def if_match(*args, &block)
+          path = @remaining_path
+          # For every block, we make sure to reset captures so that
+          # nesting matchers won't mess with each other's captures.
+          @captures.clear
+
+          return unless match_all(args)
+          block_result(get_block(&block).call(*captures))
+          throw :halt, response.finish
+        ensure
+          @remaining_path = path
+        end
 
-          block = kwargs.fetch(:to, block)
-          injections = kwargs.fetch(:inject, [])
-          method_injections = kwargs.fetch(:call_with, [])
+        def always(&block)
+          super(&get_block(&block))
+        end
 
-          unless block.nil? || block.respond_to?(:call)
-            block, method = block.to_s.split('#')
-            if method
-              block = roda_class.resolve(block).call(*injections).method(method)
+        def get_block(&block)
+          if block_given?
+            block
+          elsif @block_arg
+            if @block_method
+              block_arg = @block_arg.method(@block_method)
             else
-              block = roda_class.resolve(block).call(*injections)
+              block_arg = @block_arg
             end
+            clear_block_args
+            block_arg
           end
+        end
 
-          block_result(block.call(*(captures + resolutions + method_injections)))
-          throw :halt, response.finish
-        ensure
-          @remaining_path = path
+        def clear_block_args
+          @block_arg = nil
+          @block_method = nil
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roda-flow
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Andy Holland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-28 00:00:00.000000000 Z
+date: 2015-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-container