dm-core 0.9.11 → 0.10.0

data/.autotest

@@ -1,26 +1,29 @@
 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|
+  %w[ .git burn www log plugins script tasks bin CHANGELOG FAQ MIT-LICENSE PERFORMANCE QUICKLINKS README ].each do |exception|
     at.add_exception(exception)
   end
 
   at.clear_mappings
 
-  at.add_mapping(%r{^spec/.+_spec\.rb$}) do |filename,_|
-    filename
+  spec_folders = /(?:semi)?public/
+
+  # when a file is updated, make sure it's dependent public and semipublic specs pass
+  at.add_mapping %r{\Alib/dm\-core/(.+)\.rb\z} do |_,match|
+    at.files_matching %r{\Aspec/#{spec_folders}/#{match[1]}_spec\.rb\z}
+  end
+
+  # when the spec configuration changes make sure all specs pass
+  at.add_mapping %r{\Aspec/spec_helper\.rb\z} do
+    at.files_matching %r{\Aspec/.+_spec\.rb\z}
   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$})
+  # when a spec is updated, make sure it passes
+  at.add_mapping %r{\Aspec/#{spec_folders}/(.+)_spec\.rb\z} do |filename,_|
+    filename
   end
 
-  at.add_mapping(%r{^spec/spec_helper\.rb$}) do
-    at.files_matching(%r{^spec/.+_spec\.rb$})
+  # when the collection shared spec is update, make sure all dependent specs pass
+  at.add_mapping %r{\Aspec/lib/collection_shared_spec\.rb\z} do
+    at.files_matching %r{\Aspec/#{spec_folders}/collection_spec\.rb\z}
   end
 end

data/.gitignore

@@ -3,9 +3,10 @@ log/*
 doc
 cov
 pkg
-.DS_Store
+coverage.html
 coverage/*
 *.db
+spec/db
 spec/integration/*.db*
 nbproject
 profile_results.*
@@ -16,3 +17,4 @@ lib/coverage.html
 _Yardoc
 .yardoc
 tmp/*
+\.*

data/FAQ

@@ -24,7 +24,7 @@ model has two or more keys, no big deal
 Create a property and make it a ParanoidDateTime or ParanoidBoolean type.
 
   property :deleted_at, ParanoidDateTime
-  property :deleted, ParanoidBoolean
+  property :deleted,    ParanoidBoolean
 
 All of your calls to <tt>##all()</tt>, <tt>##first()</tt> will be scoped 
 with <tt>:deleted_at => nil</tt> or <tt>:deleted => false</tt>. Plus, 
@@ -36,8 +36,9 @@ This is what the Discriminator data-type is for:
 
   class Person
     include DataMapper::Resource
-    property :id, Serial
-    property :type, Discriminator ## other shared properties here
+
+    property :id,   Serial
+    property :type, Discriminator  ## other shared properties here
   end
 
   class Salesperson < Person; end
@@ -48,8 +49,8 @@ the data-store.
 
 === How do I run my own commands?
 
-  repository.adapter.query("select * from users where clue > 0")
-  repository(:integration).adapter.query("select * from users where clue > 0")
+  repository.adapter.query("SELECT * FROM users WHERE clue > 0")
+  repository(:integration).adapter.query("SELECT * FROM users WHERE clue > 0")
 
 This does not return any Users (har har), but rather Struct's that will quack
 like Users. They'll be read-only as well.

data/History.txt

@@ -1,52 +1,7 @@
-=== 0.9.11 / not released
+=== 0.10.0 / 2009-10-15
 
-* 1 major enhancement:
+  * Countless enhancements:
 
-  * Added deprecation warning for inferred child_key naming convention change
-
-* 6 bug fixes:
-
-  * Removed unecessary code from SEL
-  * 1.9.1 fix for Logger to use Array#join instead of Array#to_s
-  * 1.9.1 fix for specs to pass
-  * Fix for multiple join models to create correct SQL
-  * Fix for STI and lazy loading
-  * Fixed Resource#eql?
-
-=== 0.9.10 / 2009-01-19
-
-* 1 major enhancement:
-
-  * Ruby 1.9.1 compatibility
-
-* 1 minor enhancement:
-
-  * Updated Resource marshaling to be more thorough
-
-=== 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:
-
-  * 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.
-
-* 1 bug fix:
-
-  * 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.
+    * Total rewrite of most of dm-core, including YARD docs for more
+      than half the methods and ~90% coverage of code.  More to be done
+      but this is a great start.

data/Manifest.txt

@@ -10,6 +10,7 @@ README.txt
 Rakefile
 SPECS
 TODO
+deps.rip
 dm-core.gemspec
 lib/dm-core.rb
 lib/dm-core/adapters.rb
@@ -17,42 +18,46 @@ lib/dm-core/adapters/abstract_adapter.rb
 lib/dm-core/adapters/data_objects_adapter.rb
 lib/dm-core/adapters/in_memory_adapter.rb
 lib/dm-core/adapters/mysql_adapter.rb
+lib/dm-core/adapters/oracle_adapter.rb
 lib/dm-core/adapters/postgres_adapter.rb
 lib/dm-core/adapters/sqlite3_adapter.rb
-lib/dm-core/associations.rb
+lib/dm-core/adapters/yaml_adapter.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/core_ext/kernel.rb
+lib/dm-core/core_ext/symbol.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/migrations.rb
 lib/dm-core/model.rb
-lib/dm-core/naming_conventions.rb
+lib/dm-core/model/descendant_set.rb
+lib/dm-core/model/hook.rb
+lib/dm-core/model/is.rb
+lib/dm-core/model/property.rb
+lib/dm-core/model/relationship.rb
+lib/dm-core/model/scope.rb
 lib/dm-core/property.rb
 lib/dm-core/property_set.rb
 lib/dm-core/query.rb
+lib/dm-core/query/conditions/comparison.rb
+lib/dm-core/query/conditions/operation.rb
+lib/dm-core/query/direction.rb
+lib/dm-core/query/operator.rb
+lib/dm-core/query/path.rb
+lib/dm-core/query/sort.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/spec/adapter_shared_spec.rb
+lib/dm-core/spec/data_objects_adapter_shared_spec.rb
+lib/dm-core/support/chainable.rb
+lib/dm-core/support/deprecate.rb
+lib/dm-core/support/logger.rb
+lib/dm-core/support/naming_conventions.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
@@ -61,67 +66,52 @@ 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/content.rb
-spec/models/vehicles.rb
-spec/models/zoo.rb
+spec/lib/adapter_helpers.rb
+spec/lib/collection_helpers.rb
+spec/lib/counter_adapter.rb
+spec/lib/pending_helpers.rb
+spec/lib/rspec_immediate_feedback_formatter.rb
+spec/public/associations/many_to_many_spec.rb
+spec/public/associations/many_to_one_spec.rb
+spec/public/associations/one_to_many_spec.rb
+spec/public/associations/one_to_one_spec.rb
+spec/public/collection_spec.rb
+spec/public/migrations_spec.rb
+spec/public/model/relationship_spec.rb
+spec/public/model_spec.rb
+spec/public/property_spec.rb
+spec/public/resource_spec.rb
+spec/public/sel_spec.rb
+spec/public/setup_spec.rb
+spec/public/shared/association_collection_shared_spec.rb
+spec/public/shared/collection_shared_spec.rb
+spec/public/shared/finder_shared_spec.rb
+spec/public/shared/resource_shared_spec.rb
+spec/public/shared/sel_shared_spec.rb
+spec/public/transaction_spec.rb
+spec/public/types/discriminator_spec.rb
+spec/semipublic/adapters/abstract_adapter_spec.rb
+spec/semipublic/adapters/in_memory_adapter_spec.rb
+spec/semipublic/adapters/mysql_adapter_spec.rb
+spec/semipublic/adapters/oracle_adapter_spec.rb
+spec/semipublic/adapters/postgres_adapter_spec.rb
+spec/semipublic/adapters/sqlite3_adapter_spec.rb
+spec/semipublic/adapters/yaml_adapter_spec.rb
+spec/semipublic/associations/many_to_one_spec.rb
+spec/semipublic/associations/relationship_spec.rb
+spec/semipublic/associations_spec.rb
+spec/semipublic/collection_spec.rb
+spec/semipublic/property_spec.rb
+spec/semipublic/query/conditions_spec.rb
+spec/semipublic/query/path_spec.rb
+spec/semipublic/query_spec.rb
+spec/semipublic/resource_spec.rb
+spec/semipublic/shared/condition_shared_spec.rb
+spec/semipublic/shared/resource_shared_spec.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/in_memory_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

data/QUICKLINKS

@@ -6,6 +6,6 @@
 * FAQ[link:/files/FAQ.html]
 * Contact Us
   * Website - http://www.datamapper.org
-  * Bug Reports - http://wm.lighthouseapp.com/projects/4819-datamapper/overview
+  * Bug Reports - http://datamapper.lighthouseapp.com
   * IRC Channel - <tt>##datamapper</tt> on irc.freenode.net
   * Mailing List - http://groups.google.com/group/datamapper/

data/README.txt

@@ -8,8 +8,8 @@
 DataMapper sports a very accessible code-base and a welcoming community.
 Outside contributions and feedback are welcome and encouraged, especially
 constructive criticism. Make your voice heard! Submit a
-ticket[http://wm.lighthouseapp.com/projects/4819-datamapper/overview] or
-patch[http://wm.lighthouseapp.com/projects/4819-datamapper/overview], speak up
+ticket[http://datamapper.lighthouseapp.com] or
+patch[http://datamapper.lighthouseapp.com], speak up
 on our mailing-list[http://groups.google.com/group/datamapper/], chat with us
 on irc[irc://irc.freenode.net/#datamapper], write a spec, get it reviewed, ask
 for commit rights. It's as easy as that to become a contributor.
@@ -21,10 +21,12 @@ Pretty profound impact. If you run the following code in ActiveRecord you'll
 see all <tt>false</tt> results. Do the same in DataMapper and it's
 <tt>true</tt> all the way down.
 
-  @parent = Tree.find(:first, :conditions => ['name = ?', 'bob'])
+  repository do
+    @parent = Tree.first(:name => 'bob')
 
-  @parent.children.each do |child|
-    puts @parent.object_id == child.parent.object_id
+    @parent.children.each do |child|
+      puts @parent.object_id == child.parent.object_id
+    end
   end
 
 This makes DataMapper faster and allocate less resources to get things done.
@@ -42,9 +44,11 @@ You can also configure which strategy you'd like to use to track dirtiness.
 
 Ready for something amazing? The following example executes only two queries.
 
-  zoos = Zoo.all
-  first = zoos.first
-  first.exhibits  # Loads the exhibits for all the Zoo objects in the zoos variable.
+  repository do
+    zoos = Zoo.all
+    first = zoos.first
+    first.exhibits  # Loads the exhibits for all the Zoo objects in the zoos variable.
+  end
 
 Pretty impressive huh? The idea is that you aren't going to load a set of
 objects and use only an association in just one of them. This should hold up
@@ -71,6 +75,7 @@ text-fields) by passing a @lazy@ option to your field mapping with a value of
 
   class Animal
     include DataMapper::Resource
+
     property :name, String
     property :notes, Text, :lazy => false
   end
@@ -79,9 +84,11 @@ Plus, lazy-loading of text fields happens automatically and intelligently when
 working with associations.  The following only issues 2 queries to load up all
 of the notes fields on each animal:
 
-  animals = Animal.all
-  animals.each do |pet|
-    pet.notes
+  repository do
+    animals = Animal.all
+    animals.each do |pet|
+      pet.notes
+    end
   end
 
 == Plays Well With Others
@@ -131,13 +138,12 @@ need other comparisons though? Try these:
   Person.all(:name.not => 'bob')
 
   # If the value of a pair is an Array, we do an IN-clause for you.
-  Person.all(:name.like => 'S%', :id => [1, 2, 3, 4, 5])
+  Person.all(:name.like => 'S%', :id => [ 1, 2, 3, 4, 5 ])
 
-  # An alias for Zoo.find(11)
-  Zoo[11]
+  Zoo.get(11)
 
   # Does a NOT IN () clause for you.
-  Person.all(:name.not => ['bob','rick','steve'])
+  Person.all(:name.not => [ 'bob', 'rick', 'steve' ])
 
 See? Fewer SQL fragments dirtying your Ruby code. And that's just a few of the
 nice syntax tweaks DataMapper delivers out of the box...

data/Rakefile

@@ -1,22 +1,21 @@
-#!/usr/bin/env ruby
+#!/usr/bin/env ruby -KU
+
 require 'pathname'
 require 'rubygems'
 require 'rake'
 require 'rake/rdoctask'
-require 'spec/rake/spectask'
-
-require 'lib/dm-core/version'
 
 ROOT = Pathname(__FILE__).dirname.expand_path
 
+require ROOT + 'lib/dm-core/version'
+
 AUTHOR           = 'Dan Kubb'
 EMAIL            = 'dan.kubb@gmail.com'
 GEM_NAME         = 'dm-core'
 GEM_VERSION      = DataMapper::VERSION
 GEM_DEPENDENCIES = [
-  %w[ data_objects ~>0.9.11 ],
-  %w[ extlib       ~>0.9.11 ],
-  %w[ addressable  ~>2.0.2  ],
+  %w[ extlib      ~>0.9.13 ],
+  %w[ addressable ~>2.1    ],
 ]
 
 PROJECT_NAME        = 'datamapper'