rconditions 0.2.0 → 0.3.0

data/README

@@ -96,6 +96,7 @@ the require call. Our test setup had no measurable slowdown afterwards.
 The test suite of RConditions passes for
 * ruby 1.8.6
 * ruby 1.9.0 (tested with revision 13680)
+* jruby 1.1 (tested with revision 4574)
 
 If you use another ruby version, please check whether the tests pass.
 

data/lib/rconditions.rb

@@ -31,7 +31,7 @@ module RConditions
     def extend_predicate_methods_and_define_bang_methods
       ObjectSpace.each_object(Module) do |mod|
         (mod.instance_methods(false) + mod.private_instance_methods(false)).each do |id|
-          RConditions.extend_predicate_method_and_define_bang_method(mod, id) 
+          ::RConditions.extend_predicate_method_and_define_bang_method(mod, id) 
         end
       end
     end  
@@ -61,7 +61,7 @@ module RConditions
         mod.const_set(positive_module, Module.new) unless mod.const_defined?(positive_module)
         negative_module = camelize("not_#{predicate_method_without_questionmark}_error")
         mod.const_set(negative_module, Module.new) unless mod.const_defined?(negative_module)
-        
+
         time = Time.now
         predicate_method_without_rconditions = "#{predicate_method_without_questionmark}_rconditions_#{mod.object_id}_#{time.to_i}_#{time.usec}"
 
@@ -73,6 +73,10 @@ module RConditions
             result = #{predicate_method_without_rconditions}(*args, &block)
             ::RConditions.add_exception_module(result ? #{positive_module} : #{negative_module})
             result
+          rescue NoMethodError => e
+            raise unless self.is_a?(Module) && e.message =~ /#{Regexp.escape(predicate_method_without_rconditions)}/
+            module_function :#{predicate_method_without_rconditions}
+            #{predicate_method_without_rconditions}(*args, &block)
           end
           #{visibility(mod, predicate_method)} :#{predicate_method}
         EOS
@@ -111,16 +115,16 @@ module RConditions
   end
 end
 
-unless defined? RCONDITIONS_ONLY_FOR_NEW_METHODS
+unless defined? ::RCONDITIONS_ONLY_FOR_NEW_METHODS
   # To apply RConditions to new methods only, set this constant to <tt>true</tt>
   # before <tt>require "rconditions"</tt>.
-  RCONDITIONS_ONLY_FOR_NEW_METHODS = false 
+  ::RCONDITIONS_ONLY_FOR_NEW_METHODS = false 
 end  
-  
-unless RCONDITIONS_ONLY_FOR_NEW_METHODS
-  RConditions.extend_predicate_methods_and_define_bang_methods
+
+unless ::RCONDITIONS_ONLY_FOR_NEW_METHODS
+  ::RConditions.extend_predicate_methods_and_define_bang_methods
 end
- 
+
 class Module #:nodoc:
   alias_method :method_added_without_rconditions, :method_added
   private :method_added_without_rconditions

data/test/rconditions_test.rb

@@ -239,7 +239,7 @@ class RConditionsTest < Test::Unit::TestCase
     assert e.kind_of?(NowANamedModule::NotActivatedError)
   end
   
-  def test_does_not_work_for_virtual_classes
+  def test_does_not_work_for_singleton_methods
     f = Foo.new
     class << f
       def x?; b?; end
@@ -247,6 +247,42 @@ class RConditionsTest < Test::Unit::TestCase
     assert !f.respond_to?(:x!)
   end
   
+  def test_does_not_break_module_functions
+    eval <<-EOS
+      module WithModuleFunctions
+        def module_function_1?
+          'module_function_1?'
+        end
+        module_function :module_function_1?
+        
+        module_function
+        def module_function_2?
+          'module_function_2?'
+        end 
+      end
+    EOS
+    assert !WithModuleFunctions.respond_to?(:module_function_1!)
+    assert !WithModuleFunctions.respond_to?(:module_function_2!)
+    assert_equal 'module_function_1?', WithModuleFunctions.module_function_1?
+    assert_equal 'module_function_2?', WithModuleFunctions.module_function_2?
+  end
+
+  def test_module_functions_fix_ignores_no_method_error_from_non_module_function
+    eval <<-EOS
+      module ModuleWithNoMethodError
+        def error?
+          foo()
+        end
+        module_function :error?
+      end  
+    EOS
+    o = Object.new
+    class<<o;include ModuleWithNoMethodError;end
+    e = exception_raised_by { o.instance_eval { error? } }
+    assert_equal NoMethodError, e.class
+    assert e.message =~ /foo/
+  end
+  
   def test_exception_in_a_predicate_method_does_not_screw_up_the_next_result
     eval <<-EOS
       class Foo

metadata

@@ -1,41 +1,17 @@
---- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
-specification_version: 1
-name: rconditions
-version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2007-10-14 00:00:00 +02:00
-summary: RConditions generates a bang method (for example, Array#empty!) for each predicate method (for example, Array#empty?). The bang method will return true if the predicate method returns true, otherwise it will throw an exception. The exception will include auto-generated modules that give information on predicate methods passed or failed in the bang method's execution.
-require_paths: 
-- lib
-email: tammo@tammofreese.de
+--- !ruby/object:Gem::Specification
 homepage: http://rconditions.rubyforge.org
-rubyforge_project: 
-description: 
-autorequire: rconditions
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
-platform: ruby
-signing_key: 
-cert_chain: 
+extensions: []
+executables: []
+version: !ruby/object:Gem::Version
+  version: 0.3.0
 post_install_message: 
-authors: 
-- Norman Timmler
-- Tammo Freese
+date: 2007-11-28 23:00:00 +00:00
 files: 
 - test/rconditions_test.rb
 - lib/rconditions.rb
 - README
 - MIT-LICENSE
-test_files: 
-- test/rconditions_test.rb
+rubygems_version: 0.9.4
 rdoc_options: 
 - --title
 - RConditions RDoc Documentation
@@ -43,14 +19,38 @@ rdoc_options:
 - README
 - --charset
 - utf-8
+signing_key: 
+cert_chain: 
+name: rconditions
+has_rdoc: true
+platform: ruby
+summary: RConditions generates a bang method (for example, Array#empty!) for each
+  predicate method (for example, Array#empty?). The bang method will return true if
+  the predicate method returns true, otherwise it will throw an exception. The exception
+  will include auto-generated modules that give information on predicate methods passed
+  or failed in the bang method's execution.
+default_executable: 
+bindir: bin
+required_ruby_version: !ruby/object:Gem::Version::Requirement
+  version: 
+  requirements: 
+  - - '>'
+    - !ruby/object:Gem::Version
+      version: 0.0.0
+require_paths: 
+- lib
+specification_version: 1
+test_files: 
+- test/rconditions_test.rb
+dependencies: []
+description: 
+authors: 
+- Norman Timmler
+- Tammo Freese
+email: tammo@tammofreese.de
 extra_rdoc_files: 
 - README
 - MIT-LICENSE
-executables: []
-
-extensions: []
-
 requirements: []
-
-dependencies: []
-
+rubyforge_project: 
+autorequire: rconditions