dm-core 0.9.11 → 0.10.0

data/tasks/doc.rb

@@ -1,20 +1,17 @@
 # when yard's ready, it'll have to come back, but for now...
-Rake::RDocTask.new("doc") do |t|
-  t.rdoc_dir = 'doc'
-  t.title    = "DataMapper - Ruby Object Relational Mapper"
-  t.options  = ['--line-numbers', '--inline-source', '--all']
-  t.rdoc_files.include("README.txt", "QUICKLINKS", "FAQ", "lib/**/**/*.rb")
+Rake::RDocTask.new('doc') do |config|
+  config.rdoc_dir = 'doc'
+  config.title    = 'DataMapper - Ruby Object Relational Mapper'
+  config.options  = %w[ --line-numbers --inline-source --all ]
+  config.rdoc_files.include('README.txt', 'QUICKLINKS', 'FAQ', 'lib/**/**/*.rb')
 end
 
 begin
-  gem 'yard', '>=0.2.1'
   require 'yard'
 
-  YARD::Rake::YardocTask.new("yardoc") do |t|
-    t.options << '--protected'
-    # t.options << '-q'
-    # t.files << '...anyglobshere...'
+  YARD::Rake::YardocTask.new('yardoc') do |config|
+    config.files << 'lib/**/*.rb'
   end
-rescue Exception
+rescue LoadError
   # yard not installed
 end

data/tasks/gemspec.rb

@@ -1,20 +1,20 @@
-desc "Generate gemspec"
-task :gemspec do |x|
+desc 'Generate gemspec'
+task :gemspec do
   # Clean up extraneous files before checking manifest
   %x[rake clean]
 
   # Check the manifest before generating the gemspec
   manifest = %x[rake check_manifest]
-  manifest.gsub!("(in /usr/local/projects/dm/dm-core)\n", "")
+  manifest.gsub!("(in /usr/local/projects/dm/dm-core)\n", '')
 
   unless manifest.empty?
-    print "\n", "#"*68, "\n"
+    print "\n", '#' * 68, "\n"
     print <<-EOS
   Manifest.txt is not up-to-date. Please review the changes below.
   If the changes are correct, run 'rake check_manifest | patch'
   and then run this command again.
 EOS
-    print "#"*68, "\n\n"
+    print '#' * 68, "\n\n"
     puts manifest
   else
     %x[rake debug_gem > #{GEM_NAME}.gemspec]

data/tasks/hoe.rb

@@ -1,8 +1,8 @@
 require 'hoe'
 
-@config_file = "~/.rubyforge/user-config.yml"
+@config_file = '~/.rubyforge/user-config.yml'
 @config = nil
-RUBYFORGE_USERNAME = "unknown"
+RUBYFORGE_USERNAME = 'unknown'
 def rubyforge_username
   unless @config
     begin
@@ -16,31 +16,30 @@ Run 'rubyforge setup' to prepare your env for access to Rubyforge
       exit
     end
   end
-  RUBYFORGE_USERNAME.replace @config["username"]
+  RUBYFORGE_USERNAME.replace @config['username']
 end
 
 # Remove hoe dependency
 class Hoe
   def extra_dev_deps
-    @extra_dev_deps.reject! { |dep| dep[0] == "hoe" }
+    @extra_dev_deps.reject! { |dep| dep[0] == 'hoe' }
     @extra_dev_deps
   end
 end
 
-hoe = Hoe.new(GEM_NAME, GEM_VERSION) do |p|
+# Don't use Hoe's test task
+Hoe.plugins.delete(:test)
 
-  p.developer(AUTHOR, EMAIL)
+hoe = Hoe.spec(GEM_NAME) do
+  developer(AUTHOR, EMAIL)
 
-  p.description = PROJECT_DESCRIPTION
-  p.summary = PROJECT_SUMMARY
-  p.url = PROJECT_URL
+  self.version     = GEM_VERSION
+  self.description = PROJECT_DESCRIPTION
+  self.summary     = PROJECT_SUMMARY
+  self.url         = PROJECT_URL
 
-  p.rubyforge_name = PROJECT_NAME if PROJECT_NAME
-
-  p.clean_globs |= ["{coverage,doc,log,tmp}", "**/*.{log,db}", "profile_results.*", "**/.DS_Store"]
-
-  GEM_DEPENDENCIES.each do |dep|
-    p.extra_deps << dep
-  end
+  self.rubyforge_name = PROJECT_NAME
 
+  clean_globs |= %w[ {coverage,doc,log,tmp} **/*.{log,db} profile_results.* **/.DS_Store spec/db ]
+  extra_deps  |= GEM_DEPENDENCIES
 end

data/tasks/install.rb

@@ -1,20 +1,18 @@
 WIN32 = (RUBY_PLATFORM =~ /win32|mingw|bccwin|cygwin/) rescue nil
 SUDO = WIN32 ? '' : ('sudo' unless ENV['SUDOLESS'])
 
-desc "Install #{GEM_NAME}"
+def sudo_gem(cmd)
+  sh "#{SUDO} #{RUBY} -S gem #{cmd}", :verbose => false
+end
+
 if WIN32
+  desc "Install #{GEM_NAME}"
   task :install => :gem do
-    system %{gem install --no-rdoc --no-ri -l pkg/#{GEM_NAME}-#{GEM_VERSION}.gem}
-  end
-  namespace :dev do
-    desc 'Install for development (for windows)'
-    task :winstall => :gem do
-      warn "You can now call 'rake install' instead of 'rake dev:winstall'."
-      system %{gem install --no-rdoc --no-ri -l pkg/#{GEM_NAME}-#{GEM_VERSION}.gem}
-    end
+    sudo_gem "install --no-rdoc --no-ri pkg/#{GEM_NAME}-#{GEM_VERSION}.gem"
   end
 else
+  desc "Install #{GEM_NAME}"
   task :install => :package do
-    sh %{#{SUDO} gem install --local pkg/#{GEM_NAME}-#{GEM_VERSION}.gem}
+    sudo_gem "install --no-rdoc --no-ri pkg/#{GEM_NAME}-#{GEM_VERSION}.gem"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-core
 version: !ruby/object:Gem::Version 
-  version: 0.9.11
+  version: 0.10.0
 platform: ruby
 authors: 
 - Dan Kubb
@@ -9,39 +9,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-29 00:00:00 -07:00
+date: 2009-09-16 00:00:00 -07:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: data_objects
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.9.11
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: extlib
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.9.11
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: addressable
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.0.2
-    version: 
+dependencies: []
+
 description: Faster, Better, Simpler.
 email: 
 - dan.kubb@gmail.com
@@ -66,6 +37,7 @@ files:
 - Rakefile
 - SPECS
 - TODO
+- deps.rip
 - dm-core.gemspec
 - lib/dm-core.rb
 - lib/dm-core/adapters.rb
@@ -73,42 +45,46 @@ files:
 - 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
@@ -117,67 +93,52 @@ files:
 - 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
@@ -186,6 +147,8 @@ files:
 - tasks/install.rb
 has_rdoc: true
 homepage: http://datamapper.org
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -207,9 +170,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: An Object/Relational Mapper for Ruby
 test_files: []
 

data/lib/dm-core/associations.rb

@@ -1,207 +0,0 @@
-dir = Pathname(__FILE__).dirname.expand_path / 'associations'
-
-require dir / 'relationship'
-require dir / 'relationship_chain'
-require dir / 'many_to_many'
-require dir / 'many_to_one'
-require dir / 'one_to_many'
-require dir / 'one_to_one'
-
-module DataMapper
-  module Associations
-    include Assertions
-
-    class ImmutableAssociationError < RuntimeError
-    end
-
-    class UnsavedParentError < RuntimeError
-    end
-
-    # Returns all relationships that are many-to-one for this model.
-    #
-    # Used to find the relationships that require properties in any Repository.
-    #
-    # Example:
-    # class Plur
-    #   include DataMapper::Resource
-    #   def self.default_repository_name
-    #     :plur_db
-    #   end
-    #   repository(:plupp_db) do
-    #     has 1, :plupp
-    #   end
-    # end
-    #
-    # This resource has a many-to-one to the Plupp resource residing in the :plupp_db repository,
-    # but the Plur resource needs the plupp_id property no matter what repository itself lives in,
-    # ie we need to create that property when we migrate etc.
-    #
-    # Used in DataMapper::Model.properties_with_subclasses
-    #
-    # @api private
-    def many_to_one_relationships
-      relationships unless @relationships # needs to be initialized!
-      @relationships.values.collect do |rels| rels.values end.flatten.select do |relationship| relationship.child_model == self end
-    end
-
-    def relationships(repository_name = default_repository_name)
-      @relationships ||= {}
-      @relationships[repository_name] ||= repository_name == Repository.default_name ? {} : relationships(Repository.default_name).dup
-    end
-
-    def n
-      1.0/0
-    end
-
-    ##
-    # A shorthand, clear syntax for defining one-to-one, one-to-many and
-    # many-to-many resource relationships.
-    #
-    # @example [Usage]
-    #   * has 1, :friend                          # one friend
-    #   * has n, :friends                         # many friends
-    #   * has 1..3, :friends
-    #                         # many friends (at least 1, at most 3)
-    #   * has 3, :friends
-    #                         # many friends (exactly 3)
-    #   * has 1, :friend, :class_name => 'User'
-    #                         # one friend with the class name User
-    #   * has 3, :friends, :through => :friendships
-    #                         # many friends through the friendships relationship
-    #   * has n, :friendships => :friends
-    #                         # identical to above example
-    #
-    # @param cardinality [Integer, Range, Infinity]
-    #   cardinality that defines the association type and constraints
-    # @param name <Symbol>  the name that the association will be referenced by
-    # @param opts <Hash>    an options hash
-    #
-    # @option :through[Symbol]  A association that this join should go through to form
-    #       a many-to-many association
-    # @option :class_name[String] The name of the class to associate with, if omitted
-    #       then the association name is assumed to match the class name
-    # @option :remote_name[Symbol] In the case of a :through option being present, the
-    #       name of the relationship on the other end of the :through-relationship
-    #       to be linked to this relationship.
-    #
-    # @return [DataMapper::Association::Relationship] the relationship that was
-    #   created to reflect either a one-to-one, one-to-many or many-to-many
-    #   relationship
-    # @raise [ArgumentError] if the cardinality was not understood. Should be a
-    #   Integer, Range or Infinity(n)
-    #
-    # @api public
-    def has(cardinality, name, options = {})
-
-      # NOTE: the reason for this fix is that with the ability to pass in two
-      # hashes into has() there might be instances where people attempt to
-      # pass in the options into the name part and not know why things aren't
-      # working for them.
-      if name.kind_of?(Hash)
-        name_through, through = name.keys.first, name.values.first
-        cardinality_string = cardinality.to_s == 'Infinity' ? 'n' : cardinality.inspect
-        warn("In #{self.name} 'has #{cardinality_string}, #{name_through.inspect} => #{through.inspect}' is deprecated. Use 'has #{cardinality_string}, #{name_through.inspect}, :through => #{through.inspect}' instead")
-      end
-
-      options = options.merge(extract_min_max(cardinality))
-      options = options.merge(extract_throughness(name))
-
-      # do not remove this. There is alot of confusion on people's
-      # part about what the first argument to has() is.  For the record it
-      # is the min cardinality and max cardinality of the association.
-      # simply put, it constraints the number of resources that will be
-      # returned by the association.  It is not, as has been assumed,
-      # the number of results on the left and right hand side of the
-      # reltionship.
-      if options[:min] == n && options[:max] == n
-        raise ArgumentError, 'Cardinality may not be n..n.  The cardinality specifies the min/max number of results from the association', caller
-      end
-
-      klass = options[:max] == 1 ? OneToOne : OneToMany
-      klass = ManyToMany if options[:through] == DataMapper::Resource
-      relationship = klass.setup(options.delete(:name), self, options)
-
-      # Please leave this in - I will release contextual serialization soon
-      # which requires this -- guyvdb
-      # TODO convert this to a hook in the plugin once hooks work on class
-      # methods
-      self.init_has_relationship_for_serialization(relationship) if self.respond_to?(:init_has_relationship_for_serialization)
-
-      relationship
-    end
-
-    ##
-    # A shorthand, clear syntax for defining many-to-one resource relationships.
-    #
-    # @example [Usage]
-    #   * belongs_to :user                          # many_to_one, :friend
-    #   * belongs_to :friend, :class_name => 'User'  # many_to_one :friends
-    #
-    # @param name [Symbol] The name that the association will be referenced by
-    # @see #has
-    #
-    # @return [DataMapper::Association::ManyToOne] The association created
-    #   should not be accessed directly
-    #
-    # @api public
-    def belongs_to(name, options={})
-      @_valid_relations = false
-
-      if options.key?(:class_name) && !options.key?(:child_key)
-        warn "The inferred child_key will changing to be prefixed with the relationship name #{name}. " \
-          "When using :class_name in belongs_to specify the :child_key explicitly to avoid problems." \
-          "#{caller(0)[1]}"
-      end
-
-      relationship = ManyToOne.setup(name, self, options)
-      # Please leave this in - I will release contextual serialization soon
-      # which requires this -- guyvdb
-      # TODO convert this to a hook in the plugin once hooks work on class
-      # methods
-      self.init_belongs_relationship_for_serialization(relationship) if self.respond_to?(:init_belongs_relationship_for_serialization)
-
-      relationship
-    end
-
-    private
-
-    def extract_throughness(name)
-      assert_kind_of 'name', name, Hash, Symbol
-
-      case name
-        when Hash
-          unless name.keys.size == 1
-            raise ArgumentError, "name must have only one key, but had #{name.keys.size}", caller(2)
-          end
-
-          { :name => name.keys.first, :through => name.values.first }
-        when Symbol
-          { :name => name }
-      end
-    end
-
-    # A support method form converting Integer, Range or Infinity values into a
-    # { :min => x, :max => y } hash.
-    #
-    # @api private
-    def extract_min_max(constraints)
-      assert_kind_of 'constraints', constraints, Integer, Range unless constraints == n
-
-      case constraints
-        when Integer
-          { :min => constraints, :max => constraints }
-        when Range
-          if constraints.first > constraints.last
-            raise ArgumentError, "Constraint min (#{constraints.first}) cannot be larger than the max (#{constraints.last})"
-          end
-
-          { :min => constraints.first, :max => constraints.last }
-        when n
-          { :min => 0, :max => n }
-      end
-    end
-  end # module Associations
-
-  Model.append_extensions DataMapper::Associations
-
-end # module DataMapper