sam-dm-core 0.9.10 → 0.9.11

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

data/spec/unit/identity_map_spec.rb

@@ -2,18 +2,18 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
 describe "DataMapper::IdentityMap" do
   before(:all) do
-    class Cow
+    class ::Cow
       include DataMapper::Resource
       property :id, Integer, :key => true
       property :name, String
     end
 
-    class Chicken
+    class ::Chicken
       include DataMapper::Resource
       property :name, String
     end
 
-    class Pig
+    class ::Pig
       include DataMapper::Resource
       property :id, Integer, :key => true
       property :composite, Integer, :key => true

data/spec/unit/is_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 describe "DataMapper::Is" do
   describe ".is" do
 
-    module DataMapper
+    module ::DataMapper
 
       module Is
         module Example
@@ -32,17 +32,17 @@ describe "DataMapper::Is" do
       end # module Model
     end # module DataMapper
 
-    class House
+    class ::House
       include DataMapper::Resource
     end
 
-    class Cabin
+    class ::Cabin
       include DataMapper::Resource
     end
 
     it "should raise error unless it finds the plugin" do
       lambda do
-        class House
+        class ::House
           is :no_plugin_by_this_name
         end
       end.should raise_error(DataMapper::PluginNotFoundError)
@@ -50,14 +50,14 @@ describe "DataMapper::Is" do
 
     it "should call plugin is_* method" do
       lambda do
-        class House
+        class ::House
           is :example
         end
       end.should_not raise_error
     end
 
     it "should pass through arguments to plugin is_* method" do
-      class House
+      class ::House
         is :example ,:option1 => :ping, :option2 => :pong
       end
 
@@ -68,7 +68,7 @@ describe "DataMapper::Is" do
     it "should not add class_methods before the plugin is activated" do
       Cabin.respond_to?(:example_class_method).should be_false
 
-      class Cabin
+      class ::Cabin
         is :example
       end
 

data/spec/unit/property_spec.rb

@@ -3,14 +3,14 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 describe DataMapper::Property do
   before :each do
     Object.send(:remove_const, :Zoo) if defined?(Zoo)
-    class Zoo
+    class ::Zoo
       include DataMapper::Resource
 
       property :id, DataMapper::Types::Serial
     end
 
     Object.send(:remove_const, :Name) if defined?(Name)
-    class Name < DataMapper::Type
+    class ::Name < DataMapper::Type
       primitive String
       track :hash
 
@@ -28,7 +28,7 @@ describe DataMapper::Property do
     end
 
     Object.send(:remove_const, :Tomato) if defined?(Tomato)
-    class Tomato
+    class ::Tomato
       include DataMapper::Resource
     end
   end
@@ -286,7 +286,7 @@ describe DataMapper::Property do
 
   it "should not have key that is lazy" do
     Zoo.class_eval do
-      property :id, DataMapper::Types::Text, :key => true
+      property :id, String, :lazy => true, :key => true
       property :name, String, :lazy => true
     end
     Zoo.auto_migrate!
@@ -429,8 +429,8 @@ describe DataMapper::Property do
         Tomato.class_eval <<-RUBY
           property :botanical_name, String, #{input.inspect}
         RUBY
-        Tomato.send("#{output[0]}_instance_methods").should include("botanical_name")
-        Tomato.send("#{output[1]}_instance_methods").should include("botanical_name=")
+        Tomato.send("#{output[0]}_instance_methods").map { |m| m.to_s }.should include("botanical_name")
+        Tomato.send("#{output[1]}_instance_methods").map { |m| m.to_s }.should include("botanical_name=")
       end
     end
 
@@ -466,7 +466,7 @@ describe DataMapper::Property do
   # end
 
   it "should append ? to TrueClass property reader methods" do
-    class Potato
+    class ::Potato
       include DataMapper::Resource
       property :id, Integer, :key => true
       property :fresh, TrueClass

data/spec/unit/resource_spec.rb

@@ -60,7 +60,7 @@ end
 describe DataMapper::Resource do
   before(:each) do
     Object.send(:remove_const, :Planet) if defined?(Planet)
-    class Planet
+    class ::Planet
       include DataMapper::Resource
 
       storage_names[:legacy] = "dying_planets"
@@ -86,7 +86,7 @@ describe DataMapper::Resource do
     end
 
     Object.send(:remove_const, :Phone) if defined?(Phone)
-    class Phone
+    class ::Phone
       include DataMapper::Resource
 
       property :name, String, :key => true
@@ -94,7 +94,7 @@ describe DataMapper::Resource do
     end
 
     Object.send(:remove_const, :Fruit) if defined?(Fruit)
-    class Fruit
+    class ::Fruit
       include DataMapper::Resource
 
       property :id, Integer, :key => true
@@ -102,7 +102,7 @@ describe DataMapper::Resource do
     end
 
     Object.send(:remove_const, :Grain) if defined?(Grain)
-    class Grain
+    class ::Grain
       include DataMapper::Resource
 
       property :id, Serial
@@ -110,7 +110,7 @@ describe DataMapper::Resource do
     end
 
     Object.send(:remove_const, :Vegetable) if defined?(Vegetable)
-    class Vegetable
+    class ::Vegetable
       include DataMapper::Resource
 
       property :id, Serial
@@ -118,12 +118,12 @@ describe DataMapper::Resource do
     end
 
     Object.send(:remove_const, :Banana) if defined?(Banana)
-    class Banana < Fruit
+    class ::Banana < Fruit
       property :type, Discriminator
     end
 
     Object.send(:remove_const, :Cyclist) if defined?(Cyclist)
-    class Cyclist
+    class ::Cyclist
       include DataMapper::Resource
       property :id,         Serial
       property :victories,  Integer
@@ -568,7 +568,7 @@ describe DataMapper::Resource do
 
   describe "inheritance" do
     before(:all) do
-      class Media
+      class ::Media
         include DataMapper::Resource
 
         storage_names[:default] = 'media'
@@ -577,7 +577,7 @@ describe DataMapper::Resource do
         property :name, String, :key => true
       end
 
-      class NewsPaper < Media
+      class ::NewsPaper < Media
 
         storage_names[:east_coast] = 'mother'
 
@@ -600,7 +600,7 @@ describe DataMapper::Resource do
 
   describe "Single-table Inheritance" do
     before(:all) do
-      class Plant
+      class ::Plant
         include DataMapper::Resource
 
         property :id, Integer, :key => true
@@ -615,13 +615,13 @@ describe DataMapper::Resource do
         end
       end
 
-      class HousePlant < Plant
+      class ::HousePlant < Plant
         def calculate(int)
           int ** 3
         end
       end
 
-      class PoisonIvy < Plant
+      class ::PoisonIvy < Plant
         def length=(len)
           attribute_set(:length, len - 1)
         end