class_dependencies 0.3.0 → 0.3.1

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/class_dependencies.rb

@@ -1,5 +1,6 @@
 require 'set'
-require 'inflector.rb'
+require 'tsort'
+require 'inflector'
 
 # include Sonar::ClassDependencies onto a Module or Class
 # then include that Module, or inherit from that Class,
@@ -34,6 +35,14 @@ require 'inflector.rb'
 
 module Sonar
   module ClassDependencies
+    class TSortHash < Hash
+      include TSort
+      alias tsort_each_node each_key
+      def tsort_each_child(node,&block)
+        fetch(node,[]).each(&block)
+      end
+    end
+
     module ClassName
       def class_to_sym(klass)
         klass.to_s.underscore.to_sym
@@ -79,7 +88,7 @@ module Sonar
         end
         # generate the dependency list value and the descendants value accessors
         # on first include : they return a closed over value
-        dependencies = {}
+        dependencies = TSortHash.new
         descendants = []
         mc.send(:define_method, :class_dependencies){dependencies}
         mc.send(:define_method, :descendants){descendants}
@@ -117,15 +126,7 @@ module Sonar
       end
 
       def ordered_dependencies
-        descendants.sort do |a,b| 
-          if all_dependencies_of(a).include?(b)
-            +1
-          elsif all_dependencies_of(b).include?(a)
-            -1
-          else
-            0
-          end
-        end
+        class_dependencies.tsort
       end
 
       def ordered_dependent_classes

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - mccraig mccraig of the clan mccraig
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-23 00:00:00 +00:00
+date: 2010-03-24 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency