@@ -122,13 +122,11 @@ module AutoCode # check to see if some other thread loaded the constant before # we entered the lock. return const_get( cname ) if const_defined?( cname ) - constructors = @autocode[:constructors].map do |k,v| - # v - k == true || /V2/ === cname.to_s || k == cname + actions = [] + @autocode[:constructors].each do |matcher,action| + actions.concat action if (matcher == true || matcher == cname || matcher === cname.to_s ) end - # raise constructors.inspect - # constructors = @autocode[:constructors][true] + @autocode[:constructors][cname] - constructors.reverse.find { | a,c | c.call( cname ) and const_defined?( cname ) } + actions.reverse!.find { | c | c.call( cname ) and const_defined?( cname ) } return old.call( cname ) unless const_defined?( cname ) initializers = @autocode[:initializers][true] + @autocode[:initializers][cname] mod = const_get( cname ); initializers.each { |init| init.call( mod ) } @@ -140,4 +138,5 @@ module AutoCode end end end -Autocode = AutoCode \ No newline at end of file +Autocode = AutoCode + lib/autocode.rb @@ -18,11 +18,11 @@ describe "auto_create" do end end - specify "allows you create and initialize a given const name" do + it "allows you create and initialize a given const name" do A::B.smurf.should == "blue" end - specify "allows you create and initialize const using a wildcard" do + it "allows you create and initialize const using a wildcard" do A::B::C.pixie.should == "brown" end @@ -48,18 +48,21 @@ describe "auto_create" do L::WONK::KNOW.foo.should == "bar" end - specify "raises a NameError if a const doesn't match" do + it "raises a NameError if a const doesn't match" do lambda{ A::C }.should.raise NameError end - # it "can take a Regexp as a key" do - # module M - # include AutoCode - # auto_create_module(/V\d+/) do - # Thing = self.name.split("::").last.reverse - # end - # end - # M::V2::Thing.should == "2V" - # end + it "can take a Regexp as a key" do + module M + include AutoCode + auto_create_module(/V\d+/) do + def self.thing + name.split("::").last.reverse + end + end + end + M::V2.thing.should == "2V" + M::V3.thing.should == "3V" + end end \ No newline at end of file test/auto_create.rb 48818e0627fbaff5aa1b4cf416edbd3560c425fc Matthew King automatthew@gmail.com http://github.com/dyoder/autocode/commit/7410d58a0aeceecf21c65d28cbd1b5174eeb4800 7410d58a0aeceecf21c65d28cbd1b5174eeb4800 2009-03-06T07:21:22-08:00 2009-03-06T07:21:22-08:00 allow regex as cname matcher a717a566e5ec5a2226ba83aa153a9e14341b2b87 Matthew King automatthew@gmail.com