dsort 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e29b9d36c3e4bb2c6122b967ffdfa3e3609a01fe5dfe37cf6c1d4d319a8495b3
-  data.tar.gz: 81fffd543f6dd5518583cca18dd1ba73d69ab164fa88895943bb80e1553eee32
+  metadata.gz: c9ed6fb53266348e036bed7d5f6ca9c31763d9db4f41803eebe86c9b0ad0811f
+  data.tar.gz: 517b02275b892c789cb9aa217d15d1ed5c0a7ec5d9f0d4310e0dbfd4a732d734
 SHA512:
-  metadata.gz: 9a74383d8fc09440f1a53ecf03dccc6900c16a0db9633292d80ab06a8751452accbb4f4ad91ce4b41474d58e52a5f77b79acf555c7c354dfb984664da182610a
-  data.tar.gz: af569f855ea9d98b72909e6b4b9d607d8072bcd33b040e8a5eb434e26c4d3be75c9470d41fc6f1ac7d60e4ea4470ef8080358b5a95b2bb11518966abfb50ece5
+  metadata.gz: 85946f69bb5bd4d9166e3a2dbb1e785ddedf70189d4b7aa3a1ce80a84d697dd4c28f4af70559b855ccbdc7003a474481a4800dfc6f19e854fa026b60dbb2fc64
+  data.tar.gz: f477f1eafdd649013677a672d9f13db5aa1bbdf558135caff60edd6b39c2c5bcf877ddb3b613fc0a941a39778f27cd9d408e570b50034f480d66f14dd1e04029

data/lib/dsort/version.rb

@@ -1,3 +1,3 @@
 module Dsort
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/dsort.rb

@@ -110,6 +110,7 @@ module DSort
         @deps = {}
         if block_given?
           a = [a] if !a.is_a?(Array)
+          @pool = {}
           a.each { |elem| find_dependencies(elem, &block) }
         else
           a.each { |obj, deps| 
@@ -134,20 +135,13 @@ module DSort
     private
       def find_dependencies(a, &block)
         block.call(a).each { |d|
-          (@deps[a] ||= []) << d
-          find_dependencies(d, &block)
+          if !(@deps[a] ||= []).include? d # Cyclic dependency
+            @deps[a] << d
+            find_dependencies(d, &block)
+          end
         }
       end
     end
   end
 end
 
-
-
-
-
-
-
-
-
-

data/spec/dsort_spec.rb

@@ -89,11 +89,20 @@ describe DSort do
       end
     end
     context "with circular dependencies" do
-      it "should raise DSort::Cyclic" do
-       lambda {
-          pairs = [[:a, :b], [:b, :a]]
-          DSort.dsort(pairs).should == 1
-       }.should raise_error(DSort::Cyclic)
+      context "should raise DSort::Cyclic" do
+        it "when given an array argument" do
+          lambda {
+            pairs = [[:a, :b], [:b, :a]]
+            DSort.dsort(pairs).should == 1
+          }.should raise_error(DSort::Cyclic)
+        end
+      
+        it "when given a block argument" do
+          l = lambda { |node| [node == :a ? :b : :a] }
+          expect {
+            DSort.dsort(:a, &l)
+          }.to raise_error(DSort::Cyclic)
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dsort
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Claus Rasmussen