dm-aggregates 1.1.0.rc2 → 1.1.0.rc3

data/Gemfile

@@ -5,7 +5,7 @@ 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.rc2'
+DM_VERSION     = '~> 1.1.0.rc3'
 DO_VERSION     = '~> 0.10.2'
 DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ]
 

data/VERSION

@@ -1 +1 @@
-1.1.0.rc2
+1.1.0.rc3

data/dm-aggregates.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-aggregates}
-  s.version = "1.1.0.rc2"
+  s.version = "1.1.0.rc3"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Foy Savas"]
-  s.date = %q{2011-03-01}
+  s.date = %q{2011-03-10}
   s.description = %q{DataMapper plugin providing support for aggregates on collections}
   s.email = %q{foysavas [a] gmail [d] com}
   s.extra_rdoc_files = [
@@ -28,7 +28,9 @@ Gem::Specification.new do |s|
     "lib/dm-aggregates/aggregate_functions.rb",
     "lib/dm-aggregates/collection.rb",
     "lib/dm-aggregates/core_ext/symbol.rb",
+    "lib/dm-aggregates/functions.rb",
     "lib/dm-aggregates/model.rb",
+    "lib/dm-aggregates/operators.rb",
     "lib/dm-aggregates/query.rb",
     "lib/dm-aggregates/repository.rb",
     "spec/isolated/require_after_setup_spec.rb",
@@ -47,7 +49,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/datamapper/dm-aggregates}
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{datamapper}
-  s.rubygems_version = %q{1.5.2}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{DataMapper plugin providing support for aggregates on collections}
   s.test_files = [
     "spec/isolated/require_after_setup_spec.rb",
@@ -63,18 +65,18 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<dm-core>, ["~> 1.1.0.rc2"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.1.0.rc3"])
       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"])
     else
-      s.add_dependency(%q<dm-core>, ["~> 1.1.0.rc2"])
+      s.add_dependency(%q<dm-core>, ["~> 1.1.0.rc3"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rake>, ["~> 0.8.7"])
       s.add_dependency(%q<rspec>, ["~> 1.3.1"])
     end
   else
-    s.add_dependency(%q<dm-core>, ["~> 1.1.0.rc2"])
+    s.add_dependency(%q<dm-core>, ["~> 1.1.0.rc3"])
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<rake>, ["~> 0.8.7"])
     s.add_dependency(%q<rspec>, ["~> 1.3.1"])

data/lib/dm-aggregates.rb

@@ -7,12 +7,6 @@ require 'dm-aggregates/model'
 require 'dm-aggregates/query'
 require 'dm-aggregates/repository'
 
-begin
-  require 'active_support/core_ext/time/conversions'
-rescue LoadError
-  require 'extlib/time'
-end
-
 module DataMapper
   module Aggregates
     def self.include_aggregate_api

data/lib/dm-aggregates/aggregate_functions.rb

@@ -1,232 +1 @@
-module DataMapper
-  module Aggregates
-    module Functions
-      include DataMapper::Assertions
-
-      # Count results (given the conditions)
-      #
-      # @example the count of all friends
-      #   Friend.count
-      #
-      # @example the count of all friends older then 18
-      #   Friend.count(:age.gt => 18)
-      #
-      # @example the count of all your female friends
-      #   Friend.count(:conditions => [ 'gender = ?', 'female' ])
-      #
-      # @example the count of all friends with an address (NULL values are not included)
-      #   Friend.count(:address)
-      #
-      # @example the count of all friends with an address that are older then 18
-      #   Friend.count(:address, :age.gt => 18)
-      #
-      # @example the count of all your female friends with an address
-      #   Friend.count(:address, :conditions => [ 'gender = ?', 'female' ])
-      #
-      # @param property [Symbol] of the property you with to count (optional)
-      # @param  opts [Hash, Symbol] the conditions
-      #
-      # @return [Integer] return the count given the conditions
-      #
-      # @api public
-      def count(*args)
-        query         = args.last.kind_of?(Hash) ? args.pop : {}
-        property_name = args.first
-
-        if property_name
-          assert_kind_of 'property', property_by_name(property_name), Property
-        end
-
-        aggregate(query.merge(:fields => [ property_name ? property_name.count : :all.count ])).to_i
-      end
-
-      # Get the lowest value of a property
-      #
-      # @example the age of the youngest friend
-      #   Friend.min(:age)
-      #
-      # @example  the age of the youngest female friend
-      #   Friend.min(:age, :conditions => [ 'gender = ?', 'female' ])
-      #
-      # @param property [Symbol] the property you wish to get the lowest value of
-      # @param  opts [Hash, Symbol] the conditions
-      #
-      # @return [Integer] return the lowest value of a property given the conditions
-      #
-      # @api public
-      def min(*args)
-        query         = args.last.kind_of?(Hash) ? args.pop : {}
-        property_name = args.first
-
-        assert_property_type property_name, ::Integer, ::Float, ::BigDecimal, ::DateTime, ::Date, ::Time
-
-        aggregate(query.merge(:fields => [ property_name.min ]))
-      end
-
-      # Get the highest value of a property
-      #
-      # @example the age of the oldest friend
-      #   Friend.max(:age)
-      #
-      # @example the age of the oldest female friend
-      #   Friend.max(:age, :conditions => [ 'gender = ?', 'female' ])
-      #
-      # @param property [Symbol] the property you wish to get the highest value of
-      # @param  opts [Hash, Symbol] the conditions
-      #
-      # @return [Integer] return the highest value of a property given the conditions
-      #
-      # @api public
-      def max(*args)
-        query         = args.last.kind_of?(Hash) ? args.pop : {}
-        property_name = args.first
-
-        assert_property_type property_name, ::Integer, ::Float, ::BigDecimal, ::DateTime, ::Date, ::Time
-
-        aggregate(query.merge(:fields => [ property_name.max ]))
-      end
-
-      # Get the average value of a property
-      #
-      # @example the average age of all friends
-      #   Friend.avg(:age)
-      #
-      # @example the average age of all female friends
-      #   Friend.avg(:age, :conditions => [ 'gender = ?', 'female' ])
-      #
-      # @param property [Symbol] the property you wish to get the average value of
-      # @param  opts [Hash, Symbol] the conditions
-      #
-      # @return [Integer] return the average value of a property given the conditions
-      #
-      # @api public
-      def avg(*args)
-        query         = args.last.kind_of?(Hash) ? args.pop : {}
-        property_name = args.first
-
-        assert_property_type property_name, ::Integer, ::Float, ::BigDecimal
-
-        aggregate(query.merge(:fields => [ property_name.avg ]))
-      end
-
-      # Get the total value of a property
-      #
-      # @example the total age of all friends
-      #   Friend.sum(:age)
-      #
-      # @example the total age of all female friends
-      #   Friend.max(:age, :conditions => [ 'gender = ?', 'female' ])
-      #
-      # @param property [Symbol] the property you wish to get the total value of
-      # @param  opts [Hash, Symbol] the conditions
-      #
-      # @return [Integer] return the total value of a property given the conditions
-      #
-      # @api public
-      def sum(*args)
-        query         = args.last.kind_of?(::Hash) ? args.pop : {}
-        property_name = args.first
-
-        assert_property_type property_name, ::Integer, ::Float, ::BigDecimal
-
-        aggregate(query.merge(:fields => [ property_name.sum ]))
-      end
-
-      # Perform aggregate queries
-      #
-      # @example the count of friends
-      #   Friend.aggregate(:all.count)
-      #
-      # @example the minimum age, the maximum age and the total age of friends
-      #   Friend.aggregate(:age.min, :age.max, :age.sum)
-      #
-      # @example the average age, grouped by gender
-      #   Friend.aggregate(:age.avg, :fields => [ :gender ])
-      #
-      # @param aggregates [Symbol, ...] operators to aggregate with
-      # @param query [Hash] the conditions
-      #
-      # @return [Array,Numeric,DateTime,Date,Time] the results of the
-      #   aggregate query
-      #
-      # @api public
-      def aggregate(*args)
-        query = args.last.kind_of?(Hash) ? args.pop : {}
-
-        query[:fields] ||= []
-        query[:fields]  |= args
-        query[:fields].map! { |f| normalize_field(f) }
-
-        raise ArgumentError, 'query[:fields] must not be empty' if query[:fields].empty?
-
-        unless query.key?(:order)
-          # the current collection/model is already sorted by attributes
-          # and since we are projecting away some of the attributes,
-          # and then performing aggregate functions on the remainder,
-          # we need to honor the existing order, as if it were already
-          # materialized, and we are looping over the rows in order.
-
-          directions = direction_map
-
-          query[:order] = []
-
-          # use the current query order for each property if available
-          query[:fields].each do |property|
-            next unless property.kind_of?(Property)
-            query[:order] << directions.fetch(property, property)
-          end
-        end
-
-        query = scoped_query(query)
-
-        if query.fields.any? { |p| p.kind_of?(Property) }
-          query.repository.aggregate(query.update(:unique => true))
-        else
-          query.repository.aggregate(query).first  # only return one row
-        end
-      end
-
-      private
-
-      def assert_property_type(name, *types)
-        if name.nil?
-          raise ArgumentError, 'property name must not be nil'
-        end
-
-        property = property_by_name(name)
-        type     = property.primitive
-
-        unless types.include?(type)
-          raise ArgumentError, "#{name} must be #{types * ' or '}, but was #{type}"
-        end
-      end
-
-      def normalize_field(field)
-        assert_kind_of 'field', field, DataMapper::Query::Operator, Symbol, Property
-
-        case field
-          when DataMapper::Query::Operator
-            if field.target == :all
-              field
-            else
-              field.class.new(property_by_name(field.target), field.operator)
-            end
-
-          when Symbol
-            property_by_name(field)
-
-          when Property
-            field
-        end
-      end
-
-      def direction_map
-        direction_map = {}
-        self.query.order.each do |direction|
-          direction_map[direction.target] = direction
-        end
-        direction_map
-      end
-    end
-  end
-end
+require 'dm-aggregates/functions'

data/lib/dm-aggregates/collection.rb

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

data/lib/dm-aggregates/core_ext/symbol.rb

@@ -1,9 +1,7 @@
+require 'dm-aggregates/operators'
+
 class Symbol
-  [ :count, :min, :max, :avg, :sum ].each do |sym|
-    class_eval <<-RUBY, __FILE__, __LINE__ + 1
-      def #{sym}
-        DataMapper::Query::Operator.new(self, #{sym.inspect})
-      end
-    RUBY
-  end
-end # class Symbol
+
+  include DataMapper::Aggregates::Operators
+
+end

data/lib/dm-aggregates/functions.rb

@@ -0,0 +1,232 @@
+module DataMapper
+  module Aggregates
+    module Functions
+      include DataMapper::Assertions
+
+      # Count results (given the conditions)
+      #
+      # @example the count of all friends
+      #   Friend.count
+      #
+      # @example the count of all friends older then 18
+      #   Friend.count(:age.gt => 18)
+      #
+      # @example the count of all your female friends
+      #   Friend.count(:conditions => [ 'gender = ?', 'female' ])
+      #
+      # @example the count of all friends with an address (NULL values are not included)
+      #   Friend.count(:address)
+      #
+      # @example the count of all friends with an address that are older then 18
+      #   Friend.count(:address, :age.gt => 18)
+      #
+      # @example the count of all your female friends with an address
+      #   Friend.count(:address, :conditions => [ 'gender = ?', 'female' ])
+      #
+      # @param property [Symbol] of the property you with to count (optional)
+      # @param  opts [Hash, Symbol] the conditions
+      #
+      # @return [Integer] return the count given the conditions
+      #
+      # @api public
+      def count(*args)
+        query         = args.last.kind_of?(Hash) ? args.pop : {}
+        property_name = args.first
+
+        if property_name
+          assert_kind_of 'property', property_by_name(property_name), Property
+        end
+
+        aggregate(query.merge(:fields => [ property_name ? property_name.count : :all.count ])).to_i
+      end
+
+      # Get the lowest value of a property
+      #
+      # @example the age of the youngest friend
+      #   Friend.min(:age)
+      #
+      # @example  the age of the youngest female friend
+      #   Friend.min(:age, :conditions => [ 'gender = ?', 'female' ])
+      #
+      # @param property [Symbol] the property you wish to get the lowest value of
+      # @param  opts [Hash, Symbol] the conditions
+      #
+      # @return [Integer] return the lowest value of a property given the conditions
+      #
+      # @api public
+      def min(*args)
+        query         = args.last.kind_of?(Hash) ? args.pop : {}
+        property_name = args.first
+
+        assert_property_type property_name, ::Integer, ::Float, ::BigDecimal, ::DateTime, ::Date, ::Time
+
+        aggregate(query.merge(:fields => [ property_name.min ]))
+      end
+
+      # Get the highest value of a property
+      #
+      # @example the age of the oldest friend
+      #   Friend.max(:age)
+      #
+      # @example the age of the oldest female friend
+      #   Friend.max(:age, :conditions => [ 'gender = ?', 'female' ])
+      #
+      # @param property [Symbol] the property you wish to get the highest value of
+      # @param  opts [Hash, Symbol] the conditions
+      #
+      # @return [Integer] return the highest value of a property given the conditions
+      #
+      # @api public
+      def max(*args)
+        query         = args.last.kind_of?(Hash) ? args.pop : {}
+        property_name = args.first
+
+        assert_property_type property_name, ::Integer, ::Float, ::BigDecimal, ::DateTime, ::Date, ::Time
+
+        aggregate(query.merge(:fields => [ property_name.max ]))
+      end
+
+      # Get the average value of a property
+      #
+      # @example the average age of all friends
+      #   Friend.avg(:age)
+      #
+      # @example the average age of all female friends
+      #   Friend.avg(:age, :conditions => [ 'gender = ?', 'female' ])
+      #
+      # @param property [Symbol] the property you wish to get the average value of
+      # @param  opts [Hash, Symbol] the conditions
+      #
+      # @return [Integer] return the average value of a property given the conditions
+      #
+      # @api public
+      def avg(*args)
+        query         = args.last.kind_of?(Hash) ? args.pop : {}
+        property_name = args.first
+
+        assert_property_type property_name, ::Integer, ::Float, ::BigDecimal
+
+        aggregate(query.merge(:fields => [ property_name.avg ]))
+      end
+
+      # Get the total value of a property
+      #
+      # @example the total age of all friends
+      #   Friend.sum(:age)
+      #
+      # @example the total age of all female friends
+      #   Friend.max(:age, :conditions => [ 'gender = ?', 'female' ])
+      #
+      # @param property [Symbol] the property you wish to get the total value of
+      # @param  opts [Hash, Symbol] the conditions
+      #
+      # @return [Integer] return the total value of a property given the conditions
+      #
+      # @api public
+      def sum(*args)
+        query         = args.last.kind_of?(::Hash) ? args.pop : {}
+        property_name = args.first
+
+        assert_property_type property_name, ::Integer, ::Float, ::BigDecimal
+
+        aggregate(query.merge(:fields => [ property_name.sum ]))
+      end
+
+      # Perform aggregate queries
+      #
+      # @example the count of friends
+      #   Friend.aggregate(:all.count)
+      #
+      # @example the minimum age, the maximum age and the total age of friends
+      #   Friend.aggregate(:age.min, :age.max, :age.sum)
+      #
+      # @example the average age, grouped by gender
+      #   Friend.aggregate(:age.avg, :fields => [ :gender ])
+      #
+      # @param aggregates [Symbol, ...] operators to aggregate with
+      # @param query [Hash] the conditions
+      #
+      # @return [Array,Numeric,DateTime,Date,Time] the results of the
+      #   aggregate query
+      #
+      # @api public
+      def aggregate(*args)
+        query = args.last.kind_of?(Hash) ? args.pop : {}
+
+        query[:fields] ||= []
+        query[:fields]  |= args
+        query[:fields].map! { |f| normalize_field(f) }
+
+        raise ArgumentError, 'query[:fields] must not be empty' if query[:fields].empty?
+
+        unless query.key?(:order)
+          # the current collection/model is already sorted by attributes
+          # and since we are projecting away some of the attributes,
+          # and then performing aggregate functions on the remainder,
+          # we need to honor the existing order, as if it were already
+          # materialized, and we are looping over the rows in order.
+
+          directions = direction_map
+
+          query[:order] = []
+
+          # use the current query order for each property if available
+          query[:fields].each do |property|
+            next unless property.kind_of?(Property)
+            query[:order] << directions.fetch(property, property)
+          end
+        end
+
+        query = scoped_query(query)
+
+        if query.fields.any? { |p| p.kind_of?(Property) }
+          query.repository.aggregate(query.update(:unique => true))
+        else
+          query.repository.aggregate(query).first  # only return one row
+        end
+      end
+
+      private
+
+      def assert_property_type(name, *types)
+        if name.nil?
+          raise ArgumentError, 'property name must not be nil'
+        end
+
+        property = property_by_name(name)
+        type     = property.primitive
+
+        unless types.include?(type)
+          raise ArgumentError, "#{name} must be #{types * ' or '}, but was #{type}"
+        end
+      end
+
+      def normalize_field(field)
+        assert_kind_of 'field', field, DataMapper::Query::Operator, Symbol, Property
+
+        case field
+          when DataMapper::Query::Operator
+            if field.target == :all
+              field
+            else
+              field.class.new(property_by_name(field.target), field.operator)
+            end
+
+          when Symbol
+            property_by_name(field)
+
+          when Property
+            field
+        end
+      end
+
+      def direction_map
+        direction_map = {}
+        self.query.order.each do |direction|
+          direction_map[direction.target] = direction
+        end
+        direction_map
+      end
+    end
+  end
+end

data/lib/dm-aggregates/model.rb

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

data/lib/dm-aggregates/operators.rb

@@ -0,0 +1,25 @@
+module DataMapper
+  module Aggregates
+    module Operators
+      def count
+        DataMapper::Query::Operator.new(self, :count)
+      end
+
+      def min
+        DataMapper::Query::Operator.new(self, :min)
+      end
+
+      def max
+        DataMapper::Query::Operator.new(self, :max)
+      end
+
+      def avg
+        DataMapper::Query::Operator.new(self, :avg)
+      end
+
+      def sum
+        DataMapper::Query::Operator.new(self, :sum)
+      end
+    end # module Operators
+  end # module Aggregates
+end # module DataMapper

data/lib/dm-aggregates/repository.rb

@@ -2,8 +2,11 @@ module DataMapper
   module Aggregates
     module Repository
       def aggregate(query)
-        return [] unless query.valid?
-        adapter.aggregate(query)
+        unless query.valid?
+          []
+        else
+          adapter.aggregate(query)
+        end
       end
     end
   end

data/spec/public/collection_spec.rb

@@ -118,7 +118,9 @@ describe DataMapper::Collection do
 
       describe "#count" do
         it 'should return 1' do
-          pending { @dragons.count.should == 1 }
+          pending 'TODO: make count apply to the limited collection. Currently limit applies after the count' do
+            @dragons.count.should == 1
+          end
         end
       end
 

data/spec/public/shared/aggregate_shared_spec.rb

@@ -10,9 +10,9 @@ shared_examples_for 'It Has Setup Resources' do
 
     DataMapper.auto_migrate!
 
-    @birth_time = Time.now
-    @birth_at   = @birth_time.to_datetime
-    @birth_on   = @birth_time.send(:to_date)
+    @birth_at   = DateTime.now
+    @birth_on   = Date.parse(@birth_at.to_s)
+    @birth_time = Time.parse(@birth_at.to_s)
 
     @chuck = Knight.create(:name => 'Chuck')
     @larry = Knight.create(:name => 'Larry')
@@ -112,9 +112,10 @@ shared_examples_for 'An Aggregatable Class' do
       end
 
       it 'should provide the lowest value of a DateTime property' do
-        pending 'TODO: returns incorrect value until DO handles TZs properly' if @skip
-        @dragons.min(:birth_at).should be_kind_of(DateTime)
-        @dragons.min(:birth_at).to_s.should == @birth_at.to_s
+        pending_if 'TODO: returns incorrect value until DO handles TZs properly', @skip do
+          @dragons.min(:birth_at).should be_kind_of(DateTime)
+          @dragons.min(:birth_at).to_s.should == @birth_at.to_s
+        end
       end
 
       it 'should provide the lowest value of a Date property' do
@@ -158,9 +159,10 @@ shared_examples_for 'An Aggregatable Class' do
       end
 
       it 'should provide the highest value of a DateTime property' do
-        pending 'TODO: returns incorrect value until DO handles TZs properly' if @skip
-        @dragons.min(:birth_at).should be_kind_of(DateTime)
-        @dragons.min(:birth_at).to_s.should == @birth_at.to_s
+        pending_if 'TODO: returns incorrect value until DO handles TZs properly', @skip do
+          @dragons.min(:birth_at).should be_kind_of(DateTime)
+          @dragons.min(:birth_at).to_s.should == @birth_at.to_s
+        end
       end
 
       it 'should provide the highest value of a Date property' do

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require 'dm-core/spec/setup'
 require 'dm-core/spec/lib/adapter_helpers'
+require 'dm-core/spec/lib/pending_helpers'
 
 require 'dm-aggregates'
 require 'dm-migrations'
@@ -11,6 +12,7 @@ DataMapper::Spec.setup
 Spec::Runner.configure do |config|
 
   config.extend(DataMapper::Spec::Adapters::Helpers)
+  config.include(DataMapper::Spec::PendingHelpers)
 
   config.before(:all) do
 

metadata

@@ -2,7 +2,7 @@
 name: dm-aggregates
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.1.0.rc2
+  version: 1.1.0.rc3
 platform: ruby
 authors: 
 - Foy Savas
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-01 00:00:00 -08:00
+date: 2011-03-10 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.1.0.rc2
+        version: 1.1.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -78,7 +78,9 @@ files:
 - lib/dm-aggregates/aggregate_functions.rb
 - lib/dm-aggregates/collection.rb
 - lib/dm-aggregates/core_ext/symbol.rb
+- lib/dm-aggregates/functions.rb
 - lib/dm-aggregates/model.rb
+- lib/dm-aggregates/operators.rb
 - lib/dm-aggregates/query.rb
 - lib/dm-aggregates/repository.rb
 - spec/isolated/require_after_setup_spec.rb
@@ -117,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: DataMapper plugin providing support for aggregates on collections