activerecord-nulldb-adapter 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f69f1b8bd9e94574231d49a3331d7450898dbf53
-  data.tar.gz: 30c4eee10acc87ad0cb5506aa9e7ea152d757e61
+  metadata.gz: 7989a037f4a78914709a6bc164c42354f4d708ac
+  data.tar.gz: 19d7c505c54bff50938ded3876c4950950024dd6
 SHA512:
-  metadata.gz: ef9146cce2f44f0ce28f41a82c8d0267b87a80683495d0db646af723a12203a57260c33027426f15e621b188ddb06ce00444d35a64a01a279ff013e0cd2a2ff9
-  data.tar.gz: b26bfde72d5f8f9b50e27c9d1400633825f951db515f71465f8f1f9fb433ac7f3affdc9448821c931ba0855ccfdd5b83766ee6e1f08486de71b8ad59a11ae444
+  metadata.gz: 0f95ca035463bfd3930316ab3f2267a5db786a3a03cdc628a306a7369be037d7ee200a126e50fa8e82c87dffca1eaaf0f1e4f1b89a406fea263cc90b1d9fec8b
+  data.tar.gz: eb74c28351efcf56dd5f70b5c1de440866fb1d569a94821ec551d426e986b2a577c2039342fd060003ac25d28a55206a9c76dfa322da8b7b34f7cb8198fd1dcd

data/Appraisals

@@ -1,4 +1,5 @@
 appraise "activerecord-2.3" do
+  gem 'iconv', :platforms => :ruby
   gem "activerecord", "~> 2.3.0"
 end
 

data/CHANGES.md

@@ -1,3 +1,8 @@
+0.3.1 (2014-02-17)
+-----------
+- Removes accidental dependency on iconv. Fixing JRuby support.
+
+
 0.3.0 (2014-01-31)
 -----------
 - Drops 1.8.7 support.

data/Gemfile

@@ -2,11 +2,6 @@ source "https://rubygems.org"
 
 gem 'activerecord', '>= 2.0.0'
 
-platforms :ruby_20, :ruby_21 do
-  gem 'iconv'
-  gem 'coveralls', :group => :test, :require => false
-end
-
 group :development, :test do
   gem 'spec'
   gem 'rspec', '>= 1.2.9'
@@ -16,4 +11,5 @@ end
 group :development do
   gem 'jeweler'
   gem 'appraisal', :github => 'thoughtbot/appraisal'
+  gem 'simplecov', :require => false
 end

data/README.rdoc

@@ -137,11 +137,11 @@ nothing will be saved.
 == Who
 
 NullDB was originally written by Avdi Grimm <mailto:avdi@avdi.org>.
-It is currently maintained by {Myron Marston}[http://github.com/myronmarston].
+It is currently maintained by {Bram de Vries}[https://github.com/blaet].
 
 == Where
 
-* Homepage: http://github.com/nulldb/nulldb
+* Homepage: https://github.com/nulldb/nulldb
 
 == License
 

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/activerecord-nulldb-adapter.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: activerecord-nulldb-adapter 0.3.0 ruby lib
+# stub: activerecord-nulldb-adapter 0.3.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "activerecord-nulldb-adapter"
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Avdi Grimm", "Myron Marston"]
-  s.date = "2014-01-31"
+  s.date = "2014-02-17"
   s.description = "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 = "myron.marston@gmail.com"
   s.extra_rdoc_files = [
@@ -34,10 +34,20 @@ Gem::Specification.new do |s|
     "gemfiles/activerecord_3.2.gemfile",
     "gemfiles/activerecord_4.0.gemfile",
     "lib/active_record/connection_adapters/nulldb_adapter.rb",
+    "lib/active_record/connection_adapters/nulldb_adapter/checkpoint.rb",
+    "lib/active_record/connection_adapters/nulldb_adapter/column.rb",
+    "lib/active_record/connection_adapters/nulldb_adapter/configuration.rb",
+    "lib/active_record/connection_adapters/nulldb_adapter/core.rb",
+    "lib/active_record/connection_adapters/nulldb_adapter/empty_result.rb",
+    "lib/active_record/connection_adapters/nulldb_adapter/index_definition.rb",
+    "lib/active_record/connection_adapters/nulldb_adapter/null_object.rb",
+    "lib/active_record/connection_adapters/nulldb_adapter/statement.rb",
+    "lib/active_record/connection_adapters/nulldb_adapter/table_definition.rb",
     "lib/activerecord-nulldb-adapter.rb",
     "lib/nulldb.rb",
     "lib/nulldb/arel_compiler.rb",
     "lib/nulldb/core.rb",
+    "lib/nulldb/extensions.rb",
     "lib/nulldb/rails.rb",
     "lib/nulldb_rspec.rb",
     "lib/tasks/database.rake",
@@ -47,7 +57,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/nulldb/nulldb"
   s.licenses = ["MIT"]
   s.rubyforge_project = "nulldb"
-  s.rubygems_version = "2.2.0"
+  s.rubygems_version = "2.2.2"
   s.summary = "The Null Object pattern as applied to ActiveRecord database adapters"
 
   if s.respond_to? :specification_version then
@@ -55,29 +65,29 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activerecord>, [">= 2.0.0"])
-      s.add_runtime_dependency(%q<iconv>, [">= 0"])
       s.add_development_dependency(%q<spec>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
       s.add_development_dependency(%q<appraisal>, [">= 0"])
+      s.add_development_dependency(%q<simplecov>, [">= 0"])
     else
       s.add_dependency(%q<activerecord>, [">= 2.0.0"])
-      s.add_dependency(%q<iconv>, [">= 0"])
       s.add_dependency(%q<spec>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
       s.add_dependency(%q<appraisal>, [">= 0"])
+      s.add_dependency(%q<simplecov>, [">= 0"])
     end
   else
     s.add_dependency(%q<activerecord>, [">= 2.0.0"])
-    s.add_dependency(%q<iconv>, [">= 0"])
     s.add_dependency(%q<spec>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
     s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
     s.add_dependency(%q<appraisal>, [">= 0"])
+    s.add_dependency(%q<simplecov>, [">= 0"])
   end
 end
 

data/gemfiles/activerecord_2.3.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
+gem "iconv", :platforms=>:ruby
 gem "activerecord", "~> 2.3.0"
 
 group :development, :test do
@@ -13,9 +14,5 @@ end
 group :development do
   gem "jeweler"
   gem "appraisal", :github=>"thoughtbot/appraisal"
-end
-
-platforms :ruby_20, :ruby_21 do
-  gem "iconv"
-  gem "coveralls", :group=>:test, :require=>false
+  gem "simplecov", :require=>false
 end

data/gemfiles/activerecord_3.0.gemfile

@@ -13,9 +13,5 @@ end
 group :development do
   gem "jeweler"
   gem "appraisal", :github=>"thoughtbot/appraisal"
-end
-
-platforms :ruby_20, :ruby_21 do
-  gem "iconv"
-  gem "coveralls", :group=>:test, :require=>false
+  gem "simplecov", :require=>false
 end

data/gemfiles/activerecord_3.1.gemfile

@@ -13,9 +13,5 @@ end
 group :development do
   gem "jeweler"
   gem "appraisal", :github=>"thoughtbot/appraisal"
-end
-
-platforms :ruby_20, :ruby_21 do
-  gem "iconv"
-  gem "coveralls", :group=>:test, :require=>false
+  gem "simplecov", :require=>false
 end

data/gemfiles/activerecord_3.2.gemfile

@@ -13,9 +13,5 @@ end
 group :development do
   gem "jeweler"
   gem "appraisal", :github=>"thoughtbot/appraisal"
-end
-
-platforms :ruby_20, :ruby_21 do
-  gem "iconv"
-  gem "coveralls", :group=>:test, :require=>false
+  gem "simplecov", :require=>false
 end

data/gemfiles/activerecord_4.0.gemfile

@@ -13,9 +13,5 @@ end
 group :development do
   gem "jeweler"
   gem "appraisal", :github=>"thoughtbot/appraisal"
-end
-
-platforms :ruby_20, :ruby_21 do
-  gem "iconv"
-  gem "coveralls", :group=>:test, :require=>false
+  gem "simplecov", :require=>false
 end

data/lib/active_record/connection_adapters/nulldb_adapter.rb

@@ -2,382 +2,20 @@ require 'logger'
 require 'stringio'
 require 'singleton'
 require 'pathname'
+
 require 'active_support'
 require 'active_record/connection_adapters/abstract_adapter'
-require 'nulldb/core'
-
-unless respond_to?(:tap)
-  class Object
-    def tap
-      yield self
-      self
-    end
-  end
-end
-
-unless respond_to?(:try)
-  class Object
-    def try(*a, &b)
-      if a.empty? && block_given?
-        yield self
-      else
-        __send__(*a, &b)
-      end
-    end
-  end
-
-  class NilClass
-    def try(*args); nil; end
-  end
-end
-
-class ActiveRecord::Base
-  # Instantiate a new NullDB connection.  Used by ActiveRecord internally.
-  def self.nulldb_connection(config)
-    ActiveRecord::ConnectionAdapters::NullDBAdapter.new(config)
-  end
-end
-
-
-module ActiveRecord
-  # Just make sure you have the latest version of your schema
-  class Schema < Migration
-    def self.define(info={}, &block)
-      instance_eval(&block)
-    end
-  end
-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
-
-    def initialize(entry_point, content = "")
-      @entry_point, @content = entry_point, content
-    end
-
-    def ==(other)
-      self.entry_point == other.entry_point
-    end
-  end
-
-  class Checkpoint < Statement
-    def initialize
-      super(:checkpoint, "")
-    end
-
-    def ==(other)
-      self.class == other.class
-    end
-  end
-
-  TableDefinition = ActiveRecord::ConnectionAdapters::TableDefinition
-
-  class IndexDefinition < Struct.new(:table, :name, :unique, :columns, :lengths, :orders)
-  end
-
-  class NullObject
-    def method_missing(*args, &block)
-      nil
-    end
-
-    def to_a
-      []
-    end
-  end
-
-  class EmptyResult < Array
-    attr_writer :columns
-    def rows
-      []
-    end
-
-    def column_types
-      columns.map{|col| col.type}
-    end
-
-    def columns
-      @columns ||= []
-    end
-  end
-
-  # A convenience method for integratinginto RSpec.  See README for example of
-  # use.
-  def self.insinuate_into_spec(config)
-    config.before :all do
-      ActiveRecord::Base.establish_connection(:adapter => :nulldb)
-    end
-
-    config.after :all do
-      ActiveRecord::Base.establish_connection(:test)
-    end
-  end
-
-  # Recognized options:
-  #
-  # [+:schema+] path to the schema file, relative to Rails.root
-  def initialize(config={})
-    @log            = StringIO.new
-    @logger         = Logger.new(@log)
-    @last_unique_id = 0
-    @tables         = {'schema_info' => new_table_definition(nil)}
-    @indexes        = Hash.new { |hash, key| hash[key] = [] }
-    @schema_path    = config.fetch(:schema){ "db/schema.rb" }
-    @config         = config.merge(:adapter => :nulldb)
-    super(nil, @logger)
-    @visitor = Arel::Visitors::ToSql.new self if defined?(Arel::Visitors::ToSql)
-  end
-
-  # A log of every statement that has been "executed" by this connection adapter
-  # instance.
-  def execution_log
-    (@execution_log ||= [])
-  end
-
-  # A log of every statement that has been "executed" since the last time
-  # #checkpoint! was called, or since the connection was created.
-  def execution_log_since_checkpoint
-    checkpoint_index = @execution_log.rindex(Checkpoint.new)
-    checkpoint_index = checkpoint_index ? checkpoint_index + 1 : 0
-    @execution_log[(checkpoint_index..-1)]
-  end
-
-  # Inserts a checkpoint in the log.  See also #execution_log_since_checkpoint.
-  def checkpoint!
-    self.execution_log << Checkpoint.new
-  end
-
-  def adapter_name
-    "NullDB"
-  end
-
-  def supports_migrations?
-    true
-  end
-
-  def create_table(table_name, options = {})
-    table_definition = new_table_definition(self, table_name, options.delete(:temporary), options)
-
-    unless options[:id] == false
-      table_definition.primary_key(options[:primary_key] || "id")
-    end
 
-    yield table_definition if block_given?
-
-    @tables[table_name] = table_definition
-  end
-
-  def add_index(table_name, column_names, options = {})
-    index_name, index_type, ignore = add_index_options(table_name, column_names, options)
-    @indexes[table_name] << IndexDefinition.new(table_name, index_name, (index_type == 'UNIQUE'), column_names, [], [])
-  end
-
-  unless instance_methods.include? :add_index_options
-    def add_index_options(table_name, column_name, options = {})
-      column_names = Array.wrap(column_name)
-      index_name   = index_name(table_name, :column => column_names)
-
-      if Hash === options # legacy support, since this param was a string
-        index_type = options[:unique] ? "UNIQUE" : ""
-        index_name = options[:name].to_s if options.key?(:name)
-      else
-        index_type = options
-      end
-
-      if index_name.length > index_name_length
-        raise ArgumentError, "Index name '#{index_name}' on table '#{table_name}' is too long; the limit is #{index_name_length} characters"
-      end
-      if index_name_exists?(table_name, index_name, false)
-        raise ArgumentError, "Index name '#{index_name}' on table '#{table_name}' already exists"
-      end
-      index_columns = quoted_columns_for_index(column_names, options).join(", ")
-
-      [index_name, index_type, index_columns]
-    end
-  end
-
-  unless instance_methods.include? :index_name_exists?
-    def index_name_exists?(table_name, index_name, default)
-      return default unless respond_to?(:indexes)
-      index_name = index_name.to_s
-      indexes(table_name).detect { |i| i.name == index_name }
-    end
-  end
-
-  def add_fk_constraint(*args)
-    # NOOP
-  end
-
-  def add_pk_constraint(*args)
-    # NOOP
-  end
-
-  # Retrieve the table names defined by the schema
-  def tables
-    @tables.keys.map(&:to_s)
-  end
-
-  # Retrieve table columns as defined by the schema
-  def columns(table_name, name = nil)
-    if @tables.size <= 1
-      ActiveRecord::Migration.verbose = false
-      schema_path = if Pathname(@schema_path).absolute?
-                      @schema_path
-                    else
-                      File.join(NullDB.configuration.project_root, @schema_path)
-                    end
-      Kernel.load(schema_path)
-    end
-
-    if table = @tables[table_name]
-      table.columns.map do |col_def|
-        ActiveRecord::ConnectionAdapters::NullDBAdapter::Column.new(
-          col_def.name.to_s,
-          col_def.default,
-          col_def.type,
-          col_def.null
-        )
-      end
-    else
-      []
-    end
-  end
-
-  # Retrieve table indexes as defined by the schema
-  def indexes(table_name, name = nil)
-    @indexes[table_name]
-  end
-
-  def execute(statement, name = nil)
-    self.execution_log << Statement.new(entry_point, statement)
-    NullObject.new
-  end
-
-  def exec_query(statement, name = 'SQL', binds = [])
-    self.execution_log << Statement.new(entry_point, statement)
-    EmptyResult.new
-  end
-
-  def select_rows(statement, name = nil)
-    [].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, binds = [])
-    (object_id || next_unique_id).tap 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, binds = [])
-    with_entry_point(:update) do
-      super(statement, name)
-    end
-  end
-
-  def delete(statement, name=nil, binds = [])
-    with_entry_point(:delete) do
-      super(statement, name)
-    end
-  end
-
-  def select_all(statement, name=nil, binds = [])
-    with_entry_point(:select_all) do
-      super(statement, name)
-    end
-  end
-
-  def select_one(statement, name=nil, binds = [])
-    with_entry_point(:select_one) do
-      super(statement, name)
-    end
-  end
-
-  def select_value(statement, name=nil, binds = [])
-    with_entry_point(:select_value) do
-      super(statement, name)
-    end
-  end
-
-  def select_values(statement, name=nil)
-    with_entry_point(:select_values) do
-      super(statement, name)
-    end
-  end
-
-  def primary_key(table_name)
-    columns(table_name).detect { |col| col.sql_type == :primary_key }.try(:name)
-  end
-
-  protected
-
-  def select(statement, name = nil, binds = [])
-    EmptyResult.new.tap do |r|
-      r.columns = columns_for(name)
-      self.execution_log << Statement.new(entry_point, statement)
-    end
-  end
-
-  private
-
-  def columns_for(table_name)
-    table_def = @tables[table_name]
-    table_def ? table_def.columns : []
-  end
-
-  def next_unique_id
-    @last_unique_id += 1
-  end
-
-  def with_entry_point(method)
-    if entry_point.nil?
-      with_thread_local_variable(:entry_point, method) do
-        yield
-      end
-    else
-      yield
-    end
-  end
-
-  def entry_point
-    Thread.current[:entry_point]
-  end
-
-  def with_thread_local_variable(name, value)
-    old_value = Thread.current[name]
-    Thread.current[name] = value
-    begin
-      yield
-    ensure
-      Thread.current[name] = old_value
-    end
-  end
+require 'nulldb/core'
+require 'nulldb/extensions'
+
+require 'active_record/connection_adapters/nulldb_adapter/core'
+require 'active_record/connection_adapters/nulldb_adapter/statement'
+require 'active_record/connection_adapters/nulldb_adapter/checkpoint'
+require 'active_record/connection_adapters/nulldb_adapter/column'
+require 'active_record/connection_adapters/nulldb_adapter/configuration'
+require 'active_record/connection_adapters/nulldb_adapter/empty_result'
+require 'active_record/connection_adapters/nulldb_adapter/index_definition'
+require 'active_record/connection_adapters/nulldb_adapter/null_object'
+require 'active_record/connection_adapters/nulldb_adapter/table_definition'
 
-  def new_table_definition(adapter = nil, table_name = nil, is_temporary = nil, options = {})
-    case ::ActiveRecord::VERSION::MAJOR
-    when 4
-      TableDefinition.new(native_database_types, table_name, is_temporary, options)
-    when 2,3
-      TableDefinition.new(adapter)
-    else
-      raise "Unsupported ActiveRecord version #{::ActiveRecord::VERSION::STRING}"
-    end
-  end
-end

data/lib/active_record/connection_adapters/nulldb_adapter/checkpoint.rb

@@ -0,0 +1,13 @@
+class ActiveRecord::ConnectionAdapters::NullDBAdapter
+
+  class Checkpoint < Statement
+    def initialize
+      super(:checkpoint, "")
+    end
+
+    def ==(other)
+      self.class == other.class
+    end
+  end
+
+end

data/lib/active_record/connection_adapters/nulldb_adapter/column.rb

@@ -0,0 +1,11 @@
+class ActiveRecord::ConnectionAdapters::NullDBAdapter
+  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
+end

data/lib/active_record/connection_adapters/nulldb_adapter/configuration.rb

@@ -0,0 +1,5 @@
+class ActiveRecord::ConnectionAdapters::NullDBAdapter
+
+  class Configuration < Struct.new(:project_root); end
+
+end

data/lib/active_record/connection_adapters/nulldb_adapter/core.rb

@@ -0,0 +1,270 @@
+class ActiveRecord::ConnectionAdapters::NullDBAdapter < ActiveRecord::ConnectionAdapters::AbstractAdapter
+
+  # A convenience method for integratinginto RSpec.  See README for example of
+  # use.
+  def self.insinuate_into_spec(config)
+    config.before :all do
+      ActiveRecord::Base.establish_connection(:adapter => :nulldb)
+    end
+
+    config.after :all do
+      ActiveRecord::Base.establish_connection(:test)
+    end
+  end
+
+  # Recognized options:
+  #
+  # [+:schema+] path to the schema file, relative to Rails.root
+  def initialize(config={})
+    @log            = StringIO.new
+    @logger         = Logger.new(@log)
+    @last_unique_id = 0
+    @tables         = {'schema_info' => new_table_definition(nil)}
+    @indexes        = Hash.new { |hash, key| hash[key] = [] }
+    @schema_path    = config.fetch(:schema){ "db/schema.rb" }
+    @config         = config.merge(:adapter => :nulldb)
+    super(nil, @logger)
+    @visitor = Arel::Visitors::ToSql.new self if defined?(Arel::Visitors::ToSql)
+  end
+
+  # A log of every statement that has been "executed" by this connection adapter
+  # instance.
+  def execution_log
+    (@execution_log ||= [])
+  end
+
+  # A log of every statement that has been "executed" since the last time
+  # #checkpoint! was called, or since the connection was created.
+  def execution_log_since_checkpoint
+    checkpoint_index = @execution_log.rindex(Checkpoint.new)
+    checkpoint_index = checkpoint_index ? checkpoint_index + 1 : 0
+    @execution_log[(checkpoint_index..-1)]
+  end
+
+  # Inserts a checkpoint in the log.  See also #execution_log_since_checkpoint.
+  def checkpoint!
+    self.execution_log << Checkpoint.new
+  end
+
+  def adapter_name
+    "NullDB"
+  end
+
+  def supports_migrations?
+    true
+  end
+
+  def create_table(table_name, options = {})
+    table_definition = new_table_definition(self, table_name, options.delete(:temporary), options)
+
+    unless options[:id] == false
+      table_definition.primary_key(options[:primary_key] || "id")
+    end
+
+    yield table_definition if block_given?
+
+    @tables[table_name] = table_definition
+  end
+
+  def add_index(table_name, column_names, options = {})
+    column_names = Array.wrap(column_names).map(&:to_s)
+    index_name, index_type, ignore = add_index_options(table_name, column_names, options)
+    @indexes[table_name] << IndexDefinition.new(table_name, index_name, (index_type == 'UNIQUE'), column_names, [], [])
+  end
+
+  unless instance_methods.include? :add_index_options
+    def add_index_options(table_name, column_name, options = {})
+      column_names = Array.wrap(column_name)
+      index_name   = index_name(table_name, :column => column_names)
+
+      if Hash === options # legacy support, since this param was a string
+        index_type = options[:unique] ? "UNIQUE" : ""
+        index_name = options[:name].to_s if options.key?(:name)
+      else
+        index_type = options
+      end
+
+      if index_name.length > index_name_length
+        raise ArgumentError, "Index name '#{index_name}' on table '#{table_name}' is too long; the limit is #{index_name_length} characters"
+      end
+      if index_name_exists?(table_name, index_name, false)
+        raise ArgumentError, "Index name '#{index_name}' on table '#{table_name}' already exists"
+      end
+      index_columns = quoted_columns_for_index(column_names, options).join(", ")
+
+      [index_name, index_type, index_columns]
+    end
+  end
+
+  unless instance_methods.include? :index_name_exists?
+    def index_name_exists?(table_name, index_name, default)
+      return default unless respond_to?(:indexes)
+      index_name = index_name.to_s
+      indexes(table_name).detect { |i| i.name == index_name }
+    end
+  end
+
+  def add_fk_constraint(*args)
+    # NOOP
+  end
+
+  def add_pk_constraint(*args)
+    # NOOP
+  end
+
+  # Retrieve the table names defined by the schema
+  def tables
+    @tables.keys.map(&:to_s)
+  end
+
+  # Retrieve table columns as defined by the schema
+  def columns(table_name, name = nil)
+    if @tables.size <= 1
+      ActiveRecord::Migration.verbose = false
+      schema_path = if Pathname(@schema_path).absolute?
+                      @schema_path
+                    else
+                      File.join(NullDB.configuration.project_root, @schema_path)
+                    end
+      Kernel.load(schema_path)
+    end
+
+    if table = @tables[table_name]
+      table.columns.map do |col_def|
+        ActiveRecord::ConnectionAdapters::NullDBAdapter::Column.new(
+          col_def.name.to_s,
+          col_def.default,
+          col_def.type,
+          col_def.null
+        )
+      end
+    else
+      []
+    end
+  end
+
+  # Retrieve table indexes as defined by the schema
+  def indexes(table_name, name = nil)
+    @indexes[table_name]
+  end
+
+  def execute(statement, name = nil)
+    self.execution_log << Statement.new(entry_point, statement)
+    NullObject.new
+  end
+
+  def exec_query(statement, name = 'SQL', binds = [])
+    self.execution_log << Statement.new(entry_point, statement)
+    EmptyResult.new
+  end
+
+  def select_rows(statement, name = nil)
+    [].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, binds = [])
+    (object_id || next_unique_id).tap 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, binds = [])
+    with_entry_point(:update) do
+      super(statement, name)
+    end
+  end
+
+  def delete(statement, name=nil, binds = [])
+    with_entry_point(:delete) do
+      super(statement, name)
+    end
+  end
+
+  def select_all(statement, name=nil, binds = [])
+    with_entry_point(:select_all) do
+      super(statement, name)
+    end
+  end
+
+  def select_one(statement, name=nil, binds = [])
+    with_entry_point(:select_one) do
+      super(statement, name)
+    end
+  end
+
+  def select_value(statement, name=nil, binds = [])
+    with_entry_point(:select_value) do
+      super(statement, name)
+    end
+  end
+
+  def select_values(statement, name=nil)
+    with_entry_point(:select_values) do
+      super(statement, name)
+    end
+  end
+
+  def primary_key(table_name)
+    columns(table_name).detect { |col| col.sql_type == :primary_key }.try(:name)
+  end
+
+  protected
+
+  def select(statement, name = nil, binds = [])
+    EmptyResult.new.tap do |r|
+      r.columns = columns_for(name)
+      self.execution_log << Statement.new(entry_point, statement)
+    end
+  end
+
+  private
+
+  def columns_for(table_name)
+    table_def = @tables[table_name]
+    table_def ? table_def.columns : []
+  end
+
+  def next_unique_id
+    @last_unique_id += 1
+  end
+
+  def with_entry_point(method)
+    if entry_point.nil?
+      with_thread_local_variable(:entry_point, method) do
+        yield
+      end
+    else
+      yield
+    end
+  end
+
+  def entry_point
+    Thread.current[:entry_point]
+  end
+
+  def with_thread_local_variable(name, value)
+    old_value = Thread.current[name]
+    Thread.current[name] = value
+    begin
+      yield
+    ensure
+      Thread.current[name] = old_value
+    end
+  end
+
+  def new_table_definition(adapter = nil, table_name = nil, is_temporary = nil, options = {})
+    case ::ActiveRecord::VERSION::MAJOR
+    when 4
+      TableDefinition.new(native_database_types, table_name, is_temporary, options)
+    when 2,3
+      TableDefinition.new(adapter)
+    else
+      raise "Unsupported ActiveRecord version #{::ActiveRecord::VERSION::STRING}"
+    end
+  end
+end

data/lib/active_record/connection_adapters/nulldb_adapter/empty_result.rb

@@ -0,0 +1,18 @@
+class ActiveRecord::ConnectionAdapters::NullDBAdapter
+
+  class EmptyResult < Array
+    attr_writer :columns
+    def rows
+      []
+    end
+
+    def column_types
+      columns.map{|col| col.type}
+    end
+
+    def columns
+      @columns ||= []
+    end
+  end
+
+end

data/lib/active_record/connection_adapters/nulldb_adapter/index_definition.rb

@@ -0,0 +1,5 @@
+class ActiveRecord::ConnectionAdapters::NullDBAdapter
+
+  class IndexDefinition < Struct.new(:table, :name, :unique, :columns, :lengths, :orders); end
+
+end

data/lib/active_record/connection_adapters/nulldb_adapter/null_object.rb

@@ -0,0 +1,13 @@
+class ActiveRecord::ConnectionAdapters::NullDBAdapter
+
+  class NullObject
+    def method_missing(*args, &block)
+      nil
+    end
+
+    def to_a
+      []
+    end
+  end
+
+end

data/lib/active_record/connection_adapters/nulldb_adapter/statement.rb

@@ -0,0 +1,15 @@
+class ActiveRecord::ConnectionAdapters::NullDBAdapter
+
+  class Statement
+    attr_reader :entry_point, :content
+
+    def initialize(entry_point, content = "")
+      @entry_point, @content = entry_point, content
+    end
+
+    def ==(other)
+      self.entry_point == other.entry_point
+    end
+  end
+
+end

data/lib/active_record/connection_adapters/nulldb_adapter/table_definition.rb

@@ -0,0 +1,5 @@
+class ActiveRecord::ConnectionAdapters::NullDBAdapter
+
+  TableDefinition = ActiveRecord::ConnectionAdapters::TableDefinition
+
+end

data/lib/nulldb/extensions.rb

@@ -0,0 +1,41 @@
+unless respond_to?(:tap)
+  class Object
+    def tap
+      yield self
+      self
+    end
+  end
+end
+
+unless respond_to?(:try)
+  class Object
+    def try(*a, &b)
+      if a.empty? && block_given?
+        yield self
+      else
+        __send__(*a, &b)
+      end
+    end
+  end
+
+  class NilClass
+    def try(*args); nil; end
+  end
+end
+
+class ActiveRecord::Base
+  # Instantiate a new NullDB connection.  Used by ActiveRecord internally.
+  def self.nulldb_connection(config)
+    ActiveRecord::ConnectionAdapters::NullDBAdapter.new(config)
+  end
+end
+
+
+module ActiveRecord
+  # Just make sure you have the latest version of your schema
+  class Schema < Migration
+    def self.define(info={}, &block)
+      instance_eval(&block)
+    end
+  end
+end

data/spec/nulldb_spec.rb

@@ -1,9 +1,9 @@
 require 'rubygems'
 
-# Use Coveralls/SimpleCov when available
+# Optional simplecov loading
 begin
-  require 'coveralls'
-  Coveralls.wear!
+  require 'simplecov'
+  SimpleCov.start
 rescue LoadError
 end
 
@@ -82,7 +82,7 @@ describe "NullDB" do
         t.integer :widget_id
       end
 
-      add_index "employees", ["name"], :name => "index_employees_on_name"
+      add_index "employees", :name, :name => "index_employees_on_name"
       add_index "employees", ["employee_number"], :name => "index_employees_on_employee_number", :unique => true
       add_index "employees_widgets", ["employee_id", "widget_id"], :name => "my_index"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-nulldb-adapter
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Avdi Grimm
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-31 00:00:00.000000000 Z
+date: 2014-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -26,13 +26,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.0.0
 - !ruby/object:Gem::Dependency
-  name: iconv
+  name: spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -40,35 +40,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: spec
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.9
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.2.9
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.2.9
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -82,7 +82,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -96,7 +96,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -134,10 +134,20 @@ files:
 - gemfiles/activerecord_3.2.gemfile
 - gemfiles/activerecord_4.0.gemfile
 - lib/active_record/connection_adapters/nulldb_adapter.rb
+- lib/active_record/connection_adapters/nulldb_adapter/checkpoint.rb
+- lib/active_record/connection_adapters/nulldb_adapter/column.rb
+- lib/active_record/connection_adapters/nulldb_adapter/configuration.rb
+- lib/active_record/connection_adapters/nulldb_adapter/core.rb
+- lib/active_record/connection_adapters/nulldb_adapter/empty_result.rb
+- lib/active_record/connection_adapters/nulldb_adapter/index_definition.rb
+- lib/active_record/connection_adapters/nulldb_adapter/null_object.rb
+- lib/active_record/connection_adapters/nulldb_adapter/statement.rb
+- lib/active_record/connection_adapters/nulldb_adapter/table_definition.rb
 - lib/activerecord-nulldb-adapter.rb
 - lib/nulldb.rb
 - lib/nulldb/arel_compiler.rb
 - lib/nulldb/core.rb
+- lib/nulldb/extensions.rb
 - lib/nulldb/rails.rb
 - lib/nulldb_rspec.rb
 - lib/tasks/database.rake
@@ -163,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: nulldb
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: The Null Object pattern as applied to ActiveRecord database adapters