aquarium 0.2.0 → 0.3.0

data/spec/aquarium/extensions/hash_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper.rb'
+require File.dirname(__FILE__) + '/../spec_helper'
 require File.dirname(__FILE__) + '/../spec_example_classes'
 require 'aquarium/extensions/hash'
 require 'aquarium/utils/array_utils'

data/spec/aquarium/extensions/regex_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper.rb'
+require File.dirname(__FILE__) + '/../spec_helper'
 require 'aquarium/extensions/regexp'
 
 describe Regexp, "#empty?" do

data/spec/aquarium/extensions/set_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper.rb'
+require File.dirname(__FILE__) + '/../spec_helper'
 require File.dirname(__FILE__) + '/../spec_example_classes'
 require 'aquarium/extensions/set'
 

data/spec/aquarium/extensions/string_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper.rb'
+require File.dirname(__FILE__) + '/../spec_helper'
 require 'aquarium/extensions/string'
 
 describe  String, "#to_camel_case" do

data/spec/aquarium/extensions/symbol_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper.rb'
+require File.dirname(__FILE__) + '/../spec_helper'
 require 'aquarium/extensions/symbol'
 
 describe "Symbol#empty?" do

data/spec/aquarium/extras/design_by_contract_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper.rb'
+require File.dirname(__FILE__) + '/../spec_helper'
 require 'aquarium/extras/design_by_contract'
 
 describe Aquarium::Extras::DesignByContract, "precondition" do

data/spec/aquarium/finders/finder_result_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper.rb'
+require File.dirname(__FILE__) + '/../spec_helper'
 require File.dirname(__FILE__) + '/../spec_example_classes'
 
 require 'aquarium/finders/finder_result'

data/spec/aquarium/finders/method_finder_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper.rb'
+require File.dirname(__FILE__) + '/../spec_helper'
 require File.dirname(__FILE__) + '/../spec_example_classes'
 require 'aquarium/finders/method_finder'
 
@@ -82,24 +82,39 @@ describe Aquarium::Finders::MethodFinder, "#find (synonymous input parameters)"
     before_method_finder_spec
   end
   
-  it "should accept options :types and :type, which are synonymous." do
-    expected = Aquarium::Finders::MethodFinder.new.find :types => Derived, :methods => [/^mbase/, /^mmodule/]
-    actual   = Aquarium::Finders::MethodFinder.new.find :type  => Derived, :methods => [/^mbase/, /^mmodule/]
-    actual.should == expected
+  Aquarium::Finders::MethodFinder::CANONICAL_OPTIONS["types"].each do |key|
+    it "should accept :#{key} as a synonym for :types." do
+      expected = Aquarium::Finders::MethodFinder.new.find :types     => Derived, :methods => [/^mbase/, /^mmodule/]
+      actual   = Aquarium::Finders::MethodFinder.new.find key.intern => Derived, :methods => [/^mbase/, /^mmodule/]
+      actual.should == expected
+    end
   end
-
-  it "should accept options :objects and :object, which are synonymous." do
-    child = Derived.new
-    expected = Aquarium::Finders::MethodFinder.new.find :objects => child, :methods => [/^mbase/, /^mmodule/]
-    actual   = Aquarium::Finders::MethodFinder.new.find :object  => child, :methods => [/^mbase/, /^mmodule/]
-    actual.should == expected
+  
+  Aquarium::Finders::MethodFinder::CANONICAL_OPTIONS["objects"].each do |key|
+    it "should accept :#{key} as a synonym for :objects." do
+      child = Derived.new
+      expected = Aquarium::Finders::MethodFinder.new.find :objects   => child, :methods => [/^mbase/, /^mmodule/]
+      actual   = Aquarium::Finders::MethodFinder.new.find key.intern => child, :methods => [/^mbase/, /^mmodule/]
+      actual.should == expected
+    end
   end
-
-  it "should accept options :methods and :method, which are synonymous." do
-    expected = Aquarium::Finders::MethodFinder.new.find :types => Derived, :methods => [/^mbase/, /^mmodule/]
-    actual   = Aquarium::Finders::MethodFinder.new.find :types => Derived, :method  => [/^mbase/, /^mmodule/]
-    actual.should == expected
+  
+  Aquarium::Finders::MethodFinder::CANONICAL_OPTIONS["methods"].each do |key|
+    it "should accept :#{key} as a synonym for :methods." do
+      expected = Aquarium::Finders::MethodFinder.new.find :types => Derived, :methods   => [/^mbase/, /^mmodule/]
+      actual   = Aquarium::Finders::MethodFinder.new.find :types => Derived, key.intern => [/^mbase/, /^mmodule/]
+      actual.should == expected
+    end
+  end
+  
+  Aquarium::Finders::MethodFinder::CANONICAL_OPTIONS["options"].each do |key|
+    it "should accept :#{key} as a synonym for :options." do
+      expected = Aquarium::Finders::MethodFinder.new.find :types => Derived, :methods => [/^mder/, /^mmod/], :options   => [:exclude_ancestor_methods]
+      actual   = Aquarium::Finders::MethodFinder.new.find :types => Derived, :methods => [/^mder/, /^mmod/], key.intern => [:exclude_ancestor_methods]
+      actual.should == expected
+    end
   end
+  
 end
   
 describe Aquarium::Finders::MethodFinder, "#find (invalid input parameters)" do
@@ -330,6 +345,14 @@ describe Aquarium::Finders::MethodFinder, "#find (searching for class methods)"
     actual.matched[ClassWithPrivateClassMethod].should == Set.new(ClassWithPrivateClassMethod.public_methods.sort.map{|m| m.intern})
   end
   
+  it "should accept :all_methods as a synonym for :all." do
+    actual = Aquarium::Finders::MethodFinder.new.find :types => [ClassWithPublicClassMethod, ClassWithPrivateClassMethod], :methods => :all_methods, :options => :class
+    actual.matched.size.should == 2
+    actual.not_matched.size.should == 0
+    actual.matched[ClassWithPublicClassMethod].should == Set.new(ClassWithPublicClassMethod.public_methods.sort.map{|m| m.intern})
+    actual.matched[ClassWithPrivateClassMethod].should == Set.new(ClassWithPrivateClassMethod.public_methods.sort.map{|m| m.intern})
+  end
+  
   it "should find all public class methods in types, but not ancestors, when searching with the :all method specification and the :class and :exclude_ancestor_methods options." do
     actual = Aquarium::Finders::MethodFinder.new.find :types => [ClassWithPublicClassMethod, ClassWithPrivateClassMethod], :methods => :all, :options => [:class, :exclude_ancestor_methods]
     actual.matched.size.should == 1
@@ -569,6 +592,16 @@ describe Aquarium::Finders::MethodFinder, "#find (using :methods => :all)" do
     actual.matched[pub].should == Set.new([:public_instance_test_method])
   end
   
+  it "should ignore other method arguments if :all_methods is present." do
+    actual = Aquarium::Finders::MethodFinder.new.find :type => ClassWithPublicInstanceMethod, :method => [:all_methods, :none, /.*foo.*/], :methods =>[/.*bar.*/, /^baz/], :options => :exclude_ancestor_methods
+    actual.matched.size.should == 1
+    actual.matched[ClassWithPublicInstanceMethod].should == Set.new([:public_instance_test_method])
+    pub = ClassWithPublicInstanceMethod.new
+    actual = Aquarium::Finders::MethodFinder.new.find :object => pub, :method => [:all, :none, /.*foo.*/], :methods =>[/.*bar.*/, /^baz/], :options => :exclude_ancestor_methods
+    actual.matched.size.should == 1
+    actual.matched[pub].should == Set.new([:public_instance_test_method])
+  end
+  
   it "should report [:all] as the not_matched value when :all is the method argument and no methods match, e.g., for :exclude_ancestor_methods." do
     actual = Aquarium::Finders::MethodFinder.new.find :type => ClassWithPrivateInstanceMethod, :method => :all, :options => :exclude_ancestor_methods
     actual.matched.size.should == 0

data/spec/aquarium/finders/type_finder_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper.rb'
+require File.dirname(__FILE__) + '/../spec_helper'
 require 'aquarium/finders/type_finder'
 
 class Outside

data/spec/aquarium/finders/type_finder_with_descendents_and_ancestors_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper.rb'
+require File.dirname(__FILE__) + '/../spec_helper'
 require File.dirname(__FILE__) + '/../utils/type_utils_sample_classes'
 require 'aquarium/finders/type_finder'
 
@@ -151,6 +151,21 @@ end
   EOF
 end
 
+describe "#find with regular expressions, including descendents and ancestors" do
+  it "should find the matching types, including their descendents and ancestors, even in different nested modules." do
+    doption = "types_and_descendents".intern
+    aoption = "types_and_ancestors".intern
+    regexs = [/ForDescendents$/, /Aquarium::ForDescendents::.*ForDescendents/]
+    actual = Aquarium::Finders::TypeFinder.new.find aoption => regexs, doption => regexs
+    actual_keys = purge_actuals actual
+    expected = Aquarium::Utils::TypeUtils.sample_types_descendents_and_ancestors.keys + [Kernel, Object]
+    actual_keys.size.should == expected.size
+    expected.each do |t|
+      actual_keys.should include(t)
+    end
+    actual.not_matched_keys.should == []
+  end
+end
 
 describe "#find with regular expressions, including descendents and ancestors", :shared => true do
   it "should find the matching types, including their descendents and ancestors, even in different nested modules." do

data/spec/aquarium/utils/array_utils_spec.rb

@@ -1,13 +1,17 @@
-require File.dirname(__FILE__) + '/../spec_helper.rb'
+require File.dirname(__FILE__) + '/../spec_helper'
 require 'aquarium/utils/array_utils'
 require 'set'
 
-describe Aquarium::Utils::ArrayUtils, "make_array" do
-  
+describe Aquarium::Utils::ArrayUtils, "#make_array" do
   it "should return an empty array if the input is nil." do
     make_array(nil).should == []
   end
   
+  it "should accept a list of arguments instead of an array or Set." do
+    make_array(nil, nil).should == []
+    make_array(nil, 1, 2, nil, 3, 4).should == [1, 2, 3, 4]
+  end
+
   it "should return an empty array if an input array contains all nils." do
     make_array([nil, nil]).should == []
   end
@@ -40,8 +44,29 @@ describe Aquarium::Utils::ArrayUtils, "make_array" do
     make_array(Set.new([1,2,"123"])).should == [1,2,"123"]
   end
 
-  it "should accept a list of arguments instead of an array or Set." do
-    make_array(nil, nil).should == []
-    make_array(nil, 1, 2, nil, 3, 4).should == [1, 2, 3, 4]
+  it "should be available as a class method." do
+    Aquarium::Utils::ArrayUtils.make_array(Set.new([1,2,"123"])).should == [1,2,"123"]
+  end
+end
+
+describe Aquarium::Utils::ArrayUtils, "#strip_nils" do
+  it "should return an empty array if an input array contains all nils." do
+    strip_nils([nil, nil]).should == []
+  end
+  
+  it "should return an empty array if an input Set contains all nils." do
+    strip_nils(Set.new([nil, nil])).should == []
+  end
+  
+  it "should return an array with all nils removed from the input array." do
+    strip_nils([nil, 1, 2, nil, 3, 4]).should == [1, 2, 3, 4]
+  end
+
+  it "should return an array with all nils removed from the input Set." do
+    strip_nils(Set.new([nil, 1, 2, nil, 3, 4])).should == [1, 2, 3, 4]
+  end
+
+  it "should be accessible as a class method." do
+    Aquarium::Utils::ArrayUtils.strip_nils(Set.new([nil, 1, 2, nil, 3, 4])).should == [1, 2, 3, 4]
   end
 end

data/spec/aquarium/utils/hash_utils_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper.rb'
+require File.dirname(__FILE__) + '/../spec_helper'
 require File.dirname(__FILE__) + '/../spec_example_classes'
 require 'aquarium/utils/hash_utils'
 

data/spec/aquarium/utils/html_escaper_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper.rb'
+require File.dirname(__FILE__) + '/../spec_helper'
 require 'aquarium/utils/array_utils'
 require 'set'
 

data/spec/aquarium/utils/logic_error_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper.rb'
+require File.dirname(__FILE__) + '/../spec_helper'
 require File.dirname(__FILE__) + '/../spec_example_classes'
 require 'aquarium/utils/logic_error'
 

data/spec/aquarium/utils/method_utils_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper.rb'
+require File.dirname(__FILE__) + '/../spec_helper'
 require 'aquarium/utils/method_utils'
 
 describe Aquarium::Utils::MethodUtils, ".method_args_to_hash" do

data/spec/aquarium/utils/name_utils_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper.rb'
+require File.dirname(__FILE__) + '/../spec_helper'
 require File.dirname(__FILE__) + '/../spec_example_classes'
 require 'aquarium/utils/name_utils'
 

data/spec/aquarium/utils/nil_object_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper.rb'
+require File.dirname(__FILE__) + '/../spec_helper'
 require File.dirname(__FILE__) + '/../spec_example_classes'
 require 'aquarium/utils/nil_object'
 

data/spec/aquarium/utils/set_utils_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper.rb'
+require File.dirname(__FILE__) + '/../spec_helper'
 require File.dirname(__FILE__) + '/../spec_example_classes'
 require 'aquarium/utils/set_utils'
 

data/spec/aquarium/utils/type_utils_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper.rb'
+require File.dirname(__FILE__) + '/../spec_helper'
 require 'aquarium/utils/type_utils'
 require File.dirname(__FILE__) + '/../utils/type_utils_sample_classes'
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: aquarium
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-platform: ""
+  version: 0.3.0
+platform: ruby
 authors: 
-- - Aquarium Development Team
+- Aquarium Development Team
 autorequire: aquarium
 bindir: bin
 cert_chain: []
 
-date: 2007-11-24 00:00:00 -06:00
+date: 2008-01-21 00:00:00 -06:00
 default_executable: ""
 dependencies: []
 
@@ -34,7 +34,7 @@ files:
 - UPGRADE
 - lib/aquarium/aspects/advice.rb
 - lib/aquarium/aspects/aspect.rb
-- lib/aquarium/aspects/default_object_handler.rb
+- lib/aquarium/aspects/default_objects_handler.rb
 - lib/aquarium/aspects/dsl/aspect_dsl.rb
 - lib/aquarium/aspects/dsl/object_dsl.rb
 - lib/aquarium/aspects/dsl.rb
@@ -63,6 +63,7 @@ files:
 - lib/aquarium/utils/method_utils.rb
 - lib/aquarium/utils/name_utils.rb
 - lib/aquarium/utils/nil_object.rb
+- lib/aquarium/utils/options_utils.rb
 - lib/aquarium/utils/set_utils.rb
 - lib/aquarium/utils/type_utils.rb
 - lib/aquarium/utils.rb
@@ -77,6 +78,7 @@ files:
 - 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/dsl/aspect_dsl_spec.rb
 - spec/aquarium/aspects/join_point_spec.rb
 - spec/aquarium/aspects/pointcut_and_composition_spec.rb
@@ -143,9 +145,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: aquarium
-rubygems_version: 0.9.5
+rubygems_version: 1.0.1
 signing_key: 
 specification_version: 2
-summary: Aquarium-0.2.0 (r7) - Aspect-Oriented Programming toolkit for Ruby http://aquarium.rubyforge.org
+summary: Aquarium-0.3.0 (r7) - Aspect-Oriented Programming toolkit for Ruby http://aquarium.rubyforge.org
 test_files: []