aquarium 0.4.1 → 0.4.2

data/spec/aquarium/finders/type_finder_with_nested_types.rb

@@ -0,0 +1,47 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require File.dirname(__FILE__) + '/../utils/type_utils_sample_classes'
+require File.dirname(__FILE__) + '/../utils/type_utils_sample_nested_types'
+require 'aquarium/finders/type_finder'
+
+include Aquarium::Utils
+  
+def purge_actuals actuals
+  # Remove extra stuff inserted by RSpec, Aquarium, and "pretty printer" (rake?), possibly in other specs! 
+  actuals.matched_keys.reject do |t2| 
+    t2.name.include?("Spec::") or t2.name =~ /Aquarium::(Utils|Extras|Examples|Aspects|PointcutFinderTestClasses)/ or t2.name =~ /^PP/
+  end
+end
+
+describe TypeUtils, "#find types and their nested types, using :types_and_nested_types" do
+  it "should find the matching types and their nested types." do
+    Aquarium::NestedTestTypes.nested_in_NestedTestTypes.keys.each do |t|
+      actual = Aquarium::Finders::TypeFinder.new.find :types_and_nested_types => (t.name)
+      actual_keys = purge_actuals actual
+      actual_keys.sort{|x,y| x.name <=> y.name}.should == Aquarium::NestedTestTypes.nested_in_NestedTestTypes[t].sort{|x,y| x.name <=> y.name}
+      actual.not_matched_keys.should == []
+    end
+  end
+
+  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)
+    end
+  end
+end
+
+describe TypeUtils, "#find nested types subtracting out excluded types and descendents, using :exclude_types_and_descendents" do
+  it "should find the matching types and their descendent subtypes, minus the excluded type hierarchies." do
+    actual = Aquarium::Finders::TypeFinder.new.find :types_and_nested_types => Aquarium::NestedTestTypes, 
+      :exclude_types_and_nested_types => Aquarium::NestedTestTypes::TopModule
+    expected = [Aquarium::NestedTestTypes] + Aquarium::NestedTestTypes.nested_in_NestedTestTypes[Aquarium::NestedTestTypes::TopClass]
+    actual_keys = purge_actuals actual
+    actual_keys.sort{|x,y| x.name <=> y.name}.should == expected.sort{|x,y| x.name <=> y.name}
+    actual.not_matched_keys.should == []
+  end
+
+  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)
+    end
+  end
+end

data/spec/aquarium/utils/nil_object_spec.rb

@@ -2,6 +2,27 @@ require File.dirname(__FILE__) + '/../spec_helper'
 require File.dirname(__FILE__) + '/../spec_example_types'
 require 'aquarium/utils/nil_object'
 
+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
+  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
+  end
+end
+  
 describe Aquarium::Utils::NilObject, " (when a message is sent to it)" do
   it "should return itself, by default, for methods not defined for Object" do
     nil_object = Aquarium::Utils::NilObject.new

data/spec/aquarium/utils/type_utils_sample_nested_types.rb

@@ -0,0 +1,51 @@
+module Aquarium
+  module NestedTestTypes
+    def ntt; end
+    module TopModule
+      def tm; end
+      module MiddleModule
+        def mm; end
+        module BottomModule
+          def bm; end
+        end
+        class BottomModuleClass
+          def bmc; end
+        end
+      end
+    end
+    class TopClass
+      def tc; end
+      class MiddleClass
+        def mc; end
+        class BottomClass
+          def bc; end
+        end
+      end
+    end
+  end
+end
+
+
+module Aquarium
+  module NestedTestTypes
+    @@bottom_modules = [Aquarium::NestedTestTypes::TopModule::MiddleModule::BottomModule]
+    @@bottom_modules_classes = [Aquarium::NestedTestTypes::TopModule::MiddleModule::BottomModuleClass]
+    @@middle_modules = [Aquarium::NestedTestTypes::TopModule::MiddleModule] + @@bottom_modules + @@bottom_modules_classes
+    @@top_modules = [Aquarium::NestedTestTypes::TopModule] + @@middle_modules
+    @@bottom_classes = [Aquarium::NestedTestTypes::TopClass::MiddleClass::BottomClass]
+    @@middle_classes = [Aquarium::NestedTestTypes::TopClass::MiddleClass] + @@bottom_classes
+    @@top_classes = [Aquarium::NestedTestTypes::TopClass] + @@middle_classes
+    @@all_types = [Aquarium::NestedTestTypes] + @@top_modules + @@top_classes
+    def self.nested_in_NestedTestTypes 
+      {Aquarium::NestedTestTypes => @@all_types,
+       Aquarium::NestedTestTypes::TopModule => @@top_modules,
+       Aquarium::NestedTestTypes::TopModule::MiddleModule => @@middle_modules,
+       Aquarium::NestedTestTypes::TopModule::MiddleModule::BottomModule => @@bottom_modules,
+       Aquarium::NestedTestTypes::TopModule::MiddleModule::BottomModuleClass => @@bottom_modules_classes,
+       Aquarium::NestedTestTypes::TopClass => @@top_classes,
+       Aquarium::NestedTestTypes::TopClass::MiddleClass => @@middle_classes,
+       Aquarium::NestedTestTypes::TopClass::MiddleClass::BottomClass => @@bottom_classes}
+    end
+  end
+end
+

data/spec/aquarium/utils/type_utils_spec.rb

@@ -1,6 +1,7 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 require 'aquarium/utils/type_utils'
 require File.dirname(__FILE__) + '/../utils/type_utils_sample_classes'
+require File.dirname(__FILE__) + '/../utils/type_utils_sample_nested_types'
 
 include Aquarium::Utils
 
@@ -82,4 +83,20 @@ describe TypeUtils, ".descendents applied to JRuby-wrapped Java classes" do
   it "should properly determine descendents" do
     TypeUtils.descendents(FakeJRubyWrapperModule).should include(FakeJRubyWrapperClass)
   end
-end
+end
+
+describe TypeUtils, ".nested called with a type" do
+  it "should return the type itself in the result" do
+    Aquarium::NestedTestTypes.nested_in_NestedTestTypes.keys.each do |t|
+      TypeUtils.nested(t).should include(t)
+    end
+  end
+
+  it "should return all the modules and classes nested under the type, inclusive" do
+    Aquarium::NestedTestTypes.nested_in_NestedTestTypes.keys.each do |t|
+      actual_types = TypeUtils.nested(t)
+      actual_types.sort{|x,y| x.name <=> y.name}.should == Aquarium::NestedTestTypes.nested_in_NestedTestTypes[t].sort{|x,y| x.name <=> y.name}
+    end
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aquarium
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors: 
 - Aquarium Development Team
@@ -9,7 +9,7 @@ autorequire: aquarium
 bindir: bin
 cert_chain: []
 
-date: 2008-04-15 00:00:00 -05:00
+date: 2008-05-25 00:00:00 -05:00
 default_executable: ""
 dependencies: []
 
@@ -25,11 +25,14 @@ extra_rdoc_files:
 - MIT-LICENSE
 - UPGRADE
 files: 
+- Aquarium-IDEA.ipr
+- Aquarium-IDEA.iws
 - Aquarium.ipr
 - Aquarium.iws
 - CHANGES
 - EXAMPLES.rd
 - MIT-LICENSE
+- ParseTreePlay.rb
 - Rakefile
 - README
 - RELEASE-PLAN
@@ -56,6 +59,7 @@ files:
 - lib/aquarium/extras.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/array_utils.rb
@@ -96,8 +100,11 @@ files:
 - 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.rb
 - spec/aquarium/spec_example_types.rb
 - spec/aquarium/spec_helper.rb
 - spec/aquarium/utils/array_utils_spec.rb
@@ -111,6 +118,7 @@ files:
 - 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
 - examples/aspect_design_example.rb
 - examples/aspect_design_example_spec.rb
@@ -118,6 +126,8 @@ files:
 - 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
@@ -158,6 +168,6 @@ rubyforge_project: aquarium
 rubygems_version: 1.0.1
 signing_key: 
 specification_version: 2
-summary: Aquarium-0.4.1 (r7) - Aspect-Oriented Programming toolkit for Ruby http://aquarium.rubyforge.org
+summary: Aquarium-0.4.2 (r7) - Aspect-Oriented Programming toolkit for Ruby http://aquarium.rubyforge.org
 test_files: []