mack-data_mapper 0.8.2 → 0.8.3

data/lib/gems/data_objects-0.9.10.1/lib/data_objects/reader.rb

@@ -0,0 +1,22 @@
+module DataObjects
+  class Reader
+
+    def fields
+      raise NotImplementedError.new
+    end
+
+    def values
+      raise NotImplementedError.new
+    end
+
+    def close
+      raise NotImplementedError.new
+    end
+
+    # Moves the cursor forward.
+    def next!
+      raise NotImplementedError.new
+    end
+
+  end
+end

data/lib/gems/data_objects-0.9.10.1/lib/data_objects/result.rb

@@ -0,0 +1,13 @@
+module DataObjects
+  class Result
+    attr_accessor :insert_id, :affected_rows
+
+    def initialize(command, affected_rows, insert_id = nil)
+      @command, @affected_rows, @insert_id = command, affected_rows, insert_id
+    end
+
+    def to_i
+      @affected_rows
+    end
+  end
+end

data/lib/gems/data_objects-0.9.10.1/lib/data_objects/transaction.rb

@@ -0,0 +1,45 @@
+require 'digest'
+require 'digest/sha2'
+
+module DataObjects
+
+  class Transaction
+
+    HOST = "#{Socket::gethostbyname(Socket::gethostname)[0]}" rescue "localhost"
+    @@counter = 0
+
+    attr_reader :connection
+    attr_reader :id
+
+    def self.create_for_uri(uri)
+      uri = uri.is_a?(String) ? URI::parse(uri) : uri
+      DataObjects.const_get(uri.scheme.capitalize)::Transaction.new(uri)
+    end
+
+    #
+    # Creates a Transaction bound to the given connection
+    #
+    # ==== Parameters
+    # conn<DataObjects::Connection>:: The Connection to bind the new Transaction to
+    #
+    def initialize(uri)
+      @connection = DataObjects::Connection.new(uri)
+      @id = Digest::SHA256.hexdigest("#{HOST}:#{$$}:#{Time.now.to_f}:#{@@counter += 1}")
+    end
+
+    def close
+      @connection.close
+    end
+
+    [:begin, :commit, :rollback, :rollback_prepared, :prepare].each do |method_name|
+
+      eval <<EOF
+def #{method_name}
+  raise NotImplementedError
+end
+EOF
+
+    end
+
+  end
+end

data/lib/gems/data_objects-0.9.10.1/lib/data_objects/uri.rb

@@ -0,0 +1,34 @@
+gem 'addressable', '~>2.0'
+require 'addressable/uri'
+
+module DataObjects
+  URI = Struct.new(:scheme, :user, :password, :host, :port, :path, :query, :fragment)
+
+  class URI
+    def self.parse(uri)
+      return uri if uri.kind_of?(self)
+      uri = Addressable::URI::parse(uri) unless uri.kind_of?(Addressable::URI)
+      self.new(uri.scheme, uri.user, uri.password, uri.host, uri.port, uri.path, uri.query_values, uri.fragment)
+    end
+
+    def to_s
+      string = ""
+      string << "#{scheme}://"   if scheme
+      if user
+        string << "#{user}"
+        string << ":#{password}" if password
+        string << "@"
+      end
+      string << "#{host}"        if host
+      string << ":#{port}"       if port
+      string << path.to_s
+      if query
+        string << "?" << query.map do |key, value|
+          "#{key}=#{value}"
+        end.join("&")
+      end
+      string << "##{fragment}"   if fragment
+      string
+    end
+  end
+end

data/lib/gems/data_objects-0.9.10.1/lib/data_objects/version.rb

@@ -0,0 +1,3 @@
+module DataObjects
+  VERSION = "0.9.10.1" unless defined?(DataObjects::VERSION)
+end

data/lib/gems/{dm-aggregates-0.9.7 → dm-aggregates-0.9.9}/lib/dm-aggregates.rb

@@ -3,7 +3,7 @@ require 'rubygems'
 dir = Pathname(__FILE__).dirname.expand_path + 'dm-aggregates'
 
 require dir + 'version'
-gem 'dm-core', DataMapper::More::Aggregates::VERSION
+gem 'dm-core', '~>0.9.9'
 require 'dm-core'
 
 

data/lib/gems/{dm-aggregates-0.9.7 → dm-aggregates-0.9.9}/lib/dm-aggregates/collection.rb

@@ -2,6 +2,10 @@ module DataMapper
   class Collection
     include AggregateFunctions
 
+#    def size
+#      loaded? ? super : count
+#    end
+
     private
 
     def property_by_name(property_name)

data/lib/gems/{dm-aggregates-0.9.7 → dm-aggregates-0.9.9}/lib/dm-aggregates/model.rb

@@ -2,6 +2,10 @@ module DataMapper
   module Model
     include AggregateFunctions
 
+#    def size
+#      count
+#    end
+
     private
 
     def property_by_name(property_name)

data/lib/gems/dm-aggregates-0.9.9/lib/dm-aggregates/version.rb

@@ -0,0 +1,5 @@
+module DataMapper
+  module Aggregates
+    VERSION = '0.9.9'
+  end
+end

data/lib/gems/{dm-core-0.9.7 → dm-core-0.9.9}/lib/dm-core.rb

@@ -11,20 +11,20 @@
 
 require 'date'
 require 'pathname'
+require 'rubygems'
 require 'set'
 require 'time'
 require 'yaml'
 
-require 'rubygems'
-
-gem 'addressable', '~>2.0'
+gem 'addressable', '~>2.0.1'
 require 'addressable/uri'
 
-gem 'extlib', '~>0.9.8'
+gem 'extlib', '~>0.9.9'
 require 'extlib'
-require "extlib/inflection"
+require 'extlib/inflection'
 
 begin
+  gem 'fastthread', '~>1.0.1'
   require 'fastthread'
 rescue LoadError
   # fastthread not installed

data/lib/gems/{dm-core-0.9.7 → dm-core-0.9.9}/lib/dm-core/adapters/data_objects_adapter.rb

@@ -1,4 +1,4 @@
-gem 'data_objects', '~>0.9.7'
+gem 'data_objects', '~>0.9.10'
 require 'data_objects'
 
 module DataMapper

data/lib/gems/{dm-core-0.9.7 → dm-core-0.9.9}/lib/dm-core/adapters/mysql_adapter.rb

@@ -1,4 +1,4 @@
-gem 'do_mysql', '~>0.9.7'
+gem 'do_mysql', '~>0.9.10'
 require 'do_mysql'
 
 module DataMapper

data/lib/gems/{dm-core-0.9.7 → dm-core-0.9.9}/lib/dm-core/adapters/postgres_adapter.rb

@@ -1,4 +1,4 @@
-gem 'do_postgres', '~>0.9.7'
+gem 'do_postgres', '~>0.9.10'
 require 'do_postgres'
 
 module DataMapper

data/lib/gems/{dm-core-0.9.7 → dm-core-0.9.9}/lib/dm-core/adapters/sqlite3_adapter.rb

@@ -1,4 +1,4 @@
-gem 'do_sqlite3', '~>0.9.7'
+gem 'do_sqlite3', '~>0.9.10'
 require 'do_sqlite3'
 
 module DataMapper

data/lib/gems/{dm-core-0.9.7 → dm-core-0.9.9}/lib/dm-core/associations/many_to_one.rb

@@ -48,7 +48,7 @@ module DataMapper
       class Proxy
         include Assertions
 
-        instance_methods.each { |m| undef_method m unless %w[ __id__ __send__ class kind_of? respond_to? assert_kind_of should should_not instance_variable_set instance_variable_get ].include?(m) }
+        instance_methods.each { |m| undef_method m unless %w[ __id__ __send__ kind_of? respond_to? assert_kind_of should should_not instance_variable_set instance_variable_get ].include?(m.to_s) }
 
         def replace(parent)
           @parent = parent

data/lib/gems/{dm-core-0.9.7 → dm-core-0.9.9}/lib/dm-core/associations/one_to_many.rb

@@ -72,7 +72,7 @@ module DataMapper
       class Proxy
         include Assertions
 
-        instance_methods.each { |m| undef_method m unless %w[ __id__ __send__ class kind_of? respond_to? assert_kind_of should should_not instance_variable_set instance_variable_get ].include?(m) }
+        instance_methods.each { |m| undef_method m unless %w[ __id__ __send__ class kind_of? respond_to? assert_kind_of should should_not instance_variable_set instance_variable_get ].include?(m.to_s) }
 
         # FIXME: remove when RelationshipChain#get_children can return a Collection
         def all(query = {})
@@ -306,11 +306,8 @@ module DataMapper
         end
 
         def method_missing(method, *args, &block)
-          results = children.__send__(method, *args, &block) if children.respond_to?(method)
-
-          return self if LazyArray::RETURN_SELF.include?(method) && results.kind_of?(Array)
-
-          results
+          results = children.send(method, *args, &block)
+          results.equal?(children) ? self : results
         end
       end # class Proxy
     end # module OneToMany

data/lib/gems/{dm-core-0.9.7 → dm-core-0.9.9}/lib/dm-core/collection.rb

@@ -494,6 +494,32 @@ module DataMapper
       super || model.public_methods(false).include?(method.to_s) || relationships.has_key?(method)
     end
 
+    # TODO: add docs
+    # @api private
+    def _dump(*)
+      Marshal.dump([ query, to_a ])
+    end
+
+    # TODO: add docs
+    # @api private
+    def self._load(marshalled)
+      query, array = Marshal.load(marshalled)
+
+      # XXX: IMHO it is a code smell to be forced to use allocate
+      # and instance_variable_set to load an object.  You should
+      # be able to use a constructor to provide all the info needed
+      # to initialize an object.  This should be fixed in the edge
+      # branch dkubb/dm-core
+
+      collection = allocate
+      collection.instance_variable_set(:@query,          query)
+      collection.instance_variable_set(:@array,          array)
+      collection.instance_variable_set(:@loaded,         true)
+      collection.instance_variable_set(:@key_properties, collection.send(:model).key(collection.repository.name))
+      collection.instance_variable_set(:@cache,          {})
+      collection
+    end
+
     protected
 
     ##

data/lib/gems/{dm-core-0.9.7 → dm-core-0.9.9}/lib/dm-core/model.rb

@@ -306,11 +306,30 @@ module DataMapper
       resource
     end
 
-    # TODO SPEC
+    ##
+    # Copy a set of records from one repository to another.
+    #
+    # @param [String] source
+    #   The name of the Repository the resources should be copied _from_
+    # @param [String] destination
+    #   The name of the Repository the resources should be copied _to_
+    # @param [Hash] query
+    #   The conditions with which to find the records to copy. These
+    #   conditions are merged with Model.query
+    #
+    # @return [DataMapper::Collection]
+    #   A Collection of the Resource instances created in the operation
+    #
+    # @api public
     def copy(source, destination, query = {})
+
+      # get the list of properties that exist in the source and destination
+      destination_properties = properties(destination)
+      fields = query[:fields] ||= properties(source).select { |p| destination_properties.has_property?(p.name) }
+
       repository(destination) do
-        repository(source).read_many(scoped_query(query)).each do |resource|
-          self.create(resource.attributes)
+        all(query.merge(:repository => repository(source))).map do |resource|
+          create(fields.map { |p| [ p.name, p.get(resource) ] }.to_hash)
         end
       end
     end
@@ -366,6 +385,13 @@ module DataMapper
       Query.new(repository, self, query.merge(conditions))
     end
 
+    # TODO: add docs
+    # @api private
+    def _load(marshalled)
+      repository_name, attributes = Marshal.load(marshalled)
+      repository(repository_name) { new(attributes) }
+    end
+
     def typecast_key(key)
       self.key(repository_name).zip(key).map { |k, v| k.typecast(v) }
     end

data/lib/gems/{dm-core-0.9.7 → dm-core-0.9.9}/lib/dm-core/property.rb

@@ -512,6 +512,19 @@ module DataMapper
       "#<Property:#{@model}:#{@name}>"
     end
 
+    # TODO: add docs
+    # @api private
+    def _dump(*)
+      Marshal.dump([ repository, model, name ])
+    end
+
+    # TODO: add docs
+    # @api private
+    def self._load(marshalled)
+      repository, model, name = Marshal.load(marshalled)
+      model.properties(repository.name)[name]
+    end
+
     private
 
     def initialize(model, name, type, options = {})

data/lib/gems/{dm-core-0.9.7 → dm-core-0.9.9}/lib/dm-core/query.rb

@@ -51,11 +51,10 @@ module DataMapper
       @limit        = other.limit         unless other.limit         == nil
       @order        = other.order         unless other.order         == model.default_order
       @add_reversed = other.add_reversed? unless other.add_reversed? == false
+      @fields       = other.fields        unless other.fields        == @properties.defaults
       @links        = other.links         unless other.links         == []
       @includes     = other.includes      unless other.includes      == []
 
-      @fields == @properties.defaults ? @fields = other.fields : @fields |= other.fields
-
       update_conditions(other)
 
       self
@@ -152,6 +151,55 @@ module DataMapper
       "#<#{self.class.name} #{attrs.map { |(k,v)| "@#{k}=#{v.inspect}" } * ' '}>"
     end
 
+    # TODO: add docs
+    # @api public
+    def to_hash
+      hash = {
+        :reload       => reload?,
+        :unique       => unique?,
+        :offset       => offset,
+        :order        => order,
+        :add_reversed => add_reversed?,
+        :fields       => fields,
+      }
+
+      hash[:limit]    = limit    unless limit    == nil
+      hash[:links]    = links    unless links    == []
+      hash[:includes] = includes unless includes == []
+
+      conditions  = {}
+      raw_queries = []
+      bind_values = []
+
+      conditions.each do |condition|
+        if condition[0] == :raw
+          raw_queries << condition[1]
+          bind_values << condition[2]
+        else
+          operator, property, bind_value = condition
+          conditions[ Query::Operator.new(property, operator) ] = bind_value
+        end
+      end
+
+      if raw_queries.any?
+        hash[:conditions] = [ raw_queries.join(' ') ].concat(bind_values)
+      end
+
+      hash.update(conditions)
+    end
+
+    # TODO: add docs
+    # @api private
+    def _dump(*)
+      Marshal.dump([ repository, model, to_hash ])
+    end
+
+    # TODO: add docs
+    # @api private
+    def self._load(marshalled)
+      new(*Marshal.load(marshalled))
+    end
+
     private
 
     def initialize(repository, model, options = {})
@@ -574,7 +622,7 @@ module DataMapper
     class Path
       include Assertions
 
-   %w[ id type ].each { |m| undef_method m }
+      instance_methods.each { |m| undef_method m if %w[ id type ].include?(m.to_s) }
 
       attr_reader :relationships, :model, :property, :operator