memory_test_fix 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a95367960d728d45656a954966125070e58321a9
-  data.tar.gz: 349871f7052775bc7711eb3f0e18f15a92a25d51
+  metadata.gz: b763773a933d7ce0b6b2eebdeafb5189177c7b87
+  data.tar.gz: 0f1b84af28dad943655f40bce6590ef68505af8a
 SHA512:
-  metadata.gz: eb98875a6b21d3cdba6cf4b29694523159ad1faa6e20386d011a6b0f62c79093afc14c3f98a424779b62066fb7c5407a063a2a8736cb44988990eea0ad10df7b
-  data.tar.gz: a56398fff47b02ee0145f1d5331aa8f37fee2ce0eecd1464b9d31e83813fe9d41236f2fa878bf4014c5a1e1b34cfeb3bf65849ad59c526431c19544d850aa35a
+  metadata.gz: 9f129b1ac898e04657445684d28e4a541146ac06b7f5c16ff60919cc71ba406a67c3fdf9e1c1bd62906491feadc493d76b108e2e4c2888f2cdaa8dc20d4ff2af
+  data.tar.gz: 08948451d5f1a6bdbedb825178812c374c11dbc0c802034490017bab1479f4d630541fca9b7397d729f896bafb79c01e45aa82e1827be9e61c524e7e536c0827

data/README.md

@@ -3,6 +3,12 @@
 A simple fix to run your Rails tests with sqlite. From the
 [example by Chris Roos](http://blog.seagul.co.uk/articles/2006/02/08/in-memory-sqlite-database-for-rails-testing).
 
+## Status
+
+[![Dependency Status](https://gemnasium.com/mvz/memory_test_fix.png)](https://gemnasium.com/mvz/memory_test_fix)
+[![Build Status](https://travis-ci.org/mvz/memory_test_fix.png?branch=master)](https://travis-ci.org/mvz/memory_test_fix)
+[![Code Climate](https://codeclimate.com/github/mvz/memory_test_fix.png)](https://codeclimate.com/github/mvz/memory_test_fix)
+
 ## Usage
 
 Add the gem to your bundle by adding
@@ -27,6 +33,15 @@ You can also adjust the verbosity of the output:
       database: ":memory:"
       verbosity: silent
 
+To use rails migrations instead of loading `db/schema.rb`
+
+```yaml
+  test:
+    adapter: sqlite3
+    database: ":memory:"
+    migrate: true
+```
+
 You can also use this with other (testing) environments, not just 'test'.
 
 ## Rails Versions
@@ -37,14 +52,19 @@ version 0.1.3.
 
 ## Authors
 
-MemoryTestFix is maintained by [Matijs van Zuijlen](http://www.matijs.net/)
+The [original
+hack](http://chrisroos.co.uk/blog/2006-02-08-in-memory-sqlite-database-for-rails-testing)
+this gem is based on was created by Chris Roos.
+
+The hack was adapted as a Rails plugin by [Geoffrey
+Grosenbach](http://nubyonrails.com).
 
-The following people have contributed to this gem:
+The following people have contributed:
 
-* [Original hack](http://chrisroos.co.uk/blog/2006-02-08-in-memory-sqlite-database-for-rails-testing) by Chris Roos
-* Adapted by [Geoffrey Grosenbach](http://nubyonrails.com)
-* Verbosity patch by Kakutani Shintaro
-* Adapted as GemPlugin by Matijs van Zuijlen
-* Support for environments besides 'test' by Erik Hanson & Matt Scilipoti
-* Support for Rails 3 by Greg Weber
-* Fix for Rails 3.2 by Stephan Zalewski
+* Kakutani Shintaro
+* Matijs van Zuijlen
+* Erik Hanson & Matt Scilipoti
+* Greg Weber
+* Stephan Zalewski
+
+MemoryTestFix is maintained by [Matijs van Zuijlen](http://www.matijs.net/)

data/lib/memory_test_fix/railtie.rb

@@ -0,0 +1,7 @@
+module MemoryTestFix
+  class Railtie < ::Rails::Railtie
+    config.after_initialize do
+      MemoryTestFix::SchemaLoader.init_schema
+    end
+  end
+end

data/lib/memory_test_fix/schema_loader.rb

@@ -0,0 +1,58 @@
+module MemoryTestFix
+  module SchemaLoader
+    def self.in_memory_database?
+      in_memory? && sqlite3?
+    end
+
+    def self.in_memory?
+      configuration[:database] == ':memory:' || configuration[:dbfile] == ':memory:'
+    end
+
+    def self.sqlite3?
+       configuration[:adapter] == 'sqlite3'
+    end
+
+    def self.configuration
+      Rails.configuration.database_configuration[Rails.env].with_indifferent_access
+    end
+
+    def self.verbosity
+      configuration[:verbosity]
+    end
+
+    def self.migrate
+      configuration[:migrate] == true
+    end
+
+    def self.inform_using_in_memory
+      puts "Creating sqlite :memory: database"
+    end
+
+    def self.load_schema
+      if migrate
+        lambda {
+          ActiveRecord::Migrator.up('db/migrate') # use migrations
+        }
+      else
+        lambda {
+          load "#{Rails.root}/db/schema.rb" # use db agnostic schema by default
+        }
+      end
+    end
+
+    def self.init_schema
+      if in_memory_database?
+        case verbosity
+        when "silent"
+          silence_stream(STDOUT, &load_schema)
+        when "quiet"
+          inform_using_in_memory
+          silence_stream(STDOUT, &load_schema)
+        else
+          inform_using_in_memory
+          load_schema.call
+        end
+      end
+    end
+  end
+end

data/lib/memory_test_fix.rb

@@ -1,52 +1,15 @@
-module MemoryTestFix
-  def self.in_memory_database?
-    in_memory? && sqlite3?
-  end
-
-  def self.in_memory?
-    configuration[:database] == ':memory:' || configuration[:dbfile] == ':memory:'
-  end
+require 'memory_test_fix/schema_loader'
 
-  def self.sqlite3?
-     configuration[:adapter] == 'sqlite3'
-  end
+if defined?(Rails)
+  require 'memory_test_fix/railtie.rb'
 
-  def self.configuration
-    Rails.configuration.database_configuration[Rails.env].with_indifferent_access
-  end
-
-  def self.verbosity
-    configuration[:verbosity]
-  end
-
-  def self.inform_using_in_memory
-    puts "Creating sqlite :memory: database"
-  end
-
-  def self.init_schema
-    if in_memory_database?
-      load_schema = lambda {
-        load "#{Rails.root}/db/schema.rb" # use db agnostic schema by default
-        #  ActiveRecord::Migrator.up('db/migrate') # use migrations
-      }
-      case verbosity
-      when "silent"
-        silence_stream(STDOUT, &load_schema)
-      when "quiet"
-        inform_using_in_memory
-        silence_stream(STDOUT, &load_schema)
-      else
-        inform_using_in_memory
-        load_schema.call
+  if Rails.version =~ /^4\.0\./
+    ActiveRecord::Base.class_eval do
+      def self.establish_connection(*_)
+        super.tap do
+          MemoryTestFix::SchemaLoader.init_schema
+        end
       end
     end
   end
 end
-
-if ActiveSupport.respond_to? :on_load
-  ActiveSupport.on_load(:after_initialize) do
-    MemoryTestFix.init_schema
-  end
-else
-  MemoryTestFix.init_schema
-end

data/memory_test_fix.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "memory_test_fix"
-  s.version = "1.0.0"
+  s.version = "1.1.0"
 
   if s.respond_to? :required_rubygems_version=
     s.required_rubygems_version = Gem::Requirement.new(">= 0")
@@ -22,15 +22,16 @@ Gem::Specification.new do |s|
 
   s.homepage = "http://wiki.github.com/mvz/memory_test_fix"
   s.require_paths = ["lib"]
-  s.files = ["init.rb",
-             "rails/init.rb",
-             "lib/memory_test_fix.rb",
+  s.files = ["lib/memory_test_fix.rb",
+             "lib/memory_test_fix/railtie.rb",
+             "lib/memory_test_fix/schema_loader.rb",
              "README.md",
              "memory_test_fix.gemspec"]
   s.has_rdoc = true
   s.extra_rdoc_files = ['README.md']
   s.rubygems_version = %q{1.2.0}
 
+  s.add_runtime_dependency('railties', '>= 3.0.0')
   s.add_development_dependency('rake', '~> 10.2')
   s.add_development_dependency('minitest', '~> 5.2')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: memory_test_fix
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Matijs van Zuijlen
@@ -14,34 +14,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-07 00:00:00.000000000 Z
+date: 2014-08-30 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.2'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5.2'
 description: Makes use of SQLite3 in-memory database possible for your Rails tests
@@ -53,10 +67,10 @@ extra_rdoc_files:
 - README.md
 files:
 - README.md
-- init.rb
 - lib/memory_test_fix.rb
+- lib/memory_test_fix/railtie.rb
+- lib/memory_test_fix/schema_loader.rb
 - memory_test_fix.gemspec
-- rails/init.rb
 homepage: http://wiki.github.com/mvz/memory_test_fix
 licenses:
 - MIT
@@ -67,12 +81,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []

data/init.rb

@@ -1 +0,0 @@
-require File.dirname(__FILE__) + "/rails/init"

data/rails/init.rb

@@ -1,2 +0,0 @@
-
-require 'memory_test_fix'