dm-core 1.1.0 → 1.2.0.rc1

data/Gemfile

@@ -5,26 +5,28 @@ source 'http://rubygems.org'
 SOURCE         = ENV.fetch('SOURCE', :git).to_sym
 REPO_POSTFIX   = SOURCE == :path ? ''                                : '.git'
 DATAMAPPER     = SOURCE == :path ? Pathname(__FILE__).dirname.parent : 'http://github.com/datamapper'
-DM_VERSION     = '~> 1.1.0'
-DO_VERSION     = '~> 0.10.2'
+DM_VERSION     = '~> 1.2.0.rc1'
+DO_VERSION     = '~> 0.10.6'
 DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ]
 
-gem 'addressable', '~> 2.2.4'
+gem 'addressable', '~> 2.2.6'
 
 group :development do
 
-  gem 'jeweler', '~> 1.5.2'
-  gem 'rake',    '~> 0.8.7'
-  gem 'rspec',   '~> 1.3.1'
-  gem 'yard',    '~> 0.6'
+  gem 'jeweler', '~> 1.6.4'
+  gem 'rake',    '~> 0.9.2'
+  gem 'rspec',   '~> 1.3.2'
 
 end
 
-group :quality do
+platforms :mri_18 do
+  group :quality do
 
-  gem 'yardstick',  '~> 0.2'
-  gem 'rcov',       '~> 0.9.9', :platforms => [:mri_18]
+    gem 'rcov',      '~> 0.9.10'
+    gem 'yard',      '~> 0.7.2'
+    gem 'yardstick', '~> 0.4'
 
+  end
 end
 
 group :datamapper do
@@ -50,7 +52,7 @@ group :datamapper do
   end
 
   adapters.each do |adapter|
-    gem "dm-#{adapter}-adapter", DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-#{adapter}-adapter#{REPO_POSTFIX}"
+    gem "dm-#{adapter}-adapter", ENV.fetch('ADAPTER_VERSION', DM_VERSION), SOURCE => "#{DATAMAPPER}/dm-#{adapter}-adapter#{REPO_POSTFIX}"
   end
 
   plugins = ENV['PLUGINS'] || ENV['PLUGIN']

data/README.rdoc

@@ -5,7 +5,7 @@
 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://datamapper.lighthouseapp.com] or
+ticket[https://github.com/datamapper/dm-core/issues] 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

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 
 begin
-  gem 'jeweler', '~> 1.5.2'
+  gem 'jeweler', '~> 1.6.4'
   require 'jeweler'
 
   Jeweler::Tasks.new do |gem|
@@ -12,7 +12,6 @@ begin
     gem.email       = 'dan.kubb@gmail.com'
     gem.homepage    = 'http://github.com/datamapper/%s' % gem.name
     gem.authors     = [ 'Dan Kubb' ]
-    gem.has_rdoc    = 'yard'
 
     gem.rubyforge_project = 'datamapper'
   end

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0.rc1

data/dm-core.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{dm-core}
-  s.version = "1.1.0"
+  s.name = "dm-core"
+  s.version = "1.2.0.rc1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dan Kubb"]
-  s.date = %q{2011-03-16}
-  s.description = %q{Faster, Better, Simpler.}
-  s.email = %q{dan.kubb@gmail.com}
+  s.date = "2011-09-09"
+  s.description = "Faster, Better, Simpler."
+  s.email = "dan.kubb@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
@@ -35,6 +35,7 @@ Gem::Specification.new do |s|
     "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/backwards.rb",
     "lib/dm-core/collection.rb",
     "lib/dm-core/core_ext/kernel.rb",
     "lib/dm-core/core_ext/pathname.rb",
@@ -76,13 +77,13 @@ Gem::Specification.new do |s|
     "lib/dm-core/relationship_set.rb",
     "lib/dm-core/repository.rb",
     "lib/dm-core/resource.rb",
-    "lib/dm-core/resource/state.rb",
-    "lib/dm-core/resource/state/clean.rb",
-    "lib/dm-core/resource/state/deleted.rb",
-    "lib/dm-core/resource/state/dirty.rb",
-    "lib/dm-core/resource/state/immutable.rb",
-    "lib/dm-core/resource/state/persisted.rb",
-    "lib/dm-core/resource/state/transient.rb",
+    "lib/dm-core/resource/persistence_state.rb",
+    "lib/dm-core/resource/persistence_state/clean.rb",
+    "lib/dm-core/resource/persistence_state/deleted.rb",
+    "lib/dm-core/resource/persistence_state/dirty.rb",
+    "lib/dm-core/resource/persistence_state/immutable.rb",
+    "lib/dm-core/resource/persistence_state/persisted.rb",
+    "lib/dm-core/resource/persistence_state/transient.rb",
     "lib/dm-core/spec/lib/adapter_helpers.rb",
     "lib/dm-core/spec/lib/collection_helpers.rb",
     "lib/dm-core/spec/lib/counter_adapter.rb",
@@ -109,7 +110,6 @@ Gem::Specification.new do |s|
     "lib/dm-core/support/ext/try_dup.rb",
     "lib/dm-core/support/hook.rb",
     "lib/dm-core/support/inflections.rb",
-    "lib/dm-core/support/inflector.rb",
     "lib/dm-core/support/inflector/inflections.rb",
     "lib/dm-core/support/inflector/methods.rb",
     "lib/dm-core/support/lazy_array.rb",
@@ -271,177 +271,31 @@ Gem::Specification.new do |s|
     "tasks/yard.rake",
     "tasks/yardstick.rake"
   ]
-  s.homepage = %q{http://github.com/datamapper/dm-core}
+  s.homepage = "http://github.com/datamapper/dm-core"
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{datamapper}
-  s.rubygems_version = %q{1.6.2}
-  s.summary = %q{An Object/Relational Mapper for Ruby}
-  s.test_files = [
-    "spec/lib/rspec_immediate_feedback_formatter.rb",
-    "spec/public/associations/many_to_many/read_multiple_join_spec.rb",
-    "spec/public/associations/many_to_many_spec.rb",
-    "spec/public/associations/many_to_one_spec.rb",
-    "spec/public/associations/many_to_one_with_boolean_cpk_spec.rb",
-    "spec/public/associations/many_to_one_with_custom_fk_spec.rb",
-    "spec/public/associations/one_to_many_spec.rb",
-    "spec/public/associations/one_to_one_spec.rb",
-    "spec/public/associations/one_to_one_with_boolean_cpk_spec.rb",
-    "spec/public/collection_spec.rb",
-    "spec/public/finalize_spec.rb",
-    "spec/public/model/hook_spec.rb",
-    "spec/public/model/property_spec.rb",
-    "spec/public/model/relationship_spec.rb",
-    "spec/public/model_spec.rb",
-    "spec/public/property/binary_spec.rb",
-    "spec/public/property/boolean_spec.rb",
-    "spec/public/property/class_spec.rb",
-    "spec/public/property/date_spec.rb",
-    "spec/public/property/date_time_spec.rb",
-    "spec/public/property/decimal_spec.rb",
-    "spec/public/property/discriminator_spec.rb",
-    "spec/public/property/float_spec.rb",
-    "spec/public/property/integer_spec.rb",
-    "spec/public/property/object_spec.rb",
-    "spec/public/property/serial_spec.rb",
-    "spec/public/property/string_spec.rb",
-    "spec/public/property/text_spec.rb",
-    "spec/public/property/time_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_finder_shared_spec.rb",
-    "spec/public/shared/collection_shared_spec.rb",
-    "spec/public/shared/finder_shared_spec.rb",
-    "spec/semipublic/adapters/abstract_adapter_spec.rb",
-    "spec/semipublic/adapters/in_memory_adapter_spec.rb",
-    "spec/semipublic/associations/many_to_many_spec.rb",
-    "spec/semipublic/associations/many_to_one_spec.rb",
-    "spec/semipublic/associations/one_to_many_spec.rb",
-    "spec/semipublic/associations/one_to_one_spec.rb",
-    "spec/semipublic/associations/relationship_spec.rb",
-    "spec/semipublic/associations_spec.rb",
-    "spec/semipublic/collection_spec.rb",
-    "spec/semipublic/model_spec.rb",
-    "spec/semipublic/property/binary_spec.rb",
-    "spec/semipublic/property/boolean_spec.rb",
-    "spec/semipublic/property/class_spec.rb",
-    "spec/semipublic/property/date_spec.rb",
-    "spec/semipublic/property/date_time_spec.rb",
-    "spec/semipublic/property/decimal_spec.rb",
-    "spec/semipublic/property/discriminator_spec.rb",
-    "spec/semipublic/property/float_spec.rb",
-    "spec/semipublic/property/integer_spec.rb",
-    "spec/semipublic/property/lookup_spec.rb",
-    "spec/semipublic/property/serial_spec.rb",
-    "spec/semipublic/property/string_spec.rb",
-    "spec/semipublic/property/text_spec.rb",
-    "spec/semipublic/property/time_spec.rb",
-    "spec/semipublic/property_spec.rb",
-    "spec/semipublic/query/conditions/comparison_spec.rb",
-    "spec/semipublic/query/conditions/operation_spec.rb",
-    "spec/semipublic/query/path_spec.rb",
-    "spec/semipublic/query_spec.rb",
-    "spec/semipublic/resource/state/clean_spec.rb",
-    "spec/semipublic/resource/state/deleted_spec.rb",
-    "spec/semipublic/resource/state/dirty_spec.rb",
-    "spec/semipublic/resource/state/immutable_spec.rb",
-    "spec/semipublic/resource/state/transient_spec.rb",
-    "spec/semipublic/resource/state_spec.rb",
-    "spec/semipublic/resource_spec.rb",
-    "spec/semipublic/shared/condition_shared_spec.rb",
-    "spec/semipublic/shared/resource_shared_spec.rb",
-    "spec/semipublic/shared/resource_state_shared_spec.rb",
-    "spec/semipublic/shared/subject_shared_spec.rb",
-    "spec/spec_helper.rb",
-    "spec/support/core_ext/hash.rb",
-    "spec/support/core_ext/inheritable_attributes.rb",
-    "spec/support/properties/huge_integer.rb",
-    "spec/unit/array_spec.rb",
-    "spec/unit/blank_spec.rb",
-    "spec/unit/data_mapper/ordered_set/append_spec.rb",
-    "spec/unit/data_mapper/ordered_set/clear_spec.rb",
-    "spec/unit/data_mapper/ordered_set/delete_spec.rb",
-    "spec/unit/data_mapper/ordered_set/each_spec.rb",
-    "spec/unit/data_mapper/ordered_set/empty_spec.rb",
-    "spec/unit/data_mapper/ordered_set/entries_spec.rb",
-    "spec/unit/data_mapper/ordered_set/eql_spec.rb",
-    "spec/unit/data_mapper/ordered_set/equal_value_spec.rb",
-    "spec/unit/data_mapper/ordered_set/hash_spec.rb",
-    "spec/unit/data_mapper/ordered_set/include_spec.rb",
-    "spec/unit/data_mapper/ordered_set/index_spec.rb",
-    "spec/unit/data_mapper/ordered_set/initialize_spec.rb",
-    "spec/unit/data_mapper/ordered_set/merge_spec.rb",
-    "spec/unit/data_mapper/ordered_set/shared/append_spec.rb",
-    "spec/unit/data_mapper/ordered_set/shared/clear_spec.rb",
-    "spec/unit/data_mapper/ordered_set/shared/delete_spec.rb",
-    "spec/unit/data_mapper/ordered_set/shared/each_spec.rb",
-    "spec/unit/data_mapper/ordered_set/shared/empty_spec.rb",
-    "spec/unit/data_mapper/ordered_set/shared/entries_spec.rb",
-    "spec/unit/data_mapper/ordered_set/shared/include_spec.rb",
-    "spec/unit/data_mapper/ordered_set/shared/index_spec.rb",
-    "spec/unit/data_mapper/ordered_set/shared/initialize_spec.rb",
-    "spec/unit/data_mapper/ordered_set/shared/merge_spec.rb",
-    "spec/unit/data_mapper/ordered_set/shared/size_spec.rb",
-    "spec/unit/data_mapper/ordered_set/shared/to_ary_spec.rb",
-    "spec/unit/data_mapper/ordered_set/size_spec.rb",
-    "spec/unit/data_mapper/ordered_set/to_ary_spec.rb",
-    "spec/unit/data_mapper/subject_set/append_spec.rb",
-    "spec/unit/data_mapper/subject_set/clear_spec.rb",
-    "spec/unit/data_mapper/subject_set/delete_spec.rb",
-    "spec/unit/data_mapper/subject_set/each_spec.rb",
-    "spec/unit/data_mapper/subject_set/empty_spec.rb",
-    "spec/unit/data_mapper/subject_set/entries_spec.rb",
-    "spec/unit/data_mapper/subject_set/get_spec.rb",
-    "spec/unit/data_mapper/subject_set/include_spec.rb",
-    "spec/unit/data_mapper/subject_set/named_spec.rb",
-    "spec/unit/data_mapper/subject_set/shared/append_spec.rb",
-    "spec/unit/data_mapper/subject_set/shared/clear_spec.rb",
-    "spec/unit/data_mapper/subject_set/shared/delete_spec.rb",
-    "spec/unit/data_mapper/subject_set/shared/each_spec.rb",
-    "spec/unit/data_mapper/subject_set/shared/empty_spec.rb",
-    "spec/unit/data_mapper/subject_set/shared/entries_spec.rb",
-    "spec/unit/data_mapper/subject_set/shared/get_spec.rb",
-    "spec/unit/data_mapper/subject_set/shared/include_spec.rb",
-    "spec/unit/data_mapper/subject_set/shared/named_spec.rb",
-    "spec/unit/data_mapper/subject_set/shared/size_spec.rb",
-    "spec/unit/data_mapper/subject_set/shared/to_ary_spec.rb",
-    "spec/unit/data_mapper/subject_set/shared/values_at_spec.rb",
-    "spec/unit/data_mapper/subject_set/size_spec.rb",
-    "spec/unit/data_mapper/subject_set/to_ary_spec.rb",
-    "spec/unit/data_mapper/subject_set/values_at_spec.rb",
-    "spec/unit/hash_spec.rb",
-    "spec/unit/hook_spec.rb",
-    "spec/unit/lazy_array_spec.rb",
-    "spec/unit/mash_spec.rb",
-    "spec/unit/module_spec.rb",
-    "spec/unit/object_spec.rb",
-    "spec/unit/try_dup_spec.rb"
-  ]
+  s.rubyforge_project = "datamapper"
+  s.rubygems_version = "1.8.10"
+  s.summary = "An Object/Relational Mapper for Ruby"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<addressable>, ["~> 2.2.4"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_development_dependency(%q<rake>, ["~> 0.8.7"])
-      s.add_development_dependency(%q<rspec>, ["~> 1.3.1"])
-      s.add_development_dependency(%q<yard>, ["~> 0.6"])
+      s.add_runtime_dependency(%q<addressable>, ["~> 2.2.6"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_development_dependency(%q<rake>, ["~> 0.9.2"])
+      s.add_development_dependency(%q<rspec>, ["~> 1.3.2"])
     else
-      s.add_dependency(%q<addressable>, ["~> 2.2.4"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<rake>, ["~> 0.8.7"])
-      s.add_dependency(%q<rspec>, ["~> 1.3.1"])
-      s.add_dependency(%q<yard>, ["~> 0.6"])
+      s.add_dependency(%q<addressable>, ["~> 2.2.6"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_dependency(%q<rake>, ["~> 0.9.2"])
+      s.add_dependency(%q<rspec>, ["~> 1.3.2"])
     end
   else
-    s.add_dependency(%q<addressable>, ["~> 2.2.4"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<rake>, ["~> 0.8.7"])
-    s.add_dependency(%q<rspec>, ["~> 1.3.1"])
-    s.add_dependency(%q<yard>, ["~> 0.6"])
+    s.add_dependency(%q<addressable>, ["~> 2.2.6"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    s.add_dependency(%q<rake>, ["~> 0.9.2"])
+    s.add_dependency(%q<rspec>, ["~> 1.3.2"])
   end
 end
 

data/lib/dm-core.rb

@@ -28,7 +28,9 @@ require 'dm-core/support/ext/array'
 require 'dm-core/support/ext/try_dup'
 
 require 'dm-core/support/mash'
-require 'dm-core/support/inflector'
+require 'dm-core/support/inflector/inflections'
+require 'dm-core/support/inflector/methods'
+require 'dm-core/support/inflections'
 require 'dm-core/support/chainable'
 require 'dm-core/support/deprecate'
 require 'dm-core/support/descendant_set'
@@ -38,10 +40,29 @@ require 'dm-core/support/lazy_array'
 require 'dm-core/support/local_object_space'
 require 'dm-core/support/hook'
 require 'dm-core/support/subject'
+require 'dm-core/support/ordered_set'
+require 'dm-core/support/subject_set'
 
-require 'dm-core/collection'
+require 'dm-core/query'
+require 'dm-core/query/conditions/operation'
+require 'dm-core/query/conditions/comparison'
+require 'dm-core/query/operator'
+require 'dm-core/query/direction'
+require 'dm-core/query/path'
+require 'dm-core/query/sort'
+
+require 'dm-core/resource'
+require 'dm-core/resource/persistence_state'
+require 'dm-core/resource/persistence_state/transient'
+require 'dm-core/resource/persistence_state/immutable'
+require 'dm-core/resource/persistence_state/persisted'
+require 'dm-core/resource/persistence_state/clean'
+require 'dm-core/resource/persistence_state/deleted'
+require 'dm-core/resource/persistence_state/dirty'
 
 require 'dm-core/property'
+require 'dm-core/property/typecast/numeric'
+require 'dm-core/property/typecast/time'
 require 'dm-core/property/object'
 require 'dm-core/property/string'
 require 'dm-core/property/binary'
@@ -57,7 +78,6 @@ require 'dm-core/property/date_time'
 require 'dm-core/property/time'
 require 'dm-core/property/class'
 require 'dm-core/property/discriminator'
-
 require 'dm-core/property/lookup'
 require 'dm-core/property_set'
 
@@ -68,30 +88,19 @@ require 'dm-core/model/scope'
 require 'dm-core/model/relationship'
 require 'dm-core/model/property'
 
-require 'dm-core/adapters'
-require 'dm-core/adapters/abstract_adapter'
+require 'dm-core/collection'
+require 'dm-core/relationship_set'
 require 'dm-core/associations/relationship'
 require 'dm-core/associations/one_to_many'
 require 'dm-core/associations/one_to_one'
 require 'dm-core/associations/many_to_one'
 require 'dm-core/associations/many_to_many'
+
 require 'dm-core/identity_map'
-require 'dm-core/query'
-require 'dm-core/query/conditions/operation'
-require 'dm-core/query/conditions/comparison'
-require 'dm-core/query/operator'
-require 'dm-core/query/direction'
-require 'dm-core/query/path'
-require 'dm-core/query/sort'
 require 'dm-core/repository'
-require 'dm-core/resource'
-require 'dm-core/resource/state'
-require 'dm-core/resource/state/transient'
-require 'dm-core/resource/state/immutable'
-require 'dm-core/resource/state/persisted'
-require 'dm-core/resource/state/clean'
-require 'dm-core/resource/state/deleted'
-require 'dm-core/resource/state/dirty'
+require 'dm-core/adapters'
+require 'dm-core/adapters/abstract_adapter'
+
 require 'dm-core/support/logger'
 require 'dm-core/support/naming_conventions'
 require 'dm-core/version'
@@ -99,6 +108,8 @@ require 'dm-core/version'
 require 'dm-core/core_ext/kernel'             # TODO: do not load automatically
 require 'dm-core/core_ext/symbol'             # TODO: do not load automatically
 
+require 'dm-core/backwards'                   # TODO: do not load automatically
+
 # A logger should always be present. Lets be consistent with DO
 DataMapper::Logger.new(StringIO.new, :fatal)
 
@@ -267,54 +278,8 @@ module DataMapper
   #
   # @api public
   def self.finalize
-    Model.descendants.each do |model|
-      finalize_model(model)
-    end
+    Model.descendants.each { |model| model.finalize }
     self
   end
 
-  private
-
-  # @api private
-  def self.finalize_model(model)
-    name            = model.name
-    repository_name = model.repository_name
-    relationships   = model.relationships(repository_name)
-
-    if name.to_s.strip.empty?
-      raise IncompleteModelError, "#{model.inspect} must have a name"
-    end
-
-    if model.properties(repository_name).empty? &&
-      !relationships.any? { |relationship| relationship.kind_of?(Associations::ManyToOne::Relationship) }
-      raise IncompleteModelError, "#{name} must have at least one property or many to one relationship to be valid"
-    end
-
-    # Initialize all foreign key properties established by relationships
-    relationships.each do |relationship|
-      if relationship.kind_of?(Associations::ManyToOne::Relationship)
-        # Initialize the foreign key property this "many to one"
-        # relationship uses to persist itself
-        relationship.child_key
-      elsif relationship.kind_of?(Associations::ManyToMany::Relationship)
-        # Initialize the chain for "many to many" relationships
-        relationship.through
-        relationship.via
-      else
-        # If this is a "one to one" or "one to many" relationship, initialize
-        # the inverse "many to one" relationships explicitly before initializing
-        # other relationships. This makes sure that foreign key properties always
-        # appear in the order they were declared.
-        relationship.child_model.relationships.each do |remote_relationship|
-          if remote_relationship.kind_of?(Associations::ManyToOne::Relationship)
-            remote_relationship.child_key
-          end
-        end
-      end
-    end
-
-    if model.key(repository_name).empty?
-      raise IncompleteModelError, "#{name} must have a key to be valid"
-    end
-  end
 end # module DataMapper