aquarium 0.5.1 → 0.7.1

data/spec/aquarium/finders/pointcut_finder_spec_test_classes.rb

@@ -47,10 +47,10 @@ module Aquarium
     def self.sort_pc_array pc_array
       pc_array.sort{|x,y| x.object_id <=> y.object_id}
     end
-    def self.found_pointcuts_should_match found_result_set, expected_found_pc_array, expected_not_found_type_array = []
-      found_result_set.matched.size.should == expected_found_pc_array.size
-      found_result_set.not_matched.size.should == expected_not_found_type_array.size
-      self.sort_pc_array(found_result_set.found_pointcuts).should == expected_found_pc_array
+    def self.found_pointcuts_should_match found_result_set, lambdaed_found_pc_array, lambdaed_not_found_type_array = []
+      found_result_set.matched.size.should == lambdaed_found_pc_array.size
+      found_result_set.not_matched.size.should == lambdaed_not_found_type_array.size
+      self.sort_pc_array(found_result_set.found_pointcuts).should == lambdaed_found_pc_array
     end
 
     def self.all_pointcut_classes

data/spec/aquarium/finders/type_finder_spec.rb

@@ -12,11 +12,11 @@ class SubOutside < Outside; end
 describe Aquarium::Finders::TypeFinder, "#find invocation parameters" do
 
   it "should raise if an uknown option is specified." do
-    lambda { Aquarium::Finders::TypeFinder.new.find :foo => 'bar', :baz => ''}.should raise_error(Aquarium::Utils::InvalidOptions)
+    expect { Aquarium::Finders::TypeFinder.new.find :foo => 'bar', :baz => ''}.to raise_error(Aquarium::Utils::InvalidOptions)
   end
   
   it "should raise if the input parameters do not form a hash." do
-    lambda { Aquarium::Finders::TypeFinder.new.find "foo" }.should raise_error(Aquarium::Utils::InvalidOptions)
+    expect { Aquarium::Finders::TypeFinder.new.find "foo" }.to raise_error(Aquarium::Utils::InvalidOptions)
   end
   
   it "should return no matched types and no unmatched type expressions by default (i.e., the input is empty)." do
@@ -208,7 +208,7 @@ describe Aquarium::Finders::TypeFinder, "#find with :types_and_descendents" do
 
   Aquarium::Finders::TypeFinder::CANONICAL_OPTIONS["types_and_descendents"].reject{|key| key.eql?("types_and_descendents")}.each do |key|
     it "should accept :#{key} as a synonym for :types_and_descendents." do
-      lambda {actual = Aquarium::Finders::TypeFinder.new.find key.intern => Outside, :noop => true}.should_not raise_error
+      expect {actual = Aquarium::Finders::TypeFinder.new.find key.intern => Outside, :noop => true}.not_to raise_error
     end
   end  
 end
@@ -224,7 +224,7 @@ describe Aquarium::Finders::TypeFinder, "#find with :types_and_ancestors" do
 
   Aquarium::Finders::TypeFinder::CANONICAL_OPTIONS["types_and_ancestors"].reject{|key| key.eql?("types_and_ancestors")}.each do |key|
     it "should accept :#{key} as a synonym for :types_and_ancestors." do
-      lambda {actual = Aquarium::Finders::TypeFinder.new.find key.intern => SubOutside, :noop => true}.should_not raise_error
+      expect {actual = Aquarium::Finders::TypeFinder.new.find key.intern => SubOutside, :noop => true}.not_to raise_error
     end
   end  
 end
@@ -250,7 +250,7 @@ end
 # This is a spec for a protected method. It's primarily to keep the code coverage 100%, because there is rarely-invoked error handling code...
 describe Aquarium::Finders::TypeFinder, "#get_type_from_parent should" do
   it "should raise if a type doesn't exist that matches the constant" do
-    lambda {Aquarium::Finders::TypeFinder.new.send(:get_type_from_parent, Aquarium::Finders, "Nonexistent", /Non/)}.should raise_error(NameError)
+    expect {Aquarium::Finders::TypeFinder.new.send(:get_type_from_parent, Aquarium::Finders, "Nonexistent", /Non/)}.to raise_error(NameError)
   end
 end
  

data/spec/aquarium/finders/type_finder_with_descendents_and_ancestors_spec.rb

@@ -10,7 +10,8 @@ def purge_actuals actuals
     t2.name.include?("Spec::") or 
     t2.name =~ /Aquarium::(Utils|Extras|Examples|Aspects|PointcutFinderTestClasses)/ or 
     t2.name =~ /^PP/ or
-    t2.name =~ /InstanceExecHelper/
+    t2.name =~ /InstanceExecHelper/ or
+    t2.name =~ /JSON/ # JSON::Ext::Generator::GeneratorMethods::Object is included somewhere
   end
 end
 
@@ -26,7 +27,7 @@ describe Aquarium::Finders::TypeFinder, "#find types and their descendents, usin
 
   Aquarium::Finders::TypeFinder::CANONICAL_OPTIONS["types_and_descendents"].each do |synonym|
     it "should accept :#{synonym} as a synonym for :types_and_descendents" do
-      lambda {Aquarium::Finders::TypeFinder.new.find synonym.intern => TypeUtils.sample_types, :noop => true}.should_not raise_error(InvalidOptions)
+      expect {Aquarium::Finders::TypeFinder.new.find synonym.intern => TypeUtils.sample_types, :noop => true}.not_to raise_error
     end
   end
 end
@@ -44,7 +45,7 @@ describe Aquarium::Finders::TypeFinder, "#find types subtracting out excluded ty
 
   Aquarium::Finders::TypeFinder::CANONICAL_OPTIONS["exclude_types_and_descendents"].each do |synonym|
     it "should accept :#{synonym} as a synonym for :exclude_types_and_descendents" do
-      lambda {Aquarium::Finders::TypeFinder.new.find :types_and_descendents => ModuleForDescendents, synonym.intern => D1ForDescendents, :noop => true}.should_not raise_error(InvalidOptions)
+      expect {Aquarium::Finders::TypeFinder.new.find :types_and_descendents => ModuleForDescendents, synonym.intern => D1ForDescendents, :noop => true}.not_to raise_error
     end
   end
 end
@@ -62,7 +63,7 @@ describe Aquarium::Finders::TypeFinder, "#find types and their ancestors, using
 
   Aquarium::Finders::TypeFinder::CANONICAL_OPTIONS["types_and_ancestors"].each do |synonym|
     it "should accept :#{synonym} as a synonym for :types_and_ancestors" do
-      lambda {Aquarium::Finders::TypeFinder.new.find synonym.intern => TypeUtils.sample_types, :noop => true}.should_not raise_error(InvalidOptions)
+      expect {Aquarium::Finders::TypeFinder.new.find synonym.intern => TypeUtils.sample_types, :noop => true}.not_to raise_error
     end
   end
 end
@@ -81,7 +82,7 @@ describe Aquarium::Finders::TypeFinder, "#find types subtracting out excluded ty
 
   Aquarium::Finders::TypeFinder::CANONICAL_OPTIONS["exclude_types_and_ancestors"].each do |synonym|
     it "should accept :#{synonym} as a synonym for :exclude_types_and_ancestors" do
-      lambda {Aquarium::Finders::TypeFinder.new.find :types_and_ancestors => D1ForDescendents, synonym.intern => ModuleForDescendents, :noop => true}.should_not raise_error(InvalidOptions)
+      expect {Aquarium::Finders::TypeFinder.new.find :types_and_ancestors => D1ForDescendents, synonym.intern => ModuleForDescendents, :noop => true}.not_to raise_error
     end
   end
 end

data/spec/aquarium/finders/type_finder_with_nested_types_spec.rb

@@ -24,7 +24,7 @@ describe TypeUtils, "#find types and their nested types, using :types_and_nested
 
   Aquarium::Finders::TypeFinder::CANONICAL_OPTIONS["types_and_nested_types"].each do |synonym|
     it "should accept :#{synonym} as a synonym for :types_and_nested_types" do
-      lambda {Aquarium::Finders::TypeFinder.new.find synonym.intern => TypeUtils.sample_types, :noop => true}.should_not raise_error(InvalidOptions)
+      expect {Aquarium::Finders::TypeFinder.new.find synonym.intern => TypeUtils.sample_types, :noop => true}.not_to raise_error
     end
   end
 end
@@ -41,7 +41,7 @@ describe TypeUtils, "#find nested types subtracting out excluded types and desce
 
   Aquarium::Finders::TypeFinder::CANONICAL_OPTIONS["exclude_types_and_nested_types"].each do |synonym|
     it "should accept :#{synonym} as a synonym for :exclude_types_and_nested_types" do
-      lambda {Aquarium::Finders::TypeFinder.new.find :exclude_types_and_nested_types => ModuleForDescendents, synonym.intern => D1ForDescendents, :noop => true}.should_not raise_error(InvalidOptions)
+      expect {Aquarium::Finders::TypeFinder.new.find :exclude_types_and_nested_types => ModuleForDescendents, synonym.intern => D1ForDescendents, :noop => true}.not_to raise_error
     end
   end
 end

data/spec/aquarium/utils/logic_error_spec.rb

@@ -5,6 +5,6 @@ require 'aquarium/utils/logic_error'
 # This doesn't do much..., except make rcov happy, since this exception is essentially for catching bugs.
 describe Aquarium::Utils::LogicError, ".new" do
   it "should return an exception object" do
-    Aquarium::Utils::LogicError.new.kind_of?(Exception).should be_true 
+    Aquarium::Utils::LogicError.new.kind_of?(Exception).should be_truthy 
   end
 end

data/spec/aquarium/utils/method_utils_spec.rb

@@ -141,10 +141,10 @@ describe Aquarium::Utils::MethodUtils, ".visibility" do
   end
   
   it "should return :private for private class methods on a class" do
-    Aquarium::Utils::MethodUtils.visibility(MethodUtilsSpecProtectionExample, :private_class_m).should == :private #expected_private
+    Aquarium::Utils::MethodUtils.visibility(MethodUtilsSpecProtectionExample, :private_class_m).should == :private #lambdaed_private
   end
   it "should return :private for private class methods on a class when only class methods are specified" do
-    Aquarium::Utils::MethodUtils.visibility(MethodUtilsSpecProtectionExample, :private_class_m, :class_method_only).should == :private #expected_private
+    Aquarium::Utils::MethodUtils.visibility(MethodUtilsSpecProtectionExample, :private_class_m, :class_method_only).should == :private #lambdaed_private
   end
   it "should return nil for private class methods on a class when only instance methods are specified" do
     Aquarium::Utils::MethodUtils.visibility(MethodUtilsSpecProtectionExample, :private_class_m, :instance_method_only).should be_nil
@@ -216,103 +216,103 @@ end
 
 describe Aquarium::Utils::MethodUtils, ".has_method" do
   it "should return true for public class methods on a class" do
-    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample, :public_class_m).should be_true
+    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample, :public_class_m).should be_truthy
   end
   it "should return true for public class methods on a class when only class methods are specified" do
-    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample, :public_class_m, :class_method_only).should be_true
+    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample, :public_class_m, :class_method_only).should be_truthy
   end
   it "should return false for public class methods on a class when only instance methods are specified" do
-    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample, :public_class_m, :instance_method_only).should be_false
+    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample, :public_class_m, :instance_method_only).should be_falsey
   end
 
   it "should return true for public instance methods on a class" do
-    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample, :public_instance_m).should be_true
+    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample, :public_instance_m).should be_truthy
   end
   it "should return false for public instance methods on a class when only class methods are specified" do
-    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample, :public_instance_m, :class_method_only).should be_false
+    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample, :public_instance_m, :class_method_only).should be_falsey
   end
   it "should return true for public instance methods on a class when only instance methods are specified" do
-    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample, :public_instance_m, :instance_method_only).should be_true
+    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample, :public_instance_m, :instance_method_only).should be_truthy
   end
 
   it "should return false for public class methods on an instance of a class" do
-    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample.new, :public_class_m).should be_false
+    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample.new, :public_class_m).should be_falsey
   end
   it "should return false for public class methods on an instance of a class when only class methods are specified" do
-    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample.new, :public_class_m, :class_method_only).should be_false
+    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample.new, :public_class_m, :class_method_only).should be_falsey
   end
   it "should return false for public class methods on an instance of a class when only instance methods are specified" do
-    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample.new, :public_class_m, :instance_method_only).should be_false
+    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample.new, :public_class_m, :instance_method_only).should be_falsey
   end
 
   it "should return true for public instance methods on an instance of a class" do
-    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample.new, :public_instance_m).should be_true    
+    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample.new, :public_instance_m).should be_truthy    
   end
   it "should return false for public instance methods on an instance of a class when only class methods are specified" do
-    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample.new, :public_instance_m, :class_method_only).should be_false
+    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample.new, :public_instance_m, :class_method_only).should be_falsey
   end
   it "should return true for public instance methods on an instance of a class when only instance methods are specified" do
-    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample.new, :public_instance_m, :instance_method_only).should be_true    
+    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample.new, :public_instance_m, :instance_method_only).should be_truthy    
   end
   
   it "should return true for protected instance methods on a class" do
-    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample, :protected_instance_m).should be_true
+    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample, :protected_instance_m).should be_truthy
   end
   it "should return false for protected instance methods on a class when only class methods are specified" do
-    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample, :protected_instance_m, :class_method_only).should be_false
+    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample, :protected_instance_m, :class_method_only).should be_falsey
   end
   it "should return true for protected instance methods on a class when only instance methods are specified" do
-    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample, :protected_instance_m, :instance_method_only).should be_true
+    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample, :protected_instance_m, :instance_method_only).should be_truthy
   end
 
   it "should return true for protected instance methods on an instance of a class" do
-    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample.new, :protected_instance_m).should be_true    
+    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample.new, :protected_instance_m).should be_truthy    
   end
   it "should return false for protected instance methods on an instance of a class when only class methods are specified" do
-    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample.new, :protected_instance_m, :class_method_only).should be_false
+    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample.new, :protected_instance_m, :class_method_only).should be_falsey
   end
   it "should return true for protected instance methods on an instance of a class when only instance methods are specified" do
-    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample.new, :protected_instance_m, :instance_method_only).should be_true
+    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample.new, :protected_instance_m, :instance_method_only).should be_truthy
   end
   
   it "should return true for private class methods on a class" do
-    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample, :private_class_m).should be_true #expected_private
+    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample, :private_class_m).should be_truthy #lambdaed_private
   end
   it "should return true for private class methods on a class when only class methods are specified" do
-    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample, :private_class_m, :class_method_only).should be_true 
+    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample, :private_class_m, :class_method_only).should be_truthy 
   end
   it "should return false for private class methods on a class when only instance methods are specified" do
-    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample, :private_class_m, :instance_method_only).should be_false
+    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample, :private_class_m, :instance_method_only).should be_falsey
   end
 
   it "should return true for private instance methods on a class" do
-    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample, :private_instance_m).should be_true
+    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample, :private_instance_m).should be_truthy
   end
   it "should return false for private instance methods on a class when only class methods are specified" do
-    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample, :private_instance_m, :class_method_only).should be_false
+    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample, :private_instance_m, :class_method_only).should be_falsey
   end
   it "should return true for private instance methods on a class when only instance methods are specified" do
-    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample, :private_instance_m, :instance_method_only).should be_true
+    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample, :private_instance_m, :instance_method_only).should be_truthy
   end
 
   it "should return false for private class methods on an instance of a class" do
-    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample.new, :private_class_m).should be_false
+    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample.new, :private_class_m).should be_falsey
   end
   it "should return false for private class methods on an instance of a class when only class methods are specified" do
-    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample.new, :private_class_m, :class_method_only).should be_false
+    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample.new, :private_class_m, :class_method_only).should be_falsey
   end
   it "should return false for private class methods on an instance of a class when only instance methods are specified" do
-    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample.new, :private_class_m, :instance_method_only).should be_false
+    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample.new, :private_class_m, :instance_method_only).should be_falsey
   end
 
   it "should return true for private instance methods on an instance of a class" do
-    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample.new, :private_instance_m).should be_true    
+    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample.new, :private_instance_m).should be_truthy    
   end
   it "should return false for private instance methods on an instance of a class when only class methods are specified" do
-    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample.new, :private_instance_m, :class_method_only).should be_false
+    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample.new, :private_instance_m, :class_method_only).should be_falsey
   end
   it "should return true for private instance methods on an instance of a class when only instance methods are specified" do
-    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample.new, :private_instance_m, :instance_method_only).should be_true    
+    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample.new, :private_instance_m, :instance_method_only).should be_truthy    
   end
   
   not_string, true_or_false, ruby_name = Object.const_defined?('JRUBY_VERSION') ? ['NOT ', false, 'JRuby'] : ['', true, 'MRI'] 
@@ -322,23 +322,23 @@ describe Aquarium::Utils::MethodUtils, ".has_method" do
   end
   
   it "should return false for public instance methods on a subclass when the exclude_ancestors flag is false" do
-    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample2, :public_instance_m, :instance_method_only, false).should be_false
+    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample2, :public_instance_m, :instance_method_only, false).should be_falsey
   end
   it "should return false for protected instance methods on a subclass when the exclude_ancestors flag is false" do
-    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample2, :protected_instance_m, :instance_method_only, false).should be_false
+    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample2, :protected_instance_m, :instance_method_only, false).should be_falsey
   end
   it "should return false for private instance methods on a subclass when the exclude_ancestors flag is false" do
-    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample2, :private_instance_m, :instance_method_only, false).should be_false
+    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample2, :private_instance_m, :instance_method_only, false).should be_falsey
   end
     
   it "should return false for an unknown method" do
-    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample.new, :nonexistent_method).should be_false    
+    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample.new, :nonexistent_method).should be_falsey    
   end
   it "should return false for an unknown method when only class methods are specified" do
-    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample.new, :nonexistent_method, :class_method_only).should be_false    
+    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample.new, :nonexistent_method, :class_method_only).should be_falsey    
   end
   it "should return false for an unknown method when only instance methods are specified" do
-    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample.new, :nonexistent_method, :instance_method_only).should be_false    
+    Aquarium::Utils::MethodUtils.has_method(MethodUtilsSpecProtectionExample.new, :nonexistent_method, :instance_method_only).should be_falsey    
   end
 end
 

data/spec/aquarium/utils/nil_object_spec.rb

@@ -6,20 +6,20 @@ describe Aquarium::Utils::NilObject, "#eql?" do
   it "should return true when called with any other NilObject" do
     nil_object1 = Aquarium::Utils::NilObject.new
     nil_object2 = Aquarium::Utils::NilObject.new
-    nil_object1.should eql(nil_object1)
-    nil_object1.should eql(nil_object2)
-    nil_object2.should eql(nil_object1)
-    nil_object1.eql?(nil_object1).should be_true
-    nil_object1.eql?(nil_object2).should be_true
-    nil_object2.eql?(nil_object1).should be_true
+    nil_object1.should  eql(nil_object1)
+    nil_object1.should  eql(nil_object2)
+    nil_object2.should  eql(nil_object1)
+    nil_object1.eql?(nil_object1).should  be_truthy
+    nil_object1.eql?(nil_object2).should  be_truthy
+    nil_object2.eql?(nil_object1).should  be_truthy
   end
   
   it "should return false when called with any other object" do
     nil_object = Aquarium::Utils::NilObject.new
-    nil_object.should_not eql(nil)
-    nil_object.should_not eql("nil_object")
-    nil_object.eql?(nil).should be_false
-    nil_object.eql?("nil_object").should be_false
+    nil_object.not_to eql(nil)
+    nil_object.not_to eql("nil_object")
+    nil_object.eql?(nil).should  be_falsey
+    nil_object.eql?("nil_object").should  be_falsey
   end
 end
   
@@ -34,7 +34,7 @@ describe Aquarium::Utils::NilObject, " (when a message is sent to it)" do
   it "should invoke Object's methods, when defined" do
     nil_object = Aquarium::Utils::NilObject.new
     %w[to_s inspect].each do |method_name|
-      nil_object.send(method_name.to_sym).include?("Aquarium::Utils::NilObject").should be_true
+      nil_object.send(method_name.to_sym).include?("Aquarium::Utils::NilObject").should  be_truthy
     end
   end
 end

data/spec/aquarium/utils/options_utils_spec.rb

@@ -22,7 +22,7 @@ describe OptionsUtils, "with no 'universal' options specified" do
 
   it "should set noop to false." do
     object = Aquarium::OptionsUtilsUser.new
-    object.noop.should be_false
+    object.noop.should be_falsey
   end
 end
 
@@ -102,12 +102,12 @@ end
 describe OptionsUtils, "#noop" do
   it "should return false if :noop was not specified." do
     object = Aquarium::OptionsUtilsUser.new 
-    object.noop.should be_false
+    object.noop.should be_falsey
   end
 
   it "should return the value specified with :noop." do
     object = Aquarium::OptionsUtilsUser.new :noop => true
-    object.noop.should be_true
+    object.noop.should be_truthy
   end
 end
 
@@ -115,7 +115,7 @@ describe OptionsUtils, "#noop=" do
   it "should set the noop value." do
     object = Aquarium::OptionsUtilsUser.new :noop => true
     object.noop = false
-    object.noop.should be_false
+    object.noop.should be_falsey
   end
 end
 
@@ -205,15 +205,15 @@ end
 
 describe OptionsUtils, "and options handling" do
   it "should raise if an unknown option is specified" do
-    lambda {Aquarium::OptionsUtilsExampleWithAdditionalAllowedOptions.new :unknown => true}.should raise_error(Aquarium::Utils::InvalidOptions)
+    expect {Aquarium::OptionsUtilsExampleWithAdditionalAllowedOptions.new :unknown => true}.to raise_error(Aquarium::Utils::InvalidOptions)
   end
   it "should not raise if a known canonical option is specified" do
-    lambda {Aquarium::OptionsUtilsExampleWithAdditionalAllowedOptions.new :foos => true}.should_not raise_error(Aquarium::Utils::InvalidOptions)
+    expect {Aquarium::OptionsUtilsExampleWithAdditionalAllowedOptions.new :foos => true}.not_to raise_error
   end
   it "should not raise if a known canonical option synonym is specified" do
-    lambda {Aquarium::OptionsUtilsExampleWithAdditionalAllowedOptions.new :foo1 => true}.should_not raise_error(Aquarium::Utils::InvalidOptions)
+    expect {Aquarium::OptionsUtilsExampleWithAdditionalAllowedOptions.new :foo1 => true}.not_to raise_error
   end
   it "should not raise if an known additional allowed option is specified" do
-    lambda {Aquarium::OptionsUtilsExampleWithAdditionalAllowedOptions.new :baz => true}.should_not raise_error(Aquarium::Utils::InvalidOptions)
+    expect {Aquarium::OptionsUtilsExampleWithAdditionalAllowedOptions.new :baz => true}.not_to raise_error
   end
 end

data/spec/aquarium/utils/type_utils_spec.rb

@@ -7,15 +7,15 @@ include Aquarium::Utils
 
 describe TypeUtils, ".is_type?" do
   it "should be true for a class" do
-    TypeUtils.is_type?(String).should be_true
+    TypeUtils.is_type?(String).should be_truthy
   end
 
   it "should be true for a Module" do
-    TypeUtils.is_type?(Kernel).should be_true
+    TypeUtils.is_type?(Kernel).should be_truthy
   end
 
   it "should be false for an Object" do
-    TypeUtils.is_type?("Object").should be_false
+    TypeUtils.is_type?("Object").should be_falsey
   end
 end
 

metadata

@@ -1,35 +1,196 @@
 --- !ruby/object:Gem::Specification
 name: aquarium
 version: !ruby/object:Gem::Version
-  version: 0.5.1
-  prerelease: 
+  version: 0.7.1
 platform: ruby
 authors:
-- Aquarium Development Team
+- Dean Wampler and other contributors
 autorequire: aquarium
 bindir: bin
 cert_chain: []
-date: 2012-07-31 00:00:00.000000000 Z
-dependencies: []
-description: ! "    Aquarium is a full-featured Aspect-Oriented Programming (AOP)
-  framework for Ruby that is \n    designed to provide an intuitive syntax and support
-  for large-scale, dynamic aspects.\n"
-email: aquarium-devel@rubyforge.org
+date: 2019-04-23 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+- !ruby/object:Gem::Dependency
+  name: coderay
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.2
+- !ruby/object:Gem::Dependency
+  name: meta_project
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.15
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.15
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.3.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.3.2
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.1.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.1.1
+- !ruby/object:Gem::Dependency
+  name: RedCloth
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.3.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.3.2
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.14.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.14.1
+- !ruby/object:Gem::Dependency
+  name: rspec-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.8.0
+- !ruby/object:Gem::Dependency
+  name: rspec-expectations
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.8.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.8.3
+- !ruby/object:Gem::Dependency
+  name: webgen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.2
+description: |2
+      Aquarium is a full-featured Aspect-Oriented Programming (AOP) framework for Ruby that is
+      designed to provide an intuitive syntax and support for large-scale, dynamic aspects.
+email: deanwampler@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- README
-- CHANGES
-- MIT_LICENSE
-- UPGRADE
+extra_rdoc_files: []
 files:
 - CHANGES
 - EXAMPLES.rd
 - MIT_LICENSE
-- Rakefile
 - README
 - RELEASE-PLAN
+- Rakefile
 - UPGRADE
+- aquarium.gemspec
+- examples/README.txt
+- examples/aspect_design_example.rb
+- examples/aspect_design_example_spec.rb
+- examples/design_by_contract_example.rb
+- examples/design_by_contract_example_spec.rb
+- examples/exception_wrapping_example.rb
+- examples/exception_wrapping_example_spec.rb
+- examples/introductions_example.rb
+- examples/introductions_example_spec.rb
+- examples/method_missing_example.rb
+- examples/method_missing_example_spec.rb
+- examples/method_tracing_example.rb
+- examples/method_tracing_example_spec.rb
+- examples/reusable_aspect_hack_example.rb
+- examples/reusable_aspect_hack_example_spec.rb
+- jruby/Rakefile
+- jruby/java/example/Worker.java
+- jruby/java/example/sorter/StringListSorter.java
+- jruby/java/example/sorter/converter/StringListCaseConverterAndSorter.java
+- jruby/java/example/visibility/Visibility.java
+- jruby/spec/java_class_aspects_spec.rb
+- jruby/spec/java_visibility_spec.rb
+- jruby/spec/spec_helper.rb
+- lib/aquarium.rb
+- lib/aquarium/aspects.rb
 - lib/aquarium/aspects/advice.rb
 - lib/aquarium/aspects/aspect.rb
 - lib/aquarium/aspects/default_objects_handler.rb
@@ -37,22 +198,22 @@ files:
 - lib/aquarium/aspects/join_point.rb
 - lib/aquarium/aspects/pointcut.rb
 - lib/aquarium/aspects/pointcut_composition.rb
-- lib/aquarium/aspects.rb
+- lib/aquarium/dsl.rb
 - lib/aquarium/dsl/aspect_dsl.rb
 - lib/aquarium/dsl/object_dsl.rb
-- lib/aquarium/dsl.rb
+- lib/aquarium/extensions.rb
 - lib/aquarium/extensions/hash.rb
 - lib/aquarium/extensions/regexp.rb
 - lib/aquarium/extensions/set.rb
 - lib/aquarium/extensions/string.rb
-- lib/aquarium/extensions.rb
-- lib/aquarium/extras/design_by_contract.rb
 - lib/aquarium/extras.rb
+- lib/aquarium/extras/design_by_contract.rb
+- lib/aquarium/finders.rb
 - lib/aquarium/finders/finder_result.rb
 - lib/aquarium/finders/method_finder.rb
 - lib/aquarium/finders/pointcut_finder.rb
 - lib/aquarium/finders/type_finder.rb
-- lib/aquarium/finders.rb
+- lib/aquarium/utils.rb
 - lib/aquarium/utils/array_utils.rb
 - lib/aquarium/utils/default_logger.rb
 - lib/aquarium/utils/hash_utils.rb
@@ -65,9 +226,13 @@ files:
 - lib/aquarium/utils/options_utils.rb
 - lib/aquarium/utils/set_utils.rb
 - lib/aquarium/utils/type_utils.rb
-- lib/aquarium/utils.rb
 - lib/aquarium/version.rb
-- lib/aquarium.rb
+- previous_failures.txt
+- rake_tasks/examples.rake
+- rake_tasks/examples_specdoc.rake
+- rake_tasks/examples_with_rcov.rake
+- rake_tasks/verify_rcov.rake
+- rspec.watchr
 - spec/aquarium/aspects/advice_chain_node_spec.rb
 - spec/aquarium/aspects/advice_spec.rb
 - spec/aquarium/aspects/aspect_invocation_spec.rb
@@ -110,52 +275,68 @@ files:
 - spec/aquarium/utils/type_utils_sample_classes.rb
 - spec/aquarium/utils/type_utils_sample_nested_types.rb
 - spec/aquarium/utils/type_utils_spec.rb
-- examples/aspect_design_example.rb
-- examples/aspect_design_example_spec.rb
-- examples/design_by_contract_example.rb
-- examples/design_by_contract_example_spec.rb
-- examples/exception_wrapping_example.rb
-- examples/exception_wrapping_example_spec.rb
-- examples/introductions_example.rb
-- examples/introductions_example_spec.rb
-- examples/method_missing_example.rb
-- examples/method_missing_example_spec.rb
-- examples/method_tracing_example.rb
-- examples/method_tracing_example_spec.rb
-- examples/reusable_aspect_hack_example.rb
-- examples/reusable_aspect_hack_example_spec.rb
-- rake_tasks/examples.rake
-- rake_tasks/examples_specdoc.rake
-- rake_tasks/examples_with_rcov.rake
-- rake_tasks/verify_rcov.rake
-homepage: http://aquarium.rubyforge.org
+homepage: https://deanwampler.github.io/open-source/aquarium/index.html
 licenses: []
+metadata: {}
 post_install_message: 
-rdoc_options:
-- --title
-- Aquarium
-- --line-numbers
-- --inline-source
-- --main
-- README
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: aquarium
-rubygems_version: 1.8.11
+rubygems_version: 3.0.3
 signing_key: 
-specification_version: 3
-summary: Aquarium-0.5.1 (r7) - Aspect-Oriented Programming toolkit for Ruby http://aquarium.rubyforge.org
-test_files: []
+specification_version: 4
+summary: Aquarium-0.7.1 (r7) - Aspect-Oriented Programming toolkit for Ruby http://aquarium.rubyforge.org
+test_files:
+- spec/aquarium/aspects/advice_chain_node_spec.rb
+- spec/aquarium/aspects/advice_spec.rb
+- spec/aquarium/aspects/aspect_invocation_spec.rb
+- spec/aquarium/aspects/aspect_spec.rb
+- spec/aquarium/aspects/aspect_with_nested_types_spec.rb
+- spec/aquarium/aspects/aspect_with_subtypes_spec.rb
+- spec/aquarium/aspects/concurrent_aspects_spec.rb
+- spec/aquarium/aspects/concurrent_aspects_with_objects_and_types_spec.rb
+- spec/aquarium/aspects/concurrently_accessed.rb
+- spec/aquarium/aspects/default_objects_handler_spec.rb
+- spec/aquarium/aspects/join_point_spec.rb
+- spec/aquarium/aspects/pointcut_and_composition_spec.rb
+- spec/aquarium/aspects/pointcut_or_composition_spec.rb
+- spec/aquarium/aspects/pointcut_spec.rb
+- spec/aquarium/dsl/aspect_dsl_spec.rb
+- spec/aquarium/extensions/hash_spec.rb
+- spec/aquarium/extensions/regex_spec.rb
+- spec/aquarium/extensions/set_spec.rb
+- spec/aquarium/extensions/string_spec.rb
+- spec/aquarium/extras/design_by_contract_spec.rb
+- spec/aquarium/finders/finder_result_spec.rb
+- spec/aquarium/finders/method_finder_spec.rb
+- spec/aquarium/finders/pointcut_finder_spec.rb
+- spec/aquarium/finders/pointcut_finder_spec_test_classes.rb
+- spec/aquarium/finders/type_finder_spec.rb
+- spec/aquarium/finders/type_finder_with_descendents_and_ancestors_spec.rb
+- spec/aquarium/finders/type_finder_with_nested_types_spec.rb
+- spec/aquarium/spec_example_types.rb
+- spec/aquarium/spec_helper.rb
+- spec/aquarium/utils/array_utils_spec.rb
+- spec/aquarium/utils/default_logger_spec.rb
+- spec/aquarium/utils/hash_utils_spec.rb
+- spec/aquarium/utils/html_escaper_spec.rb
+- spec/aquarium/utils/logic_error_spec.rb
+- spec/aquarium/utils/method_utils_spec.rb
+- spec/aquarium/utils/name_utils_spec.rb
+- spec/aquarium/utils/nil_object_spec.rb
+- spec/aquarium/utils/options_utils_spec.rb
+- spec/aquarium/utils/set_utils_spec.rb
+- spec/aquarium/utils/type_utils_sample_classes.rb
+- spec/aquarium/utils/type_utils_sample_nested_types.rb
+- spec/aquarium/utils/type_utils_spec.rb