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

Sign up to get free protection for your applications and to get access to all the features.
data/Gemfile CHANGED
@@ -35,7 +35,7 @@
35
35
  source 'http://rubygems.org'
36
36
 
37
37
  DATAMAPPER = 'git://github.com/datamapper'
38
- DM_VERSION = '~> 1.0.0.rc2'
38
+ DM_VERSION = '~> 1.0.0.rc3'
39
39
  DO_VERSION = '~> 0.10.3'
40
40
 
41
41
  group :runtime do # Runtime dependencies (as in the gemspec)
data/Rakefile CHANGED
@@ -2,19 +2,21 @@ require 'rubygems'
2
2
  require 'rake'
3
3
 
4
4
  begin
5
-
5
+ gem 'jeweler', '~> 1.4'
6
6
  require 'jeweler'
7
7
 
8
8
  Jeweler::Tasks.new do |gem|
9
9
  gem.name = 'dm-sqlite-adapter'
10
10
  gem.summary = 'Sqlite3 Adapter for DataMapper'
11
11
  gem.description = gem.summary
12
- gem.authors = ["Dan Kubb"]
13
- gem.email = %q{dan.kubb@gmail.com}
14
- gem.homepage = 'http://github.com/datamapper/dm-sqlite-adapter'
12
+ gem.email = 'dan.kubb@gmail.com'
13
+ gem.homepage = 'http://github.com/datamapper/%s' % gem.name
14
+ gem.authors = [ 'Dan Kubb' ]
15
+
16
+ gem.rubyforge_project = 'datamapper'
15
17
 
16
- gem.add_dependency 'do_sqlite3', '~> 0.10.2'
17
- gem.add_dependency 'dm-do-adapter', '~> 1.0.0.rc2'
18
+ gem.add_dependency 'do_sqlite3', '~> 0.10.2'
19
+ gem.add_dependency 'dm-do-adapter', '~> 1.0.0.rc3'
18
20
 
19
21
  gem.add_development_dependency 'rspec', '~> 1.3'
20
22
  end
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.0.0.rc2
1
+ 1.0.0.rc3
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{dm-sqlite-adapter}
8
- s.version = "1.0.0.rc2"
8
+ s.version = "1.0.0.rc3"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Dan Kubb"]
12
- s.date = %q{2010-05-19}
12
+ s.date = %q{2010-05-27}
13
13
  s.description = %q{Sqlite3 Adapter for DataMapper}
14
14
  s.email = %q{dan.kubb@gmail.com}
15
15
  s.extra_rdoc_files = [
@@ -37,6 +37,7 @@ Gem::Specification.new do |s|
37
37
  s.homepage = %q{http://github.com/datamapper/dm-sqlite-adapter}
38
38
  s.rdoc_options = ["--charset=UTF-8"]
39
39
  s.require_paths = ["lib"]
40
+ s.rubyforge_project = %q{datamapper}
40
41
  s.rubygems_version = %q{1.3.7}
41
42
  s.summary = %q{Sqlite3 Adapter for DataMapper}
42
43
  s.test_files = [
@@ -50,16 +51,16 @@ Gem::Specification.new do |s|
50
51
 
51
52
  if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
52
53
  s.add_runtime_dependency(%q<do_sqlite3>, ["~> 0.10.2"])
53
- s.add_runtime_dependency(%q<dm-do-adapter>, ["~> 1.0.0.rc2"])
54
+ s.add_runtime_dependency(%q<dm-do-adapter>, ["~> 1.0.0.rc3"])
54
55
  s.add_development_dependency(%q<rspec>, ["~> 1.3"])
55
56
  else
56
57
  s.add_dependency(%q<do_sqlite3>, ["~> 0.10.2"])
57
- s.add_dependency(%q<dm-do-adapter>, ["~> 1.0.0.rc2"])
58
+ s.add_dependency(%q<dm-do-adapter>, ["~> 1.0.0.rc3"])
58
59
  s.add_dependency(%q<rspec>, ["~> 1.3"])
59
60
  end
60
61
  else
61
62
  s.add_dependency(%q<do_sqlite3>, ["~> 0.10.2"])
62
- s.add_dependency(%q<dm-do-adapter>, ["~> 1.0.0.rc2"])
63
+ s.add_dependency(%q<dm-do-adapter>, ["~> 1.0.0.rc3"])
63
64
  s.add_dependency(%q<rspec>, ["~> 1.3"])
64
65
  end
65
66
  end
@@ -6,12 +6,20 @@ module DataMapper
6
6
 
7
7
  class SqliteAdapter < DataObjectsAdapter
8
8
 
9
+ def initialize(name, options)
10
+ super(name, normalize_options(options))
11
+ end
12
+
9
13
  # @api private
10
14
  def supports_subquery?(query, source_key, target_key, qualify)
11
15
  # SQLite3 cannot match a subquery against more than one column
12
16
  source_key.size == 1 && target_key.size == 1
13
17
  end
14
18
 
19
+ def normalize_options(options)
20
+ options.update(:adapter => 'sqlite3')
21
+ end
22
+
15
23
  end
16
24
 
17
25
  const_added(:SqliteAdapter)
data/spec/adapter_spec.rb CHANGED
@@ -19,4 +19,14 @@ describe 'DataMapper::Adapters::SqliteAdapter' do
19
19
  it_should_behave_like "An Adapter"
20
20
  it_should_behave_like "A DataObjects Adapter"
21
21
 
22
+ describe "with 'sqlite' as adapter name" do
23
+ subject { DataMapper::Adapters::SqliteAdapter.new(:default, { :adapter => 'sqlite' }) }
24
+ it { subject.options[:adapter].should == 'sqlite3' }
25
+ end
26
+
27
+ describe "with 'sqlite3' as adapter name" do
28
+ subject { DataMapper::Adapters::SqliteAdapter.new(:default, { :adapter => 'sqlite3' }) }
29
+ it { subject.options[:adapter].should == 'sqlite3' }
30
+ end
31
+
22
32
  end
data/spec/rcov.opts CHANGED
@@ -1,4 +1,4 @@
1
- --exclude "spec"
1
+ --exclude "spec,^/"
2
2
  --sort coverage
3
3
  --callsites
4
4
  --xrefs
data/tasks/spec.rake CHANGED
@@ -35,4 +35,7 @@ rescue LoadError
35
35
  end
36
36
  end
37
37
 
38
+ task :spec => :check_dependencies
39
+ task :rcov => :check_dependencies
40
+
38
41
  task :default => :spec
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dm-sqlite-adapter
3
3
  version: !ruby/object:Gem::Version
4
- hash: 977940575
4
+ hash: 977940572
5
5
  prerelease: true
6
6
  segments:
7
7
  - 1
8
8
  - 0
9
9
  - 0
10
- - rc2
11
- version: 1.0.0.rc2
10
+ - rc3
11
+ version: 1.0.0.rc3
12
12
  platform: ruby
13
13
  authors:
14
14
  - Dan Kubb
@@ -16,7 +16,7 @@ autorequire:
16
16
  bindir: bin
17
17
  cert_chain: []
18
18
 
19
- date: 2010-05-19 00:00:00 -07:00
19
+ date: 2010-05-27 00:00:00 -07:00
20
20
  default_executable:
21
21
  dependencies:
22
22
  - !ruby/object:Gem::Dependency
@@ -43,13 +43,13 @@ dependencies:
43
43
  requirements:
44
44
  - - ~>
45
45
  - !ruby/object:Gem::Version
46
- hash: 977940575
46
+ hash: 977940572
47
47
  segments:
48
48
  - 1
49
49
  - 0
50
50
  - 0
51
- - rc2
52
- version: 1.0.0.rc2
51
+ - rc3
52
+ version: 1.0.0.rc3
53
53
  type: :runtime
54
54
  version_requirements: *id002
55
55
  - !ruby/object:Gem::Dependency
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
124
124
  version: 1.3.1
125
125
  requirements: []
126
126
 
127
- rubyforge_project:
127
+ rubyforge_project: datamapper
128
128
  rubygems_version: 1.3.7
129
129
  signing_key:
130
130
  specification_version: 3