activerecord-nulldb-adapter 0.1.1 → 0.2.0

data/README.rdoc

@@ -8,6 +8,10 @@ interactions into no-ops.  Using NullDB enables you to test your model
 business logic - including +after_save+ hooks - without ever touching
 a real database.
 
+== Installation
+
+  gem install activerecord-nulldb-adapter
+
 == How 
 
 Once installed, NullDB can be used much like any other ActiveRecord
@@ -124,7 +128,7 @@ nothing will be saved.
 == Version Compatibility
 
 The specs pass against ruby {1.8.6}[http://integrity186.heroku.com/null-db], {1.8.7}[http://integrity187.heroku.com/null-db]
-and {1.9.1}[http://integrity191.heroku.com/null-db], using ActiveRecord 2.0.0 to 2.3.5.
+and {1.9.1}[http://integrity191.heroku.com/null-db], using any version of ActiveRecord since 2.0.0, including ActiveRecord 3.0.0.beta.
 
 == Who 
 
@@ -133,9 +137,7 @@ It is currently maintained by {Myron Marston}[http://github.com/myronmarston].
 
 == Where
 
-* Homepage: http://nulldb.rubyforge.org
-* Project Info: http://rubyforge.org/projects/nulldb/
-* SCM: http://rubyforge.org/scm/?group_id=7512
+* Homepage: http://github.com/nulldb/nulldb
 
 == Changes
 
@@ -144,7 +146,11 @@ It is currently maintained by {Myron Marston}[http://github.com/myronmarston].
  * Version 0.0.2 (2007-05-31)
    - Moved to Rubyforge
  * Version 0.1.0 (2010-03-02)
-   - Released as a gem, with some bug fixes.
+   - Released as nulldb gem, with some bug fixes.
+ * Version 0.1.1 (2010-03-15)
+   - Released as activerecord-nulldb-adapter gem.
+ * Version 0.2.0 (2010-03-20)
+   - Rails 3 support.  All specs pass against ActiveRecord 3.0.0.beta.
 
 == License
 

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/activerecord-nulldb-adapter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{activerecord-nulldb-adapter}
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Avdi Grimm", "Myron Marston"]
-  s.date = %q{2010-03-15}
+  s.date = %q{2010-03-20}
   s.description = %q{A database backend that translates database interactions into no-ops. Using NullDB enables you to test your model business logic - including after_save hooks - without ever touching a real database.}
   s.email = %q{myron.marston@gmail.com}
   s.extra_rdoc_files = [
@@ -26,9 +26,9 @@ Gem::Specification.new do |s|
      "ginger_scenarios.rb",
      "lib/active_record/connection_adapters/nulldb_adapter.rb",
      "lib/nulldb_rspec.rb",
+     "lib/tasks/database.rake",
      "spec/nulldb_spec.rb",
-     "spec/spec.opts",
-     "tasks/database.rake"
+     "spec/spec.opts"
   ]
   s.homepage = %q{http://github.com/nulldb/nulldb}
   s.rdoc_options = ["--charset=UTF-8"]

data/ginger_scenarios.rb

@@ -11,7 +11,11 @@ Ginger.configure do |config|
   config.aliases["active_record"] = "activerecord"
   config.aliases["active_support"] = "activesupport"
 
-  versions = %w( 2.3.5 2.3.4 2.3.3 2.3.2 )
+  versions = []
+
+  # Rails 3 doesn't work on Ruby 1.8.6, so skip it.
+  versions << '3.0.0.beta' unless RUBY_VERSION == '1.8.6'
+  versions += %w( 2.3.5 2.3.4 2.3.3 2.3.2 )
   versions += %w(
     2.2.3 2.2.2
     2.1.2 2.1.1 2.1.0

data/lib/active_record/connection_adapters/nulldb_adapter.rb

@@ -2,6 +2,7 @@ require 'logger'
 require 'stringio'
 require 'singleton'
 require 'active_record/connection_adapters/abstract_adapter'
+require 'active_support/core_ext/object/returning' unless Object.new.respond_to?(:returning)
 
 class ActiveRecord::Base
   # Instantiate a new NullDB connection.  Used by ActiveRecord internally.
@@ -68,7 +69,7 @@ class ActiveRecord::ConnectionAdapters::NullDBAdapter <
 
   # Recognized options:
   #
-  # [+:schema+] path to the schema file, relative to RAILS_ROOT
+  # [+:schema+] path to the schema file, relative to Rails.root
   def initialize(config={})
     @log            = StringIO.new
     @logger         = Logger.new(@log)
@@ -134,7 +135,7 @@ class ActiveRecord::ConnectionAdapters::NullDBAdapter <
   def columns(table_name, name = nil)
     if @tables.size <= 1
       ActiveRecord::Migration.verbose = false
-      Kernel.load(File.join(RAILS_ROOT, @schema_path))
+      Kernel.load(File.join(Rails.root, @schema_path))
     end
 
     if table = @tables[table_name]
@@ -160,13 +161,14 @@ class ActiveRecord::ConnectionAdapters::NullDBAdapter <
     end
   end  
 
-  def insert(statement, name, primary_key, object_id, sequence_name)
+  def insert(statement, name = nil, primary_key = nil, object_id = nil, sequence_name = nil)
     returning(object_id || next_unique_id) do
       with_entry_point(:insert) do
         super(statement, name, primary_key, object_id, sequence_name)
       end
     end
   end
+  alias :create :insert
 
   def update(statement, name=nil)
     with_entry_point(:update) do

data/{tasks → lib/tasks}/database.rake

@@ -19,15 +19,14 @@ def wrap_task(task_name, &wrapper)
   end
 end
 
-# For later exploration...
-# namespace :db do
-#   namespace :test do
-#     wrap_task :purge do |wrapped_task|
-#       if ActiveRecord::Base.configurations["test"]["adapter"] == "nulldb"
-#         # NO-OP
-#       else
-#         wrapped_task.invoke
-#       end
-#     end
-#   end
-# end
+namespace :db do
+  namespace :test do
+    wrap_task :purge do |wrapped_task|
+      if ActiveRecord::Base.configurations["test"]["adapter"] == "nulldb"
+        # NO-OP
+      else
+        wrapped_task.invoke
+      end
+    end
+  end
+end

data/spec/nulldb_spec.rb

@@ -15,7 +15,11 @@ end
 class TablelessModel < ActiveRecord::Base
 end
 
-RAILS_ROOT = "RAILS_ROOT"
+module Rails
+  def self.root
+    'Rails.root'
+  end
+end
 
 describe "NullDB with no schema pre-loaded" do
   before :each do
@@ -23,14 +27,14 @@ describe "NullDB with no schema pre-loaded" do
     ActiveRecord::Migration.stub!(:verbose=)
   end
 
-  it "should load RAILS_ROOT/db/schema.rb if no alternate is specified" do
+  it "should load Rails.root/db/schema.rb if no alternate is specified" do
     ActiveRecord::Base.establish_connection :adapter => :nulldb
-    Kernel.should_receive(:load).with("RAILS_ROOT/db/schema.rb")
+    Kernel.should_receive(:load).with("Rails.root/db/schema.rb")
     ActiveRecord::Base.connection.columns('schema_info')
   end
 
-  it "should load the specified schema relative to RAILS_ROOT" do
-    Kernel.should_receive(:load).with("RAILS_ROOT/foo/myschema.rb")
+  it "should load the specified schema relative to Rails.root" do
+    Kernel.should_receive(:load).with("Rails.root/foo/myschema.rb")
     ActiveRecord::Base.establish_connection :adapter => :nulldb,
                                             :schema => "foo/myschema.rb"
     ActiveRecord::Base.connection.columns('schema_info')

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Avdi Grimm
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-15 00:00:00 -07:00
+date: 2010-03-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -65,9 +65,9 @@ files:
 - ginger_scenarios.rb
 - lib/active_record/connection_adapters/nulldb_adapter.rb
 - lib/nulldb_rspec.rb
+- lib/tasks/database.rake
 - spec/nulldb_spec.rb
 - spec/spec.opts
-- tasks/database.rake
 has_rdoc: true
 homepage: http://github.com/nulldb/nulldb
 licenses: []