dm-core 0.9.2 → 0.9.3

data/spec/lib/model_loader.rb

@@ -0,0 +1,91 @@
+# ---
+# Overview
+# ========
+# ModelLoader is a method for loading methods models for specs in a way
+# that will ensure that each spec will be an a pristine state when run.
+#
+# The problem is that if a spec needs to modify a model, the modifications
+# should not carry over to the next spec. As such, all models are
+# destroyed at the end of the spec and reloaded at the start.
+#
+# The second problem is that DataMapper::Resource keeps track
+# of every class that it is included in. This is used for automigration.
+# A number of specs run automigrate, and we don't want all the classes
+# that were defined in other specs to be migrated as well.
+#
+# Usage
+# =====
+#
+# Sets the specified model metaphors to be loaded before each spec and
+# destroyed after each spec in the current example group. This method
+# can be used in a describe block or in a before block.
+#
+# ==== Parameters
+# *metaphor<Symbol>:: The name of the metaphor to load (this is just the filename of
+#               file in specs/models)
+#
+# ==== Example
+#
+# describe "DataMapper::Associations" do
+#
+#   load_models_for_metaphor :zoo, :blog
+#
+#   it "should be awesome" do
+#     Zoo.new.should be_awesome
+#   end
+# end
+module ModelLoader
+
+  def self.included(base)
+    base.extend(ClassMethods)
+    base.class_eval { include InstanceMethods }
+    # base.before(:each) { load_models(:global) }
+    base.after(:each)  { unload_models }
+  end
+
+  module ClassMethods
+
+    def load_models_for_metaphor(*metaphors)
+      before(:each) { load_models_for_metaphor(*metaphors) }
+    end
+
+  end
+
+  module InstanceMethods
+
+    def load_models_for_metaphor(*metaphors)
+      files = metaphors.map { |m| DataMapper.root / "spec" / "models" / "#{m}.rb" }
+
+      klasses = object_space_classes.dup
+      files.each { |file| load file }
+      loaded_models.concat(object_space_classes - klasses)
+    end
+
+    def unload_models
+      while model = loaded_models.pop
+        remove_model(model)
+      end
+    end
+
+    def loaded_models
+      @loaded_models ||= []
+    end
+
+  private
+
+    def object_space_classes
+      klasses = []
+      ObjectSpace.each_object(Class) {|o| klasses << o}
+      klasses
+    end
+
+    def remove_model(klass)
+      DataMapper::Resource.descendants.delete(klass)
+      Object.module_eval { remove_const klass.to_s }
+    end
+  end
+end
+
+Spec::Runner.configure do |config|
+  config.include(ModelLoader)
+end

data/spec/lib/publicize_methods.rb

@@ -0,0 +1,28 @@
+class Class
+  def publicize_methods
+    klass = class << self; self; end
+
+    saved_private_class_methods      = klass.private_instance_methods
+    saved_protected_class_methods    = klass.protected_instance_methods
+    saved_private_instance_methods   = self.private_instance_methods
+    saved_protected_instance_methods = self.protected_instance_methods
+
+    self.class_eval do
+      klass.send(:public, *saved_private_class_methods)
+      klass.send(:public, *saved_protected_class_methods)
+      public(*saved_private_instance_methods)
+      public(*saved_protected_instance_methods)
+    end
+
+    begin
+      yield
+    ensure
+      self.class_eval do
+        klass.send(:private, *saved_private_class_methods)
+        klass.send(:protected, *saved_protected_class_methods)
+        private(*saved_private_instance_methods)
+        protected(*saved_protected_instance_methods)
+      end
+    end
+  end
+end

data/spec/models/vehicles.rb

@@ -0,0 +1,34 @@
+# ==========================
+# Used for Association specs
+# ---
+# These models will probably
+# end up removed. So, I wouldn't
+# use this metaphor
+class Vehicle
+  include DataMapper::Resource
+
+  property :id, Serial
+  property :name, String
+
+  class << self
+    attr_accessor :mock_relationship
+  end
+end
+
+class Manufacturer
+  include DataMapper::Resource
+
+  property :id, Serial
+  property :name, String
+
+  class << self
+    attr_accessor :mock_relationship
+  end
+end
+
+class Supplier
+  include DataMapper::Resource
+
+  property :id, Serial
+  property :name, String
+end

data/spec/models/zoo.rb

@@ -0,0 +1,48 @@
+class Zoo
+  include DataMapper::Resource
+
+  property :id,           Serial
+  property :name,         String
+  property :description,  Text
+  property :inception,    DateTime
+  property :open,         Boolean,  :default => false
+  property :size,         Integer
+
+  has n, :animals
+  
+  def to_s
+    name
+  end
+end
+
+class Species
+  include DataMapper::Resource
+
+  property :id,             Serial
+  property :name,           String
+  property :classification, String, :reader => :private
+
+  has n, :animals
+end
+
+class Animal
+  include DataMapper::Resource
+
+  property :id,   Serial
+  property :name, String
+
+  belongs_to :zoo
+  belongs_to :species
+  belongs_to :keeper
+end
+
+class Employee
+  include DataMapper::Resource
+
+  property :id,   Serial
+  property :name, String
+end
+
+class Keeper < Employee
+  has n, :animals
+end

data/spec/spec.opts

@@ -0,0 +1,3 @@
+--colour
+--loadby random
+--format progress

data/spec/spec_helper.rb

@@ -3,8 +3,13 @@ gem 'rspec', '>=1.1.3'
 require 'spec'
 require 'pathname'
 
-require Pathname(__FILE__).dirname.expand_path.parent + 'lib/dm-core'
-require DataMapper.root / 'spec' / 'lib' / 'mock_adapter'
+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|
+  require file
+end
 
 # setup mock adapters
 [ :default, :mock, :legacy, :west_coast, :east_coast ].each do |repository_name|
@@ -33,6 +38,22 @@ HAS_POSTGRES = setup_adapter(:postgres, 'postgres://postgres@localhost/dm_core_t
 
 DataMapper::Logger.new(nil, :debug)
 
+# ----------------------------------------------------------------------
+# --- Do not declare new models unless absolutely necessary. Instead ---
+# --- pick a metaphor and use those models. If you do need new       ---
+# --- models, define them according to the metaphor being used.      ---
+# ----------------------------------------------------------------------
+
+Spec::Runner.configure do |config|
+  config.before(:each) do
+    # load_models_for_metaphor :vehicles
+  end
+end
+
+# ----------------------------------------------------------------------
+# --- All these models are going to be removed. Don't use them!!!    ---
+# ----------------------------------------------------------------------
+
 class Article
   include DataMapper::Resource
 
@@ -45,68 +66,10 @@ end
 
 class Comment
   include DataMapper::Resource
+  
+  property :id,         Serial # blah
 end
 
 class NormalClass
   # should not include DataMapper::Resource
 end
-
-# ==========================
-# Used for Association specs
-class Vehicle
-  include DataMapper::Resource
-
-  property :id, Serial
-  property :name, String
-
-  class << self
-    attr_accessor :mock_relationship
-  end
-end
-
-class Manufacturer
-  include DataMapper::Resource
-
-  property :id, Serial
-  property :name, String
-
-  class << self
-    attr_accessor :mock_relationship
-  end
-end
-
-class Supplier
-  include DataMapper::Resource
-
-  property :id, Serial
-  property :name, String
-end
-
-class Class
-  def publicize_methods
-    klass = class << self; self; end
-
-    saved_private_class_methods      = klass.private_instance_methods
-    saved_protected_class_methods    = klass.protected_instance_methods
-    saved_private_instance_methods   = self.private_instance_methods
-    saved_protected_instance_methods = self.protected_instance_methods
-
-    self.class_eval do
-      klass.send(:public, *saved_private_class_methods)
-      klass.send(:public, *saved_protected_class_methods)
-      public(*saved_private_instance_methods)
-      public(*saved_protected_instance_methods)
-    end
-
-    begin
-      yield
-    ensure
-      self.class_eval do
-        klass.send(:private, *saved_private_class_methods)
-        klass.send(:protected, *saved_protected_class_methods)
-        private(*saved_private_instance_methods)
-        protected(*saved_protected_instance_methods)
-      end
-    end
-  end
-end

data/spec/unit/adapters/data_objects_adapter_spec.rb

@@ -247,6 +247,7 @@ describe DataMapper::Adapters::DataObjectsAdapter do
         @order     = [ @direction ]
 
         @query = mock('query', :model => @model, :kind_of? => true, :links => @links, :fields => @fields, :conditions => @conditions, :order => @order, :limit => 111, :offset => 222, :bind_values => @bind_values)
+        @query.should_receive(:unique?).with(no_args).and_return(false)
 
         @reader     = mock('reader', :close => true, :next! => false)
         @command    = mock('command', :set_types => nil, :execute_reader => @reader)

data/spec/unit/associations/many_to_many_spec.rb

@@ -1,6 +1,9 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
 
 describe DataMapper::Associations::ManyToMany do
+
+  load_models_for_metaphor :vehicles
+
   it 'should allow a declaration' do
     lambda do
       class Supplier

data/spec/unit/associations/many_to_one_spec.rb

@@ -1,6 +1,9 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
 
 describe DataMapper::Associations::ManyToOne do
+
+  load_models_for_metaphor :vehicles
+
   it 'should allow a declaration' do
     lambda do
       class Vehicle
@@ -11,10 +14,13 @@ describe DataMapper::Associations::ManyToOne do
 end
 
 describe DataMapper::Associations::ManyToOne::Proxy do
+
+  load_models_for_metaphor :vehicles
+
   before do
     @child        = mock('child', :kind_of? => true)
     @parent       = mock('parent')
-    @relationship = mock('relationship', :kind_of? => true, :repository_name => :default, :get_parent => @parent, :attach_parent => nil)
+    @relationship = mock('relationship', :kind_of? => true, :get_parent => @parent, :attach_parent => nil)
     @association  = DataMapper::Associations::ManyToOne::Proxy.new(@relationship, @child)
 
     @association.replace(@parent)
@@ -89,11 +95,13 @@ describe DataMapper::Associations::ManyToOne::Proxy do
       end
 
       it 'should save the parent' do
+        @relationship.should_receive(:with_repository).and_yield(@repository)
         @parent.should_receive(:save).with(no_args)
         @association.save
       end
 
       it 'should return the result of the save' do
+        @relationship.should_receive(:with_repository).and_yield(@repository)
         save_results = mock('save results')
         @parent.should_receive(:save).with(no_args).and_return(save_results)
         @association.save.object_id.should == save_results.object_id

data/spec/unit/associations/one_to_many_spec.rb

@@ -1,6 +1,9 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_helper'))
 
 describe DataMapper::Associations::OneToMany do
+
+  load_models_for_metaphor :vehicles
+
   before do
     @class = Class.new do
       def self.name
@@ -30,7 +33,7 @@ describe DataMapper::Associations::OneToMany do
 
       it 'should receive the name' do
         DataMapper::Associations::Relationship.should_receive(:new) do |name,_,_,_,_|
-          name.should == :user
+          name.should == :orders
         end
         @class.has(@class.n, :orders)
       end
@@ -60,7 +63,7 @@ describe DataMapper::Associations::OneToMany do
 
       it 'should receive the parent model name' do
         DataMapper::Associations::Relationship.should_receive(:new) do |_,_,_,parent_model_name,_|
-          parent_model_name.should == 'User'
+          parent_model_name.should == @class
         end
         @class.has(@class.n, :orders)
       end
@@ -106,8 +109,9 @@ describe DataMapper::Associations::OneToMany::Proxy do
     @parent       = mock('parent', :new_record? => true, :kind_of? => true)
     @resource     = mock('resource', :null_object => true)
     @collection   = []
+    @parent_key   = mock('parent key', :get => [])
     @repository   = mock('repository', :save => nil, :kind_of? => true)
-    @relationship = mock('relationship', :get_children => @collection, :repository_name => :mock, :query => {}, :kind_of? => true)
+    @relationship = mock('relationship', :get_children => @collection, :query => {}, :kind_of? => true, :child_key => [], :parent_key => @parent_key)
     @association  = DataMapper::Associations::OneToMany::Proxy.new(@relationship, @parent)
   end
 
@@ -124,6 +128,7 @@ describe DataMapper::Associations::OneToMany::Proxy do
     end
 
     it 'should persist the addition after saving the association' do
+      @relationship.should_receive(:with_repository).with(@resource).and_yield(@repository)
       do_add.should == return_value
       @relationship.should_receive(:attach_parent).with(@resource, @parent)
       @association.save
@@ -147,6 +152,7 @@ describe DataMapper::Associations::OneToMany::Proxy do
     end
 
     it 'should persist the removal after saving the association' do
+      @relationship.should_receive(:with_repository).with(@resource).and_yield(@repository)
       do_remove.should == return_value
       @relationship.should_receive(:attach_parent).with(@resource, nil)
       @association.save
@@ -237,6 +243,7 @@ describe DataMapper::Associations::OneToMany::Proxy do
 
     it 'should persist the removal after saving the association' do
       do_replace.should == return_value
+      @relationship.should_receive(:with_repository).exactly(3).times.and_yield(@repository)
       @relationship.should_receive(:attach_parent).with(@resource, nil)
       @association.save
     end
@@ -248,6 +255,7 @@ describe DataMapper::Associations::OneToMany::Proxy do
 
     it 'should persist the addition after saving the association' do
       do_replace.should == return_value
+      @relationship.should_receive(:with_repository).exactly(3).times.and_yield(@repository)
       @relationship.should_receive(:attach_parent).with(@children[0], @parent)
       @relationship.should_receive(:attach_parent).with(@children[1], @parent)
       @association.save
@@ -334,7 +342,7 @@ describe DataMapper::Associations::OneToMany::Proxy do
     it_should_behave_like 'a method that orphans the resource'
 
     it 'should empty the collection' do
-      @association << mock('other resource')
+      @association << mock('other resource', :new_record? => false)
       @association.should have(2).entries
       do_remove
       @association.should be_empty