contextr 1.0.0 → 1.0.1

data/History.txt

@@ -1,3 +1,9 @@
+== 1.0.1 2008-04-01
+
+* minor changes
+  * internal refactorings 
+  * updated copyrights 
+
 == 1.0.0 2008-04-01
 
 * this is the first stable release

data/LICENSE.txt

@@ -1,4 +1,5 @@
-ContextR is copyrighted free software by Gregor Schmidt <ruby@schmidtwisser.de>.
+ContextR is copyrighted free software by Gregor Schmidt <ruby@schmidtwisser.de>,
+Software-Architecture-Group, Hasso-Plattner-Institute, Potsdam, Germany.
 You can redistribute it and/or modify it under either the terms of the GPL
 (see COPYING file), or the conditions below:
 

data/README.txt

@@ -13,3 +13,4 @@ This code is published under the same license as Ruby. See LICENSE.txt for more
 information.
 
 (c) 2007 - Gregor Schmidt - Berlin, Germany
+Software-Architecture-Group, Hasso-Plattner-Institute, Potsdam, Germany

data/lib/contextr/class_methods.rb

@@ -66,14 +66,12 @@ module ContextR # :nodoc:
 
     def on_core_method_called(receiver, contextified_class, 
                               method_name, arguments, block)
-      proxies = []
-      active_layers_as_classes.each do |layer|
-        proxies += layer.context_proxies(receiver, 
-                                         contextified_class, 
-                                         method_name)
-      end.compact 
 
+      proxies = active_layers_as_classes.inject([]) do |array, layer|
+        array << layer.context_proxy(contextified_class, method_name)
+      end.compact
       proxies << core_proxy(receiver, contextified_class, method_name) 
+
       call_methods_stack(proxies.reverse, receiver, 
                          method_name, arguments, block)
     end

data/lib/contextr/inner_class.rb

@@ -13,7 +13,7 @@ module ContextR
       # hide +instance_eval+ or any method beginning with "__".
       def hide(name)
         if instance_methods.include?(name.to_s) and
-          name !~ /^(__|extend)/
+          name !~ /^(__)/
           @hidden_methods ||= {}
           @hidden_methods[name.to_sym] = instance_method(name)
           undef_method name

data/lib/contextr/layer.rb

@@ -20,9 +20,7 @@ module ContextR # :nodoc:
     end
 
     def add_method_collection(contextified_class, methods_module)
-      definitions[contextified_class] ||= []
-      definitions[contextified_class].delete(methods_module)
-      definitions[contextified_class].push(methods_module)
+      definitions[contextified_class] = methods_module
 
       (methods_module.instance_methods & 
        contextified_class.instance_methods).each do | method_name |
@@ -31,34 +29,30 @@ module ContextR # :nodoc:
       register_callbacks(contextified_class, methods_module)
     end
 
-    def methods_modules_containing_method(contextified_class, method_name)
-      if definitions.include?(contextified_class)
-        definitions[contextified_class].select do | methods_module | 
-          methods_module.instance_methods.include?(method_name.to_s) 
-        end
-      else
-        []
+    def methods_module_containing_method(contextified_class, method_name)
+      if definitions.include?(contextified_class) and
+         definitions[contextified_class].instance_methods.include?(method_name.to_s) 
+        definitions[contextified_class]
       end
     end
 
-    def context_proxies(receiver, contextified_class, method_name)
-      methods_modules_containing_method(contextified_class, method_name).
-        collect do | methods_module | 
-          context_proxy_for_module(receiver, methods_module) 
-        end.reverse
-    end
+    def context_proxy(contextified_class, method_name)
+      methods_module = methods_module_containing_method(contextified_class, 
+                                                        method_name)
 
-    def context_proxy_for_module(receiver, methods_module)
-      proxies[methods_module] ||= begin
-        p = ContextR::InnerClass.new.extend(methods_module)
-        class << p; hide(:extend); end
-        p
+      if methods_module 
+        proxies[methods_module] ||= begin
+          p = ContextR::InnerClass.new
+          class << p; self; end.class_eval do
+            include(methods_module)
+          end
+          p
+        end
       end
     end
 
     def on_class_method_added(contextified_class, method_name, version)
-      unless methods_modules_containing_method(contextified_class, 
-                                               method_name).empty?
+      if methods_module_containing_method(contextified_class, method_name)
         replace_core_method(contextified_class, method_name, version)
       end
     end

data/lib/contextr/version.rb

@@ -2,7 +2,7 @@ module ContextR #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 0
-    TINY  = 0
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: contextr
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Gregor Schmidt
@@ -30,7 +30,7 @@ cert_chain:
   y3O9DT3o4BiyPe77
   -----END CERTIFICATE-----
 
-date: 2008-03-29 23:00:00 +01:00
+date: 2008-04-24 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: contextr
-rubygems_version: 1.0.1
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
 summary: The goal is to equip Ruby with an API to allow context-oriented programming.

metadata.gz.sig

@@ -1 +1,5 @@
-�T��,���&(�!�.���ɯ��/��糝M\\O���`��<\��=�I��n��+�ge��8�:�Q=^��sD�r���ԀtqD^�E���.�,߭�l�)GS�sjȇD�&�	6��הh��C�Hu(gc�����s�ߒ��?����Q�A�=��⓯\�
r!�Ξ�;4��0����A�Ж�V�>r�m���u��B������蜒��S�vcE���O\����H���΂�w}
+�5>FV�a�oD��X����t
+�)�[�s�&�8s#5L��m��u���
?`
+5ˆ�q�Vښ��3MEZ't7+ד�f���������3ƟL�j�;2A0�TO���p��cξ-��'�;3٣�Q��"��eF�V���z��TE�}��ŀ�
%�ځ�!�Eq�G�K�O�w�g�+����޺&��ż�-���4v��>D�8
+c��
+�M�__N�?�U���^9�%3