roda-flow 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2621240ad009f4a0b9e43cbd8daecc84fdb66d46
-  data.tar.gz: b9217d5f49b36c73f138b34255ae2c7d20e044a9
+  metadata.gz: 480bc546b4bf68f5b31d38fb3c948b9f051e796c
+  data.tar.gz: c6e8b194c79d7e85a823ec5dcb94f35d67104cac
 SHA512:
-  metadata.gz: ca370e3372f1184da2f49519275575e338ee641137bd07498958445febc0bad3d63d024bb98e3dd3cdecbf5ea3094d283df08fedbb9192da93c26d6d06a589e5
-  data.tar.gz: d081fc002739af9fc377056da30d49bd68b52284f8cd4e524ad0c37ac08f4ba864a3c0d1d120aa16d401cb8d3a913fa9999aa145fd150eddac183d26e4814944
+  metadata.gz: bc02a87ab0d85340acde77d09e273dabf7a6764ae76ad0c5adb9c5d4e2c1fd955ebdb39b2528a9e3ab33f6db492b1df798e6428418129abd1a6a39aa85fa7cd9
+  data.tar.gz: a89efaef010bdb5ef4e481d695ea4302952ee290c2329acf7e9108237cdfd68c49f490f0880f221368f6cbdf73ef921ec4fd76f0adfe6136ed5ba02d72637fc4

data/README.md

@@ -120,32 +120,36 @@ class App < Roda
   route do |r|
     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]
-          )
+        # You can set the default options passed when
+        # mapping a route to a container item with
+        # flow_defaults, i.e.
+        flow_defaults inject: [response, user_repository] do
+          r.is do
+            r.get to: 'controllers.users#index'
+            r.post(
+              to: 'controllers.users#create',
+              # The following line is implied because of
+              # the call to flow_defaults above
+              # inject: [response, user_repository],
+              call_with: [r.params]
+            )
+          end
+
+          r.on :user_id do |user_id|
+            r.get(
+              to: 'controllers.users#show',
+              call_with: [user_id]
+            )
+            r.put(
+              to: 'controllers.users#update',
+              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',
+              call_with: [user_id]
+            )
+          end
         end
       end
     end

data/lib/roda/plugins/flow.rb

@@ -1,6 +1,26 @@
 class Roda
   module RodaPlugins
     module Flow
+
+      KEY = 'flow.defaults'.freeze
+
+      module InstanceMethods
+        def flow_defaults(args = {}, &block)
+          if block_given?
+            defaults.merge!(args)
+            yield
+          else
+            raise RodaError 'must pass a block when using flow defaults'
+          end
+        end
+
+        private
+
+        def defaults
+          env[KEY] ||= {}
+        end
+      end
+
       module RequestMethods
         def resolve(*keys)
           yield *keys.map { |key| roda_class.resolve(key) }
@@ -14,24 +34,27 @@ class Roda
         end
 
         def match_inject(inject)
-          @block_arg = @block_arg.call(*inject) if @block_arg
+          @block_arg = @block_arg.call(*inject)
         end
 
         def match_call_with(call_with)
           @captures.concat(call_with)
         end
 
-        def if_match(*args, &block)
+
+        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
+          if match_all(args)
+            block_result(get_block(&block).call(*captures))
+            throw :halt, response.finish
+          else
+            @remaining_path = path
+            false
+          end
         end
 
         def always(&block)
@@ -56,7 +79,34 @@ class Roda
           @block_arg = nil
           @block_method = nil
         end
+
+        def _match_hash(hash)
+          if hash.keys.include?(:to)
+            hash = merge_defaults(hash)
+          end
+
+          super(hash)
+        end
+
+        def merge_defaults(hash)
+          hash = defaults.merge(hash)
+          hash = hash.delete_if { |k,v| v == false }
+
+          # Order matters...
+          sorted = %i[to inject call_with].inject({}) do |retval, key|
+            retval[key] = hash[key] if hash[key]
+            retval
+          end
+
+          sorted
+        end
+
+        def defaults
+          env[KEY] || {}
+        end
+
       end
+
     end
 
     register_plugin(:flow, Flow)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: roda-flow
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Andy Holland
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-20 00:00:00.000000000 Z
+date: 2018-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: ''