class_dependencies 0.2.1 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/lib/class_dependencies.rb

@@ -25,6 +25,12 @@ require 'inflector.rb'
 # => [:f, :e, :d]
 # AnotherDep.ordered_dependent_classes
 # => [F, E, D]
+#
+# *NOTE* if your class already has an inherited() or included() method
+# make sure to include Sonar::ClassDependencies after that method is
+# defined : Ruby has no after/before methods, so your method will
+# overwrite the ClassDependencies versions, and dependency tracking
+# will not work
 
 module Sonar
   module ClassDependencies
@@ -47,6 +53,12 @@ module Sonar
       def generate_inclusion_method(mod, method_name)
         mc = mod.instance_eval{class << self ; self ; end}
         
+        # if there is already such a method, alias it
+        if mod.respond_to?(method_name)
+          aliased_method_name = "class_dependencies_#{method_name}"
+          mc.send(:alias_method, aliased_method_name, method_name) 
+        end
+
         mc.send(:define_method, method_name) do |mod2|
           raise "include #{mod.to_s} on a Class... doesn't work with intermediate modules" if ! mod2.is_a? Class
           mod.descendants << class_to_sym(mod2)
@@ -55,6 +67,9 @@ module Sonar
             dep_method_name = mod.relationship_name || class_to_sym(mod)
             mc2.send(:define_method, dep_method_name){|*params| mod.add_dependency(mod2, *params)}
           end
+
+          # call any aliased method. if only Ruby had :after advice etc
+          mod.send(aliased_method_name, mod2) if aliased_method_name
         end
       end
       

data/spec/class_dependencies_spec.rb

@@ -17,7 +17,6 @@ describe "ClassDependencies" do
   class C < BaseDep
   end
   
-
   it "should correctly order class dependences" do
     BaseDep.ordered_dependencies.should == [:c, :b, :a]
   end
@@ -58,4 +57,57 @@ describe "ClassDependencies" do
     AnotherDep.class_dependencies.should == {:d=>[:e], :e=>[:f]}
   end
 
+  module WithIncludedMethod
+    class << self
+      attr_accessor :count
+      def included(mod)
+        self.count ||= 0
+        self.count += 1
+      end 
+    end
+
+    include Sonar::ClassDependencies
+    set_relationship_name :depends_on
+  end
+
+  class G
+    include WithIncludedMethod
+    depends_on :h
+  end
+
+  class H
+    include WithIncludedMethod
+  end
+    
+
+  it "should call any existing included method" do
+    WithIncludedMethod.ordered_dependencies.should == [:h, :g]
+    WithIncludedMethod.count.should == 2
+  end
+
+  class WithInheritedMethod
+    class << self
+      attr_accessor :count
+      def inherited(mod)
+        self.count ||= 0
+        self.count += 1
+      end 
+    end
+
+    include Sonar::ClassDependencies
+    set_relationship_name :depends_on
+  end
+
+  class I < WithInheritedMethod
+    depends_on :j
+  end
+
+  class J < WithInheritedMethod
+  end
+
+  it "should call any existing inherited method" do
+    WithInheritedMethod.ordered_dependencies.should == [:j, :i]
+    WithInheritedMethod.count.should == 2
+  end
+
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - mccraig mccraig of the clan mccraig