dm-do-adapter 1.1.0.rc2 → 1.1.0.rc3

data/Gemfile

@@ -5,7 +5,7 @@ source 'http://rubygems.org'
 SOURCE       = ENV.fetch('SOURCE', :git).to_sym
 REPO_POSTFIX = SOURCE == :path ? ''                                : '.git'
 DATAMAPPER   = SOURCE == :path ? Pathname(__FILE__).dirname.parent : 'http://github.com/datamapper'
-DM_VERSION   = '~> 1.1.0.rc2'
+DM_VERSION   = '~> 1.1.0.rc3'
 DO_VERSION   = '~> 0.10.2'
 
 do_options = {}

data/VERSION

@@ -1 +1 @@
-1.1.0.rc2
+1.1.0.rc3

data/dm-do-adapter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-do-adapter}
-  s.version = "1.1.0.rc2"
+  s.version = "1.1.0.rc3"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Kubb"]
-  s.date = %q{2011-03-01}
+  s.date = %q{2011-03-10}
   s.description = %q{DataObjects Adapter for DataMapper}
   s.email = %q{dan.kubb@gmail.com}
   s.extra_rdoc_files = [
@@ -32,7 +32,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/datamapper/dm-do-adapter}
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{datamapper}
-  s.rubygems_version = %q{1.5.2}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{DataObjects Adapter for DataMapper}
 
   if s.respond_to? :specification_version then
@@ -40,20 +40,20 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<data_objects>, ["~> 0.10.2"])
-      s.add_runtime_dependency(%q<dm-core>, ["~> 1.1.0.rc2"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.1.0.rc3"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rake>, ["~> 0.8.7"])
       s.add_development_dependency(%q<rspec>, ["~> 1.3.1"])
     else
       s.add_dependency(%q<data_objects>, ["~> 0.10.2"])
-      s.add_dependency(%q<dm-core>, ["~> 1.1.0.rc2"])
+      s.add_dependency(%q<dm-core>, ["~> 1.1.0.rc3"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rake>, ["~> 0.8.7"])
       s.add_dependency(%q<rspec>, ["~> 1.3.1"])
     end
   else
     s.add_dependency(%q<data_objects>, ["~> 0.10.2"])
-    s.add_dependency(%q<dm-core>, ["~> 1.1.0.rc2"])
+    s.add_dependency(%q<dm-core>, ["~> 1.1.0.rc3"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<rake>, ["~> 0.8.7"])
     s.add_dependency(%q<rspec>, ["~> 1.3.1"])

data/lib/dm-do-adapter/adapter.rb

@@ -151,7 +151,7 @@ module DataMapper
 
           begin
             while reader.next!
-              records << fields.zip(reader.values).to_hash
+              records << DataMapper::Ext::Array.to_hash(fields.zip(reader.values))
             end
           ensure
             reader.close
@@ -219,7 +219,10 @@ module DataMapper
       def normalized_uri
         @normalized_uri ||=
           begin
-            query = @options.except(:adapter, :user, :password, :host, :port, :path, :fragment, :scheme, :query, :username, :database)
+            keys = [
+              :adapter, :user, :password, :host, :port, :path, :fragment,
+              :scheme, :query, :username, :database ]
+            query = DataMapper::Ext::Hash.except(@options, keys)
             query = nil if query.empty?
 
             # Better error message in case port is no Numeric value
@@ -358,7 +361,7 @@ module DataMapper
           statement = "SELECT #{columns_statement(fields, qualify)}"
           statement << " FROM #{quote_name(query.model.storage_name(name))}"
           statement << " #{join_statement(query, bind_values, qualify)}"   if qualify
-          statement << " WHERE #{conditions_statement}"                    unless conditions_statement.blank?
+          statement << " WHERE #{conditions_statement}"                    unless DataMapper::Ext.blank?(conditions_statement)
           statement << " GROUP BY #{columns_statement(group_by, qualify)}" if group_by && group_by.any?
           statement << " ORDER BY #{order_statement(order_by, qualify)}"   if order_by && order_by.any?
 
@@ -392,7 +395,7 @@ module DataMapper
           if supports_default_values? && properties.empty?
             statement << default_values_clause
           else
-            statement << <<-SQL.compress_lines
+            statement << DataMapper::Ext::String.compress_lines(<<-SQL)
               (#{properties.map { |property| quote_name(property.field) }.join(', ')})
               VALUES
               (#{(['?'] * properties.size).join(', ')})
@@ -436,7 +439,7 @@ module DataMapper
 
           statement = "UPDATE #{quote_name(model.storage_name(name))}"
           statement << " SET #{properties.map { |property| "#{quote_name(property.field)} = ?" }.join(', ')}"
-          statement << " WHERE #{conditions_statement}" unless conditions_statement.blank?
+          statement << " WHERE #{conditions_statement}" unless DataMapper::Ext.blank?(conditions_statement)
 
           return statement, bind_values
         end
@@ -458,7 +461,7 @@ module DataMapper
           end
 
           statement = "DELETE FROM #{quote_name(model.storage_name(name))}"
-          statement << " WHERE #{conditions_statement}" unless conditions_statement.blank?
+          statement << " WHERE #{conditions_statement}" unless DataMapper::Ext.blank?(conditions_statement)
 
           return statement, bind_values
         end

metadata

@@ -2,7 +2,7 @@
 name: dm-do-adapter
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.1.0.rc2
+  version: 1.1.0.rc3
 platform: ruby
 authors: 
 - Dan Kubb
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-01 00:00:00 -08:00
+date: 2011-03-10 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,7 +31,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.1.0.rc2
+        version: 1.1.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: *id002
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: DataObjects Adapter for DataMapper