dm-sqlserver-adapter 1.1.0 → 1.2.0.rc2

data/Gemfile

@@ -2,24 +2,29 @@ require 'pathname'
 
 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'
-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.2.0.rc2'
+DO_VERSION     = '~> 0.10.6'
+CURRENT_BRANCH = ENV.fetch('GIT_BRANCH', 'master')
 
 do_options = {}
 do_options[:git] = "#{DATAMAPPER}/do#{REPO_POSTFIX}" if ENV['DO_GIT'] == 'true'
 
 gem 'do_sqlserver',  DO_VERSION, do_options.dup
-gem 'dm-do-adapter', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-do-adapter#{REPO_POSTFIX}"
+gem 'dm-do-adapter', DM_VERSION,
+  SOURCE  => "#{DATAMAPPER}/dm-do-adapter#{REPO_POSTFIX}",
+  :branch => CURRENT_BRANCH
 
 group :development do
 
-  gem 'dm-migrations', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-migrations#{REPO_POSTFIX}"
-  gem 'jeweler',       '~> 1.5.2'
-  gem 'rake',          '~> 0.8.7'
-  gem 'rspec',         '~> 1.3.1'
+  gem 'dm-migrations', DM_VERSION,
+    SOURCE  => "#{DATAMAPPER}/dm-migrations#{REPO_POSTFIX}",
+    :branch => CURRENT_BRANCH
+
+  gem 'jeweler',       '~> 1.6.4'
+  gem 'rspec',         '~> 1.3.2'
 
 end
 
@@ -35,14 +40,19 @@ end
 
 group :datamapper do
 
-  gem 'dm-core',      DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-core#{REPO_POSTFIX}"
+  gem 'dm-core', DM_VERSION,
+    SOURCE  => "#{DATAMAPPER}/dm-core#{REPO_POSTFIX}",
+    :branch => CURRENT_BRANCH
+
   gem 'data_objects', DO_VERSION, do_options.dup
 
   plugins = ENV['PLUGINS'] || ENV['PLUGIN']
   plugins = plugins.to_s.tr(',', ' ').split.push('dm-migrations').uniq
 
   plugins.each do |plugin|
-    gem plugin, DM_VERSION, SOURCE => "#{DATAMAPPER}/#{plugin}#{REPO_POSTFIX}"
+    gem plugin, DM_VERSION,
+      SOURCE  => "#{DATAMAPPER}/#{plugin}#{REPO_POSTFIX}",
+      :branch => CURRENT_BRANCH
   end
 
 end

data/Rakefile

@@ -2,7 +2,6 @@ require 'rubygems'
 require 'rake'
 
 begin
-  gem 'jeweler', '~> 1.5.2'
   require 'jeweler'
 
   Jeweler::Tasks.new do |gem|

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0.rc2

data/dm-sqlserver-adapter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-sqlserver-adapter}
-  s.version = "1.1.0"
+  s.version = "1.2.0.rc2"
 
-  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 = ["Clifford Heath"]
-  s.date = %q{2011-03-16}
+  s.date = %q{2011-09-14}
   s.description = %q{Microsoft SQL Server Adapter for DataMapper}
   s.email = %q{dan.kubb@gmail.com}
   s.extra_rdoc_files = [
@@ -35,38 +35,31 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/datamapper/dm-sqlserver-adapter}
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{datamapper}
-  s.rubygems_version = %q{1.6.2}
+  s.rubygems_version = %q{1.5.1}
   s.summary = %q{Microsoft SQL Server Adapter for DataMapper}
-  s.test_files = [
-    "spec/adapter_spec.rb",
-    "spec/spec_helper.rb"
-  ]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<do_sqlserver>, ["~> 0.10.2"])
-      s.add_runtime_dependency(%q<dm-do-adapter>, ["~> 1.1.0"])
-      s.add_development_dependency(%q<dm-migrations>, ["~> 1.1.0"])
-      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"])
+      s.add_runtime_dependency(%q<do_sqlserver>, ["~> 0.10.6"])
+      s.add_runtime_dependency(%q<dm-do-adapter>, ["~> 1.2.0.rc2"])
+      s.add_development_dependency(%q<dm-migrations>, ["~> 1.2.0.rc2"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_development_dependency(%q<rspec>, ["~> 1.3.2"])
     else
-      s.add_dependency(%q<do_sqlserver>, ["~> 0.10.2"])
-      s.add_dependency(%q<dm-do-adapter>, ["~> 1.1.0"])
-      s.add_dependency(%q<dm-migrations>, ["~> 1.1.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<rake>, ["~> 0.8.7"])
-      s.add_dependency(%q<rspec>, ["~> 1.3.1"])
+      s.add_dependency(%q<do_sqlserver>, ["~> 0.10.6"])
+      s.add_dependency(%q<dm-do-adapter>, ["~> 1.2.0.rc2"])
+      s.add_dependency(%q<dm-migrations>, ["~> 1.2.0.rc2"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_dependency(%q<rspec>, ["~> 1.3.2"])
     end
   else
-    s.add_dependency(%q<do_sqlserver>, ["~> 0.10.2"])
-    s.add_dependency(%q<dm-do-adapter>, ["~> 1.1.0"])
-    s.add_dependency(%q<dm-migrations>, ["~> 1.1.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<rake>, ["~> 0.8.7"])
-    s.add_dependency(%q<rspec>, ["~> 1.3.1"])
+    s.add_dependency(%q<do_sqlserver>, ["~> 0.10.6"])
+    s.add_dependency(%q<dm-do-adapter>, ["~> 1.2.0.rc2"])
+    s.add_dependency(%q<dm-migrations>, ["~> 1.2.0.rc2"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    s.add_dependency(%q<rspec>, ["~> 1.3.2"])
   end
 end
 

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

@@ -45,7 +45,7 @@ module DataMapper
 
           columns_statement = columns_statement(fields, qualify)
           from_statement    = " FROM #{quote_name(query.model.storage_name(name))}"
-          where_statement   = " WHERE #{conditions_statement}" unless conditions_statement.blank?
+          where_statement   = " WHERE #{conditions_statement}" unless DataMapper::Ext.blank?(conditions_statement)
           join_statement    = join_statement(query, bind_values, qualify)
           use_group_by      = group_by && group_by.any?
           use_order_by      = order_by && order_by.any?

metadata

@@ -1,84 +1,73 @@
 --- !ruby/object:Gem::Specification 
 name: dm-sqlserver-adapter
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.1.0
+  prerelease: 6
+  version: 1.2.0.rc2
 platform: ruby
 authors: 
-- Clifford Heath
+  - Clifford Heath
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-03-16 00:00:00 -07:00
+date: 2011-09-21 00:00:00 +02:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: do_sqlserver
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.10.2
-  type: :runtime
-  prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: dm-do-adapter
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: dm-migrations
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.1.0
-  type: :development
-  prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.5.2
-  type: :development
-  prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rake
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.8.7
-  type: :development
-  prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rspec
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.3.1
-  type: :development
-  prerelease: false
-  version_requirements: *id006
+  - !ruby/object:Gem::Dependency 
+    name: do_sqlserver
+    version_requirements: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 0.10.6
+    requirement: *id001
+    prerelease: false
+    type: :runtime
+  - !ruby/object:Gem::Dependency 
+    name: dm-do-adapter
+    version_requirements: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 1.2.0.rc2
+    requirement: *id002
+    prerelease: false
+    type: :runtime
+  - !ruby/object:Gem::Dependency 
+    name: dm-migrations
+    version_requirements: &id003 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 1.2.0.rc2
+    requirement: *id003
+    prerelease: false
+    type: :development
+  - !ruby/object:Gem::Dependency 
+    name: jeweler
+    version_requirements: &id004 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 1.6.4
+    requirement: *id004
+    prerelease: false
+    type: :development
+  - !ruby/object:Gem::Dependency 
+    name: rspec
+    version_requirements: &id005 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 1.3.2
+    requirement: *id005
+    prerelease: false
+    type: :development
 description: Microsoft SQL Server Adapter for DataMapper
 email: dan.kubb@gmail.com
 executables: []
@@ -86,23 +75,23 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE
+  - LICENSE
 files: 
-- Gemfile
-- LICENSE
-- Rakefile
-- VERSION
-- dm-sqlserver-adapter.gemspec
-- lib/dm-sqlserver-adapter.rb
-- lib/dm-sqlserver-adapter/adapter.rb
-- lib/dm-sqlserver-adapter/spec/setup.rb
-- spec/adapter_spec.rb
-- spec/rcov.opts
-- spec/spec.opts
-- spec/spec_helper.rb
-- tasks/spec.rake
-- tasks/yard.rake
-- tasks/yardstick.rake
+  - Gemfile
+  - LICENSE
+  - Rakefile
+  - VERSION
+  - dm-sqlserver-adapter.gemspec
+  - lib/dm-sqlserver-adapter.rb
+  - lib/dm-sqlserver-adapter/adapter.rb
+  - lib/dm-sqlserver-adapter/spec/setup.rb
+  - spec/adapter_spec.rb
+  - spec/rcov.opts
+  - spec/spec.opts
+  - spec/spec_helper.rb
+  - tasks/spec.rake
+  - tasks/yard.rake
+  - tasks/yardstick.rake
 has_rdoc: true
 homepage: http://github.com/datamapper/dm-sqlserver-adapter
 licenses: []
@@ -111,26 +100,28 @@ post_install_message:
 rdoc_options: []
 
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 2
+        segments: 
+          - 0
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+    - - ">"
+      - !ruby/object:Gem::Version 
+        version: 1.3.1
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.6.2
+rubygems_version: 1.5.1
 signing_key: 
 specification_version: 3
 summary: Microsoft SQL Server Adapter for DataMapper
-test_files: 
-- spec/adapter_spec.rb
-- spec/spec_helper.rb
+test_files: []
+