zimbatm-monkeypatch 0.1.1 → 0.1.2

data/README.rdoc

@@ -39,6 +39,6 @@ Once you have a patch object, look at the MonkeyPatch::Patch definition to know
 
 ==== TODO
 
-* Add programmable patching conditions
+* Rework the documentation
 * Add reason string
 * Add 'monkeywarn' that warns when a monkeypatch is applied

data/lib/monkeypatch.rb

@@ -7,7 +7,7 @@ Once you have a patch, look at Patch and it's children to see how to use it.
 =end
 module MonkeyPatch
   # MonkeyPatch's version as a string
-  VERSION = '0.1.1'
+  VERSION = '0.1.2'
   # May be raised on check_conflicts
   class ConflictError < StandardError; end
   
@@ -56,6 +56,10 @@ module MonkeyPatch
     def initialize(&patch_def) #:nodoc:
       raise ArgumentError, "patch_def not given" unless block_given?
       @patch_def = patch_def
+      @conditions = []
+      add_condition("Patch already applied") do |klass|
+        !(klass.respond_to?(:applied_patches) && klass.applied_patches.include?(self))
+      end
     end
     
     # Combine patches together. Produces a PatchSet instance.
@@ -86,6 +90,14 @@ module MonkeyPatch
       patch_class(meta)
     end
     
+    # Add a condition for patch application, like library version
+    # 
+    # If condition is not matched, +msg+ is 
+    def add_condition(msg, &block)
+      raise ArgumentError, "block is missing" unless block_given?
+      @conditions.push [block, msg]
+    end
+    
   protected
   
     # Condition are checks that raise nothing
@@ -94,11 +106,13 @@ module MonkeyPatch
     #
     # Returns true if all conditions are matched
     def check_conditions(klass) #:nodoc:
-      if klass.respond_to?(:applied_patches) && klass.applied_patches.include?(self)
-        log "WARN: Patch already applied"
-        return false
+      !@conditions.find do |tuple|
+        if tuple[0].call(klass); false
+        else
+          log tuple[1]
+          true
+        end
       end
-      true
     end
   
     # Re-implement in childs. Make sure super is called

data/task/gem.rake

@@ -23,7 +23,7 @@ task :gem => "gem:spec"
 
 namespace :gem do
 
-  spec_name = "ruby-monkeypatch.gemspec"
+  spec_name = "monkeypatch.gemspec"
   desc "Updates the #{spec_name} file if VERSION has changed"
   task :spec do
     if !File.exist?(spec_name) ||

data/test/test_monkeypatch.rb

@@ -135,5 +135,21 @@ class TestMonkeypatch < Test::Unit::TestCase
     assert_equal("exists", @c.new.new_method )
     assert_equal("replaced", @c.new.existing_method )
   end
+
+  def test_add_failing_condition
+    @p_add.add_condition("Failing condition") do |klass|
+      false
+    end
+    assert !@p_add.patch_class(@c)
+    assert !@c.respond_to?(:applied_patches)
+    assert_equal(["Failing condition"], @logs)
+  end
+
+  def test_working_condition
+    @p_add.add_condition("Working condition") do true end
+    assert @p_add.patch_class(@c)
+    assert @c.respond_to?(:applied_patches)
+    assert @logs.empty?
+  end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: zimbatm-monkeypatch
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - zimbatm