Updated to pass specs when using Ruby 1.9.1

phildarnowsky · Jan 20, 2009 · 8dcfcee · 8dcfcee
1 parent 09de831
commit 8dcfcee
Show file tree

Hide file tree

Showing 70 changed files with 191 additions and 173 deletions.
diff --git a/adapters/dm-couchdb-adapter/spec/couchdb_adapter_spec.rb b/adapters/dm-couchdb-adapter/spec/couchdb_adapter_spec.rb
@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__), 'spec_helper.rb')
 
 if COUCHDB_AVAILABLE
-  class User
+  class ::User
     include DataMapper::CouchResource
     def self.default_repository_name
       :couch
@@ -29,7 +29,7 @@ def self.default_repository_name
     end
   end
 
-  class Company
+  class ::Company
     include DataMapper::CouchResource
     def self.default_repository_name
       :couch
@@ -42,7 +42,7 @@ def self.default_repository_name
     has n, :users
   end
 
-  class Person
+  class ::Person
     include DataMapper::CouchResource
     def self.default_repository_name
       :couch
@@ -51,11 +51,11 @@ def self.default_repository_name
     property :name, String
   end
 
-  class Employee < Person
+  class ::Employee < Person
     property :rank, String
   end
 
-  class Broken
+  class ::Broken
     include DataMapper::CouchResource
     def self.default_repository_name
       :couch

diff --git a/adapters/dm-couchdb-adapter/spec/couchdb_attachments_spec.rb b/adapters/dm-couchdb-adapter/spec/couchdb_attachments_spec.rb
@@ -8,14 +8,14 @@
 
     before do
       Object.send(:remove_const, :NonCouch) if defined?(NonCouch)
-      class NonCouch
+      class ::NonCouch
         include DataMapper::Resource
 
         property :id, Serial
       end
 
       Object.send(:remove_const, :Message) if defined?(Message)
-      class Message
+      class ::Message
         include DataMapper::CouchResource
         def self.default_repository_name
           :couch

diff --git a/adapters/dm-couchdb-adapter/tasks/spec.rb b/adapters/dm-couchdb-adapter/tasks/spec.rb
@@ -8,7 +8,7 @@
   desc 'Run specifications'
   Spec::Rake::SpecTask.new(:spec) do |t|
     t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
-    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s)
+    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s).map { |f| f.to_s }
 
     begin
       gem 'rcov', '~>0.8'

diff --git a/adapters/dm-ferret-adapter/tasks/spec.rb b/adapters/dm-ferret-adapter/tasks/spec.rb
@@ -8,7 +8,7 @@
   desc 'Run specifications'
   Spec::Rake::SpecTask.new(:spec) do |t|
     t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
-    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s)
+    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s).map { |f| f.to_s }
 
     begin
       gem 'rcov', '~>0.8'

diff --git a/adapters/dm-rest-adapter/lib/rest_adapter.rb b/adapters/dm-rest-adapter/lib/rest_adapter.rb
@@ -161,7 +161,7 @@ def http_put(uri, data = nil)
 
       def http_post(uri, data)
         request do |http|
-          request = Net::HTTP::Post.new(uri, data, {"Content-Type", "application/xml"})
+          request = Net::HTTP::Post.new(uri, data, 'Content-Type' => 'application/xml')
           request.basic_auth(@uri[:login], @uri[:password]) unless @uri[:login].blank?
           http.request(request)
         end

diff --git a/adapters/dm-rest-adapter/tasks/spec.rb b/adapters/dm-rest-adapter/tasks/spec.rb
@@ -8,7 +8,7 @@
   desc 'Run specifications'
   Spec::Rake::SpecTask.new(:spec) do |t|
     t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
-    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s)
+    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s).map { |f| f.to_s }
 
     begin
       gem 'rcov', '~>0.8'

diff --git a/dm-adjust/tasks/spec.rb b/dm-adjust/tasks/spec.rb
@@ -8,7 +8,7 @@
   desc 'Run specifications'
   Spec::Rake::SpecTask.new(:spec) do |t|
     t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
-    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s)
+    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s).map { |f| f.to_s }
 
     begin
       gem 'rcov', '~>0.8'

diff --git a/dm-aggregates/spec/public/shared/aggregate_shared_spec.rb b/dm-aggregates/spec/public/shared/aggregate_shared_spec.rb
@@ -1,14 +1,14 @@
 shared_examples_for 'It Has Setup Resources' do
   before :all do
     # A simplistic example, using with an Integer property
-    class Knight
+    class ::Knight
       include DataMapper::Resource
 
       property :id,   Serial
       property :name, String
     end
 
-    class Dragon
+    class ::Dragon
       include DataMapper::Resource
 
       property :id,                Serial
@@ -25,7 +25,7 @@ class Dragon
     # A more complex example, with BigDecimal and Float properties
     # Statistics taken from CIA World Factbook:
     # https://www.cia.gov/library/publications/the-world-factbook/
-    class Country
+    class ::Country
       include DataMapper::Resource
 
       property :id,                  Serial

diff --git a/dm-aggregates/tasks/spec.rb b/dm-aggregates/tasks/spec.rb
@@ -8,7 +8,7 @@
   desc 'Run specifications'
   Spec::Rake::SpecTask.new(:spec) do |t|
     t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
-    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s)
+    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s).map { |f| f.to_s }
 
     begin
       gem 'rcov', '~>0.8'

diff --git a/dm-ar-finders/spec/integration/ar-finders_spec.rb b/dm-ar-finders/spec/integration/ar-finders_spec.rb
@@ -8,7 +8,7 @@
     end
 
     before(:all) do
-      class GreenSmoothie
+      class ::GreenSmoothie
         include DataMapper::Resource
         property :id, Integer, :serial => true
         property :name, String

diff --git a/dm-ar-finders/spec/spec_helper.rb b/dm-ar-finders/spec/spec_helper.rb
@@ -11,7 +11,7 @@ def load_driver(name, default_uri)
     DataMapper::Repository.adapters[:default] =  DataMapper::Repository.adapters[name]
 
     FileUtils.touch LOG_PATH
-    DataMapper::Logger.new(LOG_PATH, 0)
+    DataMapper::Logger.new(LOG_PATH, :debug)
     at_exit { DataMapper.logger.close }
     true
   rescue LoadError => e

diff --git a/dm-ar-finders/tasks/spec.rb b/dm-ar-finders/tasks/spec.rb
@@ -8,7 +8,7 @@
   desc 'Run specifications'
   Spec::Rake::SpecTask.new(:spec) do |t|
     t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
-    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s)
+    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s).map { |f| f.to_s }
 
     begin
       gem 'rcov', '~>0.8'

diff --git a/dm-cli/tasks/spec.rb b/dm-cli/tasks/spec.rb
@@ -8,7 +8,7 @@
   desc 'Run specifications'
   Spec::Rake::SpecTask.new(:spec) do |t|
     t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
-    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s)
+    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s).map { |f| f.to_s }
 
     begin
       gem 'rcov', '~>0.8'

diff --git a/dm-constraints/spec/integration/constraints_spec.rb b/dm-constraints/spec/integration/constraints_spec.rb
@@ -10,7 +10,7 @@
     before do
       DataMapper::Repository.adapters[:default] =  DataMapper::Repository.adapters[adapter]
 
-      class Stable
+      class ::Stable
         include DataMapper::Resource
         include DataMapper::Constraints
 
@@ -21,7 +21,7 @@ class Stable
         has n, :cows
       end
 
-      class Farmer
+      class ::Farmer
         include DataMapper::Resource
         include DataMapper::Constraints
 
@@ -31,7 +31,7 @@ class Farmer
         has n, :cows
       end
 
-      class Cow
+      class ::Cow
         include DataMapper::Resource
         include DataMapper::Constraints
 
@@ -94,10 +94,10 @@ class Cow
 
       describe "when :constraint => :protect is given" do
         before do
-          class Farmer
+          class ::Farmer
             has n, :cows, :constraint => :protect
           end
-          class Cow
+          class ::Cow
             belongs_to :farmer
           end
         end
@@ -125,10 +125,10 @@ class Cow
 
       describe "when :constraint => :destroy is given" do
         before do
-          class Farmer
+          class ::Farmer
             has n, :cows, :constraint => :destroy
           end
-          class Cow
+          class ::Cow
             belongs_to :farmer
           end
           DataMapper.auto_migrate!
@@ -159,10 +159,10 @@ class Cow
 
       describe "when :constraint => :set_nil is given" do
         before do
-          class Farmer
+          class ::Farmer
             has n, :cows, :constraint => :set_nil
           end
-          class Cow
+          class ::Cow
             belongs_to :farmer
           end
           DataMapper.auto_migrate!
@@ -187,10 +187,10 @@ class Cow
 
       describe "when :constraint => :skip is given" do
         before do
-          class Farmer
+          class ::Farmer
             has n, :cows, :constraint => :skip
           end
-          class Cow
+          class ::Cow
             belongs_to :farmer
           end
           DataMapper.auto_migrate!
@@ -219,7 +219,7 @@ class Cow
 
         it "should raise an error" do
           lambda do
-            class Farmer
+            class ::Farmer
               has n, :cows, :constraint => :chocolate
             end
           end.should raise_error(ArgumentError)

diff --git a/dm-constraints/tasks/spec.rb b/dm-constraints/tasks/spec.rb
@@ -8,7 +8,7 @@
   desc 'Run specifications'
   Spec::Rake::SpecTask.new(:spec) do |t|
     t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
-    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s)
+    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s).map { |f| f.to_s }
 
     begin
       gem 'rcov', '~>0.8'

diff --git a/dm-is-example/tasks/spec.rb b/dm-is-example/tasks/spec.rb
@@ -8,7 +8,7 @@
   desc 'Run specifications'
   Spec::Rake::SpecTask.new(:spec) do |t|
     t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
-    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s)
+    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s).map { |f| f.to_s }
 
     begin
       gem 'rcov', '~>0.8'

diff --git a/dm-is-list/tasks/spec.rb b/dm-is-list/tasks/spec.rb
@@ -8,7 +8,7 @@
   desc 'Run specifications'
   Spec::Rake::SpecTask.new(:spec) do |t|
     t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
-    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s)
+    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s).map { |f| f.to_s }
 
     begin
       gem 'rcov', '~>0.8'

diff --git a/dm-is-nested_set/spec/integration/nested_set_spec.rb b/dm-is-nested_set/spec/integration/nested_set_spec.rb
@@ -30,7 +30,7 @@
   describe DataMapper::Is::NestedSet do
     before do
       Object.send(:remove_const, :User) if defined?(User)
-      class User
+      class ::User
         include DataMapper::Resource
 
         property :id, Serial
@@ -40,7 +40,7 @@ class User
       end
 
       Object.send(:remove_const, :Category) if defined?(Category)
-      class Category
+      class ::Category
         include DataMapper::Resource
 
         property :id, Integer, :serial => true
@@ -55,7 +55,7 @@ def pos; [lft,rgt] end # convenience method only for speccing.
       end
 
       Object.send(:remove_const, :CustomCategory) if defined?(CustomCategory)
-      class CustomCategory < Category; end
+      class ::CustomCategory < Category; end
 
       DataMapper.auto_migrate!
 

diff --git a/dm-is-nested_set/tasks/spec.rb b/dm-is-nested_set/tasks/spec.rb
@@ -8,7 +8,7 @@
   desc 'Run specifications'
   Spec::Rake::SpecTask.new(:spec) do |t|
     t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
-    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s)
+    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s).map { |f| f.to_s }
 
     begin
       gem 'rcov', '~>0.8'

diff --git a/dm-is-remixable/tasks/spec.rb b/dm-is-remixable/tasks/spec.rb
@@ -8,7 +8,7 @@
   desc 'Run specifications'
   Spec::Rake::SpecTask.new(:spec) do |t|
     t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
-    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s)
+    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s).map { |f| f.to_s }
 
     begin
       gem 'rcov', '~>0.8'

diff --git a/dm-is-searchable/tasks/spec.rb b/dm-is-searchable/tasks/spec.rb
@@ -8,7 +8,7 @@
   desc 'Run specifications'
   Spec::Rake::SpecTask.new(:spec) do |t|
     t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
-    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s)
+    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s).map { |f| f.to_s }
 
     begin
       gem 'rcov', '~>0.8'

diff --git a/dm-is-state_machine/tasks/spec.rb b/dm-is-state_machine/tasks/spec.rb
@@ -8,7 +8,7 @@
   desc 'Run specifications'
   Spec::Rake::SpecTask.new(:spec) do |t|
     t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
-    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s)
+    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s).map { |f| f.to_s }
 
     begin
       gem 'rcov', '~>0.8'

diff --git a/dm-is-tree/tasks/spec.rb b/dm-is-tree/tasks/spec.rb
@@ -8,7 +8,7 @@
   desc 'Run specifications'
   Spec::Rake::SpecTask.new(:spec) do |t|
     t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
-    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s)
+    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s).map { |f| f.to_s }
 
     begin
       gem 'rcov', '~>0.8'

diff --git a/dm-is-versioned/tasks/spec.rb b/dm-is-versioned/tasks/spec.rb
@@ -8,7 +8,7 @@
   desc 'Run specifications'
   Spec::Rake::SpecTask.new(:spec) do |t|
     t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
-    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s)
+    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s).map { |f| f.to_s }
 
     begin
       gem 'rcov', '~>0.8'

diff --git a/dm-is-viewable/tasks/spec.rb b/dm-is-viewable/tasks/spec.rb
@@ -8,7 +8,7 @@
   desc 'Run specifications'
   Spec::Rake::SpecTask.new(:spec) do |t|
     t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
-    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s)
+    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s).map { |f| f.to_s }
 
     begin
       gem 'rcov', '~>0.8'