sam-dm-core 0.9.8 → 0.9.9

data/History.txt

@@ -1,145 +1,16 @@
+=== 0.9.8 / 2008-12-07
 
-== 0.3.0
-* HasManyAssociation::Set now has a nil? method, so we can do stuff like cage.animal.nil?
+* 3 minor enhancements:
 
-== 0.2.5
-* has_one bugfixes
-* Added syntax for setting CHECK-constraints directly in your properties (Postgres)
-* You can now set indexes with :index => true and :index => :unique
-* Support for composite indexes (thanks to Jeffrey Gelens)
-* Add composite scope to validates_uniqueness
-* Added private/protected properties
-* Remove HasOneAssociation, Make HasManyAssociation impersonate has_one relationships
-* Added #get method
-* Persistence module added, inheriting from DataMapper::Base no longer necessary
+  * Updated Resource#inspect to not lazy-load unloaded attributes.
+  * Updated ManyToOne::Proxy to delegate #class to parent.  This will
+    allow the Merb resource() route helper method to use the association
+    proxy to generate the URL.
+  * Updated Resource#attributes= to respect method visibility.  This means
+    that only public mutators will set the attribute value.
 
-== 0.2.4
-* Bug fixes
-* Added paranoia
+* 1 bug fix:
 
-== 0.2.3
-* Added String#t for translation and overrides for default validation messages
-* Give credit where it's due: zapnap, not pimpmaster, submitted the String#blank? patch. My bad. :-(
-* MAJOR: Resolve issue with non-unique-hash values and #dirty?; now frozen original values are stored instead
-* Added Base#update_attributes
-* MAJOR: Queries are now passed to the database drivers in a parameterized fashion
-* Updated PostgreSQL driver and adapter to current
-
-== 0.2.2
-* Removed C extension bundles and log files from package
-
-== 0.2.1
-* Added :float column support
-* Added association proxies: ie: Zoo.first.exhibits.animals
-* Columns stored in SortedSet
-* Swig files are no longer RDOCed
-* Added :date column support
-* BUG: Fixed UTC issues with datetimes
-* Added #to_yaml method
-* Added #to_xml method
-* Added #to_json method
-* BUG: Fixed HasManyAssociation::Set#inspect
-* BUG: Fixed #reload!
-* BUG: Column copy for STI moved into Table#initialize to better handle STI with multiple mapped databases
-* BUG: before_create callbacks moved in the execution flow since they weren't guaranteed to fire before
-* Threading enhancements: Removed single_threaded_mode, #database block form adjusted for thread-safety
-* BUG: Fixed String#blank? when a multi-line string contained a blank line (thanks zapnap!)
-* Performance enhancements: (thanks wycats!)
-
-== 0.2.0
-* AdvancedHasManyAssociation now functional for fetches
-* AdvancedHasManyAssociation renamed to HasNAssociation
-* HasManyAssociation refactored to use HasNAssociation superclass
-* Slight spec tweaks to accomodate the updates
-* HasOneAssociation refactored to use HasNAssociation superclass
-* Added HasAndBelongsToManyAssociation, using HasNAssociation as a basis; Need to add corresponding SQL generation code in AdvancedLoadCommand
-* Added spec for habtm query generation
-* HasNAssociation#foreign_key returns a DataMapper::Adapters::Sql::Mappings::Column instance instead of a raw String now
-* Added table, association, association_table and to_sql methods to HasNAssociation
-* Added associations_spec.rb
-* Added a forced table-recreation to spec_helper.rb so the tests could run with a clean version of the database, including any new columns added to the models
-* Added HasAndBelongsToManyAssociation#to_sql (all current specs pass now!)
-* Minor tweaks to Callbacks
-* Added CallbacksHelper to declare class-method ::callbacks on DataMapper::Base
-* Implemented before_validate and after_validate hooks in ValidationHelper
-* Minor documentation additions in callbacks.rb
-* Added callbacks_spec
-* Moved class-method declarations for built-in callbacks to the callbacks helper instead of DataMapper::Base
-* Renamed :before/after_validate callback to :before/after_validation to match ActiveRecord
-* Callbacks#add now accepts a Symbol which maps a callback to a method call on the targetted instance, also added a spec to verify this behavior
-* Documented callbacks.rb
-* Added DataMapper::Associations::Reference class
-* Documented DataMapper::Associations::Reference class
-* Upgraded BelongsToAssociation to new style
-* Added AssociationsSet to handle simple "last-in" for association bindings
-* Fixed extra spec loading
-* Added *Association#columns
-* Some refactoring in AdvancedLoadCommand regarding :include options
-* Added support for class-less Mappings::Table instances, with just a string name
-* HasAndBelongsToManyAssociation#join_table #left_foreign_key and #right_foreign_key reference actual Table or Column objects now
-* Added :shallow_include option for HABTM joins in AdvancedLoadCommand and corresponding spec
-* Added Commands::AdvancedConditions
-* Added ORDER, LIMIT, OFFSET and WHERE support to AdvancedLoadCommand
-* Renamed spec/has_many.rb to spec/has_many_spec.rb
-* Tweaked the loading of has_many relationships; big performance boost; got rid of an extra query
-* Added EmbeddedValue support, and accompanying spec
-* Fleshed out AdvancedConditions a bit; added conditions_spec.rb
-* Added more AdvancedConditions specs
-* Added Loader to handle multi-instanced rows
-* AdvancedLoadCommand replaced LoadCommand; down to 3 failing specs
-* All specs pass
-* Added :intercept_load finder option and accompanying spec
-* Modified :intercept_load block signature to |instance,columns,row|
-* HasAndBelongsToMany works, all specs pass
-* Fixed a couple bugs with keys; Added DataMapper::Base#key= method
-* Made DataMapper::Base#lazy_load! a little more flexible
-* Removed LoadCommand overwrites from MysqlAdapter
-* Default Database#single_threaded mode is true now
-* Removed MysqlAdapter#initialize, which only served to setup the connections, moved to SqlAdapter
-* Added SqlAdapter#create_connection and SqlAdapter#close_connection abstract methods
-* Added MysqlAdapter#create_connection and MysqlAdapter#close_connection concrete methods
-* Made SqlAdapter#connection a concrete method (instead of abstract), with support for single_threaded operation
-* Database#setup now takes a Hash of options instead of a block-initializer
-* Validation chaining should work for all association types
-* Save chaining should work for has_many associations
-* Added benchmarks for in-session performance to performance.rb
-* Removed block conditions; They're slower and don't offer any real advantages
-* Removed DeleteCommand
-* Removed SaveCommand
-* Removed TableExistsCommand
-* Session renamed to Context
-* Most command implementations moved to methods in SqlAdapter
-* Removed UnitOfWork module, instead moving a slightly refactored implementation into Base
-
-== 0.1.1
-* Removed /lib/data_mapper/extensions
-* Moved ActiveRecordImpersonation into DataMapper::Support module
-* Moved CallbackHelper methods into DataMapper::Base class
-* Moved ValidationHelper into DataMapper::Validations module
-* Removed LoadedSet since it's not necessary for it to reference the Database, so it's nothing more than an array now; Replaced with Array
-* Modified data_mapper.rb to load DataMapper::Support::Enumerable
-* Modified example.rb and performance.rb to require 'lib/data_mapper' instead of modifying $LOADPATH
-* Created SqlAdapter base-class
-* Refactored MysqlAdapter to use SqlAdapter superclass
-* Refactored Sqlite3Adapter to use SqlAdapter superclass
-* Moved /lib/data_mapper/queries to /lib/data_mapper/adapters/sql/queries
-* Moved Connection, Result and Reader classes along with Coersion and Quoting modules to DataMapper::Adapters::Sql module
-* Moved DataMapper::Adapters::Sql::Queries to ::Commands
-* Moved Mappings to SqlAdapter
-* Added monolithic DeleteCommand
-* Added monolithic SaveCommand
-* Added TableExistsCommand
-* Moved save/delete logic out of Session
-* Added create-table functionality to SaveCommand
-* Cleaned up Session; #find no longer supported, use #all or #first
-* Moved object materialization into LoadCommand
-* Migrated Sqlite3Adapter::Commands
-* Added Session#query support back in
-* Removed Connection/Reader/Result classes
-* Set DataMapper::Base#key on load to avoid double-hit against Schema
-* Added DataMapper::Support::Struct for increased Session#query performance
-* Added AdvancedHasManyAssociation (preview status)
-* Added benchmarks comparing ActiveRecord::Base::find_by_sql with Session#query
-
-== 0.1.0
-* Initial Public Release
+  * Fixed regression where an update to a resource with a lazy property
+    could cause the record to reload when accessing the lazy property,
+    clobbering any changes made prior.

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/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,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: sam-dm-core
 version: !ruby/object:Gem::Version 
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors: 
-- Sam Smoot
+- Dan Kubb
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-07-24 00:00:00 -07:00
+date: 2009-01-04 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.9
+        version: 0.9.10
     version: 
 - !ruby/object:Gem::Dependency 
   name: extlib
@@ -41,7 +41,7 @@ dependencies:
     version: 
 description: Faster, Better, Simpler!
 email: 
-- ssmoot@gmail.com
+- dan.kubb@gmail.com
 executables: []
 
 extensions: []