activerecord-nulldb-adapter 0.2.0 → 0.2.1

data/README.rdoc

@@ -128,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 any version of ActiveRecord since 2.0.0, including ActiveRecord 3.0.0.beta.
+and {1.9.1}[http://integrity191.heroku.com/null-db], using any version of ActiveRecord since 2.0.0, including ActiveRecord 3.0.0.
 
 == Who 
 
@@ -151,6 +151,9 @@ It is currently maintained by {Myron Marston}[http://github.com/myronmarston].
    - 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.
+ * Version 0.2.1 (2010-09-01)
+   - Updated Rails 3 support so that nulldb works against AR 3.0.0.
+   - Add support for RSpec 2.
 
 == License
 

data/Rakefile

@@ -12,7 +12,7 @@ begin
     gem.authors = ["Avdi Grimm", "Myron Marston"]
     gem.rubyforge_project = "nulldb"
 
-    gem.add_dependency 'activerecord', '>= 2.0.0'
+    gem.add_dependency 'activerecord', '>= 2.0.0', '< 3.1'
     gem.add_development_dependency "rspec", ">= 1.2.9"
 
     gem.files.exclude 'vendor/ginger'
@@ -26,16 +26,42 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
+# We want to test ActiveRecord 3 against RSpec 2.x, and
+# prior versions of AR against RSpec 1.x.  The task
+# definitions are different, and in order to allow ginger
+# to invoke a single task (:spec_for_ginger) that runs the
+# specs against the right version of RSpec, we dynamically
+# define the spec task with this method.
+def define_specs_task
+  require 'active_record/version'
+
+  if ActiveRecord::VERSION::MAJOR > 2
+    # rspec 2
+    require "rspec/core/rake_task"
+    RSpec::Core::RakeTask.new(:specs) do |spec|
+      spec.pattern = "spec/*_spec.rb"
+    end
+  else
+    # rspec 1
+    require 'spec/rake/spectask'
+    Spec::Rake::SpecTask.new(:specs) do |spec|
+      spec.libs << 'lib' << 'spec'
+      spec.spec_files = FileList['spec/**/*_spec.rb']
+    end
+  end
 end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
+desc "Run the specs"
+task :spec do
+  define_specs_task
+  Rake::Task[:specs].invoke
+end
+
+task :spec_for_ginger do
+  $LOAD_PATH << File.join(*%w[vendor ginger lib])
+  require 'ginger'
+  define_specs_task
+  Rake::Task[:specs].invoke
 end
 
 task :spec => :check_dependencies if defined?(Jeweler)
@@ -44,7 +70,7 @@ desc 'Run ginger tests'
 task :ginger do
   $LOAD_PATH << File.join(*%w[vendor ginger lib])
   ARGV.clear
-  ARGV << 'spec'
+  ARGV << 'spec_for_ginger'
   load File.join(*%w[vendor ginger bin ginger])
 end
 

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/activerecord-nulldb-adapter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{activerecord-nulldb-adapter}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   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-20}
+  s.date = %q{2010-09-01}
   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 = [
@@ -25,6 +25,7 @@ Gem::Specification.new do |s|
      "activerecord-nulldb-adapter.gemspec",
      "ginger_scenarios.rb",
      "lib/active_record/connection_adapters/nulldb_adapter.rb",
+     "lib/nulldb/arel_compiler.rb",
      "lib/nulldb_rspec.rb",
      "lib/tasks/database.rake",
      "spec/nulldb_spec.rb",
@@ -34,7 +35,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{nulldb}
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{The Null Object pattern as applied to ActiveRecord database adapters}
   s.test_files = [
     "spec/nulldb_spec.rb"
@@ -44,15 +45,15 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, [">= 2.0.0"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<activerecord>, [">= 2.0.0", "< 3.1"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
     else
-      s.add_dependency(%q<activerecord>, [">= 2.0.0"])
+      s.add_dependency(%q<activerecord>, [">= 2.0.0", "< 3.1"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
     end
   else
-    s.add_dependency(%q<activerecord>, [">= 2.0.0"])
+    s.add_dependency(%q<activerecord>, [">= 2.0.0", "< 3.1"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
   end
 end

data/ginger_scenarios.rb

@@ -13,9 +13,9 @@ Ginger.configure do |config|
 
   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 )
+  # Rails 3 only works on Ruby 1.8.7 and 1.9.2
+  versions << '3.0.0' if %w[1.8.7 1.9.2].include?(RUBY_VERSION)
+  versions += %w( 2.3.8 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
@@ -24,4 +24,4 @@ Ginger.configure do |config|
   versions.each do |version|
     config.scenarios << create_scenario(version)
   end
-end
+end

data/lib/active_record/connection_adapters/nulldb_adapter.rb

@@ -2,7 +2,15 @@ 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)
+
+unless respond_to?(:tap)
+  class Object
+    def tap
+      yield self
+      self
+    end
+  end
+end
 
 class ActiveRecord::Base
   # Instantiate a new NullDB connection.  Used by ActiveRecord internally.
@@ -25,6 +33,16 @@ end
 class ActiveRecord::ConnectionAdapters::NullDBAdapter <
     ActiveRecord::ConnectionAdapters::AbstractAdapter
 
+  class Column < ::ActiveRecord::ConnectionAdapters::Column
+    private
+
+    def simplified_type(field_type)
+      type = super
+      type = :integer if type.nil? && sql_type == :primary_key
+      type
+    end
+  end
+
   class Statement
     attr_reader :entry_point, :content
 
@@ -140,10 +158,12 @@ class ActiveRecord::ConnectionAdapters::NullDBAdapter <
 
     if table = @tables[table_name]
       table.columns.map do |col_def|
-        ActiveRecord::ConnectionAdapters::Column.new(col_def.name.to_s,
-                                                      col_def.default,
-                                                      col_def.type,
-                                                      col_def.null)
+        ActiveRecord::ConnectionAdapters::NullDBAdapter::Column.new(
+          col_def.name.to_s,
+          col_def.default,
+          col_def.type,
+          col_def.null
+        )
       end
     else
       []
@@ -156,13 +176,13 @@ class ActiveRecord::ConnectionAdapters::NullDBAdapter <
   end
 
   def select_rows(statement, name = nil)
-    returning([]) do
+    [].tap do
       self.execution_log << Statement.new(entry_point, statement)
     end
   end  
 
   def insert(statement, name = nil, primary_key = nil, object_id = nil, sequence_name = nil)
-    returning(object_id || next_unique_id) do
+    (object_id || next_unique_id).tap do
       with_entry_point(:insert) do
         super(statement, name, primary_key, object_id, sequence_name)
       end
@@ -200,10 +220,14 @@ class ActiveRecord::ConnectionAdapters::NullDBAdapter <
     end
   end
 
+  def primary_key(table_name)
+    columns(table_name).detect { |col| col.sql_type == :primary_key }.name
+  end
+
   protected
 
   def select(statement, name)
-    returning([]) do
+    [].tap do
       self.execution_log << Statement.new(entry_point, statement)
     end
   end

data/lib/nulldb/arel_compiler.rb

@@ -0,0 +1,6 @@
+module Arel
+  module SqlCompiler
+    class NullDBCompiler < GenericCompiler
+    end
+  end
+end

data/lib/nulldb_rspec.rb

@@ -37,8 +37,11 @@ module NullDB::RSpec::NullifiedDatabase
   end
 
   def self.globally_nullify_database
-    Spec::Runner.configure do |config|
-      nullify_database(config)
+    block = lambda { |config| nullify_database(config) }
+    if defined?(RSpec)
+      RSpec.configure(&block)
+    else
+      Spec::Runner.configure(&block)
     end
   end
 
@@ -78,13 +81,14 @@ module NullDB::RSpec::NullifiedDatabase
   end
 
   def self.nullify_contextually?(other)
-    if defined? Spec::Rails::Example::RailsExampleGroup
-      other.ancestors.include?(Spec::Rails::Example::RailsExampleGroup)
+    rspec_root = defined?(RSpec) ? RSpec : Spec
+    if defined? rspec_root::Rails::RailsExampleGroup
+      other.ancestors.include?(rspec_root::Rails::RailsExampleGroup)
     else
-      other.ancestors.include?(Spec::Rails::Example::ModelExampleGroup) || 
-        other.ancestors.include?(Spec::Rails::Example::ControllerExampleGroup) || 
-        other.ancestors.include?(Spec::Rails::Example::ViewExampleGroup) || 
-        other.ancestors.include?(Spec::Rails::Example::HelperExampleGroup)
+      other.ancestors.include?(rspec_root::Rails::ModelExampleGroup) ||
+        other.ancestors.include?(rspec_root::Rails::ControllerExampleGroup) ||
+        other.ancestors.include?(rspec_root::Rails::ViewExampleGroup) ||
+        other.ancestors.include?(rspec_root::Rails::HelperExampleGroup)
     end
   end
 

data/spec/nulldb_spec.rb

@@ -1,10 +1,19 @@
 require 'rubygems'
-require 'spec'
+
 $LOAD_PATH << File.join(File.dirname(__FILE__), *%w[.. vendor ginger lib])
 require 'ginger'
 require 'active_record'
+require 'active_record/version'
 $: << File.join(File.dirname(__FILE__), "..", "lib")
 
+if ActiveRecord::VERSION::MAJOR > 2
+  require 'rspec' # rspec 2
+else
+  require 'spec' # rspec 1
+end
+
+require 'nulldb_rspec'
+
 class Employee < ActiveRecord::Base
   after_save :on_save_finished
 
@@ -95,6 +104,10 @@ describe "NullDB" do
     should_have_column(Employee, :salary, :decimal)
   end
 
+  it "should return the appropriate primary key" do
+    ActiveRecord::Base.connection.primary_key('employees').should == 'id'
+  end
+
   it "should return an empty array of columns for a table-less model" do
     TablelessModel.columns.should == []
   end
@@ -213,3 +226,14 @@ describe "NullDB" do
     col.type.should == col_type
   end
 end
+
+describe NullDB::RSpec::NullifiedDatabase do
+  describe '.globally_nullify_database' do
+    it 'nullifies the database' do
+      NullDB::RSpec::NullifiedDatabase.should respond_to(:nullify_database)
+      NullDB::RSpec::NullifiedDatabase.should_receive(:nullify_database)
+      NullDB::RSpec::NullifiedDatabase.globally_nullify_database
+    end
+  end
+end
+

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: activerecord-nulldb-adapter
 version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Avdi Grimm
@@ -15,30 +16,41 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-20 00:00:00 -07:00
+date: 2010-09-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 2
         - 0
         - 0
         version: 2.0.0
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 3
+        - 1
+        version: "3.1"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 13
         segments: 
         - 1
         - 2
@@ -64,6 +76,7 @@ files:
 - activerecord-nulldb-adapter.gemspec
 - ginger_scenarios.rb
 - lib/active_record/connection_adapters/nulldb_adapter.rb
+- lib/nulldb/arel_compiler.rb
 - lib/nulldb_rspec.rb
 - lib/tasks/database.rake
 - spec/nulldb_spec.rb
@@ -78,23 +91,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: nulldb
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: The Null Object pattern as applied to ActiveRecord database adapters