dm-do-adapter 1.0.2 → 1.1.0.rc1

data/Gemfile

@@ -1,44 +1,46 @@
+require 'pathname'
+
 source 'http://rubygems.org'
 
-DATAMAPPER = 'git://github.com/datamapper'
-DM_VERSION = '~> 1.0.2'
-DO_VERSION = '~> 0.10.2'
+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.rc1'
+DO_VERSION   = '~> 0.10.2'
 
-group :runtime do # Runtime dependencies (as in the gemspec)
+group :runtime do
 
   do_options = {}
-  do_options[:git] = "#{DATAMAPPER}/do.git" if ENV['DO_GIT'] == 'true'
+  do_options[:git] = "#{DATAMAPPER}/do#{REPO_POSTFIX}" if ENV['DO_GIT'] == 'true'
 
-  gem 'data_objects',    DO_VERSION, do_options.dup
-  gem 'dm-core',         DM_VERSION, :git => "#{DATAMAPPER}/dm-core.git"
+  gem 'data_objects', DO_VERSION, do_options.dup
+  gem 'dm-core',      DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-core#{REPO_POSTFIX}"
 
 end
 
-group(:development) do # Development dependencies
+group :development do
 
-  gem 'rake',            '~> 0.8.7'
-  gem 'rspec',           '~> 1.3', :git => 'git://github.com/snusnu/rspec', :branch => 'heckle_fix_plus_gemfile'
-  gem 'jeweler',         '~> 1.4'
+  gem 'jeweler', '~> 1.5.2'
+  gem 'rake',    '~> 0.8.7'
+  gem 'rspec',   '~> 1.3.1'
 
 end
 
-group :datamapper do # We need this because we want to pin these dependencies to their git master sources
+group :quality do
 
-  if ENV['EXTLIB']
-    gem 'extlib',        '~> 0.9.15', :git => "#{DATAMAPPER}/extlib.git", :require => nil
-  else
-    gem 'activesupport', '~> 3.0.0',  :git => 'git://github.com/rails/rails.git', :branch => '3-0-stable', :require => nil
-  end
+  gem 'rcov',      '~> 0.9.9', :platforms => :mri_18
+  gem 'yard',      '~> 0.6'
+  gem 'yardstick', '~> 0.2'
 
 end
 
-group :quality do # These gems contain rake tasks that check the quality of the source code
+group :datamapper do
 
-  gem 'metric_fu',       '~> 1.3'
-  gem 'rcov',            '~> 0.9.7'
-  gem 'reek',            '~> 1.2.7'
-  gem 'roodi',           '~> 2.1'
-  gem 'yard',            '~> 0.5'
-  gem 'yardstick',       '~> 0.1'
+  if ENV['EXTLIB']
+    gem 'extlib', '~> 0.9.15', SOURCE => "#{DATAMAPPER}/extlib#{REPO_POSTFIX}", :require => nil
+  else
+    gem 'i18n',          '~> 0.5.0'
+    gem 'activesupport', '~> 3.0.3', :require => nil
+  end
 
 end

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Dan Kubb
+Copyright (c) 2011 Dan Kubb
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 
 begin
-  gem 'jeweler', '~> 1.4'
+  gem 'jeweler', '~> 1.5.2'
   require 'jeweler'
 
   Jeweler::Tasks.new do |gem|
@@ -15,11 +15,6 @@ begin
     gem.has_rdoc    = 'yard'
 
     gem.rubyforge_project = 'datamapper'
-
-    gem.add_dependency 'data_objects', '~> 0.10.2'
-    gem.add_dependency 'dm-core',      '~> 1.0.2'
-
-    gem.add_development_dependency 'rspec', '~> 1.3'
   end
 
   Jeweler::GemcutterTasks.new
@@ -29,4 +24,4 @@ rescue LoadError
   puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler'
 end
 
-task(:spec) {} # this adapter only provides shared specs that are excercised by real adapters
+task(:spec) {} # this adapter only provides shared specs that are exercised by real adapters

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.1.0.rc1

data/dm-do-adapter.gemspec

@@ -1,61 +1,62 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{dm-do-adapter}
-  s.version = "1.0.2"
+  s.version = "1.1.0.rc1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Kubb"]
-  s.date = %q{2010-09-07}
+  s.date = %q{2011-02-28}
   s.description = %q{DataObjects Adapter for DataMapper}
   s.email = %q{dan.kubb@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
-    ".gitignore",
-     "Gemfile",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "dm-do-adapter.gemspec",
-     "lib/dm-do-adapter.rb",
-     "lib/dm-do-adapter/adapter.rb",
-     "lib/dm-do-adapter/spec/shared_spec.rb",
-     "tasks/local_gemfile.rake",
-     "tasks/yard.rake",
-     "tasks/yardstick.rake"
+    "Gemfile",
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "dm-do-adapter.gemspec",
+    "lib/dm-do-adapter.rb",
+    "lib/dm-do-adapter/adapter.rb",
+    "lib/dm-do-adapter/spec/shared_spec.rb",
+    "tasks/yard.rake",
+    "tasks/yardstick.rake"
   ]
-  s.has_rdoc = %q{yard}
   s.homepage = %q{http://github.com/datamapper/dm-do-adapter}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{datamapper}
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.5.2}
   s.summary = %q{DataObjects Adapter for DataMapper}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     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.0.2"])
-      s.add_development_dependency(%q<rspec>, ["~> 1.3"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.1.0.rc1"])
+      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.0.2"])
-      s.add_dependency(%q<rspec>, ["~> 1.3"])
+      s.add_dependency(%q<dm-core>, ["~> 1.1.0.rc1"])
+      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.0.2"])
-    s.add_dependency(%q<rspec>, ["~> 1.3"])
+    s.add_dependency(%q<dm-core>, ["~> 1.1.0.rc1"])
+    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
 end
 

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

@@ -109,7 +109,10 @@ module DataMapper
           end
 
           statement = insert_statement(model, properties, serial)
-          result    = execute(statement, *bind_values)
+
+          result = with_connection do |connection|
+            connection.create_command(statement).execute_non_query(*bind_values)
+          end
 
           if result.affected_rows == 1 && serial
             serial.set!(resource, result.insert_id)
@@ -139,7 +142,12 @@ module DataMapper
           command = connection.create_command(statement)
           command.set_types(types)
 
-          reader = command.execute_reader(*bind_values)
+          # Handle different splat semantics for nil on 1.8 and 1.9
+          reader = if bind_values
+            command.execute_reader(*bind_values)
+          else
+            command.execute_reader
+          end
 
           begin
             while reader.next!
@@ -182,7 +190,9 @@ module DataMapper
 
         bind_values.concat(conditions_bind_values)
 
-        execute(statement, *bind_values).affected_rows
+        with_connection do |connection|
+          connection.create_command(statement).execute_non_query(*bind_values)
+        end.affected_rows
       end
 
       # Constructs and executes DELETE statement for given query
@@ -197,7 +207,10 @@ module DataMapper
       def delete(collection)
         query = collection.query
         statement, bind_values = delete_statement(query)
-        execute(statement, *bind_values).affected_rows
+
+        with_connection do |connection|
+          connection.create_command(statement).execute_non_query(*bind_values)
+        end.affected_rows
       end
 
       protected
@@ -474,6 +487,7 @@ module DataMapper
           seen = { target_alias => 0 }
 
           query.links.reverse_each do |relationship|
+            target_alias = relationship.target_model.storage_name(name)
             storage_name = relationship.source_model.storage_name(name)
             source_alias = storage_name
 
@@ -491,8 +505,6 @@ module DataMapper
 
             add_join_conditions(relationship, target_alias, source_alias, statements)
             add_extra_join_conditions(relationship, target_alias, statements, join_bind_values)
-
-            target_alias = source_alias
           end
 
           # prepend the join bind values to the statement bind values

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

@@ -29,7 +29,11 @@ share_examples_for 'A DataObjects Adapter' do
 
   def log_output
     @log.rewind
-    @log.read.chomp.gsub(/^\s+~ \(\d+\.?\d*\)\s+/, '').split("\n")
+    output = @log.read
+    output.chomp!
+    output.gsub!(/\A\s+~ \(\d+\.?\d*\)\s+/, '')
+    output.gsub!(/\Acom\.\w+\.jdbc\.JDBC4PreparedStatement@[^:]+:\s+/, '') if @jruby
+    output.split($/)
   end
 
   def supports_default_values?
@@ -95,7 +99,7 @@ share_examples_for 'A DataObjects Adapter' do
         elsif @sql_server
           /^SET IDENTITY_INSERT \"articles\" ON INSERT INTO "articles" \("id"\) VALUES \(.{1,2}\) SET IDENTITY_INSERT \"articles\" OFF $/i
         else
-          /^INSERT INTO "articles" \("id"\) VALUES \(.{1,2}\)$/i
+          /^INSERT INTO "articles" \("id"\) VALUES \(('.{1,2}'|.{1,2})\)$/i
         end
 
         log_output.first.should =~ regexp
@@ -207,7 +211,28 @@ share_examples_for 'A DataObjects Adapter' do
         auto_migrate!
       end
 
-      @article_model = Article
+      class ::Publisher
+        include DataMapper::Resource
+
+        property :name, String, :key => true
+
+        auto_migrate!
+      end
+
+      class ::Author
+        include DataMapper::Resource
+
+        property :name, String, :key => true
+
+        belongs_to :article
+        belongs_to :publisher
+
+        auto_migrate!
+      end
+
+      @article_model   = Article
+      @publisher_model = Publisher
+      @author_model    = Author
     end
 
     describe 'with a raw query' do
@@ -366,5 +391,25 @@ share_examples_for 'A DataObjects Adapter' do
       end
 
     end
+
+    describe 'with a Query Path' do
+      subject { @author_model.all(query).to_a }
+
+      let(:article_name)   { 'DataMapper Rocks!'                                                    }
+      let(:publisher_name) { 'Unbiased Press'                                                       }
+      let(:query)          { { 'article.name' => article_name, 'publisher.name' => publisher_name } }
+
+      before do
+        @author = @author_model.first_or_create(
+          :name      => 'Dan Kubb',
+          :article   => { :name => article_name   },
+          :publisher => { :name => publisher_name }
+        )
+      end
+
+      specify { expect { subject }.to_not raise_error }
+
+      it { should == [ @author ] }
+    end
   end
 end

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: dm-do-adapter
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 0
-  - 2
-  version: 1.0.2
+  prerelease: 6
+  version: 1.1.0.rc1
 platform: ruby
 authors: 
 - Dan Kubb
@@ -14,53 +10,64 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-07 00:00:00 -07:00
+date: 2011-02-28 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: data_objects
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 10
-        - 2
         version: 0.10.2
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: dm-core
-  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 2
-        version: 1.0.2
+        version: 1.1.0.rc1
   type: :runtime
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  prerelease: false
+  name: jeweler
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
+        version: 1.5.2
   type: :development
+  prerelease: false
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rake
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.8.7
+  type: :development
+  prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.3.1
+  type: :development
+  prerelease: false
+  version_requirements: *id005
 description: DataObjects Adapter for DataMapper
 email: dan.kubb@gmail.com
 executables: []
@@ -71,7 +78,6 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
-- .gitignore
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -81,16 +87,15 @@ files:
 - lib/dm-do-adapter.rb
 - lib/dm-do-adapter/adapter.rb
 - lib/dm-do-adapter/spec/shared_spec.rb
-- tasks/local_gemfile.rake
 - tasks/yard.rake
 - tasks/yardstick.rake
-has_rdoc: yard
+has_rdoc: true
 homepage: http://github.com/datamapper/dm-do-adapter
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -98,21 +103,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: DataObjects Adapter for DataMapper

data/.gitignore

@@ -1,37 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## Rubinius
-*.rbc
-
-## PROJECT::GENERAL
-*.gem
-coverage
-rdoc
-pkg
-tmp
-doc
-log
-.yardoc
-measurements
-
-## BUNDLER
-.bundle
-Gemfile.local
-Gemfile.lock
-Gemfile.local.lock
-
-## PROJECT::SPECIFIC
-spec/db/

data/tasks/local_gemfile.rake

@@ -1,16 +0,0 @@
-desc "Support bundling from local source code (allows BUNDLE_GEMFILE=Gemfile.local bundle foo)"
-task :local_gemfile do |t|
-
-  root       = Pathname(__FILE__).dirname.parent
-  datamapper = root.parent
-
-  root.join('Gemfile.local').open('w') do |f|
-    root.join('Gemfile').open.each do |line|
-      line.sub!(/DATAMAPPER = 'git:\/\/github.com\/datamapper'/, "DATAMAPPER = '#{datamapper}'")
-      line.sub!(/:git => \"#\{DATAMAPPER\}\/(.+?)(?:\.git)?\"/,  ':path => "#{DATAMAPPER}/\1"')
-      line.sub!(/do_options\[:git\] = \"#\{DATAMAPPER\}\/(.+?)(?:\.git)?\"/,  'do_options[:path] = "#{DATAMAPPER}/\1"')
-      f.puts line
-    end
-  end
-
-end