methodfinalizer 0.6.0 → 0.7.0

data/History.txt

@@ -8,4 +8,9 @@
 
 * added 2 methods
 
-  * added 'final_singleton_method_exists?' and 'final_instance_method_exists?'
+  * added 'final_singleton_method_exists?' and 'final_instance_method_exists?'
+
+=== 0.7.0 / 2009-03-26
+
+* fixed: #24861 (please see at details at rubyforge)
+* resolved handling of special final class method redefinition (see commit message at github for more)

data/Manifest.txt

@@ -7,14 +7,19 @@ lib/methodfinalizer.rb
 lib/final_method/final_method.rb
 lib/final_method/final_method_version.rb
 lib/final_method/final_method_exceptions.rb
+test/test_final_declared_but_not_defined.rb
 test/test_method_finalizer.rb
 test/test_method_finalizer_usage.rb
+test/test_special_class_method_redefinition.rb
 test/test_classes_files/method_finalizer_usage.rb
+test/test_classes_files/special_class_method_redefinition.rb
 test/test_classes_files/final_class_method_files/final_class_method_called_with_no_method_arguments.rb
+test/test_classes_files/final_class_method_files/final_class_method_declared_but_not_defined.rb
 test/test_classes_files/final_class_method_files/redeclared_final_class_methods_in_child.rb
 test/test_classes_files/final_class_method_files/redefined_final_class_method_in_child_class_using_parent.rb
 test/test_classes_files/final_class_method_files/redefined_final_class_method_in_child_class.rb
 test/test_classes_files/final_instance_method_files/final_instance_method_called_with_no_method_arguments.rb
+test/test_classes_files/final_instance_method_files/final_instance_method_declared_but_not_defined.rb
 test/test_classes_files/final_instance_method_files/redeclared_final_instance_methods_in_child.rb
 test/test_classes_files/final_instance_method_files/redefined_final_instance_method_in_child_instance_using_parent.rb
 test/test_classes_files/final_instance_method_files/redefined_final_instance_method_in_child_class.rb

data/Rakefile

@@ -3,6 +3,7 @@ require 'hoe'
 require 'lib/methodfinalizer'
 
 Hoe.new('methodfinalizer', OOP::Concepts::FinalMethod::FINAL_METHOD_VERSION) do |p|
+  p.extra_deps << ['ruby2ruby', '= 1.2.2']
   p.rubyforge_name = 'methodfinalizer'
   p.developer('Wilfrido T. Nuqui Jr.', 'dofreewill22@gmail.com')
 end

data/lib/final_method/final_method.rb

@@ -1,4 +1,6 @@
 require File.dirname(__FILE__) + '/final_method_version'
+require 'rubygems'
+require 'ruby2ruby'
 
 module OOP
   module Concepts
@@ -239,10 +241,11 @@ module OOP
           validations = validate_methods(final_methods, method_names, self)
           if(validations[:valid])
             if final_methods.has_key?(self) && ((final_methods[self] - method_names) == final_methods[self])
-              final_methods[self].concat(method_names.collect{|method_name| {method_name => 0}})
+              final_methods[self].concat(method_names.collect{|method_name| {method_name => {:definition_count => 0, :definition_str => nil}}})
             else
-              final_methods[self] = method_names.collect{|method_name| {method_name => 0}}
+              final_methods[self] = method_names.collect{|method_name| {method_name => {:definition_count => 0, :definition_str => nil}}}
             end
+            nil # must return nil
           else
             final_method_error = method_type.eql?('class') ? FinalClassMethodRedeclarationError : FinalInstanceMethodRedeclarationError
             raise final_method_error.new(validations[:error_message])
@@ -258,15 +261,23 @@ module OOP
             else
               remove_method method_name
             end
-            final_method_error = method_type.eql?('class') ? FinalClassMethodRedefinitionError : FinalInstanceMethodRedefinitionError
-            raise final_method_error.new("cannot redefine '#{method_name}' because it is already defined as final #{method_type} method in parent #{parent}.")
+            unless get_first_final_method_definition(parent, final_methods, method_name).nil? # defined here
+              final_method_error = method_type.eql?('class') ? FinalClassMethodRedefinitionError : FinalInstanceMethodRedefinitionError
+              raise final_method_error.new("cannot redefine '#{method_name}' because it is already defined as final #{method_type} method in parent #{parent}.")
+            else
+              final_method_error = method_type.eql?('class') ? FinalClassMethodEmptyDefinitionError : FinalInstanceMethodEmptyDefinitionError
+              raise final_method_error.new("'#{method_name}' is declared but not defined as final #{method_type} method in parent #{parent} and was attempted to be redefined in child #{self}.")
+            end
+                
           else
             unless(parent = get_class_of_final_method(final_methods, method_name, true)).nil?
               increment_final_method_definition_count(final_methods[parent], method_name)
-              if((final_method_definition_count(final_methods[parent], method_name)) > 1) && method_type.eql?('class')
-                final_method_error = method_type.eql?('class') ? FinalClassMethodRedefinitionError : FinalInstanceMethodRedefinitionError
-                raise final_method_error.new("redefining class method '#{method_name}' in same class but inside child class will yield erroneous effect.")
-                exit
+              if((fmd_count = final_method_definition_count(final_methods[parent], method_name)) == 1)
+                store_first_final_method_definition(parent, final_methods, method_name, method_type)
+              elsif (fmd_count > 1) && method_type.eql?('class')
+                reset_final_method_definition_count(final_methods[parent], method_name)
+                class_eval get_first_final_method_definition(parent, final_methods, method_name)
+                raise FinalClassMethodRedefinitionError.new("cannot redefine '#{method_name}' because it is already defined as final class method in parent #{parent}.")
               end
             end
           end
@@ -290,13 +301,31 @@ module OOP
         
         def increment_final_method_definition_count(method_names, method_name)
           method_names.each do |mn|
-            mn[method_name] +=1 if mn.has_key?(method_name)
+            mn[method_name][:definition_count] +=1 if mn.has_key?(method_name)
           end
         end
         
         def final_method_definition_count(method_names, method_name)
           method_names.each do |mn|
-            return mn[method_name] if mn.has_key?(method_name)
+            return mn[method_name][:definition_count] if mn.has_key?(method_name)
+          end
+        end
+        
+        def store_first_final_method_definition(context, final_methods, method_name, method_type)
+          final_methods[context].each do |mn|
+            mn[method_name][:definition_str] = "#{Ruby2Ruby.translate context, "#{"self." if method_type.eql?('class')}#{method_name}"}" if mn.has_key?(method_name)
+          end
+        end
+        
+        def get_first_final_method_definition(context, final_methods, method_name)
+          final_methods[context].each do |mn|
+            return mn[method_name][:definition_str] if mn.has_key?(method_name)
+          end
+        end
+        
+        def reset_final_method_definition_count(method_names, method_name)
+          method_names.each do |mn|
+            mn[method_name][:definition_count] = 0 if mn.has_key?(method_name)
           end
         end
         

data/lib/final_method/final_method_exceptions.rb

@@ -20,4 +20,14 @@ end
 # Raised when final instance method declared in parent class
 # is attempted to be redeclared in child class as final instance method.
 class FinalInstanceMethodRedeclarationError < FinalMethodError
+end
+
+# Raised when final class method is declared but not defined in parent class
+# and is attempted to be defined in child class
+class FinalClassMethodEmptyDefinitionError < FinalMethodError
+end
+
+# Raised when final instance method is declared but not defined in parent class
+# and is attempted to be defined in child class
+class FinalInstanceMethodEmptyDefinitionError < FinalMethodError
 end

data/lib/final_method/final_method_version.rb

@@ -1,7 +1,7 @@
 module OOP
   module Concepts
     module FinalMethodVersion
-      MAJOR, MINOR, TINY  = 0, 6, 0
+      MAJOR, MINOR, TINY  = 0, 7, 0
 
       FINAL_METHOD_VERSION = [MAJOR, MINOR, TINY].join('.')
     end

data/test/test_classes_files/final_class_method_files/final_class_method_declared_but_not_defined.rb

@@ -0,0 +1,10 @@
+require 'methodfinalizer'
+
+class Dog
+  final_class_method :increase_breed_type
+end
+
+class ChowChow < Dog
+  def self.increase_breed_type
+  end
+end

data/test/test_classes_files/final_instance_method_files/final_instance_method_declared_but_not_defined.rb

@@ -0,0 +1,10 @@
+require 'methodfinalizer'
+
+class Dog
+  final_instance_method :wiggle
+end
+
+class ChowChow < Dog
+  def wiggle
+  end
+end

data/test/test_classes_files/special_class_method_redefinition.rb

@@ -0,0 +1,15 @@
+# final class method is redefined in child class
+require "methodfinalizer"
+
+class Dog
+  final_class_methods :bark
+  def self.bark
+    "aw aw aw!"
+  end
+end
+
+class ChowChow < Dog
+  def Dog.bark
+    "meow meow meow!"
+  end
+end

data/test/test_final_declared_but_not_defined.rb

@@ -0,0 +1,32 @@
+require 'test/unit'
+require 'final_method/final_method_exceptions'
+
+class TestFinalDeclaredButNotDefined < Test::Unit::TestCase
+  def test_final_class_method_called_with_no_method_arguments
+    assert_raises FinalClassMethodEmptyDefinitionError do
+      require "test_classes_files/final_class_method_files/final_class_method_declared_but_not_defined"
+    end
+  end
+  
+  def test_final_instance_method_called_with_no_method_arguments
+    assert_raises FinalInstanceMethodEmptyDefinitionError do
+      require "test_classes_files/final_instance_method_files/final_instance_method_declared_but_not_defined"
+    end
+  end
+  
+  def test_final_class_method_called_with_no_method_arguments_with_rescue
+    begin
+      require "test_classes_files/final_class_method_files/final_class_method_declared_but_not_defined"
+    rescue
+      assert !ChowChow.respond_to?(:increase_breed_type)
+    end
+  end
+  
+  def test_final_instance_method_called_with_no_method_arguments_with_rescue
+    begin
+      require "test_classes_files/final_instance_method_files/final_instance_method_declared_but_not_defined"
+    rescue
+      assert !ChowChow.new.respond_to?(:wiggle)
+    end
+  end
+end

data/test/test_special_class_method_redefinition.rb

@@ -0,0 +1,20 @@
+require 'test/unit'
+require 'methodfinalizer'
+
+class TestSpecialClassMethodRedefinition < Test::Unit::TestCase
+  def test_require_without_rescue
+    assert_raises FinalClassMethodRedefinitionError do
+      require "test_classes_files/special_class_method_redefinition"
+    end
+  end
+  
+  def test_require_with_rescue
+    begin
+      require "test_classes_files/special_class_method_redefinition"
+    rescue
+      assert_equal "aw aw aw!", Dog.bark # redefinition is handled by 'methodfinalizer'
+      assert_equal "aw aw aw!", ChowChow.bark
+      assert_not_equal "meow meow meow!", ChowChow.bark
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: methodfinalizer
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Wilfrido T. Nuqui Jr.
@@ -9,9 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-24 00:00:00 +08:00
+date: 2009-03-26 00:00:00 +08:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: ruby2ruby
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 1.2.2
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
   type: :development
@@ -44,14 +54,19 @@ files:
 - lib/final_method/final_method.rb
 - lib/final_method/final_method_version.rb
 - lib/final_method/final_method_exceptions.rb
+- test/test_final_declared_but_not_defined.rb
 - test/test_method_finalizer.rb
 - test/test_method_finalizer_usage.rb
+- test/test_special_class_method_redefinition.rb
 - test/test_classes_files/method_finalizer_usage.rb
+- test/test_classes_files/special_class_method_redefinition.rb
 - test/test_classes_files/final_class_method_files/final_class_method_called_with_no_method_arguments.rb
+- test/test_classes_files/final_class_method_files/final_class_method_declared_but_not_defined.rb
 - test/test_classes_files/final_class_method_files/redeclared_final_class_methods_in_child.rb
 - test/test_classes_files/final_class_method_files/redefined_final_class_method_in_child_class_using_parent.rb
 - test/test_classes_files/final_class_method_files/redefined_final_class_method_in_child_class.rb
 - test/test_classes_files/final_instance_method_files/final_instance_method_called_with_no_method_arguments.rb
+- test/test_classes_files/final_instance_method_files/final_instance_method_declared_but_not_defined.rb
 - test/test_classes_files/final_instance_method_files/redeclared_final_instance_methods_in_child.rb
 - test/test_classes_files/final_instance_method_files/redefined_final_instance_method_in_child_instance_using_parent.rb
 - test/test_classes_files/final_instance_method_files/redefined_final_instance_method_in_child_class.rb
@@ -83,5 +98,7 @@ signing_key:
 specification_version: 2
 summary: "'methodfinalizer' is a gem that allows you to declare final class and instance methods in your ruby program."
 test_files: 
+- test/test_final_declared_but_not_defined.rb
+- test/test_special_class_method_redefinition.rb
 - test/test_method_finalizer_usage.rb
 - test/test_method_finalizer.rb