dm-core 0.9.3 → 0.9.4

data/CONTRIBUTING

@@ -0,0 +1,51 @@
+# NOTE: This is a work in progress. As of July 24, it applies only to dm-core.
+
+# Contributing to Edge DataMapper
+
+We have now implemented Hoe throughout the DataMapper suite, so there will be a 
+handful of new procedures for contributing to our git repositories. I'll give 
+you a run through of how to set up your machine, and then provide a few 
+commands that should be run before committing or pushing changes.
+
+## Installing and configuring Hoe
+
+The first step is to install hoe. You'll need at least version 1.7.0.
+
+    (sudo) gem install hoe --include-dependencies
+    
+Now you'll need to configure hoe. You'll need to run this from inside of 
+dm-core, or one of the other DataMapper projects.
+
+    rake config_hoe
+    
+The only thing you should need to change is the exclude regular expression, 
+which needs to look like this:
+
+    exclude: !ruby/regexp /tmp$|CVS|\.svn|\.git|.+\.gemspec/
+    
+Now you have the correct setup for contributing.
+
+## Before committing changes
+
+Before you commit changes, you must verify that `Manifest.txt` (the file which 
+contains the names of every file to be included in a gem release) and 
+`[project-name].gemspec` are up to date. We have create a rake task to make 
+this easy:
+
+    rake gemspec
+    
+This will check `Manifest.txt` (using Hoe's `rake check_manifest`) to ensure 
+there are no differences between the files in the project, and those listed in 
+the manifest. If there is a difference, it will display a warning and a list of 
+the differences in `diff` format.
+
+If the changes in the diff are correct, then you can run the following command 
+to update the manifest.
+
+    rake check_manifest | patch
+    
+If there are files you do not want added to the manifest, then you should 
+remove the files from the project, and then run `rake gemspec` again.
+
+If `rake gemspec` says it was successful, then you can proceed with committing 
+and pushing your changes.

data/FAQ

@@ -61,14 +61,32 @@ back.  If you want to just execute something against the database, use
 
 === Can I get an query log of what DataMapper is issuing?
 
-Yup, to set this up, do:
+An example of how to modify an existing logger:
 
-  DataMapper::Logger.new(STDOUT, 0)
+  DataMapper.logger.set_log(STDOUT, :debug)
 
-Incidentally, if you'd like to send a message into the DataMapper logger, do:
+An example of how to create new logger:
 
-  DataMapper.logger.debug { "something" }
-  DataMapper.logger.info { "something" }
-  DataMapper.logger.warn { "something" }
-  DataMapper.logger.error { "something" }
-  DataMapper.logger.fatal { "something" }
+  DataMapper::Logger.new(STDOUT, :info)
+
+To send a message to the DataMapper logger:
+
+  DataMapper.logger.debug("something")
+  DataMapper.logger.info ("something")
+  DataMapper.logger.warn ("something")
+  DataMapper.logger.error("something")
+  DataMapper.logger.fatal("something")
+
+
+=== I want to run the specs, but I have a custom database setup
+
+For example, if you installed MySQL using MacPorts, your socket may be located
+at /opt/local/var/run/mysql5/mysqld.sock instead of /tmp/mysql.sock
+
+In that case, setup an environment variable in your shell before running the
+specs:
+  export MYSQL_SPEC_URI="mysql://localhost/dm_core_test?socket=/opt/local/var/run/mysql5/mysqld.sock"
+  rake spec
+
+Using another kind of database? Note that spec_helper.rb will also look for
+SQLITE3_SPEC_URI AND POSTGRES_SPEC_URI.

data/Manifest.txt

@@ -1,4 +1,5 @@
 .autotest
+CONTRIBUTING
 FAQ
 History.txt
 MIT-LICENSE
@@ -119,5 +120,6 @@ spec/unit/type_spec.rb
 tasks/ci.rb
 tasks/dm.rb
 tasks/doc.rb
+tasks/gemspec.rb
 tasks/hoe.rb
 tasks/install.rb

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", GEM_VERSION], ["extlib", GEM_VERSION],
+GEM_DEPENDENCIES = ["data_objects", GEM_VERSION], ["extlib", "=0.9.4"],
                    ["rspec", ">=1.1.3"], ["addressable", ">=1.0.4"]
 
 
@@ -23,6 +23,7 @@ PROJECT_SUMMARY = "An Object/Relational Mapper for Ruby"
 PROJECT_URL  = "http://datamapper.org"
 
 require ROOT + 'tasks/hoe'
+require ROOT + 'tasks/gemspec'
 require ROOT + 'tasks/install'
 require ROOT + 'tasks/dm'
 require ROOT + 'tasks/doc'

data/lib/dm-core.rb

@@ -20,7 +20,7 @@ require 'rubygems'
 gem 'addressable', '>=1.0.4'
 require 'addressable/uri'
 
-gem 'extlib', '=0.9.3'
+gem 'extlib', '=0.9.4'
 require 'extlib'
 
 begin
@@ -143,8 +143,13 @@ module DataMapper
       lib_name = "#{Extlib::Inflection.underscore(adapter_name)}_adapter"
       begin
         require root / 'lib' / 'dm-core' / 'adapters' / lib_name
-      rescue LoadError
-        require lib_name
+      rescue LoadError => e
+        begin
+          require lib_name
+        rescue Exception
+          # library not found, raise the original error
+          raise e
+        end
       end
     end
 

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

@@ -43,8 +43,8 @@ module DataMapper
         @name = name
         @uri  = normalize_uri(uri_or_options)
 
-        @resource_naming_convention = NamingConventions::UnderscoredAndPluralized
-        @field_naming_convention    = NamingConventions::Underscored
+        @resource_naming_convention = NamingConventions::Resource::UnderscoredAndPluralized
+        @field_naming_convention    = NamingConventions::Field::Underscored
 
         @transactions = Hash.new do |hash, key|
           hash.delete_if do |k, v|

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

@@ -1,4 +1,4 @@
-gem 'data_objects', '=0.9.3'
+gem 'data_objects', '=0.9.4'
 require 'data_objects'
 
 module DataMapper
@@ -327,7 +327,17 @@ 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, p, qualify) } * ', '})"
+              property_values = condition.map { |p| property_to_column_name(query.repository, p, qualify) }
+              # An IN() clause with an empty set is the same as a false condition
+              # IN() with an empty set is not supported on all RDMS, but this is.
+              if property_values.empty?
+                if [:eql, :in, :not].include? operator
+                  return operator == :not ? "1=1" : "0=1" 
+                else
+                  raise "Invalid query operator #{operator.inspect} for #{property_values.inspect}"
+                end
+              end
+              "(#{property_values * ', '})"
             else
               '?'
             end
@@ -500,7 +510,7 @@ module DataMapper
           end
 
           # TODO: move to dm-more/dm-migrations
-          def drop_table_statement(repisitory, model)
+          def drop_table_statement(repository, model)
             "DROP TABLE IF EXISTS #{quote_table_name(model.storage_name(repository.name))}"
           end
 
@@ -546,7 +556,11 @@ module DataMapper
               # remove the default if the property is not nullable
               schema.delete(:default) unless property.nullable?
             else
-              schema[:default] = property.default
+              if property.type.respond_to?(:dump)
+                schema[:default] = property.type.dump(property.default, property)
+              else
+                schema[:default] = property.default
+              end
             end
 
             schema

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

@@ -1,4 +1,4 @@
-gem 'do_mysql', '=0.9.3'
+gem 'do_mysql', '=0.9.4'
 require 'do_mysql'
 
 module DataMapper
@@ -39,8 +39,10 @@ module DataMapper
         def storage_exists?(storage_name)
           statement = <<-EOS.compress_lines
             SELECT COUNT(*)
-            FROM `information_schema`.`columns`
-            WHERE `table_schema` = ? AND `table_name` = ?
+            FROM `information_schema`.`tables`
+            WHERE `table_type` = 'BASE TABLE'
+            AND `table_schema` = ?
+            AND `table_name` = ?
           EOS
 
           query(statement, db_name, storage_name).first > 0
@@ -51,7 +53,9 @@ module DataMapper
           statement = <<-EOS.compress_lines
             SELECT COUNT(*)
             FROM `information_schema`.`columns`
-            WHERE `table_schema` = ? AND `table_name` = ? AND `column_name` = ?
+            WHERE `table_schema` = ?
+            AND `table_name` = ?
+            AND `column_name` = ?
           EOS
 
           query(statement, db_name, storage_name, field_name).first > 0

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

@@ -1,4 +1,4 @@
-gem 'do_postgres', '=0.9.3'
+gem 'do_postgres', '=0.9.4'
 require 'do_postgres'
 
 module DataMapper
@@ -21,7 +21,8 @@ module DataMapper
           statement = <<-EOS.compress_lines
             SELECT COUNT(*)
             FROM "information_schema"."columns"
-            WHERE "table_name" = ? AND "table_schema" = current_schema()
+            WHERE "table_name" = ?
+            AND "table_schema" = current_schema()
           EOS
 
           query(statement, storage_name).first > 0
@@ -33,7 +34,9 @@ module DataMapper
             SELECT COUNT(*)
             FROM "pg_class"
             JOIN "pg_attribute" ON "pg_class"."oid" = "pg_attribute"."attrelid"
-            WHERE "pg_attribute"."attname" = ? AND "pg_class"."relname" = ? AND "pg_attribute"."attnum" >= 0
+            WHERE "pg_attribute"."attname" = ?
+            AND "pg_class"."relname" = ?
+            AND "pg_attribute"."attnum" >= 0
           EOS
 
           query(statement, column_name, storage_name).first > 0
@@ -53,6 +56,7 @@ module DataMapper
 
         # TODO: move to dm-more/dm-migrations
         def destroy_model_storage(repository, model)
+          return true unless storage_exists?(model.storage_name(repository.name))
           success = without_notices { super }
           model.properties(repository.name).each do |property|
             drop_sequence(repository, property) if property.serial?
@@ -76,6 +80,11 @@ module DataMapper
         module SQL
           private
 
+          # TODO: move to dm-more/dm-migrations
+          def drop_table_statement(repository, model)
+            "DROP TABLE #{quote_table_name(model.storage_name(repository.name))}"
+          end
+
           # TODO: move to dm-more/dm-migrations
           def without_notices(&block)
             # execute the block with NOTICE messages disabled

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

@@ -1,4 +1,4 @@
-gem 'do_sqlite3', '=0.9.3'
+gem 'do_sqlite3', '=0.9.4'
 require 'do_sqlite3'
 
 module DataMapper

data/lib/dm-core/associations.rb

@@ -40,6 +40,7 @@ module DataMapper
     #
     # @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
 

data/lib/dm-core/associations/many_to_one.rb

@@ -61,7 +61,9 @@ module DataMapper
           return true  unless parent.new_record?
 
           @relationship.with_repository(parent) do
-            parent.save
+            result = parent.save
+            @relationship.child_key.set(@child, @relationship.parent_key.get(parent)) if result
+            result
           end
         end
 
@@ -78,6 +80,10 @@ module DataMapper
           super || parent.respond_to?(method, include_private)
         end
 
+        def instance_variable_get(variable)
+          super || parent.instance_variable_get(variable)
+        end
+
         private
 
         def initialize(relationship, child)

data/lib/dm-core/associations/one_to_many.rb

@@ -244,7 +244,7 @@ module DataMapper
         end
 
         def assert_mutable
-          raise ImmutableAssociationError, 'You can not modify this assocation' if children.frozen?
+          raise ImmutableAssociationError, 'You can not modify this association' if children.frozen?
         end
 
         def default_attributes

data/lib/dm-core/associations/relationship.rb

@@ -103,15 +103,14 @@ module DataMapper
 
             query = collection.query.dup
             query.conditions.map! do |operator, property, bind_value|
-              if child_key.has_property?(property.name)
+              if operator != :raw && child_key.has_property?(property.name)
                 bind_value = *children.map { |child| property.get(child) }.uniq
               end
               [ operator, property, bind_value ]
             end
 
-            parents_children = Collection.new(query) do |collection|
-              children.each { |child| collection.send(:add, child) }
-            end
+            parents_children = Collection.new(query)
+            children.each { |child| parents_children.send(:add, child) }
 
             if parent_key.get(parent) == parent_values
               ret = parents_children
@@ -137,22 +136,24 @@ module DataMapper
             return parent
           end
 
-          children = child_identity_map.values
+          children = child_identity_map.values | [child]
 
-          bind_values = *children.map { |c| child_key.get(c) }.uniq
-          query_values = bind_values.reject { |k| parent_identity_map[[k]] }
+          bind_values = children.map { |c| child_key.get(c) }.uniq
+          query_values = bind_values.reject { |k| parent_identity_map[k] }
 
           bind_values = query_values unless query_values.empty?
-          query = parent_key.map { |k| [ k, bind_values ] }.to_hash
-
+          query = parent_key.zip(bind_values.transpose).to_hash
           association_accessor = "#{self.name}_association"
 
           collection = parent_model.send(:all, query)
-          collection.send(:lazy_load)
-          children.each do |c|
-            c.send(association_accessor).instance_variable_set(:@parent, collection.get(*child_key.get(c)))
+          unless collection.empty?
+            collection.send(:lazy_load)
+            children.each do |c|
+              c.send(association_accessor).instance_variable_set(:@parent, collection.get(*child_key.get(c)))
+            end
+          
+            child.send(association_accessor).instance_variable_get(:@parent)
           end
-          child.send(association_accessor).instance_variable_get(:@parent)
         end
       end
 

data/lib/dm-core/auto_migrations.rb

@@ -3,14 +3,40 @@
 module DataMapper
   class AutoMigrator
     ##
-    # Destructively automigrates the data-store to match the model
+    # Destructively automigrates the data-store to match the model.
+    # First migrates all models down and then up.
     # REPEAT: THIS IS DESTRUCTIVE
     #
     # @param Symbol repository_name the repository to be migrated
-    # @calls DataMapper::Resource#auto_migrate!
-    def self.auto_migrate(repository_name = nil)
-      DataMapper::Resource.descendants.each do |model|
-        model.auto_migrate!(repository_name)
+    def self.auto_migrate(repository_name = nil, *descendants)
+      auto_migrate_down(repository_name, *descendants)
+      auto_migrate_up(repository_name, *descendants)
+    end
+
+    ##
+    # Destructively automigrates the data-store down
+    # REPEAT: THIS IS DESTRUCTIVE
+    #
+    # @param Symbol repository_name the repository to be migrated
+    # @calls DataMapper::Resource#auto_migrate_down!
+    # @api private
+    def self.auto_migrate_down(repository_name = nil, *descendants)
+      descendants = DataMapper::Resource.descendants.to_a if descendants.empty?
+      descendants.reverse.each do |model|
+        model.auto_migrate_down!(repository_name)
+      end
+    end
+
+    ##
+    # Automigrates the data-store up
+    #
+    # @param Symbol repository_name the repository to be migrated
+    # @calls DataMapper::Resource#auto_migrate_up!
+    # @api private
+    def self.auto_migrate_up(repository_name = nil, *descendants)
+      descendants = DataMapper::Resource.descendants.to_a if descendants.empty?
+      descendants.each do |model|
+        model.auto_migrate_up!(repository_name)
       end
     end
 
@@ -34,11 +60,37 @@ module DataMapper
     #
     # @param Symbol repository_name the repository to be migrated
     def auto_migrate!(repository_name = nil)
+      auto_migrate_down!(repository_name)
+      auto_migrate_up!(repository_name)
+    end
+
+    ##
+    # Destructively migrates the data-store down, which basically
+    # deletes all the models.
+    # REPEAT: THIS IS DESTRUCTIVE
+    #
+    # @param Symbol repository_name the repository to be migrated
+    # @api private
+    def auto_migrate_down!(repository_name = nil)
       if self.superclass != Object
         self.superclass.auto_migrate!(repository_name)
       else
         repository(repository_name) do |r|
           r.adapter.destroy_model_storage(r, self)
+        end
+      end
+    end
+
+    ##
+    # Auto migrates the data-store to match the model
+    #
+    # @param Symbol repository_name the repository to be migrated
+    # @api private
+    def auto_migrate_up!(repository_name = nil)
+      if self.superclass != Object
+        self.superclass.auto_migrate!(repository_name)
+      else
+        repository(repository_name) do |r|
           r.adapter.create_model_storage(r, self)
         end
       end