lib/dagger/default.rb in ruby-dagger-0.1.0 vs lib/dagger/default.rb in ruby-dagger-0.1.1

@@ -55,15 +55,13 @@
     # :call-seq:
     #   yield => value || KeyError
     def process(key)
       catch do |ball|
         default_rules(key).each do |rule|
-          context = Context.new(result: ball,
-                                dictionary: @dictionary,
-                                rule_chain: rule.clone)
+          context = Context.new(result: ball, dictionary: @dictionary)
 
-          process_rule(context) until context.rule_chain.empty?
+          process_rule_chain(rule, context)
         end
         raise KeyError, %(no rule succeeded for "#{key}")
       end
     end
 
@@ -73,18 +71,20 @@
     #   default_rules(key) => Array of Hash || KeyError
     def default_rules(key)
       @dictionary.fetch(@rule_prefix + key)
     end
 
-    # Call the processing method for the first clause of a rule
+    # Process the methods in a rule chain
     #
     # :call-seq:
-    #   call_rule
-    def process_rule(context)
-      key, arg = *context.rule_chain.first
-      context.rule_chain.delete(key)
-      klass = Dagger::Generate.const_get(camelize(key))
-      klass[context, arg, &->(value) { throw context.result, value }]
+    #   process_rule_chain(rule_chain, context)
+    def process_rule_chain(rule_chain, context)
+      rule_chain.each do |key, arg|
+        klass = Dagger::Generate.const_get(camelize(key))
+        klass[context, arg, &->(value) { throw context.result, value }]
+      end
+    rescue StopIteration
+      nil
     end
 
     # Convert snake_case to CamelCase
     #
     # :call-seq: