dm-core 0.9.8 → 0.9.9

data/History.txt

@@ -1,3 +1,14 @@
+=== 0.9.9 / 2009-01-04
+
+* 1 minor enhancement:
+
+  * Updated Resource and Collection to be serializable with Marshal
+
+* 1 bug fix:
+
+  * Fixed Model#copy to copy properties that are the same in both
+    repositories.
+
 === 0.9.8 / 2008-12-07
 
 * 3 minor enhancements:

data/Rakefile

@@ -13,7 +13,7 @@ AUTHOR = "Sam Smoot"
 EMAIL  = "ssmoot@gmail.com"
 GEM_NAME = "dm-core"
 GEM_VERSION = DataMapper::VERSION
-GEM_DEPENDENCIES = ["data_objects", "~>0.9.9"],
+GEM_DEPENDENCIES = ["data_objects", "~>0.9.10"],
                    ["extlib", "~>0.9.9"],
                    ["addressable", "~>2.0.1"]
 

data/dm-core.gemspec

@@ -1,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name = %q{dm-core}
-  s.version = '0.9.8'
+  s.version = '0.9.9'
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Sam Smoot"]
-  s.date = %q{2008-07-24}
+  s.authors = ["Dan Kubb"]
+  s.date = %q{2009-01-04}
   s.description = %q{Faster, Better, Simpler!}
-  s.email = ["ssmoot@gmail.com"]
+  s.email = ["dan.kubb@gmail.com"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt"]
   s.files = [".autotest", "CONTRIBUTING", "FAQ", "History.txt", "MIT-LICENSE", "Manifest.txt", "QUICKLINKS", "README.txt", "Rakefile", "SPECS", "TODO", "lib/dm-core.rb", "lib/dm-core/adapters.rb", "lib/dm-core/adapters/abstract_adapter.rb", "lib/dm-core/adapters/data_objects_adapter.rb", "lib/dm-core/adapters/mysql_adapter.rb", "lib/dm-core/adapters/postgres_adapter.rb", "lib/dm-core/adapters/sqlite3_adapter.rb", "lib/dm-core/associations.rb", "lib/dm-core/associations/many_to_many.rb", "lib/dm-core/associations/many_to_one.rb", "lib/dm-core/associations/one_to_many.rb", "lib/dm-core/associations/one_to_one.rb", "lib/dm-core/associations/relationship.rb", "lib/dm-core/associations/relationship_chain.rb", "lib/dm-core/auto_migrations.rb", "lib/dm-core/collection.rb", "lib/dm-core/dependency_queue.rb", "lib/dm-core/hook.rb", "lib/dm-core/identity_map.rb", "lib/dm-core/is.rb", "lib/dm-core/logger.rb", "lib/dm-core/migrations/destructive_migrations.rb", "lib/dm-core/migrator.rb", "lib/dm-core/model.rb", "lib/dm-core/naming_conventions.rb", "lib/dm-core/property.rb", "lib/dm-core/property_set.rb", "lib/dm-core/query.rb", "lib/dm-core/repository.rb", "lib/dm-core/resource.rb", "lib/dm-core/scope.rb", "lib/dm-core/support.rb", "lib/dm-core/support/array.rb", "lib/dm-core/support/assertions.rb", "lib/dm-core/support/errors.rb", "lib/dm-core/support/kernel.rb", "lib/dm-core/support/symbol.rb", "lib/dm-core/transaction.rb", "lib/dm-core/type.rb", "lib/dm-core/type_map.rb", "lib/dm-core/types.rb", "lib/dm-core/types/boolean.rb", "lib/dm-core/types/discriminator.rb", "lib/dm-core/types/object.rb", "lib/dm-core/types/paranoid_boolean.rb", "lib/dm-core/types/paranoid_datetime.rb", "lib/dm-core/types/serial.rb", "lib/dm-core/types/text.rb", "lib/dm-core/version.rb", "script/all", "script/performance.rb", "script/profile.rb", "spec/integration/association_spec.rb", "spec/integration/association_through_spec.rb", "spec/integration/associations/many_to_many_spec.rb", "spec/integration/associations/many_to_one_spec.rb", "spec/integration/associations/one_to_many_spec.rb", "spec/integration/auto_migrations_spec.rb", "spec/integration/collection_spec.rb", "spec/integration/data_objects_adapter_spec.rb", "spec/integration/dependency_queue_spec.rb", "spec/integration/model_spec.rb", "spec/integration/mysql_adapter_spec.rb", "spec/integration/postgres_adapter_spec.rb", "spec/integration/property_spec.rb", "spec/integration/query_spec.rb", "spec/integration/repository_spec.rb", "spec/integration/resource_spec.rb", "spec/integration/sqlite3_adapter_spec.rb", "spec/integration/sti_spec.rb", "spec/integration/strategic_eager_loading_spec.rb", "spec/integration/transaction_spec.rb", "spec/integration/type_spec.rb", "spec/lib/logging_helper.rb", "spec/lib/mock_adapter.rb", "spec/lib/model_loader.rb", "spec/lib/publicize_methods.rb", "spec/models/vehicles.rb", "spec/models/zoo.rb", "spec/spec.opts", "spec/spec_helper.rb", "spec/unit/adapters/abstract_adapter_spec.rb", "spec/unit/adapters/adapter_shared_spec.rb", "spec/unit/adapters/data_objects_adapter_spec.rb", "spec/unit/adapters/postgres_adapter_spec.rb", "spec/unit/associations/many_to_many_spec.rb", "spec/unit/associations/many_to_one_spec.rb", "spec/unit/associations/one_to_many_spec.rb", "spec/unit/associations/one_to_one_spec.rb", "spec/unit/associations/relationship_spec.rb", "spec/unit/associations_spec.rb", "spec/unit/auto_migrations_spec.rb", "spec/unit/collection_spec.rb", "spec/unit/data_mapper_spec.rb", "spec/unit/identity_map_spec.rb", "spec/unit/is_spec.rb", "spec/unit/migrator_spec.rb", "spec/unit/model_spec.rb", "spec/unit/naming_conventions_spec.rb", "spec/unit/property_set_spec.rb", "spec/unit/property_spec.rb", "spec/unit/query_spec.rb", "spec/unit/repository_spec.rb", "spec/unit/resource_spec.rb", "spec/unit/scope_spec.rb", "spec/unit/transaction_spec.rb", "spec/unit/type_map_spec.rb", "spec/unit/type_spec.rb", "tasks/ci.rb", "tasks/dm.rb", "tasks/doc.rb", "tasks/gemspec.rb", "tasks/hoe.rb", "tasks/install.rb"]
   s.has_rdoc = true
@@ -22,16 +22,16 @@ Gem::Specification.new do |s|
     s.specification_version = 2
 
     if current_version >= 3 then
-      s.add_runtime_dependency(%q<data_objects>, ["~> 0.9.9"])
+      s.add_runtime_dependency(%q<data_objects>, ["~> 0.9.10"])
       s.add_runtime_dependency(%q<extlib>, ["~> 0.9.9"])
       s.add_runtime_dependency(%q<addressable>, ["~> 2.0.1"])
     else
-      s.add_dependency(%q<data_objects>, ["~> 0.9.9"])
+      s.add_dependency(%q<data_objects>, ["~> 0.9.10"])
       s.add_dependency(%q<extlib>, ["~> 0.9.9"])
       s.add_dependency(%q<addressable>, ["~> 2.0.1"])
     end
   else
-    s.add_dependency(%q<data_objects>, ["~> 0.9.9"])
+    s.add_dependency(%q<data_objects>, ["~> 0.9.10"])
     s.add_dependency(%q<extlib>, ["~> 0.9.9"])
     s.add_dependency(%q<addressable>, ["~> 2.0.1"])
   end

data/lib/dm-core/adapters/data_objects_adapter.rb

@@ -1,4 +1,4 @@
-gem 'data_objects', '~>0.9.9'
+gem 'data_objects', '~>0.9.10'
 require 'data_objects'
 
 module DataMapper

data/lib/dm-core/adapters/mysql_adapter.rb

@@ -1,4 +1,4 @@
-gem 'do_mysql', '~>0.9.9'
+gem 'do_mysql', '~>0.9.10'
 require 'do_mysql'
 
 module DataMapper

data/lib/dm-core/adapters/postgres_adapter.rb

@@ -1,4 +1,4 @@
-gem 'do_postgres', '~>0.9.9'
+gem 'do_postgres', '~>0.9.10'
 require 'do_postgres'
 
 module DataMapper

data/lib/dm-core/adapters/sqlite3_adapter.rb

@@ -1,4 +1,4 @@
-gem 'do_sqlite3', '~>0.9.9'
+gem 'do_sqlite3', '~>0.9.10'
 require 'do_sqlite3'
 
 module DataMapper

data/lib/dm-core/collection.rb

@@ -494,6 +494,32 @@ module DataMapper
       super || model.public_methods(false).include?(method.to_s) || relationships.has_key?(method)
     end
 
+    # TODO: add docs
+    # @api private
+    def _dump(*)
+      Marshal.dump([ query, to_a ])
+    end
+
+    # TODO: add docs
+    # @api private
+    def self._load(marshalled)
+      query, array = Marshal.load(marshalled)
+
+      # XXX: IMHO it is a code smell to be forced to use allocate
+      # and instance_variable_set to load an object.  You should
+      # be able to use a constructor to provide all the info needed
+      # to initialize an object.  This should be fixed in the edge
+      # branch dkubb/dm-core
+
+      collection = allocate
+      collection.instance_variable_set(:@query,          query)
+      collection.instance_variable_set(:@array,          array)
+      collection.instance_variable_set(:@loaded,         true)
+      collection.instance_variable_set(:@key_properties, collection.send(:model).key(collection.repository.name))
+      collection.instance_variable_set(:@cache,          {})
+      collection
+    end
+
     protected
 
     ##

data/lib/dm-core/model.rb

@@ -306,11 +306,30 @@ module DataMapper
       resource
     end
 
-    # TODO SPEC
+    ##
+    # Copy a set of records from one repository to another.
+    #
+    # @param [String] source
+    #   The name of the Repository the resources should be copied _from_
+    # @param [String] destination
+    #   The name of the Repository the resources should be copied _to_
+    # @param [Hash] query
+    #   The conditions with which to find the records to copy. These
+    #   conditions are merged with Model.query
+    #
+    # @return [DataMapper::Collection]
+    #   A Collection of the Resource instances created in the operation
+    #
+    # @api public
     def copy(source, destination, query = {})
+
+      # get the list of properties that exist in the source and destination
+      destination_properties = properties(destination)
+      fields = query[:fields] ||= properties(source).select { |p| destination_properties.has_property?(p.name) }
+
       repository(destination) do
-        repository(source).read_many(scoped_query(query)).each do |resource|
-          self.create(resource.attributes)
+        all(query.merge(:repository => repository(source))).map do |resource|
+          create(fields.map { |p| [ p.name, p.get(resource) ] }.to_hash)
         end
       end
     end
@@ -366,6 +385,13 @@ module DataMapper
       Query.new(repository, self, query.merge(conditions))
     end
 
+    # TODO: add docs
+    # @api private
+    def _load(marshalled)
+      repository_name, attributes = Marshal.load(marshalled)
+      repository(repository_name) { new(attributes) }
+    end
+
     def typecast_key(key)
       self.key(repository_name).zip(key).map { |k, v| k.typecast(v) }
     end

data/lib/dm-core/property.rb

@@ -512,6 +512,19 @@ module DataMapper
       "#<Property:#{@model}:#{@name}>"
     end
 
+    # TODO: add docs
+    # @api private
+    def _dump(*)
+      Marshal.dump([ repository, model, name ])
+    end
+
+    # TODO: add docs
+    # @api private
+    def self._load(marshalled)
+      repository, model, name = Marshal.load(marshalled)
+      model.properties(repository.name)[name]
+    end
+
     private
 
     def initialize(model, name, type, options = {})

data/lib/dm-core/query.rb

@@ -151,6 +151,55 @@ module DataMapper
       "#<#{self.class.name} #{attrs.map { |(k,v)| "@#{k}=#{v.inspect}" } * ' '}>"
     end
 
+    # TODO: add docs
+    # @api public
+    def to_hash
+      hash = {
+        :reload       => reload?,
+        :unique       => unique?,
+        :offset       => offset,
+        :order        => order,
+        :add_reversed => add_reversed?,
+        :fields       => fields,
+      }
+
+      hash[:limit]    = limit    unless limit    == nil
+      hash[:links]    = links    unless links    == []
+      hash[:includes] = includes unless includes == []
+
+      conditions  = {}
+      raw_queries = []
+      bind_values = []
+
+      conditions.each do |condition|
+        if condition[0] == :raw
+          raw_queries << condition[1]
+          bind_values << condition[2]
+        else
+          operator, property, bind_value = condition
+          conditions[ Query::Operator.new(property, operator) ] = bind_value
+        end
+      end
+
+      if raw_queries.any?
+        hash[:conditions] = [ raw_queries.join(' ') ].concat(bind_values)
+      end
+
+      hash.update(conditions)
+    end
+
+    # TODO: add docs
+    # @api private
+    def _dump(*)
+      Marshal.dump([ repository, model, to_hash ])
+    end
+
+    # TODO: add docs
+    # @api private
+    def self._load(marshalled)
+      new(*Marshal.load(marshalled))
+    end
+
     private
 
     def initialize(repository, model, options = {})

data/lib/dm-core/repository.rb

@@ -91,6 +91,14 @@ module DataMapper
       "#<DataMapper::Repository:#{@name}>"
     end
 
+    def _dump(*)
+      name.to_s
+    end
+
+    def self._load(marshalled)
+      new(marshalled.to_sym)
+    end
+
     private
 
     def initialize(name)

data/lib/dm-core/resource.rb

@@ -528,6 +528,19 @@ module DataMapper
       model.to_query(repository, key, query) unless new_record?
     end
 
+    # TODO: add docs
+    # @api private
+    def _dump(*)
+      repository_name = repository.name
+      attributes      = {}
+
+      model.properties(repository_name).slice(*loaded_attributes).compact.each do |property|
+        attributes[property.name] = property.get(self) if property.writer_visibility == :public
+      end
+
+      Marshal.dump([ repository_name, attributes ])
+    end
+
     protected
 
     def properties

data/lib/dm-core/version.rb

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

data/spec/integration/collection_spec.rb

@@ -127,6 +127,10 @@ if ADAPTER
       results.first.should == bob
     end
 
+    it 'should be serializable with Marshal' do
+      Marshal.load(Marshal.dump(Zebra.all)).should == Zebra.all
+    end
+
     describe 'model proxying' do
       it 'should delegate to a model method' do
         stripes = @model.first.stripes

data/spec/integration/model_spec.rb

@@ -123,5 +123,75 @@ if ADAPTER
         }.should_not raise_error(NoMethodError)
       end
     end
+
+    it { ModelSpec::STI.should respond_to(:copy) }
+
+    ([ :sqlite3, :mysql, :postgres ] - [ ADAPTER ]).each do |alternate|
+      describe '#copy' do
+        describe 'between identical models' do
+          before do
+            ModelSpec::STI.auto_migrate!(alternate)
+
+            ModelSpec::STI.create(:name => 'Record 1')
+            ModelSpec::STI.create(:name => 'Record 2')
+
+            # copy from the default to the alternate repository
+            @return = @resources = ModelSpec::STI.copy(:default, alternate)
+          end
+
+          it 'should return an Enumerable' do
+            @return.should be_a_kind_of(Enumerable)
+          end
+
+          it 'should return Resources' do
+            @return.each { |r| r.should be_a_kind_of(DataMapper::Resource) }
+          end
+
+          it 'should have each Resource set to the expected Repository' do
+            @resources.each { |r| r.repository.name.should == alternate }
+          end
+
+          it 'should create the Resources in the expected Repository' do
+            ModelSpec::STI.all(:repository => repository(alternate)).should == @resources
+          end
+        end
+
+        describe 'between different models' do
+          before do
+            # add an extra property to the alternate model
+            repository(alternate) do
+              ModelSpec::STI.property :status, String, :default => 'new'
+            end
+
+            ModelSpec::STI.auto_migrate!(alternate)
+
+            # add new resources to the alternate repository
+            repository(alternate) do
+              ModelSpec::STI.create(:name => 'Record 1')
+              ModelSpec::STI.create(:name => 'Record 2')
+            end
+
+            # copy from the alternate to the default repository
+            @return = @resources = ModelSpec::STI.copy(alternate, :default)
+          end
+
+          it 'should return an Enumerable' do
+            @return.should be_a_kind_of(Enumerable)
+          end
+
+          it 'should return Resources' do
+            @return.each { |r| r.should be_a_kind_of(DataMapper::Resource) }
+          end
+
+          it 'should have each Resource set to the expected Repository' do
+            @resources.each { |r| r.repository.name.should == :default }
+          end
+
+          it 'should create the Resources in the expected Repository' do
+            ModelSpec::STI.all.should == @resources
+          end
+        end
+      end
+    end
   end
 end

data/spec/integration/property_spec.rb

@@ -3,6 +3,22 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 gem 'fastercsv', '~>1.4.0'
 require 'fastercsv'
 
+describe DataMapper::Property do
+  before do
+    module PropertySpec
+      class Resource
+        include DataMapper::Resource
+      end
+    end
+
+    @property = PropertySpec::Resource.property :id, DM::Serial
+  end
+
+  it 'should be serializable with Marshal' do
+    Marshal.load(Marshal.dump(@property)).should == @property
+  end
+end
+
 if ADAPTER
   describe DataMapper::Property, "with #{ADAPTER}" do
     describe " tracking strategies" do

data/spec/integration/query_spec.rb

@@ -125,6 +125,14 @@ if ADAPTER
   end
 
   describe DataMapper::Query, "with #{ADAPTER}" do
+    before do
+      @query = DataMapper::Query.new(repository(ADAPTER), QuerySpec::SailBoat)
+    end
+
+    it 'should be serializable with Marshal' do
+      Marshal.load(Marshal.dump(@query)).should == @query
+    end
+
     describe '#unique' do
       include LoggingHelper
 
@@ -137,7 +145,7 @@ if ADAPTER
       end
 
       def parse_statement(log)
-        log.readlines.join.chomp.split(' ~ ').last
+        log.readlines.join.chomp.split(' ~ ').last.sub(/\A\(\d+\.\d+\)\s+/, '')
       end
 
       describe 'when true' do

data/spec/integration/repository_spec.rb

@@ -21,6 +21,10 @@ if ADAPTER
       @query      = DataMapper::Query.new(@repository, @model)
     end
 
+    it 'should be serializable with Marshal' do
+      Marshal.load(Marshal.dump(@repository)).should == @repository
+    end
+
     it "should throw an exception if the named repository is unknown" do
       r = DataMapper::Repository.new(:completely_bogus)
       lambda { r.adapter }.should raise_error(ArgumentError)

data/spec/integration/resource_spec.rb

@@ -16,7 +16,11 @@ if ADAPTER
       repository(ADAPTER) { @zoo.save }
     end
 
-  # --- Move somewhere ----
+    it 'should be serializable with Marshal' do
+      Marshal.load(Marshal.dump(@zoo)).should == @zoo
+    end
+
+    # --- Move somewhere ----
     it "should be able to destroy objects" do
       lambda { @zoo.destroy.should be_true }.should_not raise_error
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-core
 version: !ruby/object:Gem::Version 
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors: 
 - Sam Smoot
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-07 00:00:00 -08:00
+date: 2009-01-04 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.9
+        version: 0.9.10
     version: 
 - !ruby/object:Gem::Dependency 
   name: extlib