memory_test_fix 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b763773a933d7ce0b6b2eebdeafb5189177c7b87
-  data.tar.gz: 0f1b84af28dad943655f40bce6590ef68505af8a
+  metadata.gz: d8be77be544a73632c9f612eb7d7742e6df17c24
+  data.tar.gz: 7a00be706b1a9616ff236e24afb16a10ccfdc940
 SHA512:
-  metadata.gz: 9f129b1ac898e04657445684d28e4a541146ac06b7f5c16ff60919cc71ba406a67c3fdf9e1c1bd62906491feadc493d76b108e2e4c2888f2cdaa8dc20d4ff2af
-  data.tar.gz: 08948451d5f1a6bdbedb825178812c374c11dbc0c802034490017bab1479f4d630541fca9b7397d729f896bafb79c01e45aa82e1827be9e61c524e7e536c0827
+  metadata.gz: 0400082e065eedbc1ca31f2d7cd40b8304fdb4564eb1a1587749f6656835e3ce067cf8258ea12157fba1d1c77185e62f469552be7ee89dfc0bd24d68077e3077
+  data.tar.gz: 3024609b21a8db5ee1786b498a25abf1324f58104d7a7c1d0b5b120e8359691264415cf60a8f3451692e084735fa430716dec2a67d6e10411433632ea1f27346

data/README.md

@@ -46,9 +46,11 @@ You can also use this with other (testing) environments, not just 'test'.
 
 ## Rails Versions
 
-This gem is compatible with Rails 4 and Rails 3. If you're using Rails 2.3, use
-version 0.2.2 of this gem. If you're using an even older version of Rails, use
-version 0.1.3.
+This gem is compatible with Rails 4 and Rails 3.2. If you're using an older
+version of Rails, your first priority should be upgrading Rails. If that's not
+an option, you can use version 1.1.0 of this gem with Rails 3.1 or 3.0. If
+you're using Rails 2.3, use version 0.2.2. If you're using an even older
+version of Rails, use version 0.1.3.
 
 ## Authors
 

data/lib/memory_test_fix/railtie.rb

@@ -1,4 +1,5 @@
 module MemoryTestFix
+  # Set up for use with Rails
   class Railtie < ::Rails::Railtie
     config.after_initialize do
       MemoryTestFix::SchemaLoader.init_schema

data/lib/memory_test_fix/schema_loader.rb

@@ -1,57 +1,76 @@
+require 'memory_test_fix/schema_file_loader'
+require 'active_support/core_ext/kernel/reporting'
+
 module MemoryTestFix
-  module SchemaLoader
-    def self.in_memory_database?
+  # Set up database schema into in-memory database.
+  class SchemaLoader
+    def self.init_schema
+      new.init_schema
+    end
+
+    def initialize(options = {})
+      @configuration = options[:configuration] || ActiveRecord::Base.connection_config
+      @migrator = options[:migrator] || ActiveRecord::Migrator
+      @loader = options[:loader] || SchemaFileLoader
+    end
+
+    def init_schema
+      return unless in_memory_database?
+
+      inform_using_in_memory unless silent?
+
+      if silent? || quiet?
+        load_schema_silently
+      else
+        load_schema
+      end
+    end
+
+    private
+
+    def in_memory_database?
       in_memory? && sqlite3?
     end
 
-    def self.in_memory?
-      configuration[:database] == ':memory:' || configuration[:dbfile] == ':memory:'
+    def in_memory?
+      @configuration[:database] == ':memory:' || @configuration[:dbfile] == ':memory:'
+    end
+
+    def sqlite3?
+      @configuration[:adapter] == 'sqlite3'
     end
 
-    def self.sqlite3?
-       configuration[:adapter] == 'sqlite3'
+    def verbosity
+      @configuration[:verbosity]
     end
 
-    def self.configuration
-      Rails.configuration.database_configuration[Rails.env].with_indifferent_access
+    def silent?
+      verbosity == "silent"
     end
 
-    def self.verbosity
-      configuration[:verbosity]
+    def quiet?
+      verbosity == "quiet"
     end
 
-    def self.migrate
-      configuration[:migrate] == true
+    def migrate
+      @configuration[:migrate] == true
     end
 
-    def self.inform_using_in_memory
+    def inform_using_in_memory
       puts "Creating sqlite :memory: database"
     end
 
-    def self.load_schema
+    def load_schema
       if migrate
-        lambda {
-          ActiveRecord::Migrator.up('db/migrate') # use migrations
-        }
+        @migrator.up('db/migrate')
       else
-        lambda {
-          load "#{Rails.root}/db/schema.rb" # use db agnostic schema by default
-        }
+        @loader.load_schema
       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
+    def load_schema_silently
+      silence_stream STDOUT do
+        load_schema
       end
     end
   end

data/memory_test_fix.gemspec

@@ -1,24 +1,26 @@
 Gem::Specification.new do |s|
   s.name = "memory_test_fix"
-  s.version = "1.1.0"
+  s.version = "1.2.0"
 
   if s.respond_to? :required_rubygems_version=
     s.required_rubygems_version = Gem::Requirement.new(">= 0")
   end
 
-  s.authors = [ "Matijs van Zuijlen",
-                "Chris Roos",
-                "Geoffrey Grosenbach",
-                "Kakutani Shintaro",
-                "Erik Hanson and Matt Scilipoti",
-                "Greg Weber",
-                "Stephan Zalewski" ]
+  s.authors = ["Matijs van Zuijlen",
+               "Chris Roos",
+               "Geoffrey Grosenbach",
+               "Kakutani Shintaro",
+               "Erik Hanson and Matt Scilipoti",
+               "Greg Weber",
+               "Stephan Zalewski"]
   s.email = "matijs@matijs.net"
 
   s.license = 'MIT'
 
   s.summary = "Use SQLite3 in-memory database for Rails tests."
-  s.description = "Makes use of SQLite3 in-memory database possible for your Rails tests by preloading the schema."
+  s.description =
+    "Makes use of SQLite3 in-memory database possible for your" \
+    " Rails tests by preloading the schema."
 
   s.homepage = "http://wiki.github.com/mvz/memory_test_fix"
   s.require_paths = ["lib"]
@@ -29,9 +31,11 @@ Gem::Specification.new do |s|
              "memory_test_fix.gemspec"]
   s.has_rdoc = true
   s.extra_rdoc_files = ['README.md']
-  s.rubygems_version = %q{1.2.0}
+  s.rubygems_version = '1.2.0'
 
   s.add_runtime_dependency('railties', '>= 3.0.0')
+  s.add_runtime_dependency('activerecord', '>= 3.0.0')
   s.add_development_dependency('rake', '~> 10.2')
   s.add_development_dependency('minitest', '~> 5.2')
+  s.add_development_dependency('rspec', '~> 3.1.0')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: memory_test_fix
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Matijs van Zuijlen
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-30 00:00:00.000000000 Z
+date: 2014-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -30,6 +30,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  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
@@ -58,6 +72,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.2'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 description: Makes use of SQLite3 in-memory database possible for your Rails tests
   by preloading the schema.
 email: matijs@matijs.net