sam-dm-core 0.9.10 → 0.9.11

data/lib/dm-core/model.rb

@@ -388,8 +388,9 @@ module DataMapper
     # TODO: add docs
     # @api private
     def _load(marshalled)
-      repository_name, attributes = Marshal.load(marshalled)
-      repository(repository_name) { new(attributes) }
+      resource = allocate
+      Marshal.load(marshalled).each { |kv| resource.instance_variable_set(*kv) }
+      resource
     end
 
     def typecast_key(key)
@@ -442,7 +443,7 @@ module DataMapper
         end
       EOS
 
-      if property.primitive == TrueClass && !instance_methods.include?(property.name.to_s)
+      if property.primitive == TrueClass && !instance_methods.map { |m| m.to_s }.include?(property.name.to_s)
         class_eval <<-EOS, __FILE__, __LINE__
           #{property.reader_visibility}
           alias #{property.name} #{property.getter}
@@ -452,7 +453,7 @@ module DataMapper
 
     # defines the setter for the property
     def create_property_setter(property)
-      unless instance_methods.include?("#{property.name}=")
+      unless instance_methods.map { |m| m.to_s }.include?("#{property.name}=")
         class_eval <<-EOS, __FILE__, __LINE__
           #{property.writer_visibility}
           def #{property.name}=(value)

data/lib/dm-core/resource.rb

@@ -531,14 +531,20 @@ module DataMapper
     # TODO: add docs
     # @api private
     def _dump(*)
-      repository_name = repository.name
-      attributes      = {}
+      ivars = {}
 
-      model.properties(repository_name).slice(*loaded_attributes).compact.each do |property|
-        attributes[property.name] = property.get(self) if property.writer_visibility == :public
+      # dump all the loaded properties
+      properties.each do |property|
+        next unless attribute_loaded?(property.name)
+        ivars[property.instance_variable_name] = property.get!(self)
+      end
+
+      # dump ivars used internally
+      %w[ @new_record @original_values @readonly @repository ].each do |name|
+        ivars[name] = instance_variable_get(name)
       end
 
-      Marshal.dump([ repository_name, attributes ])
+      Marshal.dump(ivars)
     end
 
     protected

data/lib/dm-core/version.rb

@@ -1,3 +1,3 @@
 module DataMapper
-  VERSION = '0.9.10' unless defined?(DataMapper::VERSION)
+  VERSION = '0.9.11' unless defined?(DataMapper::VERSION)
 end

data/script/all

@@ -1,5 +1,4 @@
 #!/usr/bin/env sh
-rake spec:unit
-ADAPTER=sqlite3  rake spec:integration
-ADAPTER=mysql    rake spec:integration
-ADAPTER=postgres rake spec:integration
+ADAPTER=sqlite3  rake spec
+ADAPTER=mysql    rake spec
+ADAPTER=postgres rake spec

data/spec/integration/association_spec.rb

@@ -9,7 +9,7 @@ if HAS_SQLITE3
       FileUtils.touch(db2)
       DataMapper.setup(:custom_db1, "sqlite3://#{db1}")
       DataMapper.setup(:custom_db2, "sqlite3://#{db2}")
-      class CustomParent
+      class ::CustomParent
         include DataMapper::Resource
         def self.default_repository_name
           :custom_db1
@@ -20,7 +20,7 @@ if HAS_SQLITE3
           has n, :custom_childs
         end
       end
-      class CustomChild
+      class ::CustomChild
         include DataMapper::Resource
         def self.default_repository_name
           :custom_db2
@@ -70,7 +70,7 @@ end
 
 if ADAPTER
   repository(ADAPTER) do
-    class Machine
+    class ::Machine
       include DataMapper::Resource
 
       def self.default_repository_name
@@ -84,7 +84,7 @@ if ADAPTER
       has n, :fussy_areas, :class_name => 'Area', :rating.gte => 3, :type => 'particular'
     end
 
-    class Area
+    class ::Area
       include DataMapper::Resource
 
       def self.default_repository_name
@@ -99,7 +99,7 @@ if ADAPTER
       belongs_to :machine
     end
 
-    class Pie
+    class ::Pie
       include DataMapper::Resource
 
       def self.default_repository_name
@@ -112,7 +112,7 @@ if ADAPTER
       belongs_to :sky
     end
 
-    class Sky
+    class ::Sky
       include DataMapper::Resource
 
       def self.default_repository_name
@@ -125,7 +125,7 @@ if ADAPTER
       has 1, :pie
     end
 
-    class Ultrahost
+    class ::Ultrahost
       include DataMapper::Resource
 
       def self.default_repository_name
@@ -138,7 +138,7 @@ if ADAPTER
       has n, :ultraslices, :order => [:id.desc]
     end
 
-    class Ultraslice
+    class ::Ultraslice
       include DataMapper::Resource
 
       def self.default_repository_name
@@ -151,7 +151,7 @@ if ADAPTER
       belongs_to :ultrahost
     end
 
-    class Node
+    class ::Node
       include DataMapper::Resource
 
       def self.default_repository_name
@@ -165,7 +165,7 @@ if ADAPTER
       belongs_to :parent, :class_name => 'Node', :child_key => [ :parent_id ]
     end
 
-    class MadeUpThing
+    class ::MadeUpThing
       include DataMapper::Resource
 
       def self.default_repository_name
@@ -178,7 +178,7 @@ if ADAPTER
       belongs_to :machine
     end
 
-    module Models
+    module ::Models
       class Project
         include DataMapper::Resource
 
@@ -220,7 +220,7 @@ if ADAPTER
       end
     end
 
-    class Galaxy
+    class ::Galaxy
       include DataMapper::Resource
 
       def self.default_repository_name
@@ -231,7 +231,7 @@ if ADAPTER
       property :size, Float,  :key => true, :precision => 15, :scale => 6
     end
 
-    class Star
+    class ::Star
       include DataMapper::Resource
 
       def self.default_repository_name
@@ -303,7 +303,7 @@ if ADAPTER
       end
 
       it 'should create the foreign key property immediately' do
-        class Duck
+        class ::Duck
           include DataMapper::Resource
           property :id, Serial
           belongs_to :sky
@@ -334,7 +334,7 @@ if ADAPTER
 
       it '#belongs_to with namespaced models' do
         repository(ADAPTER) do
-          module FlightlessBirds
+          module ::FlightlessBirds
             class Ostrich
               include DataMapper::Resource
               property :id, Serial
@@ -728,7 +728,7 @@ if ADAPTER
     describe 'through-associations' do
       before :all do
         repository(ADAPTER) do
-          module Sweets
+          module ::Sweets
             class Shop
               include DataMapper::Resource
               def self.default_repository_name
@@ -1219,7 +1219,7 @@ if ADAPTER
     if false # Many to many not yet implemented
     describe "many to many associations" do
       before(:all) do
-        class RightItem
+        class ::RightItem
           include DataMapper::Resource
 
           def self.default_repository_name
@@ -1232,7 +1232,7 @@ if ADAPTER
           has n..n, :left_items
         end
 
-        class LeftItem
+        class ::LeftItem
           include DataMapper::Resource
 
           def self.default_repository_name

data/spec/integration/association_through_spec.rb

@@ -4,7 +4,7 @@ if ADAPTER
   describe 'through-associations' do
     before :all do
       repository(ADAPTER) do
-        class Tag
+        class ::Tag
           include DataMapper::Resource
           def self.default_repository_name
             ADAPTER
@@ -22,7 +22,7 @@ if ADAPTER
           has n, :posts, :through => :taggings
         end
 
-        class Tagging
+        class ::Tagging
           include DataMapper::Resource
           def self.default_repository_name
             ADAPTER
@@ -35,7 +35,7 @@ if ADAPTER
           belongs_to :tag
         end
 
-        class Post
+        class ::Post
           include DataMapper::Resource
           def self.default_repository_name
             ADAPTER
@@ -61,7 +61,7 @@ if ADAPTER
                  Post.taggings.tag.voided => true
         end
 
-        class Relationship
+        class ::Relationship
           include DataMapper::Resource
           def self.default_repository_name
             ADAPTER

data/spec/integration/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::Proxy do
   before :all do
-    class Editor
+    class ::Editor
       include DataMapper::Resource
 
       def self.default_repository_name; ADAPTER end
@@ -15,7 +15,7 @@ describe DataMapper::Associations::ManyToMany::Proxy do
 
     Object.send(:remove_const, :Book) if defined?(Book)
 
-    class Book
+    class ::Book
       include DataMapper::Resource
 
       def self.default_repository_name; ADAPTER end
@@ -190,7 +190,7 @@ describe DataMapper::Associations::ManyToMany::Proxy do
 
   describe "with natural keys" do
     before :all do
-      class Author
+      class ::Author
         include DataMapper::Resource
 
         def self.default_repository_name; ADAPTER end
@@ -200,7 +200,7 @@ describe DataMapper::Associations::ManyToMany::Proxy do
         has n, :books, :through => Resource
       end
 
-      class Book
+      class ::Book
         has n, :authors, :through => Resource
       end
     end
@@ -237,7 +237,7 @@ describe DataMapper::Associations::ManyToMany::Proxy do
 
   describe "When join model has non-serial (integer) natural keys." do
     before :all do
-      class Tag
+      class ::Tag
         include DataMapper::Resource
 
         def self.default_repository_name; ADAPTER end
@@ -249,7 +249,7 @@ describe DataMapper::Associations::ManyToMany::Proxy do
         has n, :books, :through => :book_taggings
       end
 
-      class BookTagging
+      class ::BookTagging
         include DataMapper::Resource
 
         def self.default_repository_name; ADAPTER end
@@ -261,7 +261,7 @@ describe DataMapper::Associations::ManyToMany::Proxy do
         belongs_to :tag
       end
 
-      class Book
+      class ::Book
         has n, :book_taggings
         has n, :tags, :through => :book_taggings
       end
@@ -296,7 +296,7 @@ describe DataMapper::Associations::ManyToMany::Proxy do
 
   describe "with renamed associations" do
     before :all do
-      class Singer
+      class ::Singer
         include DataMapper::Resource
 
         def self.default_repository_name; ADAPTER end
@@ -307,7 +307,7 @@ describe DataMapper::Associations::ManyToMany::Proxy do
         has n, :tunes, :through => Resource, :class_name => 'Song'
       end
 
-      class Song
+      class ::Song
         include DataMapper::Resource
 
         def self.default_repository_name; ADAPTER end

data/spec/integration/associations/many_to_one_spec.rb

@@ -58,7 +58,7 @@ if ADAPTER
           step_child = ManyToOneSpec::StepChild.first(:id => @step_child.id)
           logger do |log|
             # should retrieve from the IdentityMap
-            child.parent.object_id.should == parent.object_id
+            child.parent.should equal(parent)
 
             # should retrieve from the datasource
             other = step_child.parent

data/spec/integration/associations/one_to_many_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'spec_hel
 require 'pp'
 describe "OneToMany" do
   before(:all) do
-    class Team
+    class ::Team
       include DataMapper::Resource
 
       def self.default_repository_name; ADAPTER end
@@ -14,10 +14,10 @@ describe "OneToMany" do
       has n, :players
     end
 
-    class BaseballTeam < Team
+    class ::BaseballTeam < Team
     end
 
-    class Player
+    class ::Player
       include DataMapper::Resource
 
       def self.default_repository_name; ADAPTER end

data/spec/integration/collection_spec.rb

@@ -561,7 +561,7 @@ if ADAPTER
           end
 
           it "should find a resource in a collection by typecasting the key" do
-            resource = @collection.get(@nancy.key.to_s)
+            resource = @collection.get(*@nancy.key)
             resource.should be_kind_of(DataMapper::Resource)
             resource.id.should == @nancy.id
           end
@@ -569,7 +569,7 @@ if ADAPTER
           it 'should not find a resource not in the collection' do
             @query.update(:offset => 0, :limit => 3)
             @david = Zebra.create(:name => 'David', :age => 15,  :notes => 'Albino')
-            @collection.get(@david.key).should be_nil
+            @collection.get(*@david.key).should be_nil
           end
         end
 

data/spec/integration/dependency_queue_spec.rb

@@ -27,7 +27,7 @@ describe "DataMapper::DependencyQueue" do
       before :each do
         @q.add('MissingConstant') { |klass| klass.instance_variable_set("@resolved", true) } # add before MissingConstant is loaded
 
-        class MissingConstant
+        class ::MissingConstant
         end
       end
 

data/spec/integration/model_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 
 if ADAPTER
-  module ModelSpec
+  module ::ModelSpec
     class STI
       include DataMapper::Resource
 

data/spec/integration/mysql_adapter_spec.rb

@@ -7,7 +7,7 @@ if HAS_MYSQL
     end
 
     before :all do
-      class Sputnik
+      class ::Sputnik
         include DataMapper::Resource
 
         property :id, Serial

data/spec/integration/postgres_adapter_spec.rb

@@ -8,7 +8,7 @@ if HAS_POSTGRES
 
     describe "auto migrating" do
       before :all do
-        class Sputnik
+        class ::Sputnik
           include DataMapper::Resource
 
           property :id, Serial
@@ -32,7 +32,7 @@ if HAS_POSTGRES
     describe '#312' do
       it "should behave sanely for time fields" do
 
-        class Thing
+        class ::Thing
           include DataMapper::Resource
           property :id, Integer, :serial => true
           property :created_at, Time
@@ -57,7 +57,7 @@ if HAS_POSTGRES
 
     describe "querying metadata" do
       before :all do
-        class Sputnik
+        class ::Sputnik
           include DataMapper::Resource
 
           property :id, Serial
@@ -86,7 +86,7 @@ if HAS_POSTGRES
 
     describe "handling transactions" do
       before :all do
-        class Sputnik
+        class ::Sputnik
           include DataMapper::Resource
 
           property :id, Serial
@@ -118,14 +118,14 @@ if HAS_POSTGRES
 
     describe "reading & writing a database" do
       before :all do
-        class User
+        class ::User
           include DataMapper::Resource
 
           property :id, Serial
           property :name, DM::Text
         end
 
-        class Voyager
+        class ::Voyager
           include DataMapper::Resource
           storage_names[:postgres] = 'voyagers'
 
@@ -163,7 +163,7 @@ if HAS_POSTGRES
         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'
@@ -182,7 +182,7 @@ if HAS_POSTGRES
 
     describe "CRUD for serial Key" do
       before :all do
-        class VideoGame
+        class ::VideoGame
           include DataMapper::Resource
 
           property :id, Serial
@@ -282,7 +282,7 @@ if HAS_POSTGRES
 
     describe "CRUD for Composite Key" do
       before :all do
-        class BankCustomer
+        class ::BankCustomer
           include DataMapper::Resource
 
           property :bank, String, :key => true
@@ -376,7 +376,7 @@ if HAS_POSTGRES
 
     describe "Ordering a Query" do
       before :all do
-        class SailBoat
+        class ::SailBoat
           include DataMapper::Resource
           property :id, Serial
           property :name, String
@@ -423,7 +423,7 @@ if HAS_POSTGRES
 
     describe "Lazy Loaded Properties" do
       before :all do
-        class SailBoat
+        class ::SailBoat
           include DataMapper::Resource
           property :id, Serial
           property :notes, String, :lazy => [:notes]
@@ -467,7 +467,7 @@ if HAS_POSTGRES
 
     describe "finders" do
       before :all do
-        class SerialFinderSpec
+        class ::SerialFinderSpec
           include DataMapper::Resource
 
           property :id, Serial
@@ -528,7 +528,7 @@ if HAS_POSTGRES
 
     describe "belongs_to associations" do
       before :all do
-        class Engine
+        class ::Engine
           include DataMapper::Resource
           def self.default_repository_name; :postgres end
 
@@ -536,7 +536,7 @@ if HAS_POSTGRES
           property :name, String
         end
 
-        class Yard
+        class ::Yard
           include DataMapper::Resource
           def self.default_repository_name; :postgres end
 
@@ -617,7 +617,7 @@ if HAS_POSTGRES
 
     describe "has n associations" do
       before :all do
-        class Host
+        class ::Host
           include DataMapper::Resource
           def self.default_repository_name; :postgres end
 
@@ -627,7 +627,7 @@ if HAS_POSTGRES
           has n, :slices
         end
 
-        class Slice
+        class ::Slice
           include DataMapper::Resource
           def self.default_repository_name; :postgres end