aquarium 0.4.4 → 0.5.1

data/spec/aquarium/extensions/set_spec.rb

@@ -15,7 +15,7 @@ end
 class Bar
 end
 
-describe "set comparison", :shared => true do
+shared_examples_for "set comparison" do
   it "should return true for the same set" do
     s = Set.new [Foo.new("f1"), Foo.new("f2")]
     s.should eql(s)

data/spec/aquarium/extras/design_by_contract_spec.rb

@@ -28,7 +28,7 @@ describe Aquarium::Extras::DesignByContract, "postcondition" do
     end
     
     postcondition :method => :action, :message => "Must pass more than one argument and first argument must be non-empty." do |jp, obj, *args|
-      args.size > 0 && ! args[0].empty?
+      args.size > 0 && ! args[0].to_s.empty?
     end
   end
   

data/spec/aquarium/finders/finder_result_spec.rb

@@ -153,7 +153,7 @@ describe Aquarium::Finders::FinderResult, "#<<" do
   end    
 end
 
-describe "union of finder results", :shared => true do
+shared_examples_for "union of finder results" do
   it "should return a FinderResult equal to the second, non-empty FinderResult if the first FinderResult is empty." do
     result1 = Aquarium::Finders::FinderResult.new
     result2 = Aquarium::Finders::FinderResult.new :b => [:b1, :b2]
@@ -221,7 +221,7 @@ describe Aquarium::Finders::FinderResult, "#|" do
   end    
 end
 
-describe "intersection of finder results", :shared => true do
+shared_examples_for "intersection of finder results" do
   it "should return an empty FinderResult if self is empty." do
     result1 = Aquarium::Finders::FinderResult.new
     result2 = Aquarium::Finders::FinderResult.new :b => [:b1, :b2]
@@ -298,7 +298,7 @@ describe Aquarium::Finders::FinderResult, "#&" do
 end
 
 
-describe "subtraction of finder results", :shared => true do
+shared_examples_for "subtraction of finder results" do
   it "should return an empty FinderResult if self is substracted from itself." do
     result = Aquarium::Finders::FinderResult.new :b => [:b1, :b2]
     (result - result).should be_empty
@@ -377,7 +377,7 @@ describe Aquarium::Finders::FinderResult, "#.append_not_matched" do
   end
 end
 
-describe "equality", :shared => true do
+shared_examples_for "equality" do
   it "should return true for the same object." do
     result = Aquarium::Finders::FinderResult.new
     result.should be_eql(result)

data/spec/aquarium/finders/method_finder_spec.rb

@@ -1,6 +1,7 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 require 'aquarium/spec_example_types'
 require 'aquarium/finders/method_finder'
+require 'stringio'
 
 # :stopdoc:
 class Base
@@ -115,12 +116,6 @@ describe Aquarium::Finders::MethodFinder, "#find (synonymous input parameters)"
       actual.should == expected
     end
   end
-
-  it "should warn that :options as a synonym for :method_options is deprecated." do
-    expected = Aquarium::Finders::MethodFinder.new.find :types => Derived, :methods => [/^mder/, /^mmod/], :options => [:exclude_ancestor_methods], :logger_stream => @logger_stream
-    @logger_stream.to_s.grep(/WARN.*deprecated/).should_not be_nil
-  end
-  
 end
   
 describe Aquarium::Finders::MethodFinder, "#find (invalid input parameters)" do
@@ -332,15 +327,17 @@ describe Aquarium::Finders::MethodFinder, "#find (searching for class methods)"
   end
   
   it "should find all class methods specified by regular expression for types when :class is used." do
-    # NOTE: The list of methods defined by Kernel is different for MRI and JRuby!
+    # NOTE: The list of methods defined by Kernel is different for Ruby 1.8 and 1.9.
     expected = {}
     expected[Kernel] = [:respond_to?]
-    expected[Kernel] += [:chomp!, :chop!] unless Object.const_defined?('JRUBY_VERSION')
+    if RUBY_VERSION.index("1.8")
+      expected[Kernel] += [:chomp!, :chop!] 
+    end
     [Object, Module, Class].each do |clazz|
       expected[clazz] = [:respond_to?]
     end
     class_array = [Kernel, Module, Object, Class]
-    actual = Aquarium::Finders::MethodFinder.new.find :types => class_array, :methods => [/^resp.*\?$/, /^ch.*\!$/], :method_options => :class
+    actual = Aquarium::Finders::MethodFinder.new.find :types => class_array, :methods => [/^resp.*to\?$/, /^ch.*\!$/], :method_options => :class
     class_array.each do |c|
       actual.matched[c].should == Set.new(expected[c])
     end

data/spec/aquarium/finders/type_finder_spec.rb

@@ -97,7 +97,7 @@ describe Aquarium::Finders::TypeFinder, "#find with :types used to specify one o
     expected_unfound_exps = %w[TestCase Unknown1 Unknown2]
     actual = Aquarium::Finders::TypeFinder.new.find :types=> %w[Kernel Module Object Class TestCase Unknown1 Unknown2]
     actual.matched_keys.sort.should == expected_found_types.sort
-    actual.not_matched_keys.should == expected_unfound_exps
+    actual.not_matched_keys.sort.should == expected_unfound_exps.sort
   end
 
   it "should find types with :: namespace delimiters using their names." do
@@ -254,4 +254,4 @@ describe Aquarium::Finders::TypeFinder, "#get_type_from_parent should" do
   end
 end
  
-  
+  

data/spec/aquarium/finders/type_finder_with_descendents_and_ancestors_spec.rb

@@ -3,7 +3,7 @@ require 'aquarium/utils/type_utils_sample_classes'
 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| 
@@ -14,7 +14,7 @@ def purge_actuals actuals
   end
 end
 
-describe TypeUtils, "#find types and their descendents, using :types_and_descendents" do
+describe Aquarium::Finders::TypeFinder, "#find types and their descendents, using :types_and_descendents" do
   it "should find the matching types and their descendent subtypes, even in different nested modules." do
     TypeUtils.sample_types.each do |t|
       actual = Aquarium::Finders::TypeFinder.new.find :types_and_descendents => (t.name)
@@ -31,7 +31,7 @@ describe TypeUtils, "#find types and their descendents, using :types_and_descend
   end
 end
 
-describe TypeUtils, "#find types subtracting out excluded types and descendents, using :exclude_types_and_descendents" do
+describe Aquarium::Finders::TypeFinder, "#find 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_descendents => ModuleForDescendents, :exclude_types_and_descendents => D1ForDescendents
     actual_keys = purge_actuals actual
@@ -50,7 +50,7 @@ describe TypeUtils, "#find types subtracting out excluded types and descendents,
 end
 
 
-describe TypeUtils, "#find types and their ancestors, using :types_and_ancestors" do
+describe Aquarium::Finders::TypeFinder, "#find types and their ancestors, using :types_and_ancestors" do
   it "should find the matching types and their ancestors, even in different nested modules." do
     TypeUtils.sample_types.each do |t|
       actual = Aquarium::Finders::TypeFinder.new.find :types_and_ancestors => (t.name)
@@ -68,7 +68,7 @@ describe TypeUtils, "#find types and their ancestors, using :types_and_ancestors
 end
 
 
-describe TypeUtils, "#find types subtracting out excluded types and ancestors, using :exclude_types_and_ancestors" do
+describe Aquarium::Finders::TypeFinder, "#find types subtracting out excluded types and ancestors, using :exclude_types_and_ancestors" do
   it "should find the matching types and their ancestors, minus the excluded types and ancestors." do
     actual = Aquarium::Finders::TypeFinder.new.find :types_and_ancestors => D1ForDescendents, :exclude_types_and_ancestors => ModuleForDescendents
     actual_keys = purge_actuals actual
@@ -87,7 +87,7 @@ describe TypeUtils, "#find types subtracting out excluded types and ancestors, u
 end
 
 
-describe TypeUtils, "#find types and their descendents and ancestors" do
+describe Aquarium::Finders::TypeFinder, "#find types and their descendents and ancestors" do
   it "should find the matching types and their descendents and ancestors, even in different nested modules." do
     TypeUtils.sample_types.each do |t|
       actual = Aquarium::Finders::TypeFinder.new.find :types_and_ancestors => (t.name), :types_and_descendents => (t.name)
@@ -99,7 +99,7 @@ describe TypeUtils, "#find types and their descendents and ancestors" do
   end
 end
 
-describe TypeUtils, "#find types subtracting out excluded types and their descendents and ancestors" do
+describe Aquarium::Finders::TypeFinder, "#find types subtracting out excluded types and their descendents and ancestors" do
   it "should find the matching types and their descendents and ancestors, minus the excluded types and their descendents and ancestors." do
     actual = Aquarium::Finders::TypeFinder.new.find \
       :types_and_ancestors => Aquarium::ForDescendents::NestedD1ForDescendents, 
@@ -113,12 +113,14 @@ describe TypeUtils, "#find types subtracting out excluded types and their descen
   end
 end
 
-describe TypeUtils, "#find types and their descendents and ancestors, specified with regular expressions" do
+describe Aquarium::Finders::TypeFinder, "#find types and their descendents and ancestors, specified with regular expressions" do
   it "should find the matching types and their descendents and ancestors, even in different nested modules." do
     regexs = [/ForDescendents$/, /Aquarium::ForDescendents::.*ForDescendents/]
     actual = Aquarium::Finders::TypeFinder.new.find :types_and_ancestors => regexs, :types_and_descendents => regexs
     actual_keys = purge_actuals actual
-    expected = TypeUtils.sample_types_descendents_and_ancestors.keys + [Kernel, Object]
+    extras = RUBY_VERSION =~ /^1.8/ ? [Kernel, Object] : [Kernel, BasicObject, Object]
+    
+    expected = TypeUtils.sample_types_descendents_and_ancestors.keys + extras
     actual_keys.size.should == expected.size
     expected.each do |t|
       actual_keys.should include(t)
@@ -128,7 +130,7 @@ describe TypeUtils, "#find types and their descendents and ancestors, specified
   end
 end
 
-describe TypeUtils, "#find types and their descendents and ancestors, subtracting out excluded types and their descendents and ancestors, specified using regular expressions" do
+describe Aquarium::Finders::TypeFinder, "#find types and their descendents and ancestors, subtracting out excluded types and their descendents and ancestors, specified using regular expressions" do
   it "should find the matching types and their descendents and ancestors, minus the excluded types and their descendents and ancestors." do
     actual = Aquarium::Finders::TypeFinder.new.find :types_and_ancestors => /Aquarium::ForDescendents::.*D1ForDescendents/, 
       :types_and_descendents => /Aquarium::ForDescendents::.*D1ForDescendents/, 

data/spec/aquarium/spec_example_types.rb

@@ -118,9 +118,8 @@ class Watchful
 
   %w[public protected private].each do |protection|
     class_eval(<<-EOF, __FILE__, __LINE__)
-      public
       attr_accessor :#{protection}_watchful_method_args, :#{protection}_watchful_method_that_raises_args
-      #{protection}
+      public        :#{protection}_watchful_method_args, :#{protection}_watchful_method_that_raises_args
       def #{protection}_watchful_method *args
         @#{protection}_watchful_method_args = args
         yield *args if block_given?
@@ -130,6 +129,7 @@ class Watchful
         yield *args if block_given?
         raise WatchfulError.new #("#{protection}_watchful_method_that_raises")
       end
+      #{protection} :#{protection}_watchful_method, :#{protection}_watchful_method_that_raises
     EOF
   end
 

data/spec/aquarium/spec_helper.rb

@@ -1,4 +1,4 @@
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../../lib')
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/..')
 require 'rubygems'
-require 'spec'
+require 'rspec'

data/spec/aquarium/utils/array_utils_spec.rb

@@ -3,6 +3,8 @@ require 'aquarium/utils/array_utils'
 require 'set'
 
 describe Aquarium::Utils::ArrayUtils, "#make_array" do
+  include Aquarium::Utils::ArrayUtils
+  
   it "should return an empty array if the input is nil." do
     make_array(nil).should == []
   end
@@ -25,7 +27,12 @@ describe Aquarium::Utils::ArrayUtils, "#make_array" do
   end
 
   it "should return an array with all nils removed from the input Set." do
-    make_array(Set.new([nil, 1, 2, nil, 3, 4])).should == [1, 2, 3, 4]
+    array = make_array(Set.new([nil, 1, 2, nil, 3, 4]))
+    array.should include(1)
+    array.should include(2)
+    array.should include(3)
+    array.should include(4)
+    array.should_not include(nil)
   end
 
   it "should return an 1-element array with an empty element if the input is empty." do
@@ -41,15 +48,25 @@ describe Aquarium::Utils::ArrayUtils, "#make_array" do
   end
 
   it "should return an input Set#to_a if it contains no nil elements." do
-    make_array(Set.new([1,2,"123"])).should == [1,2,"123"]
+    array = make_array(Set.new([1,2,"123"]))
+    array.should include(1)
+    array.should include(2)
+    array.should include("123")
+    array.should_not include(nil)
   end
 
   it "should be available as a class method." do
-    Aquarium::Utils::ArrayUtils.make_array(Set.new([1,2,"123"])).should == [1,2,"123"]
+    array = Aquarium::Utils::ArrayUtils.make_array(Set.new([1,2,"123"]))
+    array.should include(1)
+    array.should include(2)
+    array.should include("123")
+    array.should_not include(nil)
   end
 end
 
 describe Aquarium::Utils::ArrayUtils, "#strip_array_nils" do
+  include Aquarium::Utils::ArrayUtils
+
   it "should return an empty array if an input array contains all nils." do
     strip_array_nils([nil, nil]).should == []
   end
@@ -63,12 +80,22 @@ describe Aquarium::Utils::ArrayUtils, "#strip_array_nils" do
   end
 
   it "should return an array with all nils removed from the input Set." do
-    strip_array_nils(Set.new([nil, 1, 2, nil, 3, 4])).should == [1, 2, 3, 4]
+    array = strip_array_nils(Set.new([nil, 1, 2, nil, 3, 4]))
+    array.should include(1)
+    array.should include(2)
+    array.should include(3)
+    array.should include(4)
+    array.should_not include(nil)
   end
 end
 
 describe Aquarium::Utils::ArrayUtils, ".strip_array_nils" do
   it "should work like the instance method." do
-    Aquarium::Utils::ArrayUtils.strip_array_nils(Set.new([nil, 1, 2, nil, 3, 4])).should == [1, 2, 3, 4]
+    array = Aquarium::Utils::ArrayUtils.strip_array_nils(Set.new([nil, 1, 2, nil, 3, 4]))
+    array.should include(1)
+    array.should include(2)
+    array.should include(3)
+    array.should include(4)
+    array.should_not include(nil)
   end
 end

data/spec/aquarium/utils/hash_utils_spec.rb

@@ -3,6 +3,7 @@ require 'aquarium/spec_example_types'
 require 'aquarium/utils/hash_utils'
 
 describe Aquarium::Utils::HashUtils, "#make_hash" do
+  include Aquarium::Utils::HashUtils
   
   it "should return an empty hash if the input is nil." do
     make_hash(nil).should == {}

data/spec/aquarium/utils/method_utils_spec.rb

@@ -1,6 +1,24 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 require 'aquarium/utils/method_utils'
 
+describe Aquarium::Utils::MethodUtils, ".to_name" do
+  it "should return a String for Ruby 1.8" do
+    name = Aquarium::Utils::MethodUtils.to_name "length"
+    if RUBY_VERSION =~ /^1.8/
+      name.class.should == String
+    end
+    String.public_instance_methods.include?(name)
+  end
+
+  it "should return a Symbol for Ruby 1.9" do
+    name = Aquarium::Utils::MethodUtils.to_name "length"
+    if RUBY_VERSION =~ /^1.9/
+      name.class.should == Symbol
+    end
+    String.public_instance_methods.include?(name)
+  end
+end
+
 describe Aquarium::Utils::MethodUtils, ".method_args_to_hash" do
 
   it "should return an empty hash for no arguments." do

data/spec/aquarium/utils/options_utils_spec.rb

@@ -1,6 +1,7 @@
 
 require File.dirname(__FILE__) + '/../spec_helper'
 require 'aquarium/utils'
+require 'stringio'
 
 include Aquarium::Utils
 
@@ -155,44 +156,39 @@ module Aquarium
   end
 end
 
+def method_checks which_type, has_methods, has_not_methods = []
+  # Handle 1.8 vs. 1.9 difference; convert methods names uniformly to symbols
+  methods = which_type.instance_methods.map {|m| m.intern}
+  has_methods.each     {|m| methods.should include(m)}
+  has_not_methods.each {|m| methods.should_not include(m)}
+end
+
 describe OptionsUtils, ".canonical_option_accessor" do
+  
   it "should create a reader and writer method for each option" do
-    Aquarium::OptionsUtilsExampleWithAccessors.instance_methods.should include("foos")
-    Aquarium::OptionsUtilsExampleWithAccessors.instance_methods.should include("bars")
-    Aquarium::OptionsUtilsExampleWithAccessors.instance_methods.should include("foos=")
-    Aquarium::OptionsUtilsExampleWithAccessors.instance_methods.should include("bars=")
+    method_checks Aquarium::OptionsUtilsExampleWithAccessors, [:foos, :bars, :foos=, :bars=]
   end
   it "should accept individual options" do
-    Aquarium::OptionsUtilsExampleWithAccessors.instance_methods.should include("foos")
-    Aquarium::OptionsUtilsExampleWithAccessors.instance_methods.should include("bars")
-    Aquarium::OptionsUtilsExampleWithAccessors.instance_methods.should include("foos=")
-    Aquarium::OptionsUtilsExampleWithAccessors.instance_methods.should include("bars=")
+    method_checks Aquarium::OptionsUtilsExampleWithAccessors, [:foos, :bars, :foos=, :bars=]
   end
   it "should accept the CANONICAL_OPTIONS as an argument" do
-    Aquarium::OptionsUtilsExampleWithCanonicalOptionsAccessors.instance_methods.should include("foos")
-    Aquarium::OptionsUtilsExampleWithCanonicalOptionsAccessors.instance_methods.should include("bars")
-    Aquarium::OptionsUtilsExampleWithCanonicalOptionsAccessors.instance_methods.should include("foos=")
-    Aquarium::OptionsUtilsExampleWithCanonicalOptionsAccessors.instance_methods.should include("bars=")
+    method_checks Aquarium::OptionsUtilsExampleWithCanonicalOptionsAccessors, [:foos, :bars, :foos=, :bars=]
   end
 end
+
 describe OptionsUtils, ".canonical_option_reader" do
   it "creates a reader method for each option" do
-    Aquarium::OptionsUtilsExampleWithReaders.instance_methods.should include("foos")
-    Aquarium::OptionsUtilsExampleWithReaders.instance_methods.should include("bars")
-    Aquarium::OptionsUtilsExampleWithReaders.instance_methods.should_not include("foos=")
-    Aquarium::OptionsUtilsExampleWithReaders.instance_methods.should_not include("bars=")
+    method_checks Aquarium::OptionsUtilsExampleWithReaders, [:foos, :bars], [:foos=, :bars=]
   end
   it "should create readers that return set values" do
     object = Aquarium::OptionsUtilsExampleWithReaders.new
     object.foos.class.should == Set
   end
 end
+
 describe OptionsUtils, ".canonical_option_writer" do
   it "creates a writer method for each option" do
-    Aquarium::OptionsUtilsExampleWithWriters.instance_methods.should_not include("foos")
-    Aquarium::OptionsUtilsExampleWithWriters.instance_methods.should_not include("bars")
-    Aquarium::OptionsUtilsExampleWithWriters.instance_methods.should include("foos=")
-    Aquarium::OptionsUtilsExampleWithWriters.instance_methods.should include("bars=")
+    method_checks Aquarium::OptionsUtilsExampleWithWriters, [:foos=, :bars=], [:foos, :bars]
   end
   it "should create writers that convert the input values to sets, if they aren't already sets" do
     object = Aquarium::OptionsUtilsExampleWithAccessors.new

data/spec/aquarium/utils/type_utils_sample_classes.rb

@@ -115,7 +115,7 @@ module Aquarium
           Aquarium::ForDescendents::Nested2ModuleForDescendents,
           ModuleForDescendents]}
 
-      @@sample_classes_ancestors = {
+      sample_classes_ancestors = {
         BaseForDescendents => [
           BaseForDescendents,
           Object,
@@ -178,6 +178,15 @@ module Aquarium
           BaseForDescendents,
           Object,
           Kernel]}
+
+        @@sample_classes_ancestors = if RUBY_VERSION =~ /^1.8/
+          sample_classes_ancestors
+        else
+          sample_classes_ancestors.inject({}) do |map, (k,v)|
+            map[k] = (v << BasicObject).sort {|a,b| a.name <=> b.name}
+            map
+          end
+        end
           
         @@sample_types_ancestors = @@sample_classes_ancestors.merge @@sample_modules_ancestors 
           

data/spec/aquarium/utils/type_utils_spec.rb

@@ -31,13 +31,15 @@ describe TypeUtils, ".descendents called with a class" do
   end
 
   it "should return just the class if it has no descendents" do
-    TypeUtils.descendents(D11ForDescendents).should eql([D11ForDescendents])
-    TypeUtils.descendents(D2ForDescendents).should  eql([D2ForDescendents])
-    TypeUtils.descendents(Aquarium::ForDescendents::NestedD11ForDescendents).should  eql([Aquarium::ForDescendents::NestedD11ForDescendents])
-    TypeUtils.descendents(Aquarium::ForDescendents::NestedD2ForDescendents).should   eql([Aquarium::ForDescendents::NestedD2ForDescendents])
-    TypeUtils.descendents(Aquarium::ForDescendents::NestedD3ForDescendents).should   eql([Aquarium::ForDescendents::NestedD3ForDescendents])
-    TypeUtils.descendents(Aquarium::ForDescendents::NestedD4ForDescendents).should   eql([Aquarium::ForDescendents::NestedD4ForDescendents])
-    TypeUtils.descendents(Aquarium::ForDescendents::NestedD31ForDescendents).should  eql([Aquarium::ForDescendents::NestedD31ForDescendents])
+    [D11ForDescendents, 
+     D2ForDescendents, 
+     Aquarium::ForDescendents::NestedD11ForDescendents,
+     Aquarium::ForDescendents::NestedD2ForDescendents,
+     Aquarium::ForDescendents::NestedD3ForDescendents,
+     Aquarium::ForDescendents::NestedD4ForDescendents,
+     Aquarium::ForDescendents::NestedD31ForDescendents].each do |t|
+      TypeUtils.descendents(t).should eql([t])
+    end
   end
 
   TypeUtils.sample_classes.each do |t|