contextr 0.0.2 → 0.0.3

data/History.txt

@@ -1,7 +1,14 @@
++++ 0.0.3 2007-05-22
+
++ 3 major changes
+  + Added #add_context_sensor and #with_current_context
+  + Added #activate_layers and #deactivate_layers
+  + Added support for class side methods
+
 +++ 0.0.2 2007-05-08
 
 + 1 major change:
-  + Changed the wrapper execution order to a hopefulle more natural ordering
+  + Changed the wrapper execution order to a hopefully more natural ordering
   + Added documentation
 + 1 minor change:
   + finished transition from unit tests to rspec based specification

data/Manifest.txt

@@ -6,6 +6,7 @@ README.txt
 Rakefile
 examples/education.rb
 examples/fibonacci.rb
+examples/with_current_context.rb
 lib/contextr.rb
 lib/contextr/contextr.rb
 lib/contextr/layer.rb
@@ -20,6 +21,7 @@ rake/specific_group_spec_task.rb
 scripts/txt2html
 setup.rb
 spec/contextr/contextr_api_spec.rb
+spec/contextr/contextr_class_side_spec.rb
 spec/contextr/contextr_functional_spec.rb
 spec/core_ext/module_spec.rb
 spec/core_ext/proc_spec.rb

data/Rakefile

@@ -68,7 +68,7 @@ task :website_upload do
   remote_dir = "/var/www/gforge-projects/#{RUBYFORGE_PROJECT}/"
   # remote_dir = "/var/www/gforge-projects/#{RUBYFORGE_PROJECT}/#{GEM_NAME}"
   local_dir = 'website'
-  sh %{rsync -av --delete-excluded --exclude=".*/" #{local_dir}/ #{host}:#{remote_dir}}
+  sh %{rsync -av --exclude=".*/" #{local_dir}/ #{host}:#{remote_dir}}
 end
 
 desc 'Generate and upload website files'
@@ -88,6 +88,14 @@ task :check_version do
   end
 end
 
+#desc 'Submit the docs HTML files to RubyForge'
+#task :docs_publish => [ :docs ] do
+#  config = YAML.load(File.read(File.expand_path("~/.rubyforge/user-config.yml")))
+#  host = "#{config["username"]}@rubyforge.org"
+#  remote_dir = "/var/www/gforge-projects/#{RUBYFORGE_PROJECT}/api"
+#  local_dir = 'doc'
+#  sh %{rsync -av --delete-excluded --exclude=".*/" #{local_dir}/ #{host}:#{remote_dir}}
+#end
 
 # Most of this code was taken from the Rubinius Rakefile. 
 # Thanks for the help.

data/examples/fibonacci.rb

@@ -4,39 +4,41 @@ require "contextr"
 require 'test/unit'
 require 'benchmark'
 
-class FibonacciCalculator
-  def compute fixnum
-    if fixnum == 1 or fixnum == 0
-      fixnum
-    elsif fixnum < 0
-      raise ArgumentError, "Fibonacci not defined for negative numbers"
-    else
-      compute(fixnum - 1) + compute(fixnum - 2)
+class Fibonacci
+  class << self
+    def compute fixnum
+      if fixnum == 1 or fixnum == 0
+        fixnum
+      elsif fixnum < 0
+        raise ArgumentError, "Fibonacci not defined for negative numbers"
+      else
+        compute(fixnum - 1) + compute(fixnum - 2)
+      end
     end
-  end
-
-  layer :fib_pre_post, :fib_wrap
-  attr_accessor :cache
+  
+    layer :fib_pre_post, :fib_wrap
+    attr_accessor :cache
 
-  fib_pre_post.pre :compute do | nature |
-    self.cache ||= {}
-    if self.cache.key? nature.arguments.first
-      nature.break! self.cache[nature.arguments.first]
+    fib_pre_post.pre :compute do | nature |
+      self.cache ||= {}
+      if self.cache.key? nature.arguments.first
+        nature.break! self.cache[nature.arguments.first]
+      end
     end
-  end
 
-  fib_pre_post.post :compute do | nature |
-    self.cache[nature.arguments.first] = nature.return_value
-  end
-  
-  fib_wrap.wrap :compute do | nature |
-    self.cache ||= {}
-    if self.cache.key? nature.arguments.first
-      nature.return_value = self.cache[nature.arguments.first]
-    else
-      nature.call_next
+    fib_pre_post.post :compute do | nature |
       self.cache[nature.arguments.first] = nature.return_value
     end
+    
+    fib_wrap.wrap :compute do | nature |
+      self.cache ||= {}
+      if self.cache.key? nature.arguments.first
+        nature.return_value = self.cache[nature.arguments.first]
+      else
+        nature.call_next
+        self.cache[nature.arguments.first] = nature.return_value
+      end
+    end
   end
 end
 
@@ -58,17 +60,17 @@ end
 
 class FibonacciTest < Test::Unit::TestCase
   def setup
-    @fibonacci = FibonacciCalculator.new
+    Fibonacci.cache = {}
   end
   
   def test_basic_function
     Benchmark.bm(20) do |x|
       x.report("Recursive:") {
-        assert_equal       0, @fibonacci.compute(  0 )
-        assert_equal       1, @fibonacci.compute(  1 )
-        assert_equal       1, @fibonacci.compute(  2 )
-        assert_equal      55, @fibonacci.compute( 10 )
-        assert_equal    6765, @fibonacci.compute( 20 )
+        assert_equal       0, Fibonacci.compute(  0 )
+        assert_equal       1, Fibonacci.compute(  1 )
+        assert_equal       1, Fibonacci.compute(  2 )
+        assert_equal      55, Fibonacci.compute( 10 )
+        assert_equal    6765, Fibonacci.compute( 20 )
         # The following are too hard for the simple solution
         assert_equal  75_025, 25.fibonacci
         assert_equal 9227465, 35.fibonacci
@@ -84,18 +86,17 @@ class FibonacciTest < Test::Unit::TestCase
     Benchmark.bm(20) do |x|
       x.report("Layered Pre/Post:") {
         ContextR.with_layers :fib_pre_post do
-          assert_equal       0, @fibonacci.compute(  0 )
-          assert_equal       1, @fibonacci.compute(  1 )
-          assert_equal       1, @fibonacci.compute(  2 )
-          assert_equal       2, @fibonacci.compute(  3 )
-          assert_equal      55, @fibonacci.compute( 10 )
-          assert_equal    6765, @fibonacci.compute( 20 )
-          assert_equal  75_025, @fibonacci.compute( 25 )
-          assert_equal 9227465, @fibonacci.compute( 35 )
+          assert_equal       0, Fibonacci.compute(  0 )
+          assert_equal       1, Fibonacci.compute(  1 )
+          assert_equal       1, Fibonacci.compute(  2 )
+          assert_equal      55, Fibonacci.compute( 10 )
+          assert_equal    6765, Fibonacci.compute( 20 )
+          assert_equal  75_025, Fibonacci.compute( 25 )
+          assert_equal 9227465, Fibonacci.compute( 35 )
           assert_equal 280571172992510140037611932413038677189525,
-                                @fibonacci.compute( 200 )
+                                Fibonacci.compute( 200 )
           assert_equal 176023680645013966468226945392411250770384383304492191886725992896575345044216019675,
-          @fibonacci.compute( 400 )
+          Fibonacci.compute( 400 )
         end
       }
     end
@@ -105,17 +106,17 @@ class FibonacciTest < Test::Unit::TestCase
     Benchmark.bm(20) do |x|
       x.report("Layered Wrap:") {
         ContextR.with_layers :fib_wrap do
-          assert_equal       0, @fibonacci.compute(  0 )
-          assert_equal       1, @fibonacci.compute(  1 )
-          assert_equal       1, @fibonacci.compute(  2 )
-          assert_equal      55, @fibonacci.compute( 10 )
-          assert_equal    6765, @fibonacci.compute( 20 )
-          assert_equal  75_025, @fibonacci.compute( 25 )
-          assert_equal 9227465, @fibonacci.compute( 35 )
+          assert_equal       0, Fibonacci.compute(  0 )
+          assert_equal       1, Fibonacci.compute(  1 )
+          assert_equal       1, Fibonacci.compute(  2 )
+          assert_equal      55, Fibonacci.compute( 10 )
+          assert_equal    6765, Fibonacci.compute( 20 )
+          assert_equal  75_025, Fibonacci.compute( 25 )
+          assert_equal 9227465, Fibonacci.compute( 35 )
           assert_equal 280571172992510140037611932413038677189525,
-                                @fibonacci.compute( 200 )
+                                Fibonacci.compute( 200 )
           assert_equal 176023680645013966468226945392411250770384383304492191886725992896575345044216019675,
-                                @fibonacci.compute( 400 )
+                                Fibonacci.compute( 400 )
         end
       }
     end

data/examples/with_current_context.rb

@@ -0,0 +1,29 @@
+require "rubygems"
+require "contextr" 
+
+class A
+  class << self
+    def a
+      "a"
+    end
+
+    layer :foo
+
+    foo.post :a do | n | 
+      n.return_value << " post"
+    end
+  end
+end
+
+ContextR::add_context_sensor do
+  [:foo]
+end
+
+puts A.a    # => "a"
+ContextR::with_layer :foo do
+  puts A.a  # => "a post"
+end
+ContextR::with_current_context do
+  puts A.a  # => "a post"
+end
+puts A.a    # => "a"

data/lib/contextr.rb

@@ -2,8 +2,12 @@
 # TODO: get rid of this workaround to avoid double loading on `rake test`
 #++
 unless Object.const_defined? "ContextR"
-  require 'rubygems'
-  require 'active_support'
+  if RUBY_VERSION == "1.9.0"
+    require File.dirname(__FILE__) + '/activesupport/lib/active_support'
+  else
+    require 'rubygems'
+    require 'active_support'
+  end
 
   Dir[File.join(File.dirname(__FILE__), 'ext/**/*.rb')].sort.each { |lib| require lib }
   Dir[File.join(File.dirname(__FILE__), 'core_ext/**/*.rb')].sort.each { |lib| require lib }

data/lib/contextr/contextr.rb

@@ -26,6 +26,23 @@ module ContextR
       end
       Dynamic.let( { :layers => Dynamic[:layers] | layers }, &block )
     end
+    alias with_layer with_layers
+
+    # allows the explicit activation of layers
+    # 
+    #   ContextR::activate_layers( :foo, :bar )
+    #   ContextR::current_layers            # => [:default, :foo, :bar]
+    #
+    # :call-seq:
+    #   deactivate_layers( layer_name, ... )
+    #
+    def activate_layers( *layer_symbols )
+      layers = layer_symbols.collect do | layer_symbol |
+        ContextR.layer_by_name( ContextR.layerize( layer_symbol ) )
+      end
+      Dynamic[:layers] |= layers
+    end
+    alias activate_layer activate_layers
 
     # allows the explicit deactivation of layers within a block context
     # 
@@ -47,6 +64,26 @@ module ContextR
       end
       Dynamic.let( { :layers => Dynamic[:layers] - layers }, &block )
     end
+    alias without_layer without_layers
+
+    # allows the explicit deactivation of layers
+    # 
+    #   ContextR::activate_layers( :foo, :bar )
+    #   ContextR::current_layers            # => [:default, :foo, :bar]
+    #
+    #   ContextR::deactivate_layers( :foo )
+    #   ContextR::current_layers            # => [:default, :bar]
+    #
+    # :call-seq:
+    #   deactivate_layers( layer_name, ... )
+    #
+    def deactivate_layers( *layer_symbols )
+      layers = layer_symbols.collect do | layer_symbol |
+        ContextR.layer_by_name( ContextR.layerize( layer_symbol ) )
+      end
+      Dynamic[:layers] -= layers
+    end
+    alias deactivate_layer deactivate_layers
 
     # returns the names of the currently activated layers
     #
@@ -59,6 +96,39 @@ module ContextR
       Dynamic[:layers].collect{ | layer_class | self.symbolize( layer_class ) }
     end
 
+    # allows the registration of context sensors. These are blocks that are
+    # called on with_current_context and should return a list of layers, that
+    # should be activated.
+    # 
+    #   ContextR::add_context_sensor do
+    #     # some clever code computes some layers to activate
+    #     [ :foo ]
+    #   end
+    #
+    # :call-seq:
+    #   add_context_sensor() { ... }
+    #
+    def add_context_sensor &block
+      @sensors ||= []
+      @sensors << block
+    end
+
+    # asks all sensors to compute the current context, e.g. layers that should
+    # be active, and executes the given block in the context. It works basically
+    # like with_layers
+    # 
+    # :call-seq:
+    #   with_current_context() { ... }
+    #
+    def with_current_context(&block) 
+      layers = @sensors.inject([]) do | akku, sensor |
+        akku | sensor.call
+      end
+      ContextR::with_layers(*layers) do
+        block.call
+      end
+    end
+
     def symbolize( layer_klass ) # :nodoc:
       layer_klass.namespace_free_name.gsub( "Layer", "" ).downcase.to_sym
     end

data/lib/contextr/layer.rb

@@ -79,7 +79,7 @@ module ContextR
       end
 
       def inherited( new_base_layer )
-        unless new_base_layer.name.empty?
+        unless new_base_layer.name.nil? or new_base_layer.name.empty?
           base_layers[ContextR::symbolize( new_base_layer )] = new_base_layer
         end
       end
@@ -146,8 +146,13 @@ module ContextR
 
       def extended( object )
         self.extended_objects ||= Hash.new do | cache, object |
+          object_class = if object.kind_of? Class
+            (class << object; self; end)
+          else
+            object.class
+          end
           cache[ object ] = 
-              ExtendedObject.new( object, self.methods_of( object.class ) )
+              ExtendedObject.new( object, self.methods_of( object_class ) )
         end
         self.extended_objects[object]
       end

data/lib/contextr/version.rb

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

data/spec/contextr/contextr_api_spec.rb

@@ -9,8 +9,8 @@ class ContextRApiFoo
   end
 end
 
-context 'Each class' do
-  specify 'should provide a method to enable a single layer' do
+describe 'Each class' do
+  it 'should provide a method to enable a single layer' do
     lambda do
       class ContextRApiFoo 
         layer :bar
@@ -18,7 +18,7 @@ context 'Each class' do
     end.should_not raise_error
   end
 
-  specify 'should provide a method to access these layers by name' do
+  it 'should provide a method to access these layers by name' do
     begin
       class ContextRApiFoo
         bar
@@ -27,8 +27,8 @@ context 'Each class' do
   end
 end
 
-context 'Each layer in a class' do
-  specify 'should allow the definition of pre method wrappers ' +
+describe 'Each layer in a class' do
+  it 'should allow the definition of pre method wrappers ' +
           'with `pre`' do
     lambda do
       class ContextRApiFoo
@@ -39,7 +39,7 @@ context 'Each layer in a class' do
       end
     end.should_not raise_error
   end
-  specify 'should allow the definition of post method wrappers ' +
+  it 'should allow the definition of post method wrappers ' +
           'with `post`' do
     lambda do
       class ContextRApiFoo
@@ -50,7 +50,7 @@ context 'Each layer in a class' do
       end
     end.should_not raise_error
   end
-  specify 'should allow the definition of around method wrappers ' +
+  it 'should allow the definition of around method wrappers ' +
           'with `around`' do
     lambda do
       class ContextRApiFoo
@@ -62,7 +62,7 @@ context 'Each layer in a class' do
       end
     end.should_not raise_error
   end
-  specify 'should allow the definition of around method wrappers ' +
+  it 'should allow the definition of around method wrappers ' +
           'with `wrap`' do
     lambda do
       class ContextRApiFoo
@@ -76,3 +76,51 @@ context 'Each layer in a class' do
   end
 end
 
+describe ContextR do
+  it "should activate layers with activate_layers" do
+    ContextR::activate_layers :foo
+    ContextR::current_layers.should include(:foo)
+  end
+
+  it "should activate multiple layers wiht activate_layers" do
+    ContextR::activate_layers :bar, :baz
+    ContextR::current_layers.should include(:foo)
+    ContextR::current_layers.should include(:bar)
+    ContextR::current_layers.should include(:baz)
+  end
+
+  it "should deactivate layers with activate_layers" do
+    ContextR::deactivate_layers :bar
+    ContextR::current_layers.should_not include(:bar)
+    ContextR::current_layers.should include(:foo)
+    ContextR::current_layers.should include(:baz)
+  end
+
+  it "should deactivate multiple layers wiht activate_layers" do
+    ContextR::deactivate_layers :foo, :baz
+    ContextR::current_layers.should_not include(:bar)
+    ContextR::current_layers.should_not include(:foo)
+    ContextR::current_layers.should_not include(:baz)
+  end
+
+  it "should allow the registration of context sensors" do
+    lambda do
+      ContextR::add_context_sensor do
+        [:foo]
+      end
+    end.should_not raise_error
+  end
+
+  it "should allow the use of with_current_context and use the sensors to " +
+     "compute it" do
+    ContextR::add_context_sensor do
+      [:bar]
+    end
+    lambda do
+      ContextR::with_current_context do
+        ContextR::current_layers.should include(:foo)
+        ContextR::current_layers.should include(:bar)
+      end
+    end.should_not raise_error
+  end
+end

data/spec/contextr/contextr_class_side_spec.rb

@@ -0,0 +1,77 @@
+require File.dirname(__FILE__) + "/../spec_helper.rb"
+
+class ContextRClassSide
+  class << self
+    def non_contextified_method
+      "non_contextified_method"
+    end
+    def pre_wrapped_method
+      "pre_wrapped_method"
+    end
+    def post_wrapped_method
+      "post_wrapped_method"
+    end
+    def around_wrapped_method
+      "around_wrapped_method"
+    end
+
+    layer :simple_wrappers, :dummy
+
+    simple_wrappers.pre :pre_wrapped_method do
+      @pre_wrapped_method_called = true
+    end
+    simple_wrappers.post :post_wrapped_method do
+      @post_wrapped_method_called = true
+    end
+    simple_wrappers.around :around_wrapped_method do | n |
+      @around_wrapped_method_called = true
+      n.call_next
+    end
+  end
+end
+
+describe "A contextified class" do
+  it "should run a simple method " + 
+          "*normally* when all layers are deactivated" do
+    ContextRClassSide.non_contextified_method.should == 
+        "non_contextified_method"
+  end
+
+  it "should run a simple method " +
+          "*normally* when any layer is activated" do
+    ContextR.with_layers( :simple_wrappers ) do
+      ContextRClassSide.non_contextified_method.should == 
+          "non_contextified_method"
+    end
+  end
+
+  %w{pre post around}.each do | qualifier |
+    it "should run a #{qualifier}-ed method " +
+            "*normally* when all layers are deactivated" do
+      ContextRClassSide.send( "#{qualifier}_wrapped_method" ).should == 
+            "#{qualifier}_wrapped_method"
+      ContextRClassSide.instance_variables.should_not include( 
+            "@#{qualifier}_wrapped_method_called" )
+    end
+
+    it "should run a #{qualifier}-ed method " +
+            "*normally* when any layer is activated" do
+      ContextR.with_layers( :dummy ) do
+        ContextRClassSide.send( "#{qualifier}_wrapped_method" ).should == 
+              "#{qualifier}_wrapped_method"
+        ContextRClassSide.instance_variables.should_not include( 
+              "@#{qualifier}_wrapped_method_called" )
+      end
+    end
+
+    it "should run a #{qualifier}-ed method with " +
+            "additional behaviour when a specific layer is activated" do
+      ContextR.with_layers( :simple_wrappers ) do
+        ContextRClassSide.send( "#{qualifier}_wrapped_method" ).should == 
+              "#{qualifier}_wrapped_method"
+        ContextRClassSide.instance_variables.should include( 
+              "@#{qualifier}_wrapped_method_called" )
+      end
+    end
+  end
+end

data/spec/contextr/contextr_functional_spec.rb

@@ -27,17 +27,17 @@ class SimpleWrapperClass
     n.call_next
   end
 end
-context "An instance of a contextified class" do
-  setup do
+describe "An instance of a contextified class" do
+  before do
     @instance = SimpleWrapperClass.new
   end
 
-  specify "should run a simple method " + 
+  it "should run a simple method " + 
           "*normally* when all layers are deactivated" do
     @instance.non_contextified_method.should == "non_contextified_method"
   end
 
-  specify "should run a simple method " +
+  it "should run a simple method " +
           "*normally* when any layer is activated" do
     ContextR.with_layers( :simple_wrappers ) do
       @instance.non_contextified_method.should == "non_contextified_method"
@@ -45,42 +45,42 @@ context "An instance of a contextified class" do
   end
 
   %w{pre post around}.each do | qualifier |
-    specify "should run a #{qualifier}-ed method " +
+    it "should run a #{qualifier}-ed method " +
             "*normally* when all layers are deactivated" do
       @instance.send( "#{qualifier}_wrapped_method" ).should == 
             "#{qualifier}_wrapped_method"
-      @instance.instance_variables.should_not_include( 
+      @instance.instance_variables.should_not include( 
             "@#{qualifier}_wrapped_method_called" )
     end
 
-    specify "should run a #{qualifier}-ed method " +
+    it "should run a #{qualifier}-ed method " +
             "*normally* when any layer is activated" do
       ContextR.with_layers( :dummy ) do
         @instance.send( "#{qualifier}_wrapped_method" ).should == 
               "#{qualifier}_wrapped_method"
-        @instance.instance_variables.should_not_include( 
+        @instance.instance_variables.should_not include( 
               "@#{qualifier}_wrapped_method_called" )
       end
     end
 
-    specify "should run a #{qualifier}-ed method with " +
+    it "should run a #{qualifier}-ed method with " +
             "additional behaviour when a specific layer is activated" do
       ContextR.with_layers( :simple_wrappers ) do
         @instance.send( "#{qualifier}_wrapped_method" ).should == 
               "#{qualifier}_wrapped_method"
-        @instance.instance_variables.should_include( 
+        @instance.instance_variables.should include( 
               "@#{qualifier}_wrapped_method_called" )
       end
     end
 
-    specify "should run a #{qualifier}-ed method without additional " +
+    it "should run a #{qualifier}-ed method without additional " +
             "behaviour when a specific layer is activated and afterwards " + 
             "deactivated" do
       ContextR.with_layers( :simple_wrappers ) do
         ContextR.without_layers( :simple_wrappers ) do
           @instance.send( "#{qualifier}_wrapped_method" ).should == 
                 "#{qualifier}_wrapped_method"
-          @instance.instance_variables.should_not_include( 
+          @instance.instance_variables.should_not include( 
                 "@#{qualifier}_wrapped_method_called" )
         end
       end
@@ -253,11 +253,11 @@ around_multiple_spec = lambda do | instance |
 end
 
 %w{pre post around}.each do | qualifier |
-  context "#{qualifier.capitalize} wrappers within a method" do
-    setup do
+  describe "#{qualifier.capitalize} wrappers within a method" do
+    before do
       @instance = NestedLayerActivationClass.new
     end
-    specify "should run in the sequence of nesting, when using nested " +
+    it "should run in the sequence of nesting, when using nested " +
             "activation" do
       ContextR::with_layers :outer_layer do
         ContextR::with_layers :inner_layer do
@@ -267,7 +267,7 @@ end
       end
       eval("#{qualifier}_spec").call( @instance )
     end
-    specify "should run in the sequence of nesting, when using simultaneous " +
+    it "should run in the sequence of nesting, when using simultaneous " +
             "activation" do
       ContextR::with_layers :outer_layer, :inner_layer do
         @instance.send( "#{qualifier}ed_method" ).should == 
@@ -276,14 +276,14 @@ end
       eval("#{qualifier}_spec").call( @instance )
     end
 
-    specify "should run in the sequence of definition within the same layer" do
+    it "should run in the sequence of definition within the same layer" do
       ContextR::with_layers "multiple_#{qualifier}s".to_sym do
         @instance.contextualized_method.should == "contextualized_method"
       end
       eval("#{qualifier}_multiple_spec").call( @instance )
     end
 
-    specify "should be able to stop the execution with `break!`" do
+    it "should be able to stop the execution with `break!`" do
       ContextR::with_layers "break_in_#{qualifier}".to_sym, :other_layer do
         @instance.contextualized_method.should == "contextualized_method"
       end
@@ -291,4 +291,3 @@ end
     end
   end
 end
-

data/spec/core_ext/module_spec.rb

@@ -1,19 +1,19 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
-context 'Each first level module' do
-  specify 'should have the same name and namespace_free_name' do
+describe 'Each first level module' do
+  it 'should have the same name and namespace_free_name' do
     Math.namespace_free_name.should == Math.name
     Kernel.namespace_free_name.should == Kernel.name
   end
 
-  specify 'should have a namespace_free_name matching their constant' do
+  it 'should have a namespace_free_name matching their constant' do
     Kernel.namespace_free_name.should == Kernel.to_s
     Kernel.namespace_free_name.should == "Kernel"
   end
 end
 
-context 'Each sublevel module' do
-  setup do
+describe 'Each sublevel module' do
+  before do
     module ModuleTestA
       module B
         module C
@@ -22,14 +22,14 @@ context 'Each sublevel module' do
     end
   end
 
-  specify 'should have a namespace free namespace_free_name' do
+  it 'should have a namespace free namespace_free_name' do
     ModuleTestA::B.namespace_free_name.should == "B"
     ModuleTestA::B::C.namespace_free_name.should == "C"
   end
 end
 
-context "Each module" do
-  specify "should have a attr_accessor_with_default_setter" do
+describe "Each module" do
+  it "should have a attr_accessor_with_default_setter" do
     lambda do
       class ClassSpecA
         attr_accessor_with_default_setter :miau do
@@ -40,57 +40,59 @@ context "Each module" do
   end
 end
 
-context "Each instance" do
-  setup do
+describe "Each instance" do
+  before do
     @instance = ClassSpecA.new
     @instance2 = ClassSpecA.new
   end
-  specify "should provide a getter method" do
-    @instance.should_respond_to :miau
+  
+  it "should provide a getter method" do
+    @instance.should respond_to( :miau )
   end
-  specify "should provide a setter method" do
-    @instance.should_respond_to :miau=
+  
+  it "should provide a setter method" do
+    @instance.should respond_to( :miau= )
   end
 
 end
 
-context "A getter method" do
-  setup do
+describe "A getter method" do
+  before do
     @getter = ClassSpecA.instance_method( :miau )
     @instance = ClassSpecA.new
     @instance2 = ClassSpecA.new
   end
 
-  specify "should not expect a parameter" do
+  it "should not expect a parameter" do
     @getter.arity.should == 0
   end
 
-  specify "should provide the default value" do
+  it "should provide the default value" do
     @instance.miau.should == Hash.new 
   end
 
-  specify "should provide the default value also multiple times" do
+  it "should provide the default value also multiple times" do
     @instance.miau.object_id.should == @instance.miau.object_id
   end
 
-  specify "should provide the different default values for different " +
-          "instances" do
+  it "should provide the different default values for different " +
+     "instances" do
     @instance2.miau.object_id.should_not == @instance.miau.object_id
   end
 end
 
-context "A setter method" do
-  setup do
+describe "A setter method" do
+  before do
     @setter = ClassSpecA.instance_method( :miau= )
     @instance = ClassSpecA.new
     @instance2 = ClassSpecA.new
   end
 
-  specify "should not expect a parameter" do
+  it "should not expect a parameter" do
     @setter.arity.should == 1
   end
 
-  specify "should allow the setting of the corresonding instance variable" do
+  it "should allow the setting of the corresonding instance variable" do
     begin
       @instance.miau = "blue"
     end.should == "blue"

data/spec/core_ext/proc_spec.rb

@@ -9,39 +9,39 @@ class ProcSpecFoo
   end
 end
 
-context "A Proc" do
-  setup do
+describe "A Proc" do
+  before do
     @a = lambda do @a = true; "a" end
     @b = lambda do @b = true; "b" end
     @foo = ProcSpecFoo.new
   end
 
-  specify "should convert itself to an unbound method" do 
-    @b.to_unbound_method( ProcSpecFoo ).should_be_kind_of UnboundMethod
+  it "should convert itself to an unbound method" do 
+    @b.to_unbound_method( ProcSpecFoo ).should be_a_kind_of( UnboundMethod )
   end
 
-  specify "which should be bindable to an instance of the specified class" do 
+  it "which should be bindable to an instance of the specified class" do 
     lambda do
       @b.to_unbound_method( ProcSpecFoo ).bind( @foo )
     end.should_not raise_error
   end
 
-  specify "which should execute the proc in turn" do
+  it "which should execute the proc in turn" do
     @b.to_unbound_method( ProcSpecFoo ).bind( @foo ).call.should == "b"
     @foo.instance_variable_get( :@b ).should == true
   end
 
-  specify "should respond to `+`" do
-    @b.should_respond_to :+
+  it "should respond to `+`" do
+    @b.should respond_to( :+ )
   end
 
-  specify "should build a joined block with `self.+( other_proc)`" do
-    (@a + @b).should_be_kind_of Proc
+  it "should build a joined block with `self.+( other_proc)`" do
+    (@a + @b).should be_a_kind_of( Proc )
   end
 end
 
-context "The result of `+` of two Procs" do
-  setup do
+describe "The result of `+` of two Procs" do
+  before do
     @a = lambda do | arg | 
       arg || "a" 
     end
@@ -50,12 +50,12 @@ context "The result of `+` of two Procs" do
     end
   end
 
-  specify "should give the correct return value" do
+  it "should give the correct return value" do
     (@a + @b).call( nil ).should == "b"
     (@b + @a).call( nil ).should == "a"
   end
 
-  specify "should pass through given parameters" do
+  it "should pass through given parameters" do
     (@a + @b).call( 1 ).should == 1
   end
 end

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>Context-oriented Programming in Ruby</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/contextr"; return false'>
       Get Version
-      <a href="http://rubyforge.org/projects/contextr" class="numbers">0.0.1</a>
+      <a href="http://rubyforge.org/projects/contextr" class="numbers">0.0.3</a>
     </div>
     <h1>&#x2192; &#8216;contextr&#8217;</h1>
 
@@ -160,7 +160,8 @@ Name: Gregor Schmidt; Address: Berlin
 
 
 	<ul>
-	<li><a href="http://rubyforge.org/projects/contextr">Rubyforge Project Page</a></li>
+	<li><a href="http://contextr.rubyforge.org/contextr">ContextR <span class="caps">API</span> documentation</a></li>
+		<li><a href="http://rubyforge.org/projects/contextr">RubyForge Project Page</a></li>
 		<li><a href="http://www.nach-vorne.de">Author&#8217;s Development Blog &#8211; The Ruby Ahead</a></li>
 		<li><a href="http://www.ohloh.net/projects/5037">ContextR Statistics on ohloh</a></li>
 	</ul>
@@ -177,12 +178,17 @@ Name: Gregor Schmidt; Address: Berlin
 
 	<p>Comments are welcome. Send an email to <a href="mailto:ruby@schmidtwisser.de">Gregor Schmidt</a></p>
     <p class="coda">
-      <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, 9th May 2007<br>
+      <a href="mailto:drnicwilliams@gmail.com">Dr Nic</a>, 10th May 2007<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>
 
-<!-- insert site tracking codes here, like Google Urchin -->
+<script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  _uacct = "UA-510991-4";
+  urchinTracker();
+</script>
 
 </body>
 </html>

data/website/index.txt

@@ -115,7 +115,8 @@ You may find other examples in the <code>examples</code> folder.
 
 h2. Other resources
 
-* "Rubyforge Project Page":http://rubyforge.org/projects/contextr
+* "ContextR API documentation":http://contextr.rubyforge.org/contextr
+* "RubyForge Project Page":http://rubyforge.org/projects/contextr
 * "Author's Development Blog - The Ruby Ahead":http://www.nach-vorne.de
 * "ContextR Statistics on ohloh":http://www.ohloh.net/projects/5037
 

data/website/template.rhtml

@@ -42,7 +42,12 @@
     </p>
 </div>
 
-<!-- insert site tracking codes here, like Google Urchin -->
+<script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+</script>
+<script type="text/javascript">
+  _uacct = "UA-510991-4";
+  urchinTracker();
+</script>
 
 </body>
 </html>

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
+rubygems_version: 0.9.3
 specification_version: 1
 name: contextr
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
-date: 2007-05-10 00:00:00 +02:00
+  version: 0.0.3
+date: 2007-05-22 00:00:00 +02:00
 summary: The goal is to equip Ruby with an API to allow context-oriented programming.
 require_paths: 
 - lib
@@ -37,6 +37,7 @@ files:
 - Rakefile
 - examples/education.rb
 - examples/fibonacci.rb
+- examples/with_current_context.rb
 - lib/contextr.rb
 - lib/contextr/contextr.rb
 - lib/contextr/layer.rb
@@ -51,6 +52,7 @@ files:
 - scripts/txt2html
 - setup.rb
 - spec/contextr/contextr_api_spec.rb
+- spec/contextr/contextr_class_side_spec.rb
 - spec/contextr/contextr_functional_spec.rb
 - spec/core_ext/module_spec.rb
 - spec/core_ext/proc_spec.rb
@@ -66,10 +68,16 @@ files:
 test_files: 
 - test/contextr/test_contextr.rb
 - test/test_helper.rb
-rdoc_options: []
-
-extra_rdoc_files: []
-
+rdoc_options: 
+- --main
+- README.txt
+extra_rdoc_files: 
+- COPYING.txt
+- History.txt
+- LICENSE.txt
+- Manifest.txt
+- README.txt
+- website/index.txt
 executables: []
 
 extensions: []