dm-core 0.9.2 → 0.9.3

data/.autotest

@@ -0,0 +1,26 @@
+Autotest.add_hook :initialize do |at|
+  ignore = %w[ .git burn www log plugins script tasks bin CHANGELOG FAQ MIT-LICENSE PERFORMANCE QUICKLINKS README ]
+
+  unless ENV['AUTOTEST'] == 'integration'
+    ignore << 'spec/integration'
+  end
+
+  ignore.each do |exception|
+    at.add_exception(exception)
+  end
+
+  at.clear_mappings
+
+  at.add_mapping(%r{^spec/.+_spec\.rb$}) do |filename,_|
+    filename
+  end
+
+  at.add_mapping(%r{^lib/data_mapper/(.+)\.rb$}) do |_,match|
+    [ "spec/unit/#{match[1]}_spec.rb" ] +
+    at.files_matching(%r{^spec/integration/.+_spec\.rb$})
+  end
+
+  at.add_mapping(%r{^spec/spec_helper\.rb$}) do
+    at.files_matching(%r{^spec/.+_spec\.rb$})
+  end
+end

data/{CHANGELOG → History.txt}

@@ -1,37 +1,52 @@
--- 0.1.0
-* Initial Public Release
 
--- 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.3.0
+* HasManyAssociation::Set now has a nil? method, so we can do stuff like cage.animal.nil?
+
+== 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
+
+== 0.2.4
+* Bug fixes
+* Added paranoia
+
+== 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
+== 0.2.0
 * AdvancedHasManyAssociation now functional for fetches
 * AdvancedHasManyAssociation renamed to HasNAssociation
 * HasManyAssociation refactored to use HasNAssociation superclass
@@ -96,49 +111,35 @@
 * Most command implementations moved to methods in SqlAdapter
 * Removed UnitOfWork module, instead moving a slightly refactored implementation into Base
 
--- 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.2
-* Removed C extension bundles and log files from package
-
--- 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.4
-* Bug fixes
-* Added paranoia
-
--- 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
+== 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.3.0
-* HasManyAssociation::Set now has a nil? method, so we can do stuff like cage.animal.nil?
+== 0.1.0
+* Initial Public Release

data/Manifest.txt

@@ -0,0 +1,123 @@
+.autotest
+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/hoe.rb
+tasks/install.rb

data/Rakefile

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'pathname'
+require 'rubygems'
+require 'rake'
+require 'rake/rdoctask'
+require 'spec/rake/spectask'
+
+require 'lib/dm-core/version'
+
+ROOT = Pathname(__FILE__).dirname.expand_path
+
+AUTHOR = "Sam Smoot"
+EMAIL  = "ssmoot@gmail.com"
+GEM_NAME = "dm-core"
+GEM_VERSION = DataMapper::VERSION
+GEM_DEPENDENCIES = ["data_objects", GEM_VERSION], ["extlib", GEM_VERSION],
+                   ["rspec", ">=1.1.3"], ["addressable", ">=1.0.4"]
+
+
+PROJECT_NAME = "datamapper"
+PROJECT_DESCRIPTION = "Faster, Better, Simpler."
+PROJECT_SUMMARY = "An Object/Relational Mapper for Ruby"
+PROJECT_URL  = "http://datamapper.org"
+
+require ROOT + 'tasks/hoe'
+require ROOT + 'tasks/install'
+require ROOT + 'tasks/dm'
+require ROOT + 'tasks/doc'
+require ROOT + 'tasks/ci'

data/SPECS

@@ -0,0 +1,63 @@
+Reading Specs
+=============
+
+  Blah blah blah...
+  
+Writing Specs
+=============
+
+  Here are some general dos and don'ts
+  
+  = DO:
+  
+  * Write more specs for error conditions than clean conditions.
+  * Write specs with readability in mind. Somebody knew to DataMapper should be
+    able to read specs to learn how something works.
+  * Use existing models that are part of a metaphor.
+  * Nest describe blocks (2 or 3 levels deep is probably fine).
+  * Limit a describe block to 10 - 15 examples.
+  * Group specs by method being tested. (See the 'Ordering Specs' section)
+  * Use custom matchers.
+  
+  = DON'T:
+  
+  * Spec more than one unit of functionality in an example. An example should be
+    as short as possible (while still remaining readable).
+  * Spec implementation. Refactoring code should not break specs.
+  * Declare models in the spec file.
+  
+  And a final do: Do go against the guidelines if your best judgement tells you
+  to. These are just guidelines and are obviously not fast rules.
+
+Models
+======
+
+  Models are declared in separate files as opposed to individual spec files for
+  two reasons. The first is to improve readability. By creating as few models
+  as possible and sharing these models throughout the specs, a reader can
+  become familiar with the models being used quicker. Models also follow a
+  few simple metaphors, such as a zoo, a blog implementation, etc... Following
+  metaphors makes it easier for a reader to guess what is going on with respect
+  to the models.
+  
+  The second reason is to allow the spec environment to be as pristine as
+  possible going into an example. Models being loaded from the model directory
+  are tracked and reloaded before each example. Any changes that might be made
+  to the model are reset at the end.
+
+Mocks and Stubs
+===============
+
+  Obviously, mocks and stubs are a powerful feature when it comes to BDD;
+  however, remember that you are writing specs for behavior and NOT
+  implementation.
+  
+Ordering Specs
+==============
+
+  Specs aren't much use if nobody can find where anything is, so keeping specs
+  well organized is critical. Currently, we are trying out the following
+  structure:
+  
+    * List guidelines here...
+  

data/TODO

@@ -0,0 +1 @@
+See: http://github.com/sam/dm-core/wikis

data/lib/dm-core.rb

@@ -20,7 +20,7 @@ require 'rubygems'
 gem 'addressable', '>=1.0.4'
 require 'addressable/uri'
 
-gem 'extlib', '=0.9.2'
+gem 'extlib', '=0.9.3'
 require 'extlib'
 
 begin
@@ -35,6 +35,7 @@ require dir / 'support'
 require dir / 'resource'
 require dir / 'model'
 
+require dir / 'dependency_queue'
 require dir / 'type'
 require dir / 'type_map'
 require dir / 'types'
@@ -210,4 +211,8 @@ module DataMapper
   def self.prepare(*args, &blk)
     yield repository(*args)
   end
+
+  def self.dependency_queue
+    @dependency_queue ||= DependencyQueue.new
+  end
 end

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

@@ -1,4 +1,4 @@
-gem 'data_objects', '=0.9.2'
+gem 'data_objects', '=0.9.3'
 require 'data_objects'
 
 module DataMapper
@@ -228,6 +228,7 @@ module DataMapper
           statement << " FROM #{quote_table_name(query.model.storage_name(query.repository.name))}"
           statement << links_statement(query)                        if query.links.any?
           statement << " WHERE #{conditions_statement(query)}"       if query.conditions.any?
+          statement << " GROUP BY #{group_by_statement(query)}"      if query.unique? && query.fields.any? { |p| p.kind_of?(Property) }
           statement << " ORDER BY #{order_statement(query)}"         if query.order.any?
           statement << " LIMIT #{quote_column_value(query.limit)}"   if query.limit
           statement << " OFFSET #{quote_column_value(query.offset)}" if query.offset && query.offset > 0
@@ -256,17 +257,7 @@ module DataMapper
 
         def fields_statement(query)
           qualify = query.links.any?
-
-          query.fields.map do |property|
-            # TODO Should we raise an error if there is no such property in the
-            #      repository of the query?
-            #
-            #if property.model.properties(query.repository.name)[property.name].nil?
-            #  raise "Property #{property.model.to_s}.#{property.name.to_s} not available in repository #{name}."
-            #end
-            #
-            property_to_column_name(query.repository, property, qualify)
-          end * ', '
+          query.fields.map { |p| property_to_column_name(query.repository, p, qualify) } * ', '
         end
 
         def links_statement(query)
@@ -292,29 +283,35 @@ module DataMapper
         end
 
         def conditions_statement(query)
-          query.conditions.map do |operator, property, bind_value|
-            condition_statement(query, operator, property, bind_value)
-          end * ' AND '
+          query.conditions.map { |o,p,b| condition_statement(query, o, p, b) } * ' AND '
+        end
+
+        def group_by_statement(query)
+          repository = query.repository
+          qualify    = query.links.any?
+          query.fields.select { |p| p.kind_of?(Property) }.map { |p| property_to_column_name(repository, p, qualify) } * ', '
         end
 
         def order_statement(query)
-          qualify = query.links.any?
+          repository = query.repository
+          qualify    = query.links.any?
+          query.order.map { |i| order_column(repository, i, qualify) } * ', '
+        end
 
-          query.order.map do |item|
-            property, descending = nil, false
+        def order_column(repository, item, qualify)
+          property, descending = nil, false
 
-            case item
-              when Property
-                property = item
-              when Query::Direction
-                property  = item.property
-                descending = true if item.direction == :desc
-            end
+          case item
+            when Property
+              property = item
+            when Query::Direction
+              property  = item.property
+              descending = true if item.direction == :desc
+          end
 
-            order = property_to_column_name(query.repository, property, qualify)
-            order << ' DESC' if descending
-            order
-          end * ', '
+          order_column = property_to_column_name(repository, property, qualify)
+          order_column << ' DESC' if descending
+          order_column
         end
 
         def condition_statement(query, operator, left_condition, right_condition)
@@ -330,7 +327,7 @@ module DataMapper
               query.merge_subquery(operator, opposite, condition)
               "(#{read_statement(condition)})"
             elsif condition.kind_of?(Array) && condition.all? { |p| p.kind_of?(Property) }
-              "(#{condition.map { |p| property_to_column_name(query.repository, property, qualify) } * ', '})"
+              "(#{condition.map { |p| property_to_column_name(query.repository, p, qualify) } * ', '})"
             else
               '?'
             end
@@ -598,8 +595,8 @@ module DataMapper
               tm.map(String).to('VARCHAR').with(:size => Property::DEFAULT_LENGTH)
               tm.map(Class).to('VARCHAR').with(:size => Property::DEFAULT_LENGTH)
               tm.map(DM::Discriminator).to('VARCHAR').with(:size => Property::DEFAULT_LENGTH)
-              tm.map(BigDecimal).to('DECIMAL').with(:precision => Property::DEFAULT_PRECISION, :scale => Property::DEFAULT_SCALE)
-              tm.map(Float).to('FLOAT').with(:precision => Property::DEFAULT_PRECISION, :scale => Property::DEFAULT_SCALE)
+              tm.map(BigDecimal).to('DECIMAL').with(:precision => Property::DEFAULT_PRECISION, :scale => Property::DEFAULT_SCALE_BIGDECIMAL)
+              tm.map(Float).to('FLOAT').with(:precision => Property::DEFAULT_PRECISION)
               tm.map(DateTime).to('DATETIME')
               tm.map(Date).to('DATE')
               tm.map(Time).to('TIMESTAMP')