sam-dm-core 0.9.6 → 0.9.7

data/script/profile.rb

@@ -4,10 +4,10 @@ require File.join(File.dirname(__FILE__), '..', 'lib', 'dm-core')
 
 require 'rubygems'
 
-gem 'ruby-prof', '>=0.6.0'
+gem 'ruby-prof', '~>0.7.1'
 require 'ruby-prof'
 
-gem 'faker', '>=0.3.1'
+gem 'faker', '~>0.3.1'
 require 'faker'
 
 OUTPUT = DataMapper.root / 'profile_results.txt'

data/spec/integration/association_spec.rb

@@ -302,6 +302,18 @@ if ADAPTER
         area.should respond_to(:machine=)
       end
 
+      it 'should create the foreign key property immediately' do
+        class Duck
+          include DataMapper::Resource
+          property :id, Serial
+          belongs_to :sky
+        end
+        Duck.properties.slice(:sky_id).compact.should_not be_empty
+        duck = Duck.new
+        duck.should respond_to(:sky_id)
+        duck.should respond_to(:sky_id=)
+      end
+
       it 'should load without the parent'
 
       it 'should allow substituting the parent' do
@@ -331,7 +343,7 @@ if ADAPTER
             end
           end
 
-          FlightlessBirds::Ostrich.properties.slice(:sky_id).should_not be_empty
+          FlightlessBirds::Ostrich.properties(ADAPTER).slice(:sky_id).compact.should_not be_empty
         end
       end
 

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/auto_migrations_spec.rb

@@ -39,7 +39,10 @@ class EveryType
 end
 
 module Publications
-  class ShortStoryCollection
+  class StoryCollection
+  end
+
+  class ShortStoryCollection < StoryCollection
     include DataMapper::Resource
     property :serial, Serial
     property :date,   Date,    :nullable => false, :default => TODAY, :index => :date_date_time
@@ -153,6 +156,10 @@ if HAS_SQLITE3
         end
       end
 
+      it 'should handle a model which inherits from a regular object' do
+        lambda { Publications::ShortStoryCollection.auto_migrate!(:sqlite3) }.should_not raise_error
+      end
+
       it 'should escape a namespaced model' do
         Publications::ShortStoryCollection.auto_migrate!(:sqlite3).should be_true
         @adapter.query('SELECT "name" FROM "sqlite_master" WHERE type = ?', 'table').should include('publications_short_story_collections')
@@ -259,6 +266,10 @@ if HAS_MYSQL
         end
       end
 
+      it 'should handle a model which inherits from a regular object' do
+        lambda { Publications::ShortStoryCollection.auto_migrate!(:mysql) }.should_not raise_error
+      end
+
       it 'should escape a namespaced model' do
         Publications::ShortStoryCollection.auto_migrate!(:mysql).should be_true
         @adapter.query('SHOW TABLES').should include('publications_short_story_collections')
@@ -389,6 +400,10 @@ if HAS_POSTGRES
         pending 'TODO'
       end
 
+      it 'should handle a model which inherits from a regular object' do
+        lambda { Publications::ShortStoryCollection.auto_migrate!(:postgres) }.should_not raise_error
+      end
+
       it 'should escape a namespaced model' do
         Publications::ShortStoryCollection.auto_migrate!(:postgres).should be_true
         @adapter.query('SELECT "tablename" FROM "pg_tables" WHERE "tablename" NOT LIKE ?', 'pg_%').should include('publications_short_story_collections')

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

@@ -1,6 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
-gem 'fastercsv', '>=1.2.3'
+gem 'fastercsv', '~>1.4.0'
 require 'fastercsv'
 
 if ADAPTER
@@ -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/resource_spec.rb

@@ -21,6 +21,12 @@ if ADAPTER
       lambda { @zoo.destroy.should be_true }.should_not raise_error
     end
 
+    it 'should not overwrite attributes when lazy loading' do
+      zoo = Zoo.first
+      zoo.name = 'San Diego'
+      lambda { zoo.description }.should_not change(zoo, :name)
+    end
+
     describe '#attribute_get' do
       it 'should provide #attribute_get' do
         Zoo.new.should respond_to(:attribute_get)

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

@@ -1,6 +1,6 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
-gem 'fastercsv', '>=1.2.3'
+gem 'fastercsv', '~>1.4.0'
 require 'fastercsv'
 
 if ADAPTER

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/zoo.rb

@@ -7,6 +7,7 @@ class Zoo
   property :inception,    DateTime
   property :open,         Boolean,  :default => false
   property :size,         Integer
+  property :mission,      Text, :writer => :protected
 
   has n, :animals
 

data/spec/spec_helper.rb

@@ -1,7 +1,8 @@
+require 'pathname'
 require 'rubygems'
-gem 'rspec', '>=1.1.3'
+
+gem 'rspec', '~>1.1.11'
 require 'spec'
-require 'pathname'
 
 SPEC_ROOT = Pathname(__FILE__).dirname.expand_path
 require SPEC_ROOT.parent + 'lib/dm-core'

data/spec/unit/adapters/data_objects_adapter_spec.rb

@@ -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
 

data/spec/unit/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 do
 
-  load_models_for_metaphor :vehicles
+  load_models_for_metaphor :vehicles, :content
 
   it 'should allow a declaration' do
     lambda do
@@ -11,6 +11,21 @@ describe DataMapper::Associations::ManyToMany do
       end
     end.should_not raise_error
   end
+
+  it 'should handle models inside modules' do
+    lambda do
+      module Content
+        class Dialect
+          has n, :locales, :through => Resource, :class_name => "Language::Locale"
+        end
+
+        class Locale
+          has n, :dialects, :through => Resource, :class_name => "Language::Dialect"
+        end
+      end
+    end.should_not raise_error
+  end
+
 end
 
 describe DataMapper::Associations::ManyToMany::Proxy do

data/spec/unit/associations/many_to_one_spec.rb

@@ -19,7 +19,7 @@ describe DataMapper::Associations::ManyToOne::Proxy do
 
   before do
     @child        = mock('child', :kind_of? => true)
-    @parent       = mock('parent')
+    @parent       = mock('parent', :nil? => false, :new_record? => false)
     @relationship = mock('relationship', :kind_of? => true, :get_parent => @parent, :attach_parent => nil)
     @association  = DataMapper::Associations::ManyToOne::Proxy.new(@relationship, @child)
 
@@ -30,6 +30,13 @@ describe DataMapper::Associations::ManyToOne::Proxy do
     @association.should respond_to(:replace)
   end
 
+  describe '#class' do
+    it 'should be forwarded to parent' do
+      @parent.should_receive(:class).and_return(Manufacturer)
+      @association.class.should == Manufacturer
+    end
+  end
+
   describe '#replace' do
     before do
       @other = mock('other parent')
@@ -62,7 +69,7 @@ describe DataMapper::Associations::ManyToOne::Proxy do
   describe '#save' do
     describe 'when the parent is nil' do
       before do
-        @parent.should_receive(:nil?).with(no_args).and_return(true)
+        @parent.stub!(:nil?).and_return(true)
       end
 
       it 'should not save the parent' do