sam-dm-core 0.9.10 → 0.9.11

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

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/models/content.rb

@@ -0,0 +1,16 @@
+module Content
+  class Dialect
+    include DataMapper::Resource
+
+    property :id,   Serial
+    property :name, String
+    property :code, String
+  end
+
+  class Locale
+    include DataMapper::Resource
+
+    property :id,   Serial
+    property :name, String
+  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

@@ -0,0 +1,98 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', "..", 'spec_helper'))
+
+describe DataMapper::Adapters::InMemoryAdapter do
+  before do
+    DataMapper.setup(:inmem, :adapter => 'in_memory')
+
+    class ::Heffalump
+      include DataMapper::Resource
+
+      def self.default_repository_name
+        :inmem
+      end
+
+      property :color,      String, :key => true # TODO: Drop the 'must have a key' limitation
+      property :num_spots,  Integer
+      property :striped,    Boolean
+    end
+
+    @heff1 = Heffalump.create(:color => 'Black', :num_spots => 0,   :striped => true)
+    @heff2 = Heffalump.create(:color => 'Brown', :num_spots => 25,  :striped => false)
+    @heff3 = Heffalump.create(:color => 'Blue',  :num_spots => nil, :striped => false)
+  end
+
+  it 'should successfully save an object' do
+    @heff1.new_record?.should be_false
+  end
+
+  it 'should be able to get the object' do
+    Heffalump.get('Black').should == @heff1
+  end
+
+  it 'should be able to get all the objects' do
+    Heffalump.all.should == [@heff1, @heff2, @heff3]
+  end
+
+  it 'should be able to search for objects with equal value' do
+    Heffalump.all(:striped => true).should == [@heff1]
+  end
+
+  it 'should be able to search for objects included in an array of values' do
+    Heffalump.all(:num_spots => [ 25, 50, 75, 100 ]).should == [@heff2]
+  end
+
+  it 'should be able to search for objects included in a range of values' do
+    Heffalump.all(:num_spots => 25..100).should == [@heff2]
+  end
+
+  it 'should be able to search for objects with nil value' do
+    Heffalump.all(:num_spots => nil).should == [@heff3]
+  end
+
+  it 'should be able to search for objects with not equal value' do
+    Heffalump.all(:striped.not => true).should == [@heff2, @heff3]
+  end
+
+  it 'should be able to search for objects not included in an array of values' do
+    Heffalump.all(:num_spots.not => [ 25, 50, 75, 100 ]).should == [@heff1, @heff3]
+  end
+
+  it 'should be able to search for objects not included in a range of values' do
+    Heffalump.all(:num_spots.not => 25..100).should == [@heff1, @heff3]
+  end
+
+  it 'should be able to search for objects with not nil value' do
+    Heffalump.all(:num_spots.not => nil).should == [@heff1, @heff2]
+  end
+
+  it 'should be able to search for objects that match value' do
+    Heffalump.all(:color.like => 'Bl').should == [@heff1, @heff3]
+  end
+
+  it 'should be able to search for objects with value greater than' do
+    Heffalump.all(:num_spots.gt => 0).should == [@heff2]
+  end
+
+  it 'should be able to search for objects with value greater than or equal to' do
+    Heffalump.all(:num_spots.gte => 0).should == [@heff1, @heff2]
+  end
+
+  it 'should be able to search for objects with value less than' do
+    Heffalump.all(:num_spots.lt => 1).should == [@heff1]
+  end
+
+  it 'should be able to search for objects with value less than or equal to' do
+    Heffalump.all(:num_spots.lte => 0).should == [@heff1]
+  end
+
+  it 'should be able to update an object' do
+    @heff1.num_spots = 10
+    @heff1.save
+    Heffalump.get('Black').num_spots.should == 10
+  end
+
+  it 'should be able to destroy an object' do
+    @heff1.destroy
+    Heffalump.all.size.should == 2
+  end
+end