aquarium 0.5.1 → 0.7.1

data/jruby/spec/spec_helper.rb

@@ -0,0 +1,5 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec/aquarium/spec_helper')
+
+require 'aquarium'
+require 'jruby/java/example.jar'
+include Java

data/lib/aquarium/aspects/aspect.rb

@@ -432,9 +432,13 @@ module Aquarium
       end
 
       #--
-      # By NOT dup'ing the join_point, we save about 25% on the overhead! However, we
-      # compromise thread safety, primarily because the join_point's context object will be changed.
-      # TODO Refactor context out of static join point part.
+      # Previous versions of Aquarium did NOT dup the join_point here, because it saved about 25% 
+      # on the overhead on circa 2005 machines. However, that seriously compromised thread safety,
+      # primarily because the join_point's context object changes during execution.
+      # We now dup the joinpoint, because the improved performance of circa 2013 machines seems to
+      # have largely made the extra overhead small enough to be inconsequential. There are possible
+      # improvements, such as decoupling the mutable and immutable parts and reusing the later. 
+      # Feedback is welcome.
       # Note that we have to assign the parameters and block to the context object in case
       # the advice calls "proceed" or "invoke_original_join_point" without arguments.
       #++
@@ -445,7 +449,7 @@ module Aquarium
         alias_method :#{alias_method_name}, :#{join_point.method_name}
         def #{join_point.method_name} *args, &block_for_method
           advice_chain = #{type_being_advised_text}.send :class_variable_get, "#{advice_chain_attr_sym}"
-          join_point = advice_chain.static_join_point
+          join_point = advice_chain.static_join_point.dup
           join_point.context.parameters = args
           join_point.context.block_for_method = block_for_method
           join_point.context.advised_object = #{target_self}

data/lib/aquarium/utils/type_utils.rb

@@ -1,4 +1,5 @@
 require 'set'
+require 'rbconfig'
 
 module Aquarium
   module Utils
@@ -59,7 +60,9 @@ module Aquarium
       end
       
       def self.use_underscore_methods? mod
-        mod.respond_to?(:__constants__)
+        #TODO
+        false
+        # mod.respond_to?(:__constants__)
       end
 
       def self.responds_to_ancestors? mod

data/lib/aquarium/version.rb

@@ -1,28 +1,29 @@
-module Aquarium
-  module VERSION
-    def self.build_tag
-      tag = "REL_" + [MAJOR, MINOR, TINY].join('_')
-      tag << "_" << RELEASE_CANDIDATE  unless RELEASE_CANDIDATE.nil? or RELEASE_CANDIDATE.empty?
-      tag
-    end
-
-    unless defined? MAJOR
-      MAJOR  = 0
-      MINOR  = 5
-      TINY   = 1
-      RELEASE_CANDIDATE = nil
-      
-      # RANDOM_TOKEN: 0.598704893979657
-      REV = "$LastChangedRevision: 7 $".match(/LastChangedRevision: (\d+)/)[1]
-
-      STRING = [MAJOR, MINOR, TINY].join('.')
-      FULL_VERSION = "#{STRING} (r#{REV})"
-      TAG = build_tag
-
-      NAME   = "Aquarium"
-      URL    = "http://aquarium.rubyforge.org"  
-    
-      DESCRIPTION = "#{NAME}-#{FULL_VERSION} - Aspect-Oriented Programming toolkit for Ruby\n#{URL}"
-    end
-  end
-end
+module Aquarium
+  module VERSION
+    def self.build_tag
+      tag = "REL_" + [MAJOR, MINOR, TINY].join('_')
+      tag << "_" << RELEASE_CANDIDATE  unless RELEASE_CANDIDATE.nil? or RELEASE_CANDIDATE.empty?
+      tag
+    end
+
+    unless defined? MAJOR
+      MAJOR  = 0
+      MINOR  = 7
+      TINY   = 1
+      RELEASE_CANDIDATE = nil
+
+      # RANDOM_TOKEN: 0.598704893979657
+      REV = "$LastChangedRevision: 7 $".match(/LastChangedRevision: (\d+)/)[1]
+
+      STRING = [MAJOR, MINOR, TINY].join('.')
+      FULL_VERSION = "#{STRING} (r#{REV})"
+      TAG = build_tag
+
+      NAME   = "Aquarium"
+      URL    = "http://aquarium.rubyforge.org"
+
+      DESCRIPTION = "#{NAME}-#{FULL_VERSION} - Aspect-Oriented Programming toolkit for Ruby\n#{URL}"
+    end
+  end
+end
+

data/rspec.watchr

@@ -0,0 +1,60 @@
+#!/usr/bin/env watchr
+# Run me with:
+#
+#   $ watchr rspec.watchr
+
+# --------------------------------------------------
+# Convenience Methods
+# --------------------------------------------------
+def all_test_files
+  Dir['spec/**/*_spec.rb']
+end
+
+def run_test_matching(thing_to_match)
+  matches = all_test_files.grep(/#{thing_to_match}/i)
+  if matches.empty?
+    run_all_tests
+  else
+    run matches.join(' ')
+  end
+end
+
+def run(files_to_run)
+  puts("Running: #{files_to_run}")
+  system("clear;rspec -cfs #{files_to_run}")
+  no_int_for_you
+end
+
+def run_all_tests
+  run(all_test_files.join(' '))
+end
+#
+# --------------------------------------------------
+# Watchr Rules
+# --------------------------------------------------
+watch('^spec/(.*)_spec\.rb'  )   { |m| run_test_matching(m[1]) }
+watch('^lib/(.*)\.rb'        )   { |m| run_test_matching(m[1]) }
+watch('^spec/spec_helper\.rb')   { run_all_tests }
+# --------------------------------------------------
+# Signal Handling
+# --------------------------------------------------
+
+def no_int_for_you
+  @sent_an_int = nil
+end
+
+Signal.trap 'INT' do
+  if @sent_an_int then      
+    puts "   Shutting down now."
+    exit
+  else
+    puts "   Hit ^C again to exit."
+    @sent_an_int = true
+    Kernel.sleep 1.5
+    run_all_tests 
+  end
+end
+
+run_all_tests
+
+# vim:ft=ruby

data/spec/aquarium/aspects/advice_spec.rb

@@ -115,7 +115,7 @@ describe Advice, "that raises an exception" do
     aspect = Aspect.new :before, :pointcut => {:type => Watchful, :methods => :public_class_watchful_method, :method_options => [:class]} do |jp, obj, *args| 
       raise MyException1.new("advice called with args: #{args.inspect}")
     end
-    lambda { Watchful.public_class_watchful_method :a1, :a2 }.should raise_error(MyException1)
+    expect { Watchful.public_class_watchful_method :a1, :a2 }.to raise_error(MyException1)
     aspect.unadvise
   end
 
@@ -208,7 +208,7 @@ describe Advice, "#invoke_original_join_point that raises an exception" do
       :method_options => [:class]} do |jp, obj, *args| 
         jp.invoke_original_join_point
     end
-    lambda { InvokeOriginalJoinPointRaisingException.class_raise_exception :a1, :a2 }.should raise_error(InvokeOriginalJoinPointRaisingException::IOJPRException)
+    expect { InvokeOriginalJoinPointRaisingException.class_raise_exception :a1, :a2 }.to raise_error(InvokeOriginalJoinPointRaisingException::IOJPRException)
     aspect.unadvise
   end
 
@@ -272,17 +272,17 @@ end
 
 describe AdviceChainNodeFactory, "#make_node" do
   it "should raise if an unknown advice kind is specified" do
-    lambda {AdviceChainNodeFactory.make_node :advice_kind => :foo}.should raise_error(Aquarium::Utils::InvalidOptions)    
+    expect {AdviceChainNodeFactory.make_node :advice_kind => :foo}.to raise_error(Aquarium::Utils::InvalidOptions)    
   end
 
   it "should return a node of the type corresponding to the input advice kind" do
-    AdviceChainNodeFactory.make_node(:advice_kind => :no).kind_of?(NoAdviceChainNode).should be_true
-    AdviceChainNodeFactory.make_node(:advice_kind => :none).kind_of?(NoAdviceChainNode).should be_true
-    AdviceChainNodeFactory.make_node(:advice_kind => :before).kind_of?(BeforeAdviceChainNode).should be_true
-    AdviceChainNodeFactory.make_node(:advice_kind => :after).kind_of?(AfterAdviceChainNode).should be_true
-    AdviceChainNodeFactory.make_node(:advice_kind => :after_raising).kind_of?(AfterRaisingAdviceChainNode).should be_true
-    AdviceChainNodeFactory.make_node(:advice_kind => :after_returning).kind_of?(AfterReturningAdviceChainNode).should be_true
-    AdviceChainNodeFactory.make_node(:advice_kind => :around).kind_of?(AroundAdviceChainNode).should be_true
+    AdviceChainNodeFactory.make_node(:advice_kind => :no).kind_of?(NoAdviceChainNode).should be_truthy
+    AdviceChainNodeFactory.make_node(:advice_kind => :none).kind_of?(NoAdviceChainNode).should be_truthy
+    AdviceChainNodeFactory.make_node(:advice_kind => :before).kind_of?(BeforeAdviceChainNode).should be_truthy
+    AdviceChainNodeFactory.make_node(:advice_kind => :after).kind_of?(AfterAdviceChainNode).should be_truthy
+    AdviceChainNodeFactory.make_node(:advice_kind => :after_raising).kind_of?(AfterRaisingAdviceChainNode).should be_truthy
+    AdviceChainNodeFactory.make_node(:advice_kind => :after_returning).kind_of?(AfterReturningAdviceChainNode).should be_truthy
+    AdviceChainNodeFactory.make_node(:advice_kind => :around).kind_of?(AroundAdviceChainNode).should be_truthy
   end
 end
 

data/spec/aquarium/aspects/aspect_invocation_spec.rb

@@ -73,15 +73,15 @@ describe Aspect, "methods" do
     end
   
     it "should warn about no join point matches if the :ignore_no_matching_join_points is not specified." do
-      lambda {Aspect.new(:after, :logger_stream => @log_stream) {true}}.should raise_error(Aquarium::Utils::InvalidOptions)
+      expect {Aspect.new(:after, :logger_stream => @log_stream) {true}}.to raise_error(Aquarium::Utils::InvalidOptions)
       @log_stream.string.should_not be_empty
     end
     it "should warn about no join point matches if :ignore_no_matching_join_points => false is specified." do
-      lambda {Aspect.new(:after, :logger_stream => @log_stream, :ignore_no_matching_join_points => false) {true}}.should raise_error(Aquarium::Utils::InvalidOptions)
+      expect {Aspect.new(:after, :logger_stream => @log_stream, :ignore_no_matching_join_points => false) {true}}.to raise_error(Aquarium::Utils::InvalidOptions)
       @log_stream.string.should_not be_empty
     end
     it "should not warn about no join point matches if :ignore_no_matching_join_points => true is specified." do
-      lambda {Aspect.new(:after, :logger_stream => @log_stream, :ignore_no_matching_join_points => true) {true}}.should raise_error(Aquarium::Utils::InvalidOptions)
+      expect {Aspect.new(:after, :logger_stream => @log_stream, :ignore_no_matching_join_points => true) {true}}.to raise_error(Aquarium::Utils::InvalidOptions)
       @log_stream.string.should be_empty
     end
   end
@@ -92,48 +92,48 @@ describe Aspect, "methods" do
     end
     
     it "should require the kind of advice as the first parameter." do
-      lambda { Aspect.new :pointcut => @pointcut_opts }.should raise_error(Aquarium::Utils::InvalidOptions)
+      expect { Aspect.new :pointcut => @pointcut_opts }.to raise_error(Aquarium::Utils::InvalidOptions)
     end
 
     it "should contain no other advice types if :around advice specified." do
-      lambda { Aspect.new :around, :before,          :pointcut => @pointcut_opts }.should raise_error(Aquarium::Utils::InvalidOptions)
-      lambda { Aspect.new :around, :after,           :pointcut => @pointcut_opts }.should raise_error(Aquarium::Utils::InvalidOptions)
-      lambda { Aspect.new :around, :after_returning, :pointcut => @pointcut_opts }.should raise_error(Aquarium::Utils::InvalidOptions)
-      lambda { Aspect.new :around, :after_raising,   :pointcut => @pointcut_opts }.should raise_error(Aquarium::Utils::InvalidOptions)
+      expect { Aspect.new :around, :before,          :pointcut => @pointcut_opts }.to raise_error(Aquarium::Utils::InvalidOptions)
+      expect { Aspect.new :around, :after,           :pointcut => @pointcut_opts }.to raise_error(Aquarium::Utils::InvalidOptions)
+      expect { Aspect.new :around, :after_returning, :pointcut => @pointcut_opts }.to raise_error(Aquarium::Utils::InvalidOptions)
+      expect { Aspect.new :around, :after_raising,   :pointcut => @pointcut_opts }.to raise_error(Aquarium::Utils::InvalidOptions)
     end
 
     it "should allow only one of :after, :after_returning, or :after_raising advice to be specified." do
-      lambda { Aspect.new :after, :after_returning, :pointcut => @pointcut_opts }.should raise_error(Aquarium::Utils::InvalidOptions)
-      lambda { Aspect.new :after, :after_raising,   :pointcut => @pointcut_opts }.should raise_error(Aquarium::Utils::InvalidOptions)
-      lambda { Aspect.new :after_returning, :after_raising, :pointcut => @pointcut_opts }.should raise_error(Aquarium::Utils::InvalidOptions)
+      expect { Aspect.new :after, :after_returning, :pointcut => @pointcut_opts }.to raise_error(Aquarium::Utils::InvalidOptions)
+      expect { Aspect.new :after, :after_raising,   :pointcut => @pointcut_opts }.to raise_error(Aquarium::Utils::InvalidOptions)
+      expect { Aspect.new :after_returning, :after_raising, :pointcut => @pointcut_opts }.to raise_error(Aquarium::Utils::InvalidOptions)
     end
 
     it "should allow :before to be specified with :after." do
-      lambda { Aspect.new :before, :after, :pointcut => @pointcut_opts, :noop => true }.should_not raise_error(Aquarium::Utils::InvalidOptions)
+      expect { Aspect.new :before, :after, :pointcut => @pointcut_opts, :noop => true }.not_to raise_error
     end
 
     it "should allow :before to be specified with :after_returning." do
-      lambda { Aspect.new :before, :after_returning, :pointcut => @pointcut_opts, :noop => true }.should_not raise_error(Aquarium::Utils::InvalidOptions)
+      expect { Aspect.new :before, :after_returning, :pointcut => @pointcut_opts, :noop => true }.not_to raise_error
     end
 
     it "should allow :before to be specified with :after_raising." do
-      lambda { Aspect.new :before, :after_raising,   :pointcut => @pointcut_opts, :noop => true }.should_not raise_error(Aquarium::Utils::InvalidOptions)
+      expect { Aspect.new :before, :after_raising,   :pointcut => @pointcut_opts, :noop => true }.not_to raise_error
     end
 
     it "should accept a single exception specified with :after_raising." do
-      lambda { Aspect.new :before, :after_raising => Exception, :pointcut => @pointcut_opts, :noop => true }.should_not raise_error(Aquarium::Utils::InvalidOptions)
+      expect { Aspect.new :before, :after_raising => Exception, :pointcut => @pointcut_opts, :noop => true }.not_to raise_error
     end
   
     it "should accept a list of exceptions specified with :after_raising." do
-      lambda { Aspect.new :before, :after_raising => [Exception, String], :pointcut => @pointcut_opts, :noop => true }.should_not raise_error(Aquarium::Utils::InvalidOptions)
+      expect { Aspect.new :before, :after_raising => [Exception, String], :pointcut => @pointcut_opts, :noop => true }.not_to raise_error
     end
 
     it "should accept a separate :exceptions => list of exceptions specified with :after_raising." do
-      lambda { Aspect.new :before, :after_raising, :exceptions => [Exception, String], :pointcut => @pointcut_opts, :noop => true }.should_not raise_error(Aquarium::Utils::InvalidOptions)
+      expect { Aspect.new :before, :after_raising, :exceptions => [Exception, String], :pointcut => @pointcut_opts, :noop => true }.not_to raise_error
     end
 
     it "should reject the :exceptions argument unless specified with :after_raising." do
-      lambda { Aspect.new :before, :after, :exceptions => [Exception, String], :pointcut => @pointcut_opts, :noop => true }.should raise_error(Aquarium::Utils::InvalidOptions)
+      expect { Aspect.new :before, :after, :exceptions => [Exception, String], :pointcut => @pointcut_opts, :noop => true }.to raise_error(Aquarium::Utils::InvalidOptions)
     end
   end
 
@@ -143,7 +143,7 @@ describe Aspect, "methods" do
     end
     
     it "should contain at least one of :method(s), :pointcut(s), :named_pointcut(s), :type(s), or :object(s)." do
-      lambda {Aspect.new(:after, :ignore_no_matching_join_points => true) {true}}.should raise_error(Aquarium::Utils::InvalidOptions)
+      expect {Aspect.new(:after, :ignore_no_matching_join_points => true) {true}}.to raise_error(Aquarium::Utils::InvalidOptions)
     end
 
     it "should contain at least one of :pointcut(s), :named_pointcut(s), :type(s), or :object(s) unless :default_objects => object is given." do
@@ -227,15 +227,15 @@ describe Aspect, "methods" do
     end
   
     it "should not contain :pointcut(s) and either :type(s) or :object(s)." do
-      lambda {Aspect.new(:after, :pointcuts => @pointcut_opts, :type => Aquarium::AspectInvocationTestClass, :method => :public_test_method) {true}}.should raise_error(Aquarium::Utils::InvalidOptions)
-      lambda {Aspect.new(:after, :pointcuts => @pointcut_opts, :object => Aquarium::AspectInvocationTestClass.new, :method => :public_test_method) {true}}.should raise_error(Aquarium::Utils::InvalidOptions)
+      expect {Aspect.new(:after, :pointcuts => @pointcut_opts, :type => Aquarium::AspectInvocationTestClass, :method => :public_test_method) {true}}.to raise_error(Aquarium::Utils::InvalidOptions)
+      expect {Aspect.new(:after, :pointcuts => @pointcut_opts, :object => Aquarium::AspectInvocationTestClass.new, :method => :public_test_method) {true}}.to raise_error(Aquarium::Utils::InvalidOptions)
     end
   end
 
   describe Aspect, ".new (parameters that specify named constant and/or class variable pointcuts)" do
     it "should contain at least one :types or TypeFinder synonym for :types." do
-      lambda {Aspect.new(:after, :named_pointcuts => {}, :noop => true) {true}}.should raise_error(Aquarium::Utils::InvalidOptions)
-      lambda {Aspect.new(:after, :named_pointcuts => {:types => all_pointcut_classes}, :noop => true) {true}}.should_not raise_error(Aquarium::Utils::InvalidOptions)
+      expect {Aspect.new(:after, :named_pointcuts => {}, :noop => true) {true}}.to raise_error(Aquarium::Utils::InvalidOptions)
+      expect {Aspect.new(:after, :named_pointcuts => {:types => Aquarium::PointcutFinderTestClasses.all_pointcut_classes}, :noop => true) {true}}.not_to raise_error
     end
 
     it "should ignore the :default_objects if at least one :named_pointcut is given even if the :default_objects => object are given." do
@@ -261,8 +261,8 @@ describe Aspect, "methods" do
     end
 
     it "should not contain :named_pointcut(s) and either :type(s) or :object(s)." do
-      lambda {Aspect.new(:after, :named_pointcuts => {:types => Aquarium::PointcutFinderTestClasses::PointcutClassVariableHolder1}, :type => Aquarium::AspectInvocationTestClass, :method => :public_test_method) {true}}.should raise_error(Aquarium::Utils::InvalidOptions)
-      lambda {Aspect.new(:after, :named_pointcuts => {:types => Aquarium::PointcutFinderTestClasses::PointcutClassVariableHolder1}, :object => Aquarium::AspectInvocationTestClass.new, :method => :public_test_method) {true}}.should raise_error(Aquarium::Utils::InvalidOptions)
+      expect {Aspect.new(:after, :named_pointcuts => {:types => Aquarium::PointcutFinderTestClasses::PointcutClassVariableHolder1}, :type => Aquarium::AspectInvocationTestClass, :method => :public_test_method) {true}}.to raise_error(Aquarium::Utils::InvalidOptions)
+      expect {Aspect.new(:after, :named_pointcuts => {:types => Aquarium::PointcutFinderTestClasses::PointcutClassVariableHolder1}, :object => Aquarium::AspectInvocationTestClass.new, :method => :public_test_method) {true}}.to raise_error(Aquarium::Utils::InvalidOptions)
     end
   end
   
@@ -272,7 +272,7 @@ describe Aspect, "methods" do
       aspect = Aspect.new :before, :types => Aquarium::AspectInvocationTestClass, :method => :public_test_method do; @advice_called = true; end
       Aquarium::AspectInvocationTestClass.new.public_test_method
       aspect.unadvise
-      @advice_called.should be_true
+      @advice_called.should be_truthy
     end
 
     Aspect::CANONICAL_OPTIONS["types"].each do |key|
@@ -289,7 +289,7 @@ describe Aspect, "methods" do
       aspect = Aspect.new :before, :pointcuts => {:types => Aquarium::AspectInvocationTestClass, :method => :public_test_method} do; @advice_called = true; end
       Aquarium::AspectInvocationTestClass.new.public_test_method
       aspect.unadvise
-      @advice_called.should be_true
+      @advice_called.should be_truthy
     end
 
     Aspect::CANONICAL_OPTIONS["pointcuts"].each do |key|
@@ -307,7 +307,7 @@ describe Aspect, "methods" do
       aspect = Aspect.new :before, :objects => object, :method => :public_test_method do; @advice_called = true; end
       object.public_test_method
       aspect.unadvise
-      @advice_called.should be_true
+      @advice_called.should be_truthy
     end
 
     Aspect::CANONICAL_OPTIONS["objects"].each do |key|
@@ -325,7 +325,7 @@ describe Aspect, "methods" do
       aspect = Aspect.new :before, :types => Aquarium::AspectInvocationTestClass, :methods => :public_test_method do; @advice_called = true; end
       Aquarium::AspectInvocationTestClass.new.public_test_method
       aspect.unadvise
-      @advice_called.should be_true
+      @advice_called.should be_truthy
     end
 
     Aspect::CANONICAL_OPTIONS["methods"].each do |key|
@@ -348,14 +348,14 @@ describe Aspect, "methods" do
 
     it "should require the values for :reading => ... and :writing => ... to be equal if both are specified." do
       @advice = Proc.new {}
-      lambda {Aspect.new :before, :type => Aquarium::AspectInvocationTestClass3, 
-        :reading => :public_test_method_args, :writing => :public_test_method_args2, :advice => @advice}.should raise_error(Aquarium::Utils::InvalidOptions)
+      expect {Aspect.new :before, :type => Aquarium::AspectInvocationTestClass3, 
+        :reading => :public_test_method_args, :writing => :public_test_method_args2, :advice => @advice}.to raise_error(Aquarium::Utils::InvalidOptions)
     end
 
     it "should require the values for :reading => ... and :changing => ... to be equal if both are specified." do
       @advice = Proc.new {}
-      lambda {Aspect.new :before, :type => Aquarium::AspectInvocationTestClass3, 
-        :reading => :public_test_method_args, :changing => :public_test_method_args2, :advice => @advice}.should raise_error(Aquarium::Utils::InvalidOptions)
+      expect {Aspect.new :before, :type => Aquarium::AspectInvocationTestClass3, 
+        :reading => :public_test_method_args, :changing => :public_test_method_args2, :advice => @advice}.to raise_error(Aquarium::Utils::InvalidOptions)
     end
 
     it "should accept :reading => ... as a synonym for :attributes => ..., :attribute_options => [:readers]." do
@@ -411,7 +411,7 @@ describe Aspect, "methods" do
       else
         Aquarium::AspectInvocationTestClass.new.method("#{@protection}_test_method").call :a1, :a2, :a3, :h1 => 'h1', :h2 => 'h2'
       end
-      advice_called.should be_true
+      advice_called.should be_truthy
       aspect.unadvise
     end
 
@@ -599,7 +599,7 @@ describe Aspect, "methods" do
       object.method("#{@protection}_test_method_args".intern).call 
       @expected_args = :a1
       object.method("#{@protection}_test_method_args=".intern).call @expected_args
-      advice_called.should be_true
+      advice_called.should be_truthy
       aspect.unadvise
     end
 
@@ -733,7 +733,7 @@ describe Aspect, "methods" do
       make_array(@object_spec).each do |object|
         object.method("#{@protection}_test_method".intern).call :a1, :a2, :a3, :h1 => 'h1', :h2 => 'h2'
       end
-      advice_called.should be_true
+      advice_called.should be_truthy
       aspect.unadvise
     end
 
@@ -829,7 +829,7 @@ describe Aspect, "methods" do
         object.method("#{@protection}_test_method_args".intern).call 
         @expected_args = :a1
         object.method("#{@protection}_test_method_args=".intern).call @expected_args
-        advice_called.should be_true
+        advice_called.should be_truthy
       end
       aspect.unadvise
     end
@@ -926,7 +926,7 @@ describe Aspect, "methods" do
       else
         Aquarium::AspectInvocationTestClass.new.method("#{@protection}_test_method".intern).call :a1, :a2, :a3, :h1 => 'h1', :h2 => 'h2'
       end
-      advice_called.should be_true
+      advice_called.should be_truthy
       aspect.unadvise
     end
 
@@ -1117,7 +1117,7 @@ describe Aspect, "methods" do
         args.should == [:a1, :a2, :a3, {:h1 => 'h1', :h2 => 'h2'}]
       end 
       Aquarium::AspectInvocationTestClass.new.public_test_method :a1, :a2, :a3, :h1 => 'h1', :h2 => 'h2'
-      advice_called.should be_true
+      advice_called.should be_truthy
       aspect.unadvise
     end
 
@@ -1423,7 +1423,7 @@ describe Aspect, "methods" do
         args.should == [:a1, :a2, :a3, {:h1 => 'h1', :h2 => 'h2'}]
       end 
       object.public_test_method :a1, :a2, :a3, :h1 => 'h1', :h2 => 'h2'
-      advice_called.should be_true
+      advice_called.should be_truthy
       aspect.unadvise
     end
 
@@ -1438,7 +1438,7 @@ describe Aspect, "methods" do
       }
       aspect = Aspect.new :before, :object => object, :methods => :public_test_method, :advice => advice
       object.public_test_method :a1, :a2, :a3, :h1 => 'h1', :h2 => 'h2'
-      advice_called.should be_true
+      advice_called.should be_truthy
       aspect.unadvise
     end
   
@@ -1454,7 +1454,7 @@ describe Aspect, "methods" do
         }
         aspect = Aspect.new :before, :object => object, :methods => :public_test_method, key.intern => advice
         object.public_test_method :a1, :a2, :a3, :h1 => 'h1', :h2 => 'h2'
-        advice_called.should be_true
+        advice_called.should be_truthy
         aspect.unadvise
       end
     end
@@ -1464,7 +1464,7 @@ describe Aspect, "methods" do
       advice_called = false
       advice1 = Proc.new {|jp, obj, *args| fail "advice1"}
       advice2 = Proc.new {|jp, obj, *args| fail "advice2"}
-      lambda {Aspect.new :before, :object => object, :methods => :public_test_method, :advice => advice1, :invoke => advice2}.should raise_error(Aquarium::Utils::InvalidOptions)
+      expect {Aspect.new :before, :object => object, :methods => :public_test_method, :advice => advice1, :invoke => advice2}.to raise_error(Aquarium::Utils::InvalidOptions)
     end
 
     it "should allow ignore an :advice option if a block is given." do
@@ -1476,18 +1476,18 @@ describe Aspect, "methods" do
         advice_called = true
       end
       object.public_test_method :a1, :a2, :a3, :h1 => 'h1', :h2 => 'h2'
-      advice_called.should be_true
+      advice_called.should be_truthy
       aspect.unadvise
     end
   end
 
   describe Aspect, ".new (advice block or proc parameter list)" do  
     it "should raise unless an advice block or :advice => advice parameter is specified." do
-      lambda { Aspect.new(:after, :type => Aquarium::AspectInvocationTestClass, :methods => :public_test_method)}.should raise_error(Aquarium::Utils::InvalidOptions)
+      expect { Aspect.new(:after, :type => Aquarium::AspectInvocationTestClass, :methods => :public_test_method)}.to raise_error(Aquarium::Utils::InvalidOptions)
     end
 
     it "should raise if obsolete |jp, *args| list is used." do
-      lambda { Aspect.new :before, :type => Aquarium::AspectInvocationTestClass, :methods => :public_test_method do |jp, *args|; end }.should raise_error(Aquarium::Utils::InvalidOptions)
+      expect { Aspect.new :before, :type => Aquarium::AspectInvocationTestClass, :methods => :public_test_method do |jp, *args|; end }.to raise_error(Aquarium::Utils::InvalidOptions)
     end
 
     it "should accept an argument list matching |jp, object, *args|." do
@@ -1566,12 +1566,12 @@ describe Aspect, "methods" do
       @included_types.each do |type|
         advice_called = false
         type.new(1).doit
-        advice_called.should be_true
+        advice_called.should be_truthy
       end
       @excluded_types.each do |type|
         advice_called = false
         type.new(1).doit
-        advice_called.should_not be_true
+        advice_called.should_not be_truthy
       end
       aspect.unadvise
     end
@@ -1644,12 +1644,12 @@ describe Aspect, "methods" do
       @included_objects.each do |object|
         advice_called = false
         object.doit
-        advice_called.should be_true
+        advice_called.should be_truthy
       end
       @excluded_objects.each do |object|
         advice_called = false
         object.doit
-        advice_called.should_not be_true
+        advice_called.should_not be_truthy
       end
       aspect.unadvise
     end
@@ -1688,12 +1688,12 @@ describe Aspect, "methods" do
       @included_objects.each do |object|
         advice_called = false
         object.doit
-        advice_called.should be_true
+        advice_called.should be_truthy
       end
       @excluded_objects.each do |object|
         advice_called = false
         object.doit
-        advice_called.should_not be_true
+        advice_called.should_not be_truthy
       end
       aspect.unadvise
     end
@@ -1723,12 +1723,12 @@ describe Aspect, "methods" do
       included_types.each do |type|
         advice_called = false
         type.new(1).doit
-        advice_called.should be_true
+        advice_called.should be_truthy
       end
       excluded_types.each do |type|
         advice_called = false
         type.new(1).doit
-        advice_called.should_not be_true
+        advice_called.should_not be_truthy
       end
       aspect.unadvise
     end
@@ -1747,10 +1747,10 @@ describe Aspect, "methods" do
 
       advice_called = false
       ClassWithPublicInstanceMethod.new.public_instance_test_method
-      advice_called.should be_false
+      advice_called.should be_falsey
       advice_called = false
       ClassIncludingModuleWithPublicInstanceMethod.new.public_instance_module_test_method
-      advice_called.should be_false
+      advice_called.should be_falsey
       aspect.unadvise
     end
   end
@@ -1768,10 +1768,10 @@ describe Aspect, "methods" do
 
       advice_called = false
       ClassWithPublicInstanceMethod.new.public_instance_test_method
-      advice_called.should be_false
+      advice_called.should be_falsey
       advice_called = false
       ClassIncludingModuleWithPublicInstanceMethod.new.public_instance_module_test_method
-      advice_called.should be_false
+      advice_called.should be_falsey
       aspect.unadvise
     end
   end
@@ -1789,10 +1789,10 @@ describe Aspect, "methods" do
 
       advice_called = false
       ClassWithPublicInstanceMethod.new.public_instance_test_method
-      advice_called.should be_false
+      advice_called.should be_falsey
       advice_called = false
       ClassIncludingModuleWithPublicInstanceMethod.new.public_instance_module_test_method
-      advice_called.should be_false
+      advice_called.should be_falsey
       aspect.unadvise
     end
   end
@@ -1815,12 +1815,12 @@ describe Aspect, "methods" do
       included_types.each do |type|
         advice_called = false
         type.new(1).doit
-        advice_called.should be_true
+        advice_called.should be_truthy
       end
       excluded_types.each do |type|
         advice_called = false
         type.new(1).doit
-        advice_called.should_not be_true
+        advice_called.should_not be_truthy
       end
       aspect.unadvise
     end
@@ -1851,12 +1851,12 @@ describe Aspect, "methods" do
       @included_objects.each do |object|
         advice_called = false
         object.doit
-        advice_called.should be_true
+        advice_called.should be_truthy
       end
       @excluded_objects.each do |object|
         advice_called = false
         object.doit
-        advice_called.should_not be_true
+        advice_called.should_not be_truthy
       end
       aspect.unadvise
     end
@@ -1890,12 +1890,12 @@ describe Aspect, "methods" do
       @included_types.each do |type|
         advice_called = false
         type.new(1).doit
-        advice_called.should be_true
+        advice_called.should be_truthy
       end
       @excluded_types.each do |type|
         advice_called = false
         type.new(1).doit
-        advice_called.should_not be_true
+        advice_called.should_not be_truthy
       end
       aspect.unadvise
     end
@@ -1924,12 +1924,12 @@ describe Aspect, "methods" do
       @included_types.each do |type|
         advice_called = false
         type.new(1).doit
-        advice_called.should be_true
+        advice_called.should be_truthy
       end
       @excluded_types.each do |type|
         advice_called = false
         type.new(1).doit
-        advice_called.should_not be_true
+        advice_called.should_not be_truthy
       end
       aspect.unadvise
     end
@@ -1947,12 +1947,12 @@ describe Aspect, "methods" do
       Aquarium::PointcutFinderTestClasses.all_class_variables_pointcut_classes.each do |type|
         advice_called = false
         type.new.doit
-        advice_called.should be_true
+        advice_called.should be_truthy
       end
       Aquarium::PointcutFinderTestClasses.all_constants_pointcut_classes.each do |type|
         advice_called = false
         type.new.doit
-        advice_called.should_not be_true
+        advice_called.should_not be_truthy
       end
       aspect.unadvise
     end
@@ -1985,12 +1985,12 @@ describe Aspect, "methods" do
       @included_types.each do |type|
         advice_called = false
         type.new(1).doit
-        advice_called.should be_true
+        advice_called.should be_truthy
       end
       @excluded_types.each do |type|
         advice_called = false
         type.new(1).doit
-        advice_called.should_not be_true
+        advice_called.should_not be_truthy
       end
       aspect.unadvise
     end
@@ -2096,12 +2096,12 @@ describe Aspect, "methods" do
       @included_objects.each do |object|
         advice_called = false
         object.doit
-        advice_called.should be_true
+        advice_called.should be_truthy
       end
       @excluded_objects.each do |object|
         advice_called = false
         object.doit
-        advice_called.should_not be_true
+        advice_called.should_not be_truthy
       end
       aspect.unadvise
     end
@@ -2146,23 +2146,23 @@ describe Aspect, "methods" do
         (@included_types + @excluded_types).each do |type|
           advice_called = false
           type.new(1).doit
-          advice_called.should be_true
+          advice_called.should be_truthy
         end
         @excluded_types.each do |type|
           advice_called = false
           type.new(1).doit3
-          advice_called.should_not be_true
+          advice_called.should be_falsey
         end
       end
       (@included_objects + @excluded_objects).each do |object|
         advice_called = false
         object.doit
-        advice_called.should be_true
+        advice_called.should be_truthy
       end
       @excluded_objects.each do |object|
         advice_called = false
         object.doit3
-        advice_called.should_not be_true
+        advice_called.should_not be_truthy
       end
       aspect.unadvise
     end
@@ -2205,7 +2205,7 @@ describe Aspect, "methods" do
     #   (@excluded_objects).each do |object|
     #     advice_called = false
     #     object.doit
-    #     advice_called.should be_true
+    #     advice_called.should be_truthy
     #   end
     #   aspect.unadvise
     # end