@@ -14,7 +14,7 @@ EMAIL = "ssmoot@gmail.com" GEM_NAME = "dm-core" GEM_VERSION = DataMapper::VERSION GEM_DEPENDENCIES = ["data_objects", ">=0.9.5"], ["extlib", ">=0.9.5"], - ["rspec", ">=1.1.3"], ["addressable", ">=1.0.4"] + ["rspec", ">=1.1.3"], ["addressable", "=2.0.0"] PROJECT_NAME = "datamapper" Rakefile @@ -125,16 +125,18 @@ module DataMapper return uri_or_options end - adapter = uri_or_options.delete(:adapter).to_s - user = uri_or_options.delete(:username) - password = uri_or_options.delete(:password) - host = uri_or_options.delete(:host) - port = uri_or_options.delete(:port) - database = uri_or_options.delete(:database) - query = uri_or_options.to_a.map { |pair| pair * '=' } * '&' - query = nil if query == '' - - return DataObjects::URI.parse(Addressable::URI.new(adapter, user, password, host, port, database, query, nil)) + query = uri_or_options.except(:adapter, :username, :password, :host, :port, :database).map { |pair| pair.join('=') }.join('&') + query = nil if query.blank? + + return DataObjects::URI.parse(Addressable::URI.new( + :scheme => uri_or_options[:adapter].to_s, + :user => uri_or_options[:username], + :password => uri_or_options[:password], + :host => uri_or_options[:host], + :port => uri_or_options[:port], + :path => uri_or_options[:database], + :query => query + )) end # TODO: clean up once transaction related methods move to dm-more/dm-transactions lib/dm-core/adapters/data_objects_adapter.rb @@ -19,7 +19,7 @@ describe DataMapper::Associations::ManyToOne::Proxy do before do @child = mock('child', :kind_of? => true) - @parent = mock('parent') + @parent = mock('parent', :nil? => false, :new_record? => false) @relationship = mock('relationship', :kind_of? => true, :get_parent => @parent, :attach_parent => nil) @association = DataMapper::Associations::ManyToOne::Proxy.new(@relationship, @child) @@ -62,7 +62,7 @@ describe DataMapper::Associations::ManyToOne::Proxy do describe '#save' do describe 'when the parent is nil' do before do - @parent.should_receive(:nil?).with(no_args).and_return(true) + @parent.stub!(:nil?).and_return(true) end it 'should not save the parent' do spec/unit/associations/many_to_one_spec.rb @@ -1,15 +1,18 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper')) describe 'DataMapper::Model' do - module ModelSpec - class Resource - include DataMapper::Resource + before do + Object.send(:remove_const, :ModelSpec) if defined?(ModelSpec) + module ModelSpec + class Resource + include DataMapper::Resource - storage_names[:legacy] = 'legacy_resource' + storage_names[:legacy] = 'legacy_resource' - property :id, Serial - property :name, String - property :type, Discriminator + property :id, Serial + property :name, String + property :type, Discriminator + end end end @@ -87,7 +90,7 @@ describe 'DataMapper::Model' do describe '#storage_names' do it 'should return a Hash mapping each repository to a storage location' do ModelSpec::Resource.storage_names.should be_kind_of(Hash) - ModelSpec::Resource.storage_names.should == { :default => 'model_spec_resources', :legacy => 'legacy_resource' } + ModelSpec::Resource.storage_names.should == { :legacy => 'legacy_resource' } end end @@ -165,12 +168,7 @@ describe 'DataMapper::Model' do describe '#storage_exists?' do it 'should return whether or not the storage exists' do - ModelSpec::Resource.should_receive(:repository).with(:default) do - repository = mock('repository') - repository.should_receive(:storage_exists?).with('model_spec_resources').and_return(true) - repository - end - ModelSpec::Resource.storage_exists?.should == true + ModelSpec::Resource.storage_exists?.should == false end end spec/unit/model_spec.rb @@ -240,9 +240,9 @@ describe DataMapper::Transaction do @transaction_primitive.should_receive(:begin) @transaction_primitive.should_receive(:rollback) @transaction_primitive.should_receive(:close) - p = Proc.new do raise "test exception, never mind me" end - @transaction.should_receive(:within).with(&p) - lambda do @transaction.commit(&p) end.should raise_error(Exception, /test exception, never mind me/) + p = Proc.new do end + @transaction.should_receive(:within).with(&p).and_raise(Exception.new('test exception, never mind me')) + lambda { @transaction.commit(&p) }.should raise_error(Exception, /test exception, never mind me/) end end end @@ -280,8 +280,8 @@ describe DataMapper::Transaction do describe "#method_missing" do before :each do @transaction = DataMapper::Transaction.new(@adapter, @repository) - @adapter.should_receive(:is_a?).any_number_of_times.with(Spec::Mocks::AnyArgsConstraint).and_return(false) - @adapter.should_receive(:is_a?).any_number_of_times.with(Spec::Mocks::NoArgsConstraint).and_return(false) + @adapter.should_receive(:is_a?).any_number_of_times.with(any_args).and_return(false) + @adapter.should_receive(:is_a?).any_number_of_times.with(no_args).and_return(false) @adapter.should_receive(:is_a?).any_number_of_times.with(Regexp).and_return(false) end it "should delegate calls to [a method we have]_if_[state](adapter) to [a method we have](adapter) if state of adapter is [state]" do @@ -326,11 +326,11 @@ describe DataMapper::Transaction do describe "#each_adapter" do before :each do @transaction = DataMapper::Transaction.new(@adapter, @repository) - @adapter.should_receive(:is_a?).any_number_of_times.with(Spec::Mocks::AnyArgsConstraint).and_return(false) - @adapter.should_receive(:is_a?).any_number_of_times.with(Spec::Mocks::NoArgsConstraint).and_return(false) + @adapter.should_receive(:is_a?).any_number_of_times.with(any_args).and_return(false) + @adapter.should_receive(:is_a?).any_number_of_times.with(no_args).and_return(false) @adapter.should_receive(:is_a?).any_number_of_times.with(Regexp).and_return(false) - @repository_adapter.should_receive(:is_a?).any_number_of_times.with(Spec::Mocks::AnyArgsConstraint).and_return(false) - @repository_adapter.should_receive(:is_a?).any_number_of_times.with(Spec::Mocks::NoArgsConstraint).and_return(false) + @repository_adapter.should_receive(:is_a?).any_number_of_times.with(any_args).and_return(false) + @repository_adapter.should_receive(:is_a?).any_number_of_times.with(no_args).and_return(false) @repository_adapter.should_receive(:is_a?).any_number_of_times.with(Regexp).and_return(false) end it "should send the first argument to itself once for each adapter" do @@ -386,8 +386,8 @@ describe DataMapper::Transaction do describe "#do_adapter" do before :each do @transaction = DataMapper::Transaction.new(@adapter, @repository) - @adapter.should_receive(:is_a?).any_number_of_times.with(Spec::Mocks::AnyArgsConstraint).and_return(false) - @adapter.should_receive(:is_a?).any_number_of_times.with(Spec::Mocks::NoArgsConstraint).and_return(false) + @adapter.should_receive(:is_a?).any_number_of_times.with(any_args).and_return(false) + @adapter.should_receive(:is_a?).any_number_of_times.with(no_args).and_return(false) @adapter.should_receive(:is_a?).any_number_of_times.with(Regexp).and_return(false) end it "should raise if there is no connection for the adapter" do @@ -447,8 +447,8 @@ describe DataMapper::Transaction do @other_adapter = mock("adapter") @other_adapter.should_receive(:is_a?).any_number_of_times.with(Array).and_return(false) @other_adapter.should_receive(:is_a?).any_number_of_times.with(DataMapper::Adapters::AbstractAdapter).and_return(true) - @other_adapter.should_receive(:is_a?).any_number_of_times.with(Spec::Mocks::AnyArgsConstraint).and_return(false) - @other_adapter.should_receive(:is_a?).any_number_of_times.with(Spec::Mocks::NoArgsConstraint).and_return(false) + @other_adapter.should_receive(:is_a?).any_number_of_times.with(any_args).and_return(false) + @other_adapter.should_receive(:is_a?).any_number_of_times.with(no_args).and_return(false) @other_adapter.should_receive(:is_a?).any_number_of_times.with(Regexp).and_return(false) @transaction = DataMapper::Transaction.new(@other_adapter) end spec/unit/transaction_spec.rb e5df3f6a58ae7e591f188359e33984fbccea9cfd Dan Kubb dan.kubb@autopilotmarketing.com http://github.com/sam/dm-core/commit/3e1142823bb26f497c1e91d18af12162c43e4e94 3e1142823bb26f497c1e91d18af12162c43e4e94

2008-11-15T22:12:33-08:00

Fixed to work with Addressable 2.0 * Updated dependency to be equal to 2.0.0 for Addressable * Fixed failing specs caused by too many mocks and/or relying on private constants within RSpec. edc86b4a957e813fb9d044c38cd17823638662f3 Dan Kubb dan.kubb@autopilotmarketing.com