lib/coupler/matcher.rb lib/coupler/matcher/default.rb lib/coupler/matcher/exact.rb lib/coupler/matcher/master.rb spec/libs/coupler/matcher/default_spec.rb spec/libs/coupler/matcher/exact_spec.rb spec/libs/coupler/matcher/master_spec.rb spec/libs/coupler/matcher_spec.rb @@ -42,7 +42,7 @@ module Coupler end require 'coupler/extensions' -require 'coupler/matchers' +require 'coupler/matcher' require 'coupler/options' require 'coupler/resource' require 'coupler/runner' lib/coupler.rb @@ -23,7 +23,7 @@ module Coupler else raise "unsupported scenario type" end - rnames.each do |rname| + rnames.each do |rname| @resources << Coupler::Resource.find(rname) @scratches << Coupler::Resource.find("#{rname}_scratch") raise "can't find resource '#{rname}'" if @resources[-1].nil? @@ -37,7 +37,7 @@ module Coupler list | (m['field'] ? [m['field']] : m['fields']) end - @master_matcher = Coupler::Matchers::MasterMatcher.new(self, @options) + @master_matcher = Coupler::Matcher::Master.new(self, @options) spec['matchers'].each do |m| case m['type'] when 'exact' lib/coupler/scenario.rb @@ -14,8 +14,8 @@ describe Coupler::Scenario do @result = stub(Coupler::Resource::ResultSet, :close => nil) @cache = stub(Coupler::CachedResource, :add => nil, :fetch => nil, :clear => nil, :auto_fill! => nil) - @matcher = stub(Coupler::Matchers::MasterMatcher, :add_matcher => nil) - Coupler::Matchers::MasterMatcher.stub!(:new).and_return(@matcher) + @matcher = stub(Coupler::Matcher::Master, :add_matcher => nil) + Coupler::Matcher::Master.stub!(:new).and_return(@matcher) Coupler::CachedResource.stub!(:new).and_return(@cache) end @@ -75,7 +75,7 @@ describe Coupler::Scenario do end it "should create a master matcher" do - Coupler::Matchers::MasterMatcher.should_receive(:new).with( + Coupler::Matcher::Master.should_receive(:new).with( an_instance_of(Coupler::Scenario), @options ).and_return(@matcher) create_scenario @@ -157,7 +157,7 @@ describe Coupler::Scenario do end describe "#run" do - + def do_run(spec = {}, opts = {}) create_scenario(spec, opts).run end spec/libs/coupler/scenario_spec.rb lib/coupler/matchers.rb lib/coupler/matchers/default_matcher.rb lib/coupler/matchers/exact_matcher.rb lib/coupler/matchers/master_matcher.rb spec/libs/coupler/matchers/default_matcher_spec.rb spec/libs/coupler/matchers/exact_matcher_spec.rb spec/libs/coupler/matchers/master_matcher_spec.rb spec/libs/coupler/matchers_spec.rb 8607090c812e8115760ba7c7786fd62985a00788 Jeremy Stephens viking415@gmail.com http://github.com/viking/coupler/commit/f786dab3d0e5f24503d2bb6b820891468f81f131 f786dab3d0e5f24503d2bb6b820891468f81f131 2008-11-07T14:56:08-08:00 2008-11-07T14:56:08-08:00 Renamed Matchers to Matcher 9b0cda12d67cfe5ef1bdcf5485e857f42939a87b Jeremy Stephens viking415@gmail.com