dm-sqlite-adapter 1.0.0 → 1.0.1

data/.gitignore

@@ -31,6 +31,7 @@ measurements
 .bundle
 Gemfile.local
 Gemfile.lock
+Gemfile.local.lock
 
 ## PROJECT::SPECIFIC
 spec/db/

data/Gemfile

@@ -35,12 +35,12 @@
 source 'http://rubygems.org'
 
 DATAMAPPER = 'git://github.com/datamapper'
-DM_VERSION = '~> 1.0.0'
-DO_VERSION = '~> 0.10.3'
+DM_VERSION = '~> 1.0.1'
+DO_VERSION = '~> 0.10.2'
 
 group :runtime do # Runtime dependencies (as in the gemspec)
 
-  gem 'do_sqlite3',      DO_VERSION, :git => "#{DATAMAPPER}/do.git"
+  gem 'do_sqlite3',      DO_VERSION, do_options.dup
   gem 'dm-do-adapter',   DM_VERSION, :git => "#{DATAMAPPER}/dm-do-adapter.git"
 
 end
@@ -50,7 +50,7 @@ group(:development) do # Development dependencies (as in the gemspec)
   gem 'dm-migrations',   DM_VERSION, :git => "#{DATAMAPPER}/dm-migrations.git"
 
   gem 'rake',            '~> 0.8.7'
-  gem 'rspec',           '~> 1.3'
+  gem 'rspec',           '~> 1.3', :git => 'git://github.com/snusnu/rspec', :branch => 'heckle_fix_plus_gemfile'
   gem 'jeweler',         '~> 1.4'
 
 end
@@ -58,16 +58,19 @@ end
 group :datamapper do # We need this because we want to pin these dependencies to their git master sources
 
   if ENV['EXTLIB']
-    gem 'extlib',        '~> 0.9.15',      :git => "#{DATAMAPPER}/extlib.git", :require => nil
+    gem 'extlib',        '~> 0.9.15', :git => "#{DATAMAPPER}/extlib.git", :require => nil
   else
-    gem 'activesupport', '~> 3.0.0.beta3', :git => 'git://github.com/rails/rails.git', :require => nil
+    gem 'activesupport', '~> 3.0.0',  :git => 'git://github.com/rails/rails.git', :branch => '3-0-stable', :require => nil
   end
 
+  do_options = {}
+  do_options[:git] = "#{DATAMAPPER}/do.git" if ENV['DO_GIT'] == 'true'
+
   gem 'dm-core',         DM_VERSION, :git => "#{DATAMAPPER}/dm-core.git"
-  gem 'data_objects',    DO_VERSION, :git => "#{DATAMAPPER}/do.git"
+  gem 'data_objects',    DO_VERSION, do_options.dup
 
   plugins = ENV['PLUGINS'] || ENV['PLUGIN']
-  plugins = (plugins.to_s.gsub(',',' ').split(' ') + ['dm-migrations']).uniq
+  plugins = plugins.to_s.tr(',', ' ').split.push('dm-migrations').uniq
 
   plugins.each do |plugin|
     gem plugin, DM_VERSION, :git => "#{DATAMAPPER}/#{plugin}.git"

data/Rakefile

@@ -16,7 +16,7 @@ begin
     gem.rubyforge_project = 'datamapper'
 
     gem.add_dependency 'do_sqlite3',    '~> 0.10.2'
-    gem.add_dependency 'dm-do-adapter', '~> 1.0.0'
+    gem.add_dependency 'dm-do-adapter', '~> 1.0.1'
 
     gem.add_development_dependency 'rspec', '~> 1.3'
   end

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1

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"
+  s.version = "1.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Kubb"]
-  s.date = %q{2010-06-08}
+  s.date = %q{2010-09-07}
   s.description = %q{Sqlite3 Adapter for DataMapper}
   s.email = %q{dan.kubb@gmail.com}
   s.extra_rdoc_files = [
@@ -51,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"])
+      s.add_runtime_dependency(%q<dm-do-adapter>, ["~> 1.0.1"])
       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"])
+      s.add_dependency(%q<dm-do-adapter>, ["~> 1.0.1"])
       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"])
+    s.add_dependency(%q<dm-do-adapter>, ["~> 1.0.1"])
     s.add_dependency(%q<rspec>, ["~> 1.3"])
   end
 end

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

@@ -17,7 +17,12 @@ module DataMapper
       end
 
       def normalize_options(options)
-        options.update(:adapter => 'sqlite3')
+        # TODO Once do_sqlite3 accepts both a Pathname or a String,
+        # normalizing database and path won't be necessary anymore
+        db   = (options[:database] || options.delete('database')).to_s
+        path = (options[:path    ] || options.delete('path')).to_s
+
+        options.update(:adapter => 'sqlite3', :database => db, :path => path)
       end
 
     end

data/spec/adapter_spec.rb

@@ -29,4 +29,14 @@ describe 'DataMapper::Adapters::SqliteAdapter' do
     it { subject.options[:adapter].should == 'sqlite3' }
   end
 
+  describe "with 'database' given as Symbol" do
+    subject { DataMapper::Adapters::SqliteAdapter.new(:default, { :adapter => 'sqlite', :database => :name }) }
+    it { subject.options[:database].should == 'name' }
+  end
+
+  describe "with 'path' given as Symbol" do
+    subject { DataMapper::Adapters::SqliteAdapter.new(:default, { :adapter => 'sqlite', :path => :name }) }
+    it { subject.options[:path].should == 'name' }
+  end
+
 end

data/tasks/local_gemfile.rake

@@ -1,16 +1,14 @@
 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
-
-  source_regex     = /DATAMAPPER = 'git:\/\/github.com\/datamapper'/
-  gem_source_regex = /:git => \"#\{DATAMAPPER\}\/(.+?)(?:\.git)?\"/
+  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!(source_regex,     "DATAMAPPER = '#{datamapper}'")
-      line.sub!(gem_source_regex, ':path => "#{DATAMAPPER}/\1"')
+      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

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: dm-sqlite-adapter
 version: !ruby/object:Gem::Version 
-  hash: 23
   prerelease: false
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Dan Kubb
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-08 00:00:00 -07:00
+date: 2010-09-07 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 51
         segments: 
         - 0
         - 10
@@ -42,12 +40,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
-        - 0
-        version: 1.0.0
+        - 1
+        version: 1.0.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -58,7 +55,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
         segments: 
         - 1
         - 3
@@ -105,7 +101,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -114,7 +109,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"