dm-core 0.9.9 → 0.9.10

data/spec/integration/sti_spec.rb

@@ -8,7 +8,7 @@ if HAS_SQLITE3
 
       @property_class = Struct.new(:name, :type, :nullable, :default, :serial)
 
-      class Book
+      class ::Book
         include DataMapper::Resource
 
         property :id,       Serial
@@ -17,23 +17,23 @@ if HAS_SQLITE3
         property :class_type, Discriminator
       end
 
-      class Propaganda < Book
+      class ::Propaganda < Book
         property :marxist,  Boolean,    :nullable => false, :default => false
       end
 
-      class Fiction < Book
+      class ::Fiction < Book
         property :series,   String
       end
 
-      class ShortStory < Fiction
+      class ::ShortStory < Fiction
         property :moral,    String
       end
 
-      class ScienceFiction < Fiction
+      class ::ScienceFiction < Fiction
         property :aliens, Boolean
       end
 
-      class SpaceWestern < ScienceFiction
+      class ::SpaceWestern < ScienceFiction
         property :cowboys, Boolean
       end
     end

data/spec/integration/strategic_eager_loading_spec.rb

@@ -4,7 +4,7 @@ describe "Strategic Eager Loading" do
   include LoggingHelper
 
   before :all do
-    class Zoo
+    class ::Zoo
       include DataMapper::Resource
       def self.default_repository_name; ADAPTER end
 
@@ -14,7 +14,7 @@ describe "Strategic Eager Loading" do
       has n, :exhibits
     end
 
-    class Exhibit
+    class ::Exhibit
       include DataMapper::Resource
       def self.default_repository_name; ADAPTER end
 
@@ -26,7 +26,7 @@ describe "Strategic Eager Loading" do
       has n, :animals
     end
 
-    class Animal
+    class ::Animal
       include DataMapper::Resource
       def self.default_repository_name; ADAPTER end
 
@@ -67,11 +67,12 @@ describe "Strategic Eager Loading" do
       logger do |log|
         dallas.exhibits.entries # load all exhibits for zoos in identity_map
         dallas.exhibits.size.should == 1
+
         log.readlines.size.should == 1
-      end
 
-      repository.identity_map(Zoo).keys.sort.should == zoo_ids
-      repository.identity_map(Exhibit).keys.sort.should == exhibit_ids
+        repository.identity_map(Zoo).keys.sort.should == zoo_ids
+        repository.identity_map(Exhibit).keys.sort.should == exhibit_ids
+      end
 
       logger do |log|
         zoos.each { |zoo| zoo.exhibits.entries } # issues no queries
@@ -97,16 +98,17 @@ describe "Strategic Eager Loading" do
       logger do |log|
         reptiles = dallas.exhibits(:name => 'Reptiles')
         reptiles.size.should == 1
+
         log.readlines.size.should == 1
       end
 
       logger do |log|
         primates = dallas.exhibits(:name => 'Primates')
         primates.size.should == 1
+        primates.should_not == reptiles
+
         log.readlines.size.should == 1
       end
-
-      primates.should_not == reptiles
     end
   end
 
@@ -121,11 +123,12 @@ describe "Strategic Eager Loading" do
 
       logger do |log|
         bear.exhibit
+
+        repository.identity_map(Animal).keys.sort.should == animal_ids
+        repository.identity_map(Exhibit).keys.sort.should == exhibit_ids
+
         log.readlines.size.should == 1
       end
-
-      repository.identity_map(Animal).keys.sort.should == animal_ids
-      repository.identity_map(Exhibit).keys.sort.should == exhibit_ids
     end
   end
 

data/spec/integration/type_spec.rb

@@ -1,10 +1,14 @@
 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
 
 if ADAPTER
-  module TypeTests
+  module ::TypeTests
     class Impostor < DataMapper::Type
       primitive String
     end
@@ -25,7 +29,7 @@ if ADAPTER
     end
   end
 
-  class Lemon
+  class ::Lemon
     include DataMapper::Resource
 
     def self.default_repository_name
@@ -37,7 +41,7 @@ if ADAPTER
     property :deleted_at, DataMapper::Types::ParanoidDateTime
   end
 
-  class Lime
+  class ::Lime
     include DataMapper::Resource
 
     def self.default_repository_name
@@ -199,7 +203,7 @@ if ADAPTER
         DataMapper::Repository.adapters[:alternate_paranoid] = repository(ADAPTER).adapter.dup
 
         Object.send(:remove_const, :Orange) if defined?(Orange)
-        class Orange
+        class ::Orange
           include DataMapper::Resource
 
           def self.default_repository_name

data/spec/lib/logging_helper.rb

@@ -1,18 +1,18 @@
 module LoggingHelper
-  def logger(adapter = ADAPTER, &block)
-    current_adapter = DataObjects.const_get(repository(adapter).adapter.uri.scheme.capitalize)
-    old_logger = current_adapter.logger
+  def logger
+    class << DataMapper.logger
+      attr_writer :log
+    end
+
+    old_log = DataMapper.logger.log
 
-    log_path = File.join(SPEC_ROOT, "tmp.log")
-    handle = File.open(log_path, "a+")
-    current_adapter.logger = DataObjects::Logger.new(log_path, 0)
     begin
-      yield(handle)
+      StringIO.new('') do |io|
+        DataMapper.logger.log = io
+        yield io
+      end
     ensure
-      handle.truncate(0)
-      handle.close
-      current_adapter.logger = old_logger
-      File.delete(log_path)
+      DataMapper.logger.log = old_log
     end
   end
 end

data/spec/spec_helper.rb

@@ -8,12 +8,11 @@ SPEC_ROOT = Pathname(__FILE__).dirname.expand_path
 require SPEC_ROOT.parent + 'lib/dm-core'
 
 # Load the various helpers for the spec suite
-Dir[DataMapper.root / 'spec' / 'lib' / '*.rb'].each do |file|
+Dir[(DataMapper.root / 'spec' / 'lib' / '*.rb').to_s].each do |file|
   require file
 end
 
 # setup mock adapters
-DataMapper.setup(:default, "sqlite3::memory:")
 DataMapper.setup(:default2, "sqlite3::memory:")
 
 [ :mock, :legacy, :west_coast, :east_coast ].each do |repository_name|
@@ -30,8 +29,13 @@ end
 #
 def setup_adapter(name, default_uri)
   begin
-    DataMapper.setup(name, ENV["#{name.to_s.upcase}_SPEC_URI"] || default_uri)
-    Object.const_set('ADAPTER', ENV['ADAPTER'].to_sym) if name.to_s == ENV['ADAPTER']
+    adapter = DataMapper.setup(name, ENV["#{name.to_s.upcase}_SPEC_URI"] || default_uri)
+
+    if name.to_s == ENV['ADAPTER']
+      Object.const_set('ADAPTER', ENV['ADAPTER'].to_sym)
+      DataMapper::Repository.adapters[:default] = adapter
+    end
+
     true
   rescue Exception => e
     if name.to_s == ENV['ADAPTER']

data/spec/unit/adapters/data_objects_adapter_spec.rb

@@ -7,7 +7,7 @@ require DataMapper.root / 'spec' / 'unit' / 'adapters' / 'adapter_shared_spec'
 
 describe DataMapper::Adapters::DataObjectsAdapter do
   before :all do
-    class Cheese
+    class ::Cheese
       include DataMapper::Resource
       property :id, Serial
       property :name, String, :nullable => false
@@ -26,7 +26,7 @@ describe DataMapper::Adapters::DataObjectsAdapter do
   describe "#find_by_sql" do
 
     before do
-      class Plupp
+      class ::Plupp
         include DataMapper::Resource
         property :id, Integer, :key => true
         property :name, String
@@ -34,7 +34,7 @@ describe DataMapper::Adapters::DataObjectsAdapter do
     end
 
     it "should be added to DataMapper::Model" do
-      DataMapper::Model.instance_methods.include?("find_by_sql").should == true
+      DataMapper::Model.instance_methods.map { |m| m.to_s }.include?("find_by_sql").should == true
       Plupp.should respond_to(:find_by_sql)
     end
 
@@ -73,7 +73,11 @@ describe DataMapper::Adapters::DataObjectsAdapter do
       end
 
       it "should accept a Query argument with or without options hash" do
-        @connection.should_receive(:create_command).twice.with('SELECT "name" FROM "plupps" WHERE ("name" = ?) ORDER BY "id"').and_return(@command)
+        if ADAPTER == :mysql
+          @connection.should_receive(:create_command).twice.with('SELECT `name` FROM `plupps` WHERE (`name` = ?) ORDER BY `id`').and_return(@command)
+        else
+          @connection.should_receive(:create_command).twice.with('SELECT "name" FROM "plupps" WHERE ("name" = ?) ORDER BY "id"').and_return(@command)
+        end
         @command.should_receive(:execute_reader).twice.with('my pretty plur').and_return(@reader)
         Plupp.should_receive(:repository).any_number_of_times.and_return(@repository)
         Plupp.should_receive(:repository).any_number_of_times.with(:plupp_repo).and_return(@repository)
@@ -573,7 +577,7 @@ describe DataMapper::Adapters::DataObjectsAdapter do
 
         result = @adapter.query('SQL STRING')
 
-        result.first.members.should == %w{id user_name age}
+        result.first.members.map { |m| m.to_s }.should == %w[ id user_name age ]
       end
 
       it 'should convert each row into the struct' do

data/spec/unit/adapters/in_memory_adapter_spec.rb

@@ -4,7 +4,7 @@ describe DataMapper::Adapters::InMemoryAdapter do
   before do
     DataMapper.setup(:inmem, :adapter => 'in_memory')
 
-    class Heffalump
+    class ::Heffalump
       include DataMapper::Resource
 
       def self.default_repository_name

data/spec/unit/adapters/postgres_adapter_spec.rb

@@ -25,7 +25,7 @@ if HAS_POSTGRES
         @adapter.stub!(:query).and_return([ 0 ])
 
         @original_method = @adapter.class.superclass.instance_method(:upgrade_model_storage)
-        @adapter.class.superclass.send(:define_method, :upgrade_model_storage) {}
+        @adapter.class.superclass.send(:define_method, :upgrade_model_storage) { |repository, model| }
       end
 
       after do
@@ -49,7 +49,7 @@ if HAS_POSTGRES
 
       it 'should execute the superclass upgrade_model_storage' do
         rv = mock('inside super')
-        @adapter.class.superclass.send(:define_method, :upgrade_model_storage) { rv }
+        @adapter.class.superclass.send(:define_method, :upgrade_model_storage) { |repository, model| rv }
         @adapter.upgrade_model_storage(@repository, @model).should == rv
       end
     end
@@ -91,7 +91,7 @@ if HAS_POSTGRES
 
       it 'should execute the superclass upgrade_model_storage' do
         rv = mock('inside super')
-        @adapter.class.superclass.send(:define_method, :create_table_statement) { rv }
+        @adapter.class.superclass.send(:define_method, :create_table_statement) { |repository, model| rv }
         @adapter.create_table_statement(@repository, @model).should == rv
       end
     end
@@ -117,13 +117,13 @@ if HAS_POSTGRES
 
       it 'should not execute the superclass destroy_model_storage if the storage does not exist' do
         rv = mock('inside super')
-        @adapter.class.superclass.send(:define_method, :destroy_model_storage) { rv }
+        @adapter.class.superclass.send(:define_method, :destroy_model_storage) { |repository, model| rv }
         @adapter.destroy_model_storage(@repository, @model).should_not == rv
       end
 
       it 'should execute the superclass destroy_model_storage if the storage exists' do
         rv = mock('inside super')
-        @adapter.class.superclass.send(:define_method, :destroy_model_storage) { rv }
+        @adapter.class.superclass.send(:define_method, :destroy_model_storage) { |repository, model| rv }
         @adapter.stub!(:storage_exists?).and_return(true)
 
         @adapter.destroy_model_storage(@repository, @model).should == rv

data/spec/unit/associations/many_to_many_spec.rb

@@ -6,7 +6,7 @@ describe DataMapper::Associations::ManyToMany do
 
   it 'should allow a declaration' do
     lambda do
-      class Supplier
+      class ::Supplier
         has n, :manufacturers, :through => Resource
       end
     end.should_not raise_error
@@ -14,7 +14,7 @@ describe DataMapper::Associations::ManyToMany do
 
   it 'should handle models inside modules' do
     lambda do
-      module Content
+      module ::Content
         class Dialect
           has n, :locales, :through => Resource, :class_name => "Language::Locale"
         end

data/spec/unit/associations/many_to_one_spec.rb

@@ -6,7 +6,7 @@ describe DataMapper::Associations::ManyToOne do
 
   it 'should allow a declaration' do
     lambda do
-      class Vehicle
+      class ::Vehicle
         belongs_to :manufacturer
       end
     end.should_not raise_error
@@ -102,7 +102,7 @@ describe DataMapper::Associations::ManyToOne::Proxy do
       end
 
       it 'should save the parent' do
-        @relationship.should_receive(:with_repository).and_yield(@repository)
+        @relationship.should_receive(:with_repository).and_yield
         @parent.should_receive(:save).with(no_args)
         @association.save
       end
@@ -112,7 +112,7 @@ describe DataMapper::Associations::ManyToOne::Proxy do
         child_key.should_receive(:set).and_return(true)
         parent_key = mock("parent_key")
         parent_key.should_receive(:get).and_return(1)
-        @relationship.should_receive(:with_repository).and_yield(@repository)
+        @relationship.should_receive(:with_repository).and_yield
         @relationship.should_receive(:child_key).and_return(child_key)
         @relationship.should_receive(:parent_key).and_return(parent_key)
         save_results = mock('save results')

data/spec/unit/associations/one_to_many_spec.rb

@@ -85,11 +85,11 @@ describe DataMapper::Associations::OneToMany do
 
     describe 'proxy accessor' do
       before :all do
-        class User
+        class ::User
           include DataMapper::Resource
         end
 
-        class Order
+        class ::Order
           include DataMapper::Resource
         end
       end

data/spec/unit/associations/relationship_spec.rb

@@ -8,8 +8,8 @@ describe DataMapper::Associations::Relationship do
     belongs_to = DataMapper::Associations::Relationship.new(
       :manufacturer,
       :mock,
-      'Vehicle',
-      'Manufacturer',
+      Vehicle,
+      Manufacturer,
       { :child_key => [ :manufacturer_id ] }
     )
 
@@ -23,8 +23,8 @@ describe DataMapper::Associations::Relationship do
     belongs_to = DataMapper::Associations::Relationship.new(
       :manufacturer,
       :mock,
-      'Vehicle',
-      'Manufacturer',
+      Vehicle,
+      Manufacturer,
       { :child_key => [ :manufacturer_id ], :parent_key => [ :id ] }
     )
 
@@ -44,8 +44,8 @@ describe DataMapper::Associations::Relationship do
     has_many = DataMapper::Associations::Relationship.new(
       :models,
       :mock,
-      'Vehicle',
-      'Manufacturer',
+      Vehicle,
+      Manufacturer,
       { :child_key => [:model_id] }
     )
 

data/spec/unit/associations_spec.rb

@@ -13,7 +13,7 @@ describe "DataMapper::Associations" do
 
   describe "#many_to_one_relationships" do
     before :all do
-      module MTORelationships
+      module ::MTORelationships
         class A
           include DataMapper::Resource
           def self.default_repository_name
@@ -46,11 +46,11 @@ describe "DataMapper::Associations" do
   end
 
   describe ".relationships" do
-    class B
+    class ::B
       include DataMapper::Resource
     end
 
-    class C
+    class ::C
       include DataMapper::Resource
 
       repository(:mock) do
@@ -58,15 +58,15 @@ describe "DataMapper::Associations" do
       end
     end
 
-    class D
+    class ::D
       include DataMapper::Resource
       has 1, :b
     end
 
-    class E < D
+    class ::E < D
     end
 
-    class F < D
+    class ::F < D
       has 1, :a
     end
 
@@ -92,7 +92,7 @@ describe "DataMapper::Associations" do
 
     it "should allow a declaration" do
       lambda do
-        class Manufacturer
+        class ::Manufacturer
           has 1, :halo_car
         end
       end.should_not raise_error
@@ -100,7 +100,7 @@ describe "DataMapper::Associations" do
 
     it "should not allow a constraint that is not an Integer, Range or Infinity" do
       lambda do
-        class Manufacturer
+        class ::Manufacturer
           has '1', :halo_car
         end
       end.should raise_error(ArgumentError)
@@ -108,7 +108,7 @@ describe "DataMapper::Associations" do
 
     it "should not allow a constraint where the min is larger than the max" do
       lambda do
-        class Manufacturer
+        class ::Manufacturer
           has 1..0, :halo_car
         end
       end.should raise_error(ArgumentError)
@@ -119,7 +119,7 @@ describe "DataMapper::Associations" do
         with(:vehicles, Manufacturer, { :min => 1, :max => 2 }).
         and_return(@relationship)
 
-      class Manufacturer
+      class ::Manufacturer
         has(1..2, :vehicles, :min => 5, :max => 10).should == mock_relationship
       end
     end
@@ -130,7 +130,7 @@ describe "DataMapper::Associations" do
           with(:halo_car, Manufacturer, { :min => 1, :max => 1 }).
           and_return(@relationship)
 
-        class Manufacturer
+        class ::Manufacturer
           has(1, :halo_car).should == mock_relationship
         end
       end
@@ -140,7 +140,7 @@ describe "DataMapper::Associations" do
           with(:halo_car, Manufacturer, { :min => 0, :max => 1 }).
           and_return(@relationship)
 
-        class Manufacturer
+        class ::Manufacturer
           has(0..1, :halo_car).should == mock_relationship
         end
       end
@@ -150,7 +150,7 @@ describe "DataMapper::Associations" do
           with(:halo_car, Manufacturer, { :min => 1, :max => 1, :class_name => 'Car' }).
           and_return(@relationship)
 
-        class Manufacturer
+        class ::Manufacturer
           has(1, :halo_car, :class_name => 'Car').should == mock_relationship
         end
       end
@@ -162,7 +162,7 @@ describe "DataMapper::Associations" do
           with(:vehicles, Manufacturer, { :min => 0, :max => @n }).
           and_return(@relationship)
 
-        class Manufacturer
+        class ::Manufacturer
           has(n, :vehicles).should == mock_relationship
         end
       end
@@ -172,7 +172,7 @@ describe "DataMapper::Associations" do
           with(:vehicles, Manufacturer, { :min => 4, :max => 4 }).
           and_return(@relationship)
 
-        class Manufacturer
+        class ::Manufacturer
           has(4, :vehicles).should == mock_relationship
         end
       end
@@ -182,7 +182,7 @@ describe "DataMapper::Associations" do
           with(:vehicles, Manufacturer, { :min => 2, :max => 4 }).
           and_return(@relationship)
 
-        class Manufacturer
+        class ::Manufacturer
           has(2..4, :vehicles).should == mock_relationship
         end
       end
@@ -192,7 +192,7 @@ describe "DataMapper::Associations" do
           with(:vehicles, Manufacturer, { :min => 1, :max => @n, :class_name => 'Car' }).
           and_return(@relationship)
 
-        class Manufacturer
+        class ::Manufacturer
           has(1..n, :vehicles, :class_name => 'Car').should == mock_relationship
         end
       end
@@ -200,7 +200,7 @@ describe "DataMapper::Associations" do
       # do not remove or change this spec.
       it "should raise an exception when n..n is used for the cardinality" do
         lambda do
-          class Manufacturer
+          class ::Manufacturer
             has n..n, :subsidiaries, :class_name => 'Manufacturer'
           end
         end.should raise_error(ArgumentError)
@@ -211,7 +211,7 @@ describe "DataMapper::Associations" do
           with(:suppliers, Vehicle, { :min => 0, :max => @n, :through => :manufacturers }).
           and_return(@relationship)
 
-        class Vehicle
+        class ::Vehicle
           has(n, :suppliers, :through => :manufacturers).should == mock_relationship
         end
       end
@@ -224,7 +224,7 @@ describe "DataMapper::Associations" do
         with(:vehicle, Manufacturer, {}).
         and_return(@relationship)
 
-      class Manufacturer
+      class ::Manufacturer
         belongs_to(:vehicle).should == mock_relationship
       end
     end
@@ -234,7 +234,7 @@ describe "DataMapper::Associations" do
         with(:vehicle, Manufacturer, { :class_name => 'Car' }).
         and_return(@relationship)
 
-      class Manufacturer
+      class ::Manufacturer
         belongs_to(:vehicle, :class_name => 'Car').should == mock_relationship
       end
     end