0
@@ -15,37 +15,26 @@ class Dependencies
0
     @dependencies = dependencies.to_hash
0
   end
0
   
0
-  attr_reader :dependencies
0
-  
0
   def resolve(objects = nil)
0
-    @stack, @build = [ ], [ ]
0
-    concat_dependencies(objects || dependencies.keys)
0
-    @build
0
+    @stack, @list = [], []
0
+    concat_dependencies(objects || @dependencies.keys)
0
+    @list
0
   end
0
-  
0
+
0
 private
0
 
0
   def concat_dependencies(objects)
0
     objects.uniq.each do |object|
0
-      next if @build.include?(object)
0
-      ensure_no_circular_dependency!(object)
0
-      object_dependencies = Array(dependencies[object])
0
-      stacking(object) do
0
-        concat_dependencies(object_dependencies)
0
-      end
0
+      next if @list.include?(object)
0
+      raise_circular_dependency_error(object) if @stack.include?(object)
0
+      @stack << object
0
+      concat_dependencies(Array(@dependencies[object]))
0
+      @list << @stack.pop
0
     end
0
   end
0
-  
0
-  def stacking(object)
0
-    @stack << object
0
-    yield
0
-    @build << @stack.pop
0
-  end
0
-  
0
-  def ensure_no_circular_dependency!(object)
0
-    if @stack.member?(object)
0
-      raise CircularDependencyError,
0
-        "Circular dependency on #{object.inspect}, dependencies stack : #{@stack.inspect}"
0
-    end
0
+
0
+  def raise_circular_dependency_error(object)
0
+    raise CircularDependencyError,
0
+      "Circular dependency on #{object.inspect}, dependencies stack : #{@stack.inspect}"
0
   end
0
 end