From d777cd846dcfa68004499e2135ce15b7384481e9 Mon Sep 17 00:00:00 2001 From: Arvind Laxminarayan Date: Tue, 22 Feb 2011 16:20:33 +0530 Subject: [PATCH 1/5] Prefer Rails.root to RAILS_ROOT --- lib/unit_record/disconnected_active_record.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/unit_record/disconnected_active_record.rb b/lib/unit_record/disconnected_active_record.rb index 6a5af1a..338043d 100644 --- a/lib/unit_record/disconnected_active_record.rb +++ b/lib/unit_record/disconnected_active_record.rb @@ -14,7 +14,11 @@ def disconnect!(options = {}) UnitRecord.base_rails_test_class.disconnect! ActiveRecord::Migration.verbose = false ActiveRecord::Base.connection.change_strategy(:noop) do - load(RAILS_ROOT + "/db/schema.rb") + if defined?(Rails.root) && Rails.root + load(File.join(Rails.root, 'db', 'schema')) + else + load(RAILS_ROOT + "/db/schema.rb") + end end end end From 7997ec872aaa1c1310dffcd04b9b5ff7b4fe8a9d Mon Sep 17 00:00:00 2001 From: Arvind Laxminarayan Date: Tue, 22 Feb 2011 16:33:10 +0530 Subject: [PATCH 2/5] Bumped to 0.9.2 --- CHANGELOG | 4 ++++ Rakefile | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 65af3ba..69d4933 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +*0.9.2* + +* Prefer Rails.root to RAILS_ROOT + *0.9.1* * Rails 2.3 compatibility diff --git a/Rakefile b/Rakefile index e792aad..e723dbe 100644 --- a/Rakefile +++ b/Rakefile @@ -25,7 +25,7 @@ require "date" gem_spec = Gem::Specification.new do |s| s.name = "unit_record" s.summary = "UnitRecord enables unit testing without hitting the database." - s.version = "0.9.1" + s.version = "0.9.2" s.author = "Dan Manges" s.description = "UnitRecord enables unit testing without hitting the database." s.email = "daniel.manges@gmail.com" From fdd2cebdc008c477f5c400378d620158bb539999 Mon Sep 17 00:00:00 2001 From: Arvind Laxminarayan Date: Tue, 22 Feb 2011 17:01:14 +0530 Subject: [PATCH 3/5] Modified gemspec --- unit-record.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unit-record.gemspec b/unit-record.gemspec index 49b1d98..6709c0f 100644 --- a/unit-record.gemspec +++ b/unit-record.gemspec @@ -3,7 +3,7 @@ Gem::Specification.new do |s| s.name = %q{unit_record} - s.version = "0.9.1" + s.version = "0.9.2" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Dan Manges"] From 2da830f1b571e553c84af90c4fec580c2fc2b610 Mon Sep 17 00:00:00 2001 From: Arvind Laxminarayan Date: Tue, 22 Feb 2011 17:30:28 +0530 Subject: [PATCH 4/5] Minor fix --- lib/unit_record/disconnected_active_record.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/unit_record/disconnected_active_record.rb b/lib/unit_record/disconnected_active_record.rb index 338043d..608c348 100644 --- a/lib/unit_record/disconnected_active_record.rb +++ b/lib/unit_record/disconnected_active_record.rb @@ -15,7 +15,7 @@ def disconnect!(options = {}) ActiveRecord::Migration.verbose = false ActiveRecord::Base.connection.change_strategy(:noop) do if defined?(Rails.root) && Rails.root - load(File.join(Rails.root, 'db', 'schema')) + load(File.join(Rails.root, 'db', 'schema.rb')) else load(RAILS_ROOT + "/db/schema.rb") end From f57c30f3718982cacf74cb198d96ef5f6f2ffd00 Mon Sep 17 00:00:00 2001 From: Arvind Laxminarayan Date: Tue, 22 Feb 2011 17:33:03 +0530 Subject: [PATCH 5/5] Reverted to 0.9.1 --- CHANGELOG | 5 +---- Rakefile | 2 +- unit-record.gemspec | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 69d4933..7c46ec5 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,10 +1,7 @@ -*0.9.2* - -* Prefer Rails.root to RAILS_ROOT - *0.9.1* * Rails 2.3 compatibility +* Prefer Rails.root to RAILS_ROOT *0.9.0* diff --git a/Rakefile b/Rakefile index e723dbe..e792aad 100644 --- a/Rakefile +++ b/Rakefile @@ -25,7 +25,7 @@ require "date" gem_spec = Gem::Specification.new do |s| s.name = "unit_record" s.summary = "UnitRecord enables unit testing without hitting the database." - s.version = "0.9.2" + s.version = "0.9.1" s.author = "Dan Manges" s.description = "UnitRecord enables unit testing without hitting the database." s.email = "daniel.manges@gmail.com" diff --git a/unit-record.gemspec b/unit-record.gemspec index 6709c0f..49b1d98 100644 --- a/unit-record.gemspec +++ b/unit-record.gemspec @@ -3,7 +3,7 @@ Gem::Specification.new do |s| s.name = %q{unit_record} - s.version = "0.9.2" + s.version = "0.9.1" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Dan Manges"]