watchdog 0.1.0 → 0.2.0

data/CHANGELOG.txt

@@ -0,0 +1,6 @@
+== 0.2.0
+* Fix multiple guards per extended class
+* Fix guarding for subclasses of extended classes
+
+== 0.1.0
+* Initial release

data/README.md

@@ -68,4 +68,4 @@ Thanks to Wegowise for open-source time to make this possible!
 License
 =======
 
-See LICENSE file
+See LICENSE.txt

data/lib/watchdog.rb

@@ -3,12 +3,14 @@ require 'watchdog/german_shepard'
 require 'watchdog/version'
 
 module Watchdog
-  # Maps objects or modules to their extension modules
-  class <<self; attr_accessor :extensions; end
-  self.extensions = {}
+  class <<self; attr_accessor :extensions, :subclasses; end
+  self.extensions, self.subclasses = {}, []
 
   # Guards extension methods from being overwritten
   def self.guard(obj, meth)
+    return if subclasses.include?(obj)
+    return subclasses << obj if !extensions.key?(obj) && extensions.keys.
+      any? {|e| e.is_a?(Module) && e > obj }
     if extensions[obj].instance_methods.map(&:to_sym).include?(meth)
       raise ExtensionMethodExistsError.new(meth, obj, extensions[obj])
     end

data/lib/watchdog/german_shepard.rb

@@ -1,6 +1,11 @@
 module Watchdog
   module GermanShepard
+    class << self; attr_accessor :created; end
+    self.created = []
+
     def self.create_guard(meth, obj)
+      return if created.include?([meth, obj])
+      created << [meth, obj]
       meta = class <<obj; self end
       original = meta.instance_method(meth)
       meta.send(:define_method, meth) do |m|
@@ -14,8 +19,9 @@ module Watchdog
         create_guard :method_added, obj
       elsif obj.respond_to? :singleton_method_added
         create_guard :singleton_method_added, obj
+      else
+        super
       end
-      super
     end
 
     [:singleton_method_added, :method_added].each do |m|

data/lib/watchdog/version.rb

@@ -1,3 +1,3 @@
 module Watchdog
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/spec/watchdog_spec.rb

@@ -53,17 +53,17 @@ describe Watchdog do
 
     context "new extension method" do
       it "doesn't raise error if no existing methods conflict" do
-        existing = Module.new
+        existing = Class.new
         lambda { existing.send :include, extensions }.should_not raise_error
       end
 
       it "raises error if existing public methods conflict" do
-        existing = create_methods Module.new, :blah
+        existing = create_methods Class.new, :blah
         lambda { existing.send :include, extensions }.should raise_error(Watchdog::MethodExistsError, /#blah/)
       end
 
       it "raises error if existing private methods conflict" do
-        existing = create_methods Module.new, :blah
+        existing = create_methods Class.new, :blah
         existing.send :private, :blah
         lambda { existing.send :include, extensions }.should raise_error(Watchdog::MethodExistsError)
       end
@@ -71,24 +71,37 @@ describe Watchdog do
 
     context "new method" do
       it "doesn't raise error if it doesn't redefine extension methods" do
-        existing = Module.new.send :include, extensions
+        existing = Class.new.send :include, extensions
         lambda { existing.send(:define_method, :bling) { } }.should_not raise_error
       end
 
       it "raises error if it redefines extension methods" do
-        existing = Module.new.send :include, extensions
+        existing = Class.new.send :include, extensions
         lambda {
           existing.send(:define_method, :blah) { }
         }.should raise_error(Watchdog::ExtensionMethodExistsError)
       end
 
       it "raises error if it redefines extension methods for module with method_added" do
-        existing = Module.new { def self.method_added(meth); end }
-        existing.send :include, extensions
+        existing = Class.new { def self.method_added(meth); end }.send :include, extensions
         lambda {
           existing.send(:define_method, :blah) { }
         }.should raise_error(Watchdog::ExtensionMethodExistsError)
       end
     end
+
+    it "doesn't guard if subclass of extended class" do
+      existing = Class.new.send :include, extensions
+      subclass = Class.new(existing)
+      lambda { subclass.send(:define_method, :blah) { } }.should_not raise_error
+    end
+
+    it "creates one method_added guard per extended class" do
+      Watchdog::GermanShepard.created = []
+      existing = Class.new { def self.method_added(meth); end }.send :include, extensions
+      another_extensions = Module.new.extend(Watchdog)
+      existing.send :include, another_extensions
+      Watchdog::GermanShepard.created.size.should == 1
+    end
   end
 end

data/watchdog.gemspec

@@ -11,6 +11,7 @@ Gem::Specification.new do |s|
   s.summary = "Watches over your extensions and monkey patches"
   s.description =  "Watchdog ensures your extensions and monkey patches don't redefine existing methods as well as get redefined by others."
   s.required_rubygems_version = ">= 1.3.6"
+  s.add_development_dependency 'rspec', '~> 2.5'
   s.files = Dir.glob(%w[{lib,spec}/**/*.rb [A-Z]*.{txt,rdoc,md} *.gemspec]) + %w{Rakefile}
   s.extra_rdoc_files = ["README.md", "LICENSE.txt"]
   s.license = 'MIT'

metadata

@@ -2,7 +2,7 @@
 name: watchdog
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Gabriel Horner
@@ -10,10 +10,20 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-16 00:00:00 -04:00
+date: 2011-04-17 00:00:00 -04:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: "2.5"
+  type: :development
+  version_requirements: *id001
 description: Watchdog ensures your extensions and monkey patches don't redefine existing methods as well as get redefined by others.
 email: ghorner@wegowise.com
 executables: []
@@ -29,6 +39,7 @@ files:
 - lib/watchdog/version.rb
 - lib/watchdog.rb
 - spec/watchdog_spec.rb
+- CHANGELOG.txt
 - LICENSE.txt
 - README.md
 - watchdog.gemspec