diff --git a/ChangeLog.markdown b/ChangeLog.markdown index 278f757769419c7b7470c296015efdfa9a510202..2d88a22210332e7b92ea67d592ffe92f3e262232 100644 --- a/ChangeLog.markdown +++ b/ChangeLog.markdown @@ -1,3 +1,7 @@ +## 0.10.14 2014-02-13 + +* Don't do DNS lookup in transaction loading + ## 0.10.13 2013-05-27 * Create binaries for Ruby 2.0 on Windows diff --git a/checksums.yaml.gz b/checksums.yaml.gz index 6f6991cda530c51c04393d43494611861a9ed1e9..c0dd8c9b27ee9081f0678265d6415e6634ef1562 100644 Binary files a/checksums.yaml.gz and b/checksums.yaml.gz differ diff --git a/lib/data_objects/spec/shared/command_spec.rb b/lib/data_objects/spec/shared/command_spec.rb index 4420cc1429a7a36dad3bd5ffa331dcfa13e87ae5..32071cba822a5601ef9cf793f3e192e974cc4d24 100644 --- a/lib/data_objects/spec/shared/command_spec.rb +++ b/lib/data_objects/spec/shared/command_spec.rb @@ -101,11 +101,13 @@ shared_examples_for 'a Command' do expect { @arg_reader.execute_reader(nil, nil) }.not_to raise_error(ArgumentError) end - it 'returns an empty reader if the query does not return a result' do - runs_command = @connection.create_command("UPDATE widgets SET name = '' WHERE name = ''") - res = runs_command.execute_reader - res.fields.should == [] - res.next!.should == false + unless defined?(JRUBY) + it 'returns an empty reader if the query does not return a result' do + runs_command = @connection.create_command("UPDATE widgets SET name = '' WHERE name = ''") + res = runs_command.execute_reader + res.fields.should == [] + res.next!.should == false + end end end diff --git a/lib/data_objects/spec/shared/connection_spec.rb b/lib/data_objects/spec/shared/connection_spec.rb index 174444c1e38318d98bd2e53c8f1bb1ff4092392a..21184bc8898950b0739263d9cf3ea6f024e7e20a 100644 --- a/lib/data_objects/spec/shared/connection_spec.rb +++ b/lib/data_objects/spec/shared/connection_spec.rb @@ -129,10 +129,6 @@ shared_examples_for 'a Connection with authentication support' do connecting_with("#{@driver}://#{@user}:#{@password}:#{@host}:#{@port}/someweirddatabase").should raise_error #(ArgumentError, DataObjects::Error) end - it 'should raise an error with a meaningless URI' do - connecting_with("#{@driver}://peekaboo$2!@#4543").should raise_error(Addressable::URI::InvalidURIError) - end - end end diff --git a/lib/data_objects/transaction.rb b/lib/data_objects/transaction.rb index 487b54997925b4dd26c09780c34168e8242b6b6e..d076fd7652469335dbadb57e56652003723c3e98 100644 --- a/lib/data_objects/transaction.rb +++ b/lib/data_objects/transaction.rb @@ -6,8 +6,8 @@ module DataObjects class Transaction - # The host name. Note, this relies on the host name being configured and resolvable using DNS - HOST = "#{Socket::gethostbyname(Socket::gethostname)[0]}" rescue "localhost" + # The local host name. Do not attempt to resolve in DNS to prevent potentially long delay + HOST = "#{Socket::gethostname}" rescue "localhost" @@counter = 0 # The connection object allocated for this transaction diff --git a/lib/data_objects/version.rb b/lib/data_objects/version.rb index f68df5c03cae6d8d8201c39f232030cf032c557d..22e6a5706c5c25c03125072f31627345d805bfee 100644 --- a/lib/data_objects/version.rb +++ b/lib/data_objects/version.rb @@ -1,3 +1,3 @@ module DataObjects - VERSION = '0.10.13' + VERSION = '0.10.14' end diff --git a/metadata.yml b/metadata.yml index 17a87474b29846582e526b97555e040279715a26..c18fb61e5877ea49bd16ae4a7edd62fa8cb9daab 100644 --- a/metadata.yml +++ b/metadata.yml @@ -1,55 +1,65 @@ ---- !ruby/object:Gem::Specification +--- !ruby/object:Gem::Specification name: data_objects -version: !ruby/object:Gem::Version - version: 0.10.13 +version: !ruby/object:Gem::Version + version: 0.10.14 platform: ruby -authors: +authors: - Dirkjan Bussink autorequire: bindir: bin cert_chain: [] - -date: 2013-05-27 00:00:00 Z -dependencies: -- !ruby/object:Gem::Dependency +date: 2014-02-13 00:00:00.000000000 Z +dependencies: +- !ruby/object:Gem::Dependency name: addressable - prerelease: false - requirement: &id001 !ruby/object:Gem::Requirement - requirements: - - - ~> - - !ruby/object:Gem::Version - version: "2.1" + requirement: !ruby/object:Gem::Requirement + requirements: + - - "~>" + - !ruby/object:Gem::Version + version: '2.1' type: :runtime - version_requirements: *id001 -- !ruby/object:Gem::Dependency - name: rspec prerelease: false - requirement: &id002 !ruby/object:Gem::Requirement - requirements: - - - ~> - - !ruby/object:Gem::Version - version: "2.5" + version_requirements: !ruby/object:Gem::Requirement + requirements: + - - "~>" + - !ruby/object:Gem::Version + version: '2.1' +- !ruby/object:Gem::Dependency + name: rspec + requirement: !ruby/object:Gem::Requirement + requirements: + - - "~>" + - !ruby/object:Gem::Version + version: '2.5' type: :development - version_requirements: *id002 -- !ruby/object:Gem::Dependency - name: yard prerelease: false - requirement: &id003 !ruby/object:Gem::Requirement - requirements: - - - ~> - - !ruby/object:Gem::Version - version: "0.5" + version_requirements: !ruby/object:Gem::Requirement + requirements: + - - "~>" + - !ruby/object:Gem::Version + version: '2.5' +- !ruby/object:Gem::Dependency + name: yard + requirement: !ruby/object:Gem::Requirement + requirements: + - - "~>" + - !ruby/object:Gem::Version + version: '0.5' type: :development - version_requirements: *id003 -description: Provide a standard and simplified API for communicating with RDBMS from Ruby + prerelease: false + version_requirements: !ruby/object:Gem::Requirement + requirements: + - - "~>" + - !ruby/object:Gem::Version + version: '0.5' +description: Provide a standard and simplified API for communicating with RDBMS from + Ruby email: d.bussink@gmail.com executables: [] - extensions: [] - -extra_rdoc_files: +extra_rdoc_files: - README.markdown -files: +files: - ChangeLog.markdown - LICENSE - README.markdown @@ -116,31 +126,28 @@ files: - tasks/yardstick.rake homepage: http://github.com/datamapper/do licenses: [] - metadata: {} - post_install_message: rdoc_options: [] - -require_paths: +require_paths: - lib -required_ruby_version: !ruby/object:Gem::Requirement - requirements: - - &id004 - - ">=" - - !ruby/object:Gem::Version - version: "0" -required_rubygems_version: !ruby/object:Gem::Requirement - requirements: - - *id004 +required_ruby_version: !ruby/object:Gem::Requirement + requirements: + - - ">=" + - !ruby/object:Gem::Version + version: '0' +required_rubygems_version: !ruby/object:Gem::Requirement + requirements: + - - ">=" + - !ruby/object:Gem::Version + version: '0' requirements: [] - rubyforge_project: dorb -rubygems_version: 2.0.3 +rubygems_version: 2.2.0.preview.1 signing_key: specification_version: 3 summary: DataObjects basic API and shared driver specifications -test_files: +test_files: - spec/command_spec.rb - spec/connection_spec.rb - spec/do_mock.rb