aquarium 0.1.6 → 0.1.7

data/spec/aquarium/finders/object_finder_spec.rb

@@ -118,6 +118,7 @@ describe Aquarium::Finders::ObjectFinder, "#find" do
     actual = Aquarium::Finders::ObjectFinder.new.find :type => OBase
     actual.matched.size.should == 1
     actual.matched[OBase].sort_by {|o| o.name}.should == [b1, b2, d1, d2]
+    actual.matched[OBase].each {|o| [b1, b2, d1, d2].include?(o)}
     actual.not_matched.should == {}
   end
   

data/spec/aquarium/finders/type_finder_spec.rb

@@ -157,6 +157,49 @@ describe Aquarium::Finders::TypeFinder, "#find with :types, :names, :type, and :
   end
 end
 
+describe Aquarium::Finders::TypeFinder, "#find with :exclude_types" do
+  it "should exclude types specified with a regular expression." do
+    expected_found_types  = [Class, Module, Object]
+    actual = Aquarium::Finders::TypeFinder.new.find :types => [/K.+l/, /^Mod.+e$/, /^Object$/, /^Clas{2}$/], :exclude_types => /^Kernel$/
+    actual.matched_keys.sort_by {|x| x.to_s}.should == expected_found_types.sort_by {|x| x.to_s}
+    actual.not_matched.size.should == 0
+  end
+
+  it "should exclude types specified by name." do
+    expected_found_types  = [Class, Module]
+    actual = Aquarium::Finders::TypeFinder.new.find :types => [/K.+l/, /^Mod.+e$/, /^Object$/, /^Clas{2}$/], :exclude_types => [Kernel, Object]
+    actual.matched_keys.sort_by {|x| x.to_s}.should == expected_found_types.sort_by {|x| x.to_s}
+    actual.not_matched.size.should == 0
+  end
+
+  it "should not add excluded types to the #not_matched result." do
+    expected_found_types  = [Class, Module]
+    actual = Aquarium::Finders::TypeFinder.new.find :types => [/K.+l/, /^Mod.+e$/, /^Object$/, /^Clas{2}$/], :exclude_types => [Kernel, Object]
+    actual.not_matched.size.should == 0
+  end
+
+  it "should be a synonym for :exclude_type." do
+    expected_found_types  = [Class, Module]
+    actual = Aquarium::Finders::TypeFinder.new.find :types => [/K.+l/, /^Mod.+e$/, /^Object$/, /^Clas{2}$/], :exclude_type => [Kernel, Object]
+    actual.matched_keys.sort_by {|x| x.to_s}.should == expected_found_types.sort_by {|x| x.to_s}
+    actual.not_matched.size.should == 0
+  end
+
+  it "should be a synonym for :exclude_names." do
+    expected_found_types  = [Class, Module]
+    actual = Aquarium::Finders::TypeFinder.new.find :types => [/K.+l/, /^Mod.+e$/, /^Object$/, /^Clas{2}$/], :exclude_names => [Kernel, Object]
+    actual.matched_keys.sort_by {|x| x.to_s}.should == expected_found_types.sort_by {|x| x.to_s}
+    actual.not_matched.size.should == 0
+  end
+
+  it "should be a synonym for :exclude_name." do
+    expected_found_types  = [Class, Module]
+    actual = Aquarium::Finders::TypeFinder.new.find :types => [/K.+l/, /^Mod.+e$/, /^Object$/, /^Clas{2}$/], :exclude_name => [Kernel, Object]
+    actual.matched_keys.sort_by {|x| x.to_s}.should == expected_found_types.sort_by {|x| x.to_s}
+    actual.not_matched.size.should == 0
+  end
+end
+  
 describe Aquarium::Finders::TypeFinder, "#find" do
   it "should find types when types given." do
     expected_found_types  = [Outside::Inside1, Outside::Inside2]

data/spec/aquarium/utils/name_utils_spec.rb

@@ -3,10 +3,18 @@ require File.dirname(__FILE__) + '/../spec_example_classes'
 require 'aquarium/utils/name_utils'
 
 describe Aquarium::Utils::NameUtils, ".make_valid_attr_name_from_method_name" do
-  it "should convert an equal sign into _equalsign_" do
-    Aquarium::Utils::NameUtils.make_valid_attr_name_from_method_name(:"foo=bar=baz").should eql(:foo_equalsign_bar_equalsign_baz)
+  it "should convert an equal sign into _equal_" do
+    Aquarium::Utils::NameUtils.make_valid_attr_name_from_method_name(:"foo=bar=baz").should eql(:foo_equal_bar_equal_baz)
   end
 
+  it "should convert an '==' sign into _equal__equal_" do
+    Aquarium::Utils::NameUtils.make_valid_attr_name_from_method_name(:"foo==bar==baz").should eql(:foo_equal__equal_bar_equal__equal_baz)
+  end
+  
+  it "should convert an '===' sign into _equal__equal__equal_" do
+    Aquarium::Utils::NameUtils.make_valid_attr_name_from_method_name(:"foo===bar===baz").should eql(:foo_equal__equal__equal_bar_equal__equal__equal_baz)
+  end
+  
   it "should convert a question mark into _questionmark_" do
     Aquarium::Utils::NameUtils.make_valid_attr_name_from_method_name(:"foo?bar?baz").should eql(:foo_questionmark_bar_questionmark_baz)
   end
@@ -15,12 +23,79 @@ describe Aquarium::Utils::NameUtils, ".make_valid_attr_name_from_method_name" do
     Aquarium::Utils::NameUtils.make_valid_attr_name_from_method_name(:"foo!bar!baz").should eql(:foo_exclamationmark_bar_exclamationmark_baz)
   end
 
-  it "should convert question marks into _tilde_" do
+  it "should convert a tilde into _tilde_" do
     Aquarium::Utils::NameUtils.make_valid_attr_name_from_method_name(:"foo~bar~baz").should eql(:foo_tilde_bar_tilde_baz)
   end
 
+  it "should convert a minus sign into _minus_" do
+    Aquarium::Utils::NameUtils.make_valid_attr_name_from_method_name(:"foo-bar-baz").should eql(:foo_minus_bar_minus_baz)
+  end
+
+  it "should convert a plus sign into _plus_" do
+    Aquarium::Utils::NameUtils.make_valid_attr_name_from_method_name(:"foo+bar+baz").should eql(:foo_plus_bar_plus_baz)
+  end
+
+  it "should convert a slash into _slash_" do
+    Aquarium::Utils::NameUtils.make_valid_attr_name_from_method_name(:"foo/bar/baz").should eql(:foo_slash_bar_slash_baz)
+  end
+
+  it "should convert a star into _star_" do
+    Aquarium::Utils::NameUtils.make_valid_attr_name_from_method_name(:"foo*bar*baz").should eql(:foo_star_bar_star_baz)
+  end
+
+  it "should convert a less than sign into _lessthan_" do
+    Aquarium::Utils::NameUtils.make_valid_attr_name_from_method_name(:"foo<bar<baz").should eql(:foo_lessthan_bar_lessthan_baz)
+  end
+
+  it "should convert a greater than sign into _greaterthan_" do
+    Aquarium::Utils::NameUtils.make_valid_attr_name_from_method_name(:"foo>bar>baz").should eql(:foo_greaterthan_bar_greaterthan_baz)
+  end
+
+  it "should convert a '<=>' (spaceship operator) into _greaterthan_" do
+    Aquarium::Utils::NameUtils.make_valid_attr_name_from_method_name(:"foo<=>bar<=>baz").should eql(:foo_lessthan__equal__greaterthan_bar_lessthan__equal__greaterthan_baz)
+  end
+
+  it "should convert a left shift into _leftshift_" do
+    Aquarium::Utils::NameUtils.make_valid_attr_name_from_method_name(:"foo<<bar<<baz").should eql(:foo_leftshift_bar_leftshift_baz)
+  end
+
+  it "should convert a right shift into _rightshift_" do
+    Aquarium::Utils::NameUtils.make_valid_attr_name_from_method_name(:"foo>>bar>>baz").should eql(:foo_rightshift_bar_rightshift_baz)
+  end
+
+  it "should convert an '=~' into _matches_" do
+    Aquarium::Utils::NameUtils.make_valid_attr_name_from_method_name(:"foo=~bar=~baz").should eql(:foo_matches_bar_matches_baz)
+  end
+
+  it "should convert a percent sign into _percent_" do
+    Aquarium::Utils::NameUtils.make_valid_attr_name_from_method_name(:"foo%bar%baz").should eql(:foo_percent_bar_percent_baz)
+  end
+
+  it "should convert a caret into _caret_" do
+    Aquarium::Utils::NameUtils.make_valid_attr_name_from_method_name(:"foo^bar^baz").should eql(:foo_caret_bar_caret_baz)
+  end
+
+  it "should convert a [] into _brackets_" do
+    Aquarium::Utils::NameUtils.make_valid_attr_name_from_method_name(:"foo[]bar[]baz").should eql(:foo_brackets_bar_brackets_baz)
+  end
+
+  it "should convert a & into _ampersand_" do
+    Aquarium::Utils::NameUtils.make_valid_attr_name_from_method_name(:"foo&bar&baz").should eql(:foo_ampersand_bar_ampersand_baz)
+  end
+
+  it "should convert a | into _pipe_" do
+    Aquarium::Utils::NameUtils.make_valid_attr_name_from_method_name(:"foo|bar|baz").should eql(:foo_pipe_bar_pipe_baz)
+  end
+
+  it "should convert a back tick into _backtick_" do
+    Aquarium::Utils::NameUtils.make_valid_attr_name_from_method_name(:"foo`bar`baz").should eql(:foo_backtick_bar_backtick_baz)
+  end
+
   it "should convert all of the above in the same symbol" do
-    Aquarium::Utils::NameUtils.make_valid_attr_name_from_method_name(:"foo=bar?baz!boz~bat").should eql(:foo_equalsign_bar_questionmark_baz_exclamationmark_boz_tilde_bat)
+    Aquarium::Utils::NameUtils.make_valid_attr_name_from_method_name(:"foo=bar?baz!boz~bat-bot+bit").should eql(
+      :foo_equal_bar_questionmark_baz_exclamationmark_boz_tilde_bat_minus_bot_plus_bit)
+    Aquarium::Utils::NameUtils.make_valid_attr_name_from_method_name('x/a*b<c>d<<e>>f=~g%i^j[]k&l|m`n'.intern).should eql(
+      :x_slash_a_star_b_lessthan_c_greaterthan_d_leftshift_e_rightshift_f_matches_g_percent_i_caret_j_brackets_k_ampersand_l_pipe_m_backtick_n)
   end
 end
 

metadata

@@ -3,9 +3,9 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: aquarium
 version: !ruby/object:Gem::Version 
-  version: 0.1.6
-date: 2007-10-07 00:00:00 -05:00
-summary: Aquarium-0.1.6 (r7) - Aspect-Oriented Programming toolkit for Ruby http://aquarium.rubyforge.org
+  version: 0.1.7
+date: 2007-10-27 00:00:00 -05:00
+summary: Aquarium-0.1.7 (r7) - Aspect-Oriented Programming toolkit for Ruby http://aquarium.rubyforge.org
 require_paths: 
 - lib
 email: aquarium-devel@rubyforge.org