dm-sqlite-adapter 1.0.0.rc2 → 1.0.0.rc3

data/Gemfile

@@ -35,7 +35,7 @@
 source 'http://rubygems.org'
 
 DATAMAPPER = 'git://github.com/datamapper'
-DM_VERSION = '~> 1.0.0.rc2'
+DM_VERSION = '~> 1.0.0.rc3'
 DO_VERSION = '~> 0.10.3'
 
 group :runtime do # Runtime dependencies (as in the gemspec)

data/Rakefile

@@ -2,19 +2,21 @@ require 'rubygems'
 require 'rake'
 
 begin
-
+  gem 'jeweler', '~> 1.4'
   require 'jeweler'
 
   Jeweler::Tasks.new do |gem|
     gem.name        = 'dm-sqlite-adapter'
     gem.summary     = 'Sqlite3 Adapter for DataMapper'
     gem.description = gem.summary
-    gem.authors     = ["Dan Kubb"]
-    gem.email       = %q{dan.kubb@gmail.com}
-    gem.homepage    = 'http://github.com/datamapper/dm-sqlite-adapter'
+    gem.email       = 'dan.kubb@gmail.com'
+    gem.homepage    = 'http://github.com/datamapper/%s' % gem.name
+    gem.authors     = [ 'Dan Kubb' ]
+
+    gem.rubyforge_project = 'datamapper'
 
-    gem.add_dependency 'do_sqlite3',        '~> 0.10.2'
-    gem.add_dependency 'dm-do-adapter',     '~> 1.0.0.rc2'
+    gem.add_dependency 'do_sqlite3',    '~> 0.10.2'
+    gem.add_dependency 'dm-do-adapter', '~> 1.0.0.rc3'
 
     gem.add_development_dependency 'rspec', '~> 1.3'
   end

data/VERSION

@@ -1 +1 @@
-1.0.0.rc2
+1.0.0.rc3

data/dm-sqlite-adapter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-sqlite-adapter}
-  s.version = "1.0.0.rc2"
+  s.version = "1.0.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{2010-05-19}
+  s.date = %q{2010-05-27}
   s.description = %q{Sqlite3 Adapter for DataMapper}
   s.email = %q{dan.kubb@gmail.com}
   s.extra_rdoc_files = [
@@ -37,6 +37,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/datamapper/dm-sqlite-adapter}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
+  s.rubyforge_project = %q{datamapper}
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Sqlite3 Adapter for DataMapper}
   s.test_files = [
@@ -50,16 +51,16 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<do_sqlite3>, ["~> 0.10.2"])
-      s.add_runtime_dependency(%q<dm-do-adapter>, ["~> 1.0.0.rc2"])
+      s.add_runtime_dependency(%q<dm-do-adapter>, ["~> 1.0.0.rc3"])
       s.add_development_dependency(%q<rspec>, ["~> 1.3"])
     else
       s.add_dependency(%q<do_sqlite3>, ["~> 0.10.2"])
-      s.add_dependency(%q<dm-do-adapter>, ["~> 1.0.0.rc2"])
+      s.add_dependency(%q<dm-do-adapter>, ["~> 1.0.0.rc3"])
       s.add_dependency(%q<rspec>, ["~> 1.3"])
     end
   else
     s.add_dependency(%q<do_sqlite3>, ["~> 0.10.2"])
-    s.add_dependency(%q<dm-do-adapter>, ["~> 1.0.0.rc2"])
+    s.add_dependency(%q<dm-do-adapter>, ["~> 1.0.0.rc3"])
     s.add_dependency(%q<rspec>, ["~> 1.3"])
   end
 end

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

@@ -6,12 +6,20 @@ module DataMapper
 
     class SqliteAdapter < DataObjectsAdapter
 
+      def initialize(name, options)
+        super(name, normalize_options(options))
+      end
+
       # @api private
       def supports_subquery?(query, source_key, target_key, qualify)
         # SQLite3 cannot match a subquery against more than one column
         source_key.size == 1 && target_key.size == 1
       end
 
+      def normalize_options(options)
+        options.update(:adapter => 'sqlite3')
+      end
+
     end
 
     const_added(:SqliteAdapter)

data/spec/adapter_spec.rb

@@ -19,4 +19,14 @@ describe 'DataMapper::Adapters::SqliteAdapter' do
   it_should_behave_like "An Adapter"
   it_should_behave_like "A DataObjects Adapter"
 
+  describe "with 'sqlite' as adapter name" do
+    subject { DataMapper::Adapters::SqliteAdapter.new(:default, { :adapter => 'sqlite' }) }
+    it { subject.options[:adapter].should == 'sqlite3' }
+  end
+
+  describe "with 'sqlite3' as adapter name" do
+    subject { DataMapper::Adapters::SqliteAdapter.new(:default, { :adapter => 'sqlite3' }) }
+    it { subject.options[:adapter].should == 'sqlite3' }
+  end
+
 end

data/spec/rcov.opts

@@ -1,4 +1,4 @@
---exclude "spec"
+--exclude "spec,^/"
 --sort coverage
 --callsites
 --xrefs

data/tasks/spec.rake

@@ -35,4 +35,7 @@ rescue LoadError
   end
 end
 
+task :spec => :check_dependencies
+task :rcov => :check_dependencies
+
 task :default => :spec

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: dm-sqlite-adapter
 version: !ruby/object:Gem::Version 
-  hash: 977940575
+  hash: 977940572
   prerelease: true
   segments: 
   - 1
   - 0
   - 0
-  - rc2
-  version: 1.0.0.rc2
+  - rc3
+  version: 1.0.0.rc3
 platform: ruby
 authors: 
 - Dan Kubb
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-19 00:00:00 -07:00
+date: 2010-05-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,13 +43,13 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 977940575
+        hash: 977940572
         segments: 
         - 1
         - 0
         - 0
-        - rc2
-        version: 1.0.0.rc2
+        - rc3
+        version: 1.0.0.rc3
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: datamapper
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3