dm-core 0.9.5 → 0.9.6

data/spec/integration/associations/one_to_many_spec.rb

@@ -103,6 +103,22 @@ describe "OneToMany" do
     end
   end
 
+  describe "parent initialized child" do
+    before(:each) do
+      @ajax = Team.create
+      @vandesar = @ajax.players.new
+      @vandesar.save
+    end
+
+    it "child association should return parent" do
+      @vandesar.team.should == @ajax
+    end
+
+    it "parent association should return children" do
+      @ajax.players.should == [@vandesar]
+    end
+  end
+
   it "unsaved parent model should accept array of hashes for association" do
     players = [{ :name => "Brett Favre" }, { :name => "Reggie White" }]
 
@@ -139,12 +155,33 @@ describe "OneToMany" do
   end
 
   describe "STI" do
-    it "should work" do
+    before(:all) do
+      repository(ADAPTER) do
+        @player = Player.create(:name => "Barry Bonds", :team => BaseballTeam.first)
+      end
+    end
+
+    it "should work for child.parent" do
       repository(ADAPTER) do
-        Player.create(:name => "Barry Bonds", :team => BaseballTeam.first)
+        @player.team.should == BaseballTeam.first
       end
+    end
+
+    it "should work for parent.children" do
+      repository(ADAPTER) do
+        team = BaseballTeam.first
+
+        team.players.size.should > 0
+        team.players.each{|p| p.should be_an_instance_of(Player)}
+      end
+    end
+  end
+
+  describe "alone" do
+    it "should work for parent.children without any parents in IM" do
       repository(ADAPTER) do
-        Player.first.team.should == BaseballTeam.first
+        team = BaseballTeam.first
+        team.players.each{|p| p.should be_an_instance_of(Player)}
       end
     end
   end

data/spec/integration/dependency_queue_spec.rb

@@ -6,18 +6,6 @@ describe "DataMapper::DependencyQueue" do
     @dependencies = @q.instance_variable_get("@dependencies")
   end
 
-  describe "#initialize" do
-    describe "@dependencies" do
-      it "should be a hash after initialize" do
-        @dependencies.should be_a_kind_of(Hash)
-      end
-
-      it "should set value to [] when new key is accessed" do
-        @dependencies['New Key'].should == []
-      end
-    end
-  end
-
   describe "#add" do
     it "should store the supplied callback in @dependencies" do
       @q.add('MissingConstant') { true }

data/spec/integration/postgres_adapter_spec.rb

@@ -127,7 +127,7 @@ if HAS_POSTGRES
 
         class Voyager
           include DataMapper::Resource
-          storage_names[:postgres] = 'sattellites.voyagers'
+          storage_names[:postgres] = 'voyagers'
 
           property :id, Serial
           property :age, Integer

data/spec/integration/property_spec.rb

@@ -61,7 +61,7 @@ if ADAPTER
           jon.original_values[:location].should == 'dallas'
 
           jon.dirty?.should be_false
-          jon.save.should be_false
+          jon.save.should be_true
 
           jon.location.upcase!
           jon.location.should == 'DALLAS'
@@ -115,10 +115,10 @@ if ADAPTER
           tim = Actor.first(:name => 'tim')
           tim.notes # make sure they're loaded...
           tim.dirty?.should be_false
-          tim.save.should be_false
+          tim.save.should be_true
           tim.notes = "Testing"
           tim.dirty?.should be_true
-          tim.save
+          tim.save.should be_true
         end
         repository(ADAPTER) do
           tim = Actor.first(:name => 'tim')

data/spec/integration/query_spec.rb

@@ -128,7 +128,7 @@ if ADAPTER
     describe '#unique' do
       include LoggingHelper
 
-      before do
+      before(:each) do
         QuerySpec::SailBoat.auto_migrate!
 
         QuerySpec::SailBoat.create(:name => 'A', :port => 'C')
@@ -203,7 +203,7 @@ if ADAPTER
     end
 
     describe 'when ordering' do
-      before do
+      before(:each) do
         QuerySpec::SailBoat.auto_migrate!
 
         QuerySpec::SailBoat.create(:name => 'A', :port => 'C')
@@ -258,12 +258,43 @@ if ADAPTER
 
           find = QuerySpec::SailBoat.all(:id.not => [1,2])
           find.should have(1).entries
+        end
+      end
+
+      describe "conditions passed in as an empty array" do
+        it "should work when id is an empty Array" do
+          repository(ADAPTER) do
+            find = QuerySpec::SailBoat.all(:id => [])
+            find.should have(0).entries
+          end
+        end
 
-          find = QuerySpec::SailBoat.all(:id => [])
-          find.should have(0).entries
+        it "should work when id is NOT an empty Array" do
+          repository(ADAPTER) do
+            find = QuerySpec::SailBoat.all(:id.not => [])
+            find.should have(3).entries
+          end
+        end
 
-          find = QuerySpec::SailBoat.all(:id.not => [])
-          find.should have(3).entries
+        it "should work when id is an empty Array and other conditions are specified" do
+          repository(ADAPTER) do
+            find = QuerySpec::SailBoat.all(:id => [], :name => "A")
+            find.should have(0).entries
+          end
+        end
+
+        it "should work when id is NOT an empty Array and other conditions are specified" do
+          repository(ADAPTER) do
+            find = QuerySpec::SailBoat.all(:id.not => [], :name => "A")
+            find.should have(1).entries
+          end
+        end
+
+        it "should work when id is NOT an empty Array and other Array conditions are specified" do
+          repository(ADAPTER) do
+            find = QuerySpec::SailBoat.all(:id.not => [], :name => ["A", "B"])
+            find.should have(2).entries
+          end
         end
       end
 
@@ -301,7 +332,7 @@ if ADAPTER
     end
 
     describe 'when sub-selecting' do
-      before do
+      before(:each) do
         [ QuerySpec::SailBoat, QuerySpec::Permission ].each { |m| m.auto_migrate! }
 
         QuerySpec::SailBoat.create(:id => 1, :name => "Fantasy I",      :port => "Cape Town", :captain => 'Joe')
@@ -347,7 +378,7 @@ if ADAPTER
     end  # describe sub-selecting
 
     describe 'when linking associated objects' do
-      before do
+      before(:each) do
         [ QuerySpec::Region, QuerySpec::Factory, QuerySpec::Vehicle ].each { |m| m.auto_migrate! }
 
         QuerySpec::Region.create(:id => 1, :name => 'North West', :type => 'commercial')

data/spec/integration/resource_spec.rb

@@ -77,9 +77,11 @@ if ADAPTER
       end
 
       it "should return a different hash value for different objects of the same type" do
-        e1 = Employee.create(:name => "John")
-        e2 = Employee.create(:name => "Dan")
-        e1.hash.should_not == e2.hash
+        repository(ADAPTER) do
+          e1 = Employee.create(:name => "John")
+          e2 = Employee.create(:name => "Dan")
+          e1.hash.should_not == e2.hash
+        end
       end
 
       it "should return a different hash value for different types of objects with the same key"
@@ -96,9 +98,11 @@ if ADAPTER
     describe '#key' do
       describe "original_value[:key]" do
         it "should be used when an existing resource's key changes" do
-          employee = Employee.create(:name => "John")
-          employee.name = "Jon"
-          employee.key.should == ["John"]
+          repository(ADAPTER) do
+            employee = Employee.create(:name => "John")
+            employee.name = "Jon"
+            employee.key.should == ["John"]
+          end
         end
 
         it "should be used when saving an existing resource" do

data/spec/integration/sti_spec.rb

@@ -204,5 +204,27 @@ if HAS_SQLITE3
         SpaceWestern.properties[:title].should_not be_nil
       end
     end
+
+    describe "with a child class" do
+      before :all do
+        Book.auto_migrate!(:sqlite3)
+        repository(:sqlite3) do
+          ShortStory.create(
+            :title => "The Science of Happiness",
+            :isbn => "129038",
+            :moral => "Bullshit might get you to the top, but it won't keep you there.")
+        end
+      end
+
+      it "should be able to access the properties from the parent collection" do
+        repository(:sqlite3) do
+          Book.all.each do |book|
+            book.title.should_not be_nil
+            book.isbn.should_not be_nil
+            book.moral.should_not be_nil
+          end
+        end
+      end
+    end
   end
 end

data/spec/integration/strategic_eager_loading_spec.rb

@@ -64,8 +64,12 @@ describe "Strategic Eager Loading" do
       zoos = Zoo.all.entries # load all zoos
       dallas = zoos.find { |z| z.name == 'Dallas Zoo' }
 
-      dallas.exhibits.entries # load all exhibits for zoos in identity_map
-      dallas.exhibits.size.should == 1
+      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
 
@@ -88,16 +92,21 @@ describe "Strategic Eager Loading" do
       dallas = Zoo.all.entries.find { |z| z.name == 'Dallas Zoo' }
       exhibits = dallas.exhibits.entries # load all exhibits
 
+      reptiles, primates = nil, nil
+
       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 == 2
+        log.readlines.size.should == 1
       end
+
+      primates.should_not == reptiles
     end
   end
 
@@ -109,7 +118,12 @@ describe "Strategic Eager Loading" do
     repository(ADAPTER) do
       animals = Animal.all.entries
       bear = animals.find { |a| a.name == 'Brown Bear' }
-      bear.exhibit
+
+      logger do |log|
+        bear.exhibit
+        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
@@ -124,6 +138,7 @@ describe "Strategic Eager Loading" do
         animal.exhibit # load exhibit from IM
         log.readlines.should be_empty
       end
+
       repository.identity_map(Exhibit).keys.should == [exhibit.key]
     end
   end

data/spec/integration/type_spec.rb

@@ -198,6 +198,7 @@ if ADAPTER
       before(:all) do
         DataMapper::Repository.adapters[:alternate_paranoid] = repository(ADAPTER).adapter.dup
 
+        Object.send(:remove_const, :Orange) if defined?(Orange)
         class Orange
           include DataMapper::Resource
 

data/spec/lib/model_loader.rb

@@ -81,7 +81,16 @@ module ModelLoader
 
     def remove_model(klass)
       DataMapper::Resource.descendants.delete(klass)
-      Object.module_eval { remove_const klass.to_s }
+      # Check to see if the model is living inside a module
+      klass_name = klass.to_s
+      if klass_name.index("::")
+        mod = klass_name.match(/(\S+)::/)[1]
+        child_class = klass_name.match(/\S+::(\S+)/)[1]
+
+        Object.const_get(mod).module_eval { remove_const child_class }
+      else
+        Object.module_eval { remove_const klass.to_s }
+      end
     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

@@ -12,7 +12,10 @@ Dir[DataMapper.root / 'spec' / 'lib' / '*.rb'].each do |file|
 end
 
 # setup mock adapters
-[ :default, :mock, :legacy, :west_coast, :east_coast ].each do |repository_name|
+DataMapper.setup(:default, "sqlite3::memory:")
+DataMapper.setup(:default2, "sqlite3::memory:")
+
+[ :mock, :legacy, :west_coast, :east_coast ].each do |repository_name|
   DataMapper.setup(repository_name, "mock://localhost/#{repository_name}")
 end
 

data/spec/unit/adapters/data_objects_adapter_spec.rb

@@ -73,7 +73,7 @@ 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)
+        @connection.should_receive(:create_command).twice.with('SELECT "name" FROM "plupps" WHERE ("name" = ?) ORDER BY "id"').and_return(@command)
         @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)
@@ -116,7 +116,7 @@ describe DataMapper::Adapters::DataObjectsAdapter do
 
       adapter = DataMapper::Adapters::DataObjectsAdapter.new(:spec, options)
       adapter.uri.should ==
-        Addressable::URI.parse("mysql://me:mypass@davidleal.com:5000/you_can_call_me_al?socket=nosock")
+        DataObjects::URI.parse("mysql://me:mypass@davidleal.com:5000/you_can_call_me_al?socket=nosock")
     end
 
     it 'should transform a minimal options hash into a URI' do
@@ -126,12 +126,12 @@ describe DataMapper::Adapters::DataObjectsAdapter do
       }
 
       adapter = DataMapper::Adapters::DataObjectsAdapter.new(:spec, options)
-      adapter.uri.should == Addressable::URI.parse("mysql:you_can_call_me_al")
+      adapter.uri.should == DataObjects::URI.parse("mysql:you_can_call_me_al")
     end
 
     it 'should accept the uri when no overrides exist' do
       uri = Addressable::URI.parse("protocol:///")
-      DataMapper::Adapters::DataObjectsAdapter.new(:spec, uri).uri.should == uri
+      DataMapper::Adapters::DataObjectsAdapter.new(:spec, uri).uri.should == DataObjects::URI.parse(uri)
     end
   end
 
@@ -271,7 +271,7 @@ describe DataMapper::Adapters::DataObjectsAdapter do
 
           @model.should_receive(:load).with(@values, @query).and_return(@resource)
 
-          @statement = 'SELECT "models"."property" FROM "models" INNER JOIN "parents" ON "parents"."id" = "models"."property" WHERE "models"."property" = ? ORDER BY "models"."property" DESC LIMIT 1 OFFSET 222'
+          @statement = 'SELECT "models"."property" FROM "models" INNER JOIN "parents" ON ("parents"."id" = "models"."property") WHERE ("models"."property" = ?) ORDER BY "models"."property" DESC LIMIT 1 OFFSET 222'
         end
 
         define_method(:do_read) do
@@ -281,7 +281,7 @@ describe DataMapper::Adapters::DataObjectsAdapter do
         end
       elsif method == :read_many
         before do
-          @statement = 'SELECT "models"."property" FROM "models" INNER JOIN "parents" ON "parents"."id" = "models"."property" WHERE "models"."property" = ? ORDER BY "models"."property" DESC LIMIT 111 OFFSET 222'
+          @statement = 'SELECT "models"."property" FROM "models" INNER JOIN "parents" ON ("parents"."id" = "models"."property") WHERE ("models"."property" = ?) ORDER BY "models"."property" DESC LIMIT 111 OFFSET 222'
         end
 
         define_method(:do_read) do
@@ -310,7 +310,7 @@ describe DataMapper::Adapters::DataObjectsAdapter do
         @bind_values << other_value
         @conditions << [ :eql, other_property, other_value ]
 
-        @statement = %[SELECT "models"."property" FROM "models" INNER JOIN "parents" ON "parents"."id" = "models"."property" WHERE "models"."property" = ? AND "models"."other" = ? ORDER BY "models"."property" DESC LIMIT #{method == :read_one ? '1' : '111'} OFFSET 222]
+        @statement = %[SELECT "models"."property" FROM "models" INNER JOIN "parents" ON ("parents"."id" = "models"."property") WHERE ("models"."property" = ?) AND ("models"."other" = ?) ORDER BY "models"."property" DESC LIMIT #{method == :read_one ? '1' : '111'} OFFSET 222]
         @query.should_receive(:conditions).with(no_args).twice.and_return(@conditions)
 
         @connection.should_receive(:create_command).with(@statement).and_return(@command)
@@ -358,7 +358,7 @@ describe DataMapper::Adapters::DataObjectsAdapter do
       @conditions  = [ [ :eql, @property, @bind_values[0] ] ]
       @attributes  = mock('attributes', :kind_of? => true, :empty? => false, :keys => [ @property ], :values => @values)
       @query       = mock('query', :kind_of? => true, :model => @model, :links => [], :conditions => @conditions, :bind_values => @bind_values)
-      @statement   = 'UPDATE "models" SET "property" = ? WHERE "property" = ?'
+      @statement   = 'UPDATE "models" SET "property" = ? WHERE ("property" = ?)'
     end
 
     def do_update
@@ -385,7 +385,7 @@ describe DataMapper::Adapters::DataObjectsAdapter do
 
       @query.should_receive(:conditions).with(no_args).twice.and_return(@conditions)
 
-      @statement   = 'UPDATE "models" SET "property" = ? WHERE "property" = ? AND "other" = ?'
+      @statement   = 'UPDATE "models" SET "property" = ? WHERE ("property" = ?) AND ("other" = ?)'
       @adapter.should_receive(:execute).with(@statement, *%w[ new ] + @bind_values).and_return(@result)
 
       do_update.should == 1
@@ -414,7 +414,7 @@ describe DataMapper::Adapters::DataObjectsAdapter do
       @conditions  = [ [ :eql, @property, @bind_values[0] ] ]
       @query       = mock('query', :kind_of? => true, :model => @model, :links => [], :conditions => @conditions, :bind_values => @bind_values)
       @resource    = mock('resource', :to_query => @query)
-      @statement   = 'DELETE FROM "models" WHERE "property" = ?'
+      @statement   = 'DELETE FROM "models" WHERE ("property" = ?)'
     end
 
     def do_delete
@@ -440,7 +440,7 @@ describe DataMapper::Adapters::DataObjectsAdapter do
 
       @query.should_receive(:conditions).with(no_args).twice.and_return(@conditions)
 
-      @statement = 'DELETE FROM "models" WHERE "property" = ? AND "other" = ?'
+      @statement = 'DELETE FROM "models" WHERE ("property" = ?) AND ("other" = ?)'
       @adapter.should_receive(:execute).with(@statement, *@bind_values).and_return(@result)
 
       do_delete.should == 1