dm-core 0.9.9 → 0.9.10

data/spec/integration/association_through_spec.rb

@@ -4,7 +4,7 @@ if ADAPTER
   describe 'through-associations' do
     before :all do
       repository(ADAPTER) do
-        class Tag
+        class ::Tag
           include DataMapper::Resource
           def self.default_repository_name
             ADAPTER
@@ -22,7 +22,7 @@ if ADAPTER
           has n, :posts, :through => :taggings
         end
 
-        class Tagging
+        class ::Tagging
           include DataMapper::Resource
           def self.default_repository_name
             ADAPTER
@@ -35,7 +35,7 @@ if ADAPTER
           belongs_to :tag
         end
 
-        class Post
+        class ::Post
           include DataMapper::Resource
           def self.default_repository_name
             ADAPTER
@@ -61,7 +61,7 @@ if ADAPTER
                  Post.taggings.tag.voided => true
         end
 
-        class Relationship
+        class ::Relationship
           include DataMapper::Resource
           def self.default_repository_name
             ADAPTER

data/spec/integration/associations/many_to_many_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "spec_hel
 
 describe DataMapper::Associations::ManyToMany::Proxy do
   before :all do
-    class Editor
+    class ::Editor
       include DataMapper::Resource
 
       def self.default_repository_name; ADAPTER end
@@ -15,7 +15,7 @@ describe DataMapper::Associations::ManyToMany::Proxy do
 
     Object.send(:remove_const, :Book) if defined?(Book)
 
-    class Book
+    class ::Book
       include DataMapper::Resource
 
       def self.default_repository_name; ADAPTER end
@@ -190,7 +190,7 @@ describe DataMapper::Associations::ManyToMany::Proxy do
 
   describe "with natural keys" do
     before :all do
-      class Author
+      class ::Author
         include DataMapper::Resource
 
         def self.default_repository_name; ADAPTER end
@@ -200,7 +200,7 @@ describe DataMapper::Associations::ManyToMany::Proxy do
         has n, :books, :through => Resource
       end
 
-      class Book
+      class ::Book
         has n, :authors, :through => Resource
       end
     end
@@ -237,7 +237,7 @@ describe DataMapper::Associations::ManyToMany::Proxy do
 
   describe "When join model has non-serial (integer) natural keys." do
     before :all do
-      class Tag
+      class ::Tag
         include DataMapper::Resource
 
         def self.default_repository_name; ADAPTER end
@@ -249,7 +249,7 @@ describe DataMapper::Associations::ManyToMany::Proxy do
         has n, :books, :through => :book_taggings
       end
 
-      class BookTagging
+      class ::BookTagging
         include DataMapper::Resource
 
         def self.default_repository_name; ADAPTER end
@@ -261,7 +261,7 @@ describe DataMapper::Associations::ManyToMany::Proxy do
         belongs_to :tag
       end
 
-      class Book
+      class ::Book
         has n, :book_taggings
         has n, :tags, :through => :book_taggings
       end
@@ -296,7 +296,7 @@ describe DataMapper::Associations::ManyToMany::Proxy do
 
   describe "with renamed associations" do
     before :all do
-      class Singer
+      class ::Singer
         include DataMapper::Resource
 
         def self.default_repository_name; ADAPTER end
@@ -307,7 +307,7 @@ describe DataMapper::Associations::ManyToMany::Proxy do
         has n, :tunes, :through => Resource, :class_name => 'Song'
       end
 
-      class Song
+      class ::Song
         include DataMapper::Resource
 
         def self.default_repository_name; ADAPTER end

data/spec/integration/associations/many_to_one_spec.rb

@@ -58,7 +58,7 @@ if ADAPTER
           step_child = ManyToOneSpec::StepChild.first(:id => @step_child.id)
           logger do |log|
             # should retrieve from the IdentityMap
-            child.parent.object_id.should == parent.object_id
+            child.parent.should equal(parent)
 
             # should retrieve from the datasource
             other = step_child.parent

data/spec/integration/associations/one_to_many_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_hel
 require 'pp'
 describe "OneToMany" do
   before(:all) do
-    class Team
+    class ::Team
       include DataMapper::Resource
 
       def self.default_repository_name; ADAPTER end
@@ -14,10 +14,10 @@ describe "OneToMany" do
       has n, :players
     end
 
-    class BaseballTeam < Team
+    class ::BaseballTeam < Team
     end
 
-    class Player
+    class ::Player
       include DataMapper::Resource
 
       def self.default_repository_name; ADAPTER end

data/spec/integration/collection_spec.rb

@@ -561,7 +561,7 @@ if ADAPTER
           end
 
           it "should find a resource in a collection by typecasting the key" do
-            resource = @collection.get(@nancy.key.to_s)
+            resource = @collection.get(*@nancy.key)
             resource.should be_kind_of(DataMapper::Resource)
             resource.id.should == @nancy.id
           end
@@ -569,7 +569,7 @@ if ADAPTER
           it 'should not find a resource not in the collection' do
             @query.update(:offset => 0, :limit => 3)
             @david = Zebra.create(:name => 'David', :age => 15,  :notes => 'Albino')
-            @collection.get(@david.key).should be_nil
+            @collection.get(*@david.key).should be_nil
           end
         end
 

data/spec/integration/dependency_queue_spec.rb

@@ -27,7 +27,7 @@ describe "DataMapper::DependencyQueue" do
       before :each do
         @q.add('MissingConstant') { |klass| klass.instance_variable_set("@resolved", true) } # add before MissingConstant is loaded
 
-        class MissingConstant
+        class ::MissingConstant
         end
       end
 

data/spec/integration/model_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
 if ADAPTER
-  module ModelSpec
+  module ::ModelSpec
     class STI
       include DataMapper::Resource
 

data/spec/integration/mysql_adapter_spec.rb

@@ -7,7 +7,7 @@ if HAS_MYSQL
     end
 
     before :all do
-      class Sputnik
+      class ::Sputnik
         include DataMapper::Resource
 
         property :id, Serial

data/spec/integration/postgres_adapter_spec.rb

@@ -8,7 +8,7 @@ if HAS_POSTGRES
 
     describe "auto migrating" do
       before :all do
-        class Sputnik
+        class ::Sputnik
           include DataMapper::Resource
 
           property :id, Serial
@@ -32,7 +32,7 @@ if HAS_POSTGRES
     describe '#312' do
       it "should behave sanely for time fields" do
 
-        class Thing
+        class ::Thing
           include DataMapper::Resource
           property :id, Integer, :serial => true
           property :created_at, Time
@@ -57,7 +57,7 @@ if HAS_POSTGRES
 
     describe "querying metadata" do
       before :all do
-        class Sputnik
+        class ::Sputnik
           include DataMapper::Resource
 
           property :id, Serial
@@ -86,7 +86,7 @@ if HAS_POSTGRES
 
     describe "handling transactions" do
       before :all do
-        class Sputnik
+        class ::Sputnik
           include DataMapper::Resource
 
           property :id, Serial
@@ -118,14 +118,14 @@ if HAS_POSTGRES
 
     describe "reading & writing a database" do
       before :all do
-        class User
+        class ::User
           include DataMapper::Resource
 
           property :id, Serial
           property :name, DM::Text
         end
 
-        class Voyager
+        class ::Voyager
           include DataMapper::Resource
           storage_names[:postgres] = 'voyagers'
 
@@ -163,7 +163,7 @@ if HAS_POSTGRES
         result.should be_kind_of(Array)
         row = result.first
         row.should be_kind_of(Struct)
-        row.members.should == %w{id name}
+        row.members.map { |m| m.to_s }.should == %w{id name}
 
         row.id.should == 1
         row.name.should == 'Paul'
@@ -182,7 +182,7 @@ if HAS_POSTGRES
 
     describe "CRUD for serial Key" do
       before :all do
-        class VideoGame
+        class ::VideoGame
           include DataMapper::Resource
 
           property :id, Serial
@@ -282,7 +282,7 @@ if HAS_POSTGRES
 
     describe "CRUD for Composite Key" do
       before :all do
-        class BankCustomer
+        class ::BankCustomer
           include DataMapper::Resource
 
           property :bank, String, :key => true
@@ -376,7 +376,7 @@ if HAS_POSTGRES
 
     describe "Ordering a Query" do
       before :all do
-        class SailBoat
+        class ::SailBoat
           include DataMapper::Resource
           property :id, Serial
           property :name, String
@@ -423,7 +423,7 @@ if HAS_POSTGRES
 
     describe "Lazy Loaded Properties" do
       before :all do
-        class SailBoat
+        class ::SailBoat
           include DataMapper::Resource
           property :id, Serial
           property :notes, String, :lazy => [:notes]
@@ -467,7 +467,7 @@ if HAS_POSTGRES
 
     describe "finders" do
       before :all do
-        class SerialFinderSpec
+        class ::SerialFinderSpec
           include DataMapper::Resource
 
           property :id, Serial
@@ -528,7 +528,7 @@ if HAS_POSTGRES
 
     describe "belongs_to associations" do
       before :all do
-        class Engine
+        class ::Engine
           include DataMapper::Resource
           def self.default_repository_name; :postgres end
 
@@ -536,7 +536,7 @@ if HAS_POSTGRES
           property :name, String
         end
 
-        class Yard
+        class ::Yard
           include DataMapper::Resource
           def self.default_repository_name; :postgres end
 
@@ -617,7 +617,7 @@ if HAS_POSTGRES
 
     describe "has n associations" do
       before :all do
-        class Host
+        class ::Host
           include DataMapper::Resource
           def self.default_repository_name; :postgres end
 
@@ -627,7 +627,7 @@ if HAS_POSTGRES
           has n, :slices
         end
 
-        class Slice
+        class ::Slice
           include DataMapper::Resource
           def self.default_repository_name; :postgres end
 

data/spec/integration/property_spec.rb

@@ -1,11 +1,15 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
-gem 'fastercsv', '~>1.4.0'
-require 'fastercsv'
+if RUBY_VERSION >= '1.9.0'
+  require 'csv'
+else
+  gem 'fastercsv', '~>1.4.0'
+  require 'fastercsv'
+end
 
 describe DataMapper::Property do
   before do
-    module PropertySpec
+    module ::PropertySpec
       class Resource
         include DataMapper::Resource
       end
@@ -23,7 +27,7 @@ if ADAPTER
   describe DataMapper::Property, "with #{ADAPTER}" do
     describe " tracking strategies" do
       before :all do
-        class Actor
+        class ::Actor
           include DataMapper::Resource
 
           property :id, Serial
@@ -145,7 +149,7 @@ if ADAPTER
 
     describe "lazy loading" do
       before :all do
-        class RowBoat
+        class ::RowBoat
           include DataMapper::Resource
           property :id, Serial
           property :notes, String, :lazy => [:notes]
@@ -198,7 +202,7 @@ if ADAPTER
 
     describe 'defaults' do
       before :all do
-        class Catamaran
+        class ::Catamaran
           include DataMapper::Resource
           property :id, Serial
           property :name, String

data/spec/integration/query_spec.rb

@@ -424,8 +424,8 @@ if ADAPTER
         factory = DataMapper::Associations::Relationship.new(
           :factory,
           ADAPTER,
-          'QuerySpec::Vehicle',
-          'QuerySpec::Factory',
+          QuerySpec::Vehicle,
+          QuerySpec::Factory,
           { :child_key => [ :factory_id ], :parent_key => [ :id ] }
         )
         results = repository(ADAPTER) { QuerySpec::Vehicle.all(:links => [ factory ]) }
@@ -446,8 +446,8 @@ if ADAPTER
         region = DataMapper::Associations::Relationship.new(
           :region,
           ADAPTER,
-          'QuerySpec::Factory',
-          'QuerySpec::Region',
+          QuerySpec::Factory,
+          QuerySpec::Region,
           { :child_key => [ :region_id ], :parent_key => [ :id ] }
         )
         results = repository(ADAPTER) { QuerySpec::Vehicle.all(:links => [ 'factory', region ]) }

data/spec/integration/repository_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 if ADAPTER
   describe DataMapper::Repository, "with #{ADAPTER}" do
     before :all do
-      class SerialFinderSpec
+      class ::SerialFinderSpec
         include DataMapper::Resource
 
         property :id, Serial

data/spec/integration/sqlite3_adapter_spec.rb

@@ -8,7 +8,7 @@ if HAS_SQLITE3
 
     describe "auto migrating" do
       before :all do
-        class Sputnik
+        class ::Sputnik
           include DataMapper::Resource
 
           property :id, Serial
@@ -30,7 +30,7 @@ if HAS_SQLITE3
 
     describe "querying metadata" do
       before :all do
-        class Sputnik
+        class ::Sputnik
           include DataMapper::Resource
 
           property :id, Serial
@@ -76,7 +76,7 @@ if HAS_SQLITE3
 
     describe "handling transactions" do
       before :all do
-        class Sputnik
+        class ::Sputnik
           include DataMapper::Resource
 
           property :id, Serial
@@ -108,7 +108,7 @@ if HAS_SQLITE3
 
     describe "reading & writing a database" do
       before :all do
-        class User
+        class ::User
           include DataMapper::Resource
 
           property :id, Serial
@@ -134,7 +134,7 @@ if HAS_SQLITE3
         result.should be_kind_of(Array)
         row = result.first
         row.should be_kind_of(Struct)
-        row.members.should == %w{id name}
+        row.members.map { |m| m.to_s }.should == %w{id name}
 
         row.id.should == 1
         row.name.should == 'Paul'
@@ -153,7 +153,7 @@ if HAS_SQLITE3
 
     describe "CRUD for serial Key" do
       before :all do
-        class VideoGame
+        class ::VideoGame
           include DataMapper::Resource
 
           property :id, Serial
@@ -255,7 +255,7 @@ if HAS_SQLITE3
 
     describe "CRUD for Composite Key" do
       before :all do
-        class BankCustomer
+        class ::BankCustomer
           include DataMapper::Resource
 
           property :bank, String, :key => true