dm-core 0.9.5 → 0.9.6

data/Manifest.txt

@@ -13,6 +13,7 @@ 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/in_memory_adapter.rb
 lib/dm-core/adapters/mysql_adapter.rb
 lib/dm-core/adapters/postgres_adapter.rb
 lib/dm-core/adapters/sqlite3_adapter.rb
@@ -86,6 +87,7 @@ 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/spec.opts
@@ -93,6 +95,7 @@ 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

data/lib/dm-core.rb

@@ -22,6 +22,7 @@ require 'addressable/uri'
 
 gem 'extlib', '>=0.9.5'
 require 'extlib'
+require "extlib/inflection"
 
 begin
   require 'fastthread'
@@ -132,8 +133,8 @@ module DataMapper
     case uri_or_options
       when Hash
         adapter_name = uri_or_options[:adapter].to_s
-      when String, Addressable::URI
-        uri_or_options = Addressable::URI.parse(uri_or_options) if uri_or_options.kind_of?(String)
+      when String, DataObjects::URI, Addressable::URI
+        uri_or_options = DataObjects::URI.parse(uri_or_options) if uri_or_options.kind_of?(String)
         adapter_name = uri_or_options.scheme
     end
 
@@ -168,26 +169,19 @@ module DataMapper
   # @param [Symbol] args the name of a repository to act within or return, :default is default
   # @yield [Proc] (optional) block to execute within the context of the named repository
   # @demo spec/integration/repository_spec.rb
-  def self.repository(*args, &block) # :yields: current_context
-    if args.size > 1
-      raise ArgumentError, "Can only pass in one optional argument, but passed in #{args.size} arguments", caller
-    end
-
-    if args.any? && !args.first.kind_of?(Symbol)
-      raise ArgumentError, "First optional argument must be a Symbol, but was #{args.first.inspect}", caller
-    end
-
-    name = args.first
-
+  def self.repository(name = nil) # :yields: current_context
     current_repository = if name
+      raise ArgumentError, "First optional argument must be a Symbol, but was #{args.first.inspect}" unless name.is_a?(Symbol)
       Repository.context.detect { |r| r.name == name } || Repository.new(name)
     else
       Repository.context.last || Repository.new(Repository.default_name)
     end
 
-    return current_repository unless block_given?
-
-    current_repository.scope(&block)
+    if block_given?
+      current_repository.scope { |*block_args| yield(*block_args) }
+    else
+      current_repository
+    end
   end
 
   # A logger should always be present. Lets be consistent with DO
@@ -205,12 +199,12 @@ module DataMapper
   # drops and recreates the repository upwards to match model definitions
   #
   # @param [Symbol] name repository to act on, :default is the default
-  def self.auto_migrate!(name = Repository.default_name)
-    repository(name).auto_migrate!
+  def self.auto_migrate!(repository_name = nil)
+    AutoMigrator.auto_migrate(repository_name)
   end
 
-  def self.auto_upgrade!(name = Repository.default_name)
-    repository(name).auto_upgrade!
+  def self.auto_upgrade!(repository_name = nil)
+    AutoMigrator.auto_upgrade(repository_name)
   end
 
   def self.prepare(*args, &blk)

data/lib/dm-core/adapters.rb

@@ -1,4 +1,22 @@
 dir = Pathname(__FILE__).dirname.expand_path / 'adapters'
 
 require dir / 'abstract_adapter'
+require dir / 'in_memory_adapter'
+
+# TODO Factor these out into dm-more
 require dir / 'data_objects_adapter'
+begin
+  require dir / 'sqlite3_adapter'
+rescue LoadError
+  # ignore it
+end
+begin
+  require dir / 'mysql_adapter'
+rescue LoadError
+  # ignore it
+end
+begin
+  require dir / 'postgres_adapter'
+rescue LoadError
+  # ignore it
+end

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

@@ -38,7 +38,7 @@ module DataMapper
       # connection string for configuration.
       def initialize(name, uri_or_options)
         assert_kind_of 'name',           name,           Symbol
-        assert_kind_of 'uri_or_options', uri_or_options, Addressable::URI, Hash, String
+        assert_kind_of 'uri_or_options', uri_or_options, Addressable::URI, DataObjects::URI, Hash, String
 
         @name = name
         @uri  = normalize_uri(uri_or_options)
@@ -46,12 +46,7 @@ module DataMapper
         @resource_naming_convention = NamingConventions::Resource::UnderscoredAndPluralized
         @field_naming_convention    = NamingConventions::Field::Underscored
 
-        @transactions = Hash.new do |hash, key|
-          hash.delete_if do |k, v|
-            !k.respond_to?(:alive?) || !k.alive?
-          end
-          hash[key] = []
-        end
+        @transactions = {}
       end
 
       # TODO: move to dm-more/dm-migrations
@@ -144,7 +139,7 @@ module DataMapper
         #
         # TODO: move to dm-more/dm-transaction
         def push_transaction(transaction)
-          @transactions[Thread.current] << transaction
+          transactions(Thread.current) << transaction
         end
 
         #
@@ -156,7 +151,7 @@ module DataMapper
         #
         # TODO: move to dm-more/dm-transaction
         def pop_transaction
-          @transactions[Thread.current].pop
+          transactions(Thread.current).pop
         end
 
         #
@@ -169,7 +164,7 @@ module DataMapper
         #
         # TODO: move to dm-more/dm-transaction
         def current_transaction
-          @transactions[Thread.current].last
+          transactions(Thread.current).last
         end
 
         #
@@ -194,6 +189,18 @@ module DataMapper
         def transaction_primitive
           raise NotImplementedError
         end
+
+        private
+        def transactions(thread)
+          unless @transactions[thread]
+            @transactions.delete_if do |key, value|
+              !key.respond_to?(:alive?) || !key.alive?
+            end
+            @transactions[thread] = []
+          end
+          @transactions[thread]
+        end
+
       end
 
       include Transaction

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

@@ -1,4 +1,4 @@
-gem 'data_objects', '=0.9.5'
+gem 'data_objects', '>=0.9.5'
 require 'data_objects'
 
 module DataMapper
@@ -42,7 +42,10 @@ module DataMapper
             command.set_types(query.fields.map { |p| p.primitive })
 
             begin
-              reader = command.execute_reader(*query.bind_values)
+              bind_values = query.bind_values.map do |v|
+                v == [] ? [nil] : v
+              end
+              reader = command.execute_reader(*bind_values)
 
               while(reader.next!)
                 collection.load(reader.values)
@@ -114,12 +117,12 @@ module DataMapper
       protected
 
       def normalize_uri(uri_or_options)
-        if uri_or_options.kind_of?(String)
-          uri_or_options = Addressable::URI.parse(uri_or_options)
+        if uri_or_options.kind_of?(String) || uri_or_options.kind_of?(Addressable::URI)
+          uri_or_options = DataObjects::URI.parse(uri_or_options)
         end
 
-        if uri_or_options.kind_of?(Addressable::URI)
-          return uri_or_options.normalize
+        if uri_or_options.kind_of?(DataObjects::URI)
+          return uri_or_options
         end
 
         adapter  = uri_or_options.delete(:adapter).to_s
@@ -131,7 +134,7 @@ module DataMapper
         query    = uri_or_options.to_a.map { |pair| pair * '=' } * '&'
         query    = nil if query == ''
 
-        return Addressable::URI.new(adapter, user, password, host, port, database, query, nil)
+        return DataObjects::URI.parse(Addressable::URI.new(adapter, user, password, host, port, database, query, nil))
       end
 
       # TODO: clean up once transaction related methods move to dm-more/dm-transactions
@@ -161,7 +164,7 @@ module DataMapper
         end
       end
 
-      def with_connection(&block)
+      def with_connection
         connection = nil
         begin
           connection = create_connection
@@ -174,7 +177,7 @@ module DataMapper
         end
       end
 
-      def with_reader(statement, bind_values = [], &block)
+      def with_reader(statement, bind_values = [])
         with_connection do |connection|
           reader = nil
           begin
@@ -264,8 +267,7 @@ module DataMapper
           table_name = query.model.storage_name(query.repository.name)
 
           statement = ''
-
-          query.links.reverse.each do |relationship|
+          query.links.each do |relationship|
             parent_table_name = relationship.parent_model.storage_name(query.repository.name)
             child_table_name  = relationship.child_model.storage_name(query.repository.name)
 
@@ -326,17 +328,10 @@ module DataMapper
               opposite = condition == left_condition ? right_condition : left_condition
               query.merge_subquery(operator, opposite, condition)
               "(#{read_statement(condition)})"
-            elsif condition.kind_of?(Array) && condition.all? { |p| p.kind_of?(Property) }
+
+            # [].all? is always true
+            elsif condition.kind_of?(Array) && condition.any? && condition.all? { |p| p.kind_of?(Property) }
               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
               '?'
@@ -354,7 +349,7 @@ module DataMapper
             else raise "Invalid query operator: #{operator.inspect}"
           end
 
-          conditions * " #{comparison} "
+          "(" + (conditions * " #{comparison} ") + ")"
         end
 
         def equality_operator(operand)

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

@@ -0,0 +1,87 @@
+module DataMapper
+  module Adapters
+    class InMemoryAdapter < AbstractAdapter
+      def initialize(name, uri_or_options)
+        @records = Hash.new { |hash,model| hash[model] = Array.new }
+      end
+
+      def create(resources)
+        resources.each do |resource|
+          @records[resource.model] << resource
+        end.size # just return the number of records
+      end
+
+      def update(attributes, query)
+        read_many(query).each do |resource|
+          attributes.each do |property,value|
+            property.set!(resource, value)
+          end
+        end.size
+      end
+
+      def read_one(query)
+        read(query, query.model, false)
+      end
+
+      def read_many(query)
+        Collection.new(query) do |set|
+          read(query, set, true)
+        end
+      end
+
+      def delete(query)
+        records = @records[query.model]
+
+        read_many(query).each do |resource|
+          records.delete(resource)
+        end.size
+      end
+
+      private
+
+      def read(query, set, many = true)
+        model      = query.model
+        conditions = query.conditions
+
+        match_with = many ? :select : :detect
+
+        # Iterate over the records for this model, and return
+        # the ones that match the conditions
+        result = @records[model].send(match_with) do |resource|
+          conditions.all? do |tuple|
+            operator, property, bind_value = *tuple
+
+            value = property.get!(resource)
+
+            case operator
+              when :eql, :in then equality_comparison(bind_value, value)
+              when :not      then !equality_comparison(bind_value, value)
+              when :like     then Regexp.new(bind_value) =~ value
+              when :gt       then !value.nil? && value >  bind_value
+              when :gte      then !value.nil? && value >= bind_value
+              when :lt       then !value.nil? && value <  bind_value
+              when :lte      then !value.nil? && value <= bind_value
+              else raise "Invalid query operator: #{operator.inspect}"
+            end
+          end
+        end
+
+        return result unless many
+
+        # TODO Sort
+
+        # TODO Limit
+
+        set.replace(result)
+      end
+
+      def equality_comparison(bind_value, value)
+        case bind_value
+          when Array, Range then bind_value.include?(value)
+          when NilClass     then value.nil?
+          else                   bind_value == value
+        end
+      end
+    end
+  end
+end

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

@@ -1,4 +1,4 @@
-gem 'do_mysql', '=0.9.5'
+gem 'do_mysql', '>=0.9.5'
 require 'do_mysql'
 
 module DataMapper

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

@@ -1,4 +1,4 @@
-gem 'do_postgres', '=0.9.5'
+gem 'do_postgres', '>=0.9.5'
 require 'do_postgres'
 
 module DataMapper
@@ -86,7 +86,7 @@ module DataMapper
           end
 
           # TODO: move to dm-more/dm-migrations
-          def without_notices(&block)
+          def without_notices
             # execute the block with NOTICE messages disabled
             begin
               execute('SET client_min_messages = warning')

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

@@ -1,4 +1,4 @@
-gem 'do_sqlite3', '=0.9.5'
+gem 'do_sqlite3', '>=0.9.5'
 require 'do_sqlite3'
 
 module DataMapper

data/lib/dm-core/associations.rb

@@ -45,8 +45,8 @@ module DataMapper
     end
 
     def relationships(repository_name = default_repository_name)
-      @relationships ||= Hash.new { |h,k| h[k] = k == Repository.default_name ? {} : h[Repository.default_name].dup }
-      @relationships[repository_name]
+      @relationships ||= {}
+      @relationships[repository_name] ||= repository_name == Repository.default_name ? {} : relationships(Repository.default_name).dup
     end
 
     def n
@@ -145,6 +145,7 @@ module DataMapper
     #
     # @api public
     def belongs_to(name, options={})
+      @_valid_relations = false
       relationship = ManyToOne.setup(name, self, options)
       # Please leave this in - I will release contextual serialization soon
       # which requires this -- guyvdb

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

@@ -42,13 +42,13 @@ module DataMapper
         opts[:child_model]              ||= opts.delete(:class_name)  || Extlib::Inflection.classify(name)
         opts[:parent_model]             =   model
         opts[:repository_name]          =   repository_name
-        opts[:remote_relationship_name] ||= opts.delete(:remote_name) || name
+        opts[:remote_relationship_name] ||= opts.delete(:remote_name) || Extlib::Inflection.tableize(opts[:child_model])
         opts[:parent_key]               =   opts[:parent_key]
         opts[:child_key]                =   opts[:child_key]
         opts[:mutable]                  =   true
 
         names        = [ opts[:child_model], opts[:parent_model].name ].sort
-        model_name   = names.join
+        model_name   = names.join.gsub("::", "")
         storage_name = Extlib::Inflection.tableize(Extlib::Inflection.pluralize(names[0]) + names[1])
 
         opts[:near_relationship_name] = Extlib::Inflection.tableize(model_name).to_sym
@@ -67,7 +67,7 @@ module DataMapper
           EOS
 
           names.each do |n|
-            model.belongs_to(Extlib::Inflection.underscore(n).to_sym)
+            model.belongs_to(Extlib::Inflection.underscore(n).gsub("/", "_").to_sym, :class_name => n)
           end
 
           Object.const_set(model_name, model)

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

@@ -132,7 +132,7 @@ module DataMapper
           orphan_resource(super)
         end
 
-        def delete(resource, &block)
+        def delete(resource)
           assert_mutable
           orphan_resource(super)
         end
@@ -153,6 +153,14 @@ module DataMapper
           assert_mutable
           attributes = default_attributes.merge(attributes)
           resource = children.respond_to?(:build) ? super(attributes) : new_child(attributes)
+          resource
+        end
+
+        def new(attributes = {})
+          assert_mutable
+          raise UnsavedParentError, 'You cannot intialize until the parent is saved' if @parent.new_record?
+          attributes = default_attributes.merge(attributes)
+          resource = children.respond_to?(:new) ? super(attributes) : @relationship.child_model.new(attributes)
           self << resource
           resource
         end
@@ -196,7 +204,7 @@ module DataMapper
         end
 
         def save
-          assert_mutable
+          return true if children.frozen?
 
           # save every resource in the collection
           each { |resource| save_resource(resource) }