dm-aggregates 1.1.0 → 1.2.0.rc1

data/Gemfile

@@ -5,26 +5,26 @@ 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'
-DO_VERSION     = '~> 0.10.2'
+DM_VERSION     = '~> 1.2.0.rc1'
+DO_VERSION     = '~> 0.10.6'
 DM_DO_ADAPTERS = %w[ sqlite postgres mysql oracle sqlserver ]
 
 gem 'dm-core', DM_VERSION, SOURCE => "#{DATAMAPPER}/dm-core#{REPO_POSTFIX}"
 
 group :development do
 
-  gem 'jeweler', '~> 1.5.2'
-  gem 'rake',    '~> 0.8.7'
-  gem 'rspec',   '~> 1.3.1'
+  gem 'jeweler', '~> 1.6.4'
+  gem 'rake',    '~> 0.9.2'
+  gem 'rspec',   '~> 1.3.2'
 
 end
 
 platforms :mri_18 do
   group :quality do
 
-    gem 'rcov',      '~> 0.9.9'
-    gem 'yard',      '~> 0.6'
-    gem 'yardstick', '~> 0.2'
+    gem 'rcov',      '~> 0.9.10'
+    gem 'yard',      '~> 0.7.2'
+    gem 'yardstick', '~> 0.4'
 
   end
 end

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 
 begin
-  gem 'jeweler', '~> 1.5.2'
+  gem 'jeweler', '~> 1.6.4'
   require 'jeweler'
 
   Jeweler::Tasks.new do |gem|

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0.rc1

data/dm-aggregates.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{dm-aggregates}
-  s.version = "1.1.0"
+  s.name = "dm-aggregates"
+  s.version = "1.2.0.rc1"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  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-16}
-  s.description = %q{DataMapper plugin providing support for aggregates on collections}
-  s.email = %q{foysavas [a] gmail [d] com}
+  s.date = "2011-09-09"
+  s.description = "DataMapper plugin providing support for aggregates on collections"
+  s.email = "foysavas [a] gmail [d] com"
   s.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
@@ -46,40 +46,31 @@ Gem::Specification.new do |s|
     "tasks/yard.rake",
     "tasks/yardstick.rake"
   ]
-  s.homepage = %q{http://github.com/datamapper/dm-aggregates}
+  s.homepage = "http://github.com/datamapper/dm-aggregates"
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{datamapper}
-  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",
-    "spec/isolated/require_before_setup_spec.rb",
-    "spec/isolated/require_spec.rb",
-    "spec/public/collection_spec.rb",
-    "spec/public/model_spec.rb",
-    "spec/public/shared/aggregate_shared_spec.rb",
-    "spec/spec_helper.rb"
-  ]
+  s.rubyforge_project = "datamapper"
+  s.rubygems_version = "1.8.10"
+  s.summary = "DataMapper plugin providing support for aggregates on collections"
 
   if s.respond_to? :specification_version then
     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"])
-      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"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.2.0.rc1"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_development_dependency(%q<rake>, ["~> 0.9.2"])
+      s.add_development_dependency(%q<rspec>, ["~> 1.3.2"])
     else
-      s.add_dependency(%q<dm-core>, ["~> 1.1.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<rake>, ["~> 0.8.7"])
-      s.add_dependency(%q<rspec>, ["~> 1.3.1"])
+      s.add_dependency(%q<dm-core>, ["~> 1.2.0.rc1"])
+      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_dependency(%q<rake>, ["~> 0.9.2"])
+      s.add_dependency(%q<rspec>, ["~> 1.3.2"])
     end
   else
-    s.add_dependency(%q<dm-core>, ["~> 1.1.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<rake>, ["~> 0.8.7"])
-    s.add_dependency(%q<rspec>, ["~> 1.3.1"])
+    s.add_dependency(%q<dm-core>, ["~> 1.2.0.rc1"])
+    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    s.add_dependency(%q<rake>, ["~> 0.9.2"])
+    s.add_dependency(%q<rspec>, ["~> 1.3.2"])
   end
 end
 

data/spec/public/collection_spec.rb

@@ -1,141 +1,125 @@
 require 'spec_helper'
 
 describe DataMapper::Collection do
-
-  before :all do
-    @dragons   = Dragon.all
-    @countries = Country.all
-  end
-
   supported_by :sqlite, :mysql, :postgres do
+    let(:dragons)   { Dragon.all  }
+    let(:countries) { Country.all }
 
     it_should_behave_like 'It Has Setup Resources'
     it_should_behave_like 'An Aggregatable Class'
 
     describe 'ignore invalid query' do
-      before :all do
-        @dragons = @dragons.all(:id => [])
-      end
+      let(:dragons) { Dragon.all.all(:id => []) }
 
       [ :size, :count ].each do |method|
         describe "##{method}" do
-          it 'should return 0' do
-            @dragons.send(method).should == 0
-          end
+          subject { dragons.send(method) }
+
+          it { should == 0 }
         end
       end
 
       describe '#min' do
-        it 'should return nil' do
-          @dragons.min(:id).should == nil
-        end
+        subject { dragons.min(:id) }
+
+        it { should be_nil }
       end
 
       describe '#max' do
-        it 'should return nil' do
-          @dragons.max(:id).should == nil
-        end
+        subject { dragons.max(:id) }
+
+        it { should be_nil }
       end
 
       describe '#avg' do
-        it 'should return nil' do
-          @dragons.avg(:id).should == nil
-        end
+        subject { dragons.avg(:id) }
+
+        it { should be_nil }
       end
 
       describe '#sum' do
-        it 'should return nil' do
-          @dragons.sum(:id).should == nil
-        end
+        subject { dragons.sum(:id) }
+
+        it { should be_nil }
       end
 
       describe '#aggregate' do
-        it 'should return nil' do
-          @dragons.aggregate(:id).should == []
-        end
+        subject { dragons.aggregate(:id) }
+
+        it { should == [] }
       end
     end
 
-    describe 'with collections created with Set operations' do
-      before do
-        @collection = @dragons.all(:name => 'George') | @dragons.all(:name => 'Puff')
-      end
+    context 'with collections created with Set operations' do
+      let(:collection) { dragons.all(:name => 'George') | dragons.all(:name => 'Puff') }
 
       describe '#size' do
-        subject { @collection.size }
+        subject { collection.size }
 
         it { should == 2 }
       end
 
       describe '#count' do
-        subject { @collection.count }
+        subject { collection.count }
 
         it { should == 2 }
       end
 
       describe '#min' do
-        subject { @collection.min(:toes_on_claw) }
+        subject { collection.min(:toes_on_claw) }
 
         it { should == 3 }
       end
 
       describe '#max' do
-        subject { @collection.max(:toes_on_claw) }
+        subject { collection.max(:toes_on_claw) }
 
         it { should == 4 }
       end
 
       describe '#avg' do
-        subject { @collection.avg(:toes_on_claw) }
+        subject { collection.avg(:toes_on_claw) }
 
         it { should == 3.5 }
       end
 
       describe '#sum' do
-        subject { @collection.sum(:toes_on_claw) }
+        subject { collection.sum(:toes_on_claw) }
 
         it { should == 7 }
       end
 
       describe '#aggregate' do
-        subject { @collection.aggregate(:all.count, :name.count, :toes_on_claw.min, :toes_on_claw.max, :toes_on_claw.avg, :toes_on_claw.sum)}
+        subject { collection.aggregate(:all.count, :name.count, :toes_on_claw.min, :toes_on_claw.max, :toes_on_claw.avg, :toes_on_claw.sum)}
 
         it { should == [ 2, 2, 3, 4, 3.5, 7 ] }
       end
     end
 
-    describe 'with a collection limited to 1 result' do
+    context 'with a collection limited to 1 result' do
+      let(:dragons) { Dragon.all(:limit => 1) }
 
-      before do
-        @dragons = Dragon.all(:limit => 1)
-      end
+      describe '#size' do
+        subject { dragons.size }
 
-      describe "#size" do
-        it 'should return 1' do
-          @dragons.size.should == 1
-        end
+        it { should == 1 }
       end
 
-      describe "#count" do
-        it 'should return 1' do
-          pending 'TODO: make count apply to the limited collection. Currently limit applies after the count' do
-            @dragons.count.should == 1
-          end
-        end
-      end
+      describe '#count' do
+        subject { dragons.count }
 
+        it { pending('TODO: make count apply to the limited collection. Currently limit applies after the count') { should == 1 } }
+      end
     end
 
-    describe 'with the order reversed by the grouping field' do
-      before do
-        @dragons = Dragon.all(:order => [ :birth_at.desc ])
-      end
+    context 'with the order reversed by the grouping field' do
+      subject { dragons.aggregate(:birth_at, :all.count) }
 
-      it 'should display the results in reverse order' do
-        @dragons.aggregate(:birth_at, :all.count).should == Dragon.aggregate(:birth_at, :all.count).reverse
+      let(:dragons) { Dragon.all(:order => [ :birth_at.desc ]) }
+
+      it 'displays the results in reverse order' do
+        should == Dragon.aggregate(:birth_at, :all.count).reverse
       end
     end
-
   end
-
 end

data/spec/public/model_spec.rb

@@ -1,13 +1,10 @@
 require 'spec_helper'
 
 describe DataMapper::Model do
-
-  before :all do
-    @dragons   = Dragon
-    @countries = Country
-  end
-
   supported_by :sqlite, :mysql, :postgres do
+    let(:dragons)   { Dragon  }
+    let(:countries) { Country }
+
     it_should_behave_like 'It Has Setup Resources'
     it_should_behave_like 'An Aggregatable Class'
   end

data/spec/public/shared/aggregate_shared_spec.rb

@@ -7,7 +7,6 @@ shared_examples_for 'It Has Setup Resources' do
   end
 
   before :all do
-
     DataMapper.auto_migrate!
 
     @birth_at   = DateTime.now
@@ -17,46 +16,66 @@ shared_examples_for 'It Has Setup Resources' do
     @chuck = Knight.create(:name => 'Chuck')
     @larry = Knight.create(:name => 'Larry')
 
-    Dragon.create(:name => 'George', :is_fire_breathing => false, :toes_on_claw => 3, :birth_at => @birth_at, :birth_on => @birth_on, :birth_time => @birth_time, :knight => @chuck )
-    Dragon.create(:name => 'Puff',   :is_fire_breathing => true,  :toes_on_claw => 4, :birth_at => @birth_at, :birth_on => @birth_on, :birth_time => @birth_time, :knight => @larry )
+    Dragon.create(:name => 'George', :is_fire_breathing => false, :toes_on_claw => 3, :birth_at => @birth_at, :birth_on => @birth_on, :birth_time => @birth_time, :knight => @chuck)
+    Dragon.create(:name => 'Puff',   :is_fire_breathing => true,  :toes_on_claw => 4, :birth_at => @birth_at, :birth_on => @birth_on, :birth_time => @birth_time, :knight => @larry)
     Dragon.create(:name => nil,      :is_fire_breathing => true,  :toes_on_claw => 5, :birth_at => nil,       :birth_on => nil,       :birth_time => nil)
 
-    gold_kilo_price  = 277738.70
+    gold_kilo_price   = 277738.70
     @gold_tonne_price = gold_kilo_price * 10000
 
-    Country.create(:name => 'China',
-                    :population => 1330044605,
-                    :birth_rate => 13.71,
-                    :gold_reserve_tonnes => 600.0,
-                    :gold_reserve_value  => 600.0 * @gold_tonne_price) #  32150000
-    Country.create(:name => 'United States',
-                    :population => 303824646,
-                    :birth_rate => 14.18,
-                    :gold_reserve_tonnes => 8133.5,
-                    :gold_reserve_value  => 8133.5 * @gold_tonne_price)
-    Country.create(:name => 'Brazil',
-                    :population => 191908598,
-                    :birth_rate => 16.04,
-                    :gold_reserve_tonnes => nil) # example of no stats available
-    Country.create(:name => 'Russia',
-                    :population => 140702094,
-                    :birth_rate => 11.03,
-                    :gold_reserve_tonnes => 438.2,
-                    :gold_reserve_value  => 438.2 * @gold_tonne_price)
-    Country.create(:name => 'Japan',
-                    :population => 127288419,
-                    :birth_rate => 7.87,
-                    :gold_reserve_tonnes => 765.2,
-                    :gold_reserve_value  => 765.2 * @gold_tonne_price)
-    Country.create(:name => 'Mexico',
-                    :population => 109955400,
-                    :birth_rate => 20.04,
-                    :gold_reserve_tonnes => nil) # example of no stats available
-    Country.create(:name => 'Germany',
-                    :population => 82369548,
-                    :birth_rate => 8.18,
-                    :gold_reserve_tonnes => 3417.4,
-                    :gold_reserve_value  => 3417.4 * @gold_tonne_price)
+    Country.create(
+      :name                => 'China',
+      :population          => 1330044605,
+      :birth_rate          => 13.71,
+      :gold_reserve_tonnes => 600.0,
+      :gold_reserve_value  => 600.0 * @gold_tonne_price  # => 32150000
+    )
+
+    Country.create(
+      :name                => 'United States',
+      :population          => 303824646,
+      :birth_rate          => 14.18,
+      :gold_reserve_tonnes => 8133.5,
+      :gold_reserve_value  => 8133.5 * @gold_tonne_price
+    )
+
+    Country.create(
+      :name                => 'Brazil',
+      :population          => 191908598,
+      :birth_rate          => 16.04,
+      :gold_reserve_tonnes => nil  # example of no stats available
+    )
+
+    Country.create(
+      :name                => 'Russia',
+      :population          => 140702094,
+      :birth_rate          => 11.03,
+      :gold_reserve_tonnes => 438.2,
+      :gold_reserve_value  => 438.2 * @gold_tonne_price
+    )
+
+    Country.create(
+      :name                => 'Japan',
+      :population          => 127288419,
+      :birth_rate          => 7.87,
+      :gold_reserve_tonnes => 765.2,
+      :gold_reserve_value  => 765.2 * @gold_tonne_price
+    )
+
+    Country.create(
+      :name                => 'Mexico',
+      :population          => 109955400,
+      :birth_rate          => 20.04,
+      :gold_reserve_tonnes => nil  # example of no stats available
+    )
+
+    Country.create(
+      :name                => 'Germany',
+      :population          => 82369548,
+      :birth_rate          => 8.18,
+      :gold_reserve_tonnes => 3417.4,
+      :gold_reserve_value  => 3417.4 * @gold_tonne_price
+    )
 
     @approx_by = 0.0001
   end
@@ -70,234 +89,234 @@ shared_examples_for 'An Aggregatable Class' do
   describe '#count' do
     it_should_behave_like 'count with no arguments'
 
-    describe 'with a property name' do
-      it 'should count the results' do
-        @dragons.count(:name).should == 2
+    context 'with a property name' do
+      it 'counts the results' do
+        dragons.count(:name).should == 2
       end
 
-      it 'should count the results with conditions having operators' do
-        @dragons.count(:name, :toes_on_claw.gt => 3).should == 1
+      it 'counts the results with conditions having operators' do
+        dragons.count(:name, :toes_on_claw.gt => 3).should == 1
       end
 
-      it 'should count the results with raw conditions' do
+      it 'counts the results with raw conditions' do
         statement = 'is_fire_breathing = ?'
-        @dragons.count(:name, :conditions => [ statement, false ]).should == 1
-        @dragons.count(:name, :conditions => [ statement, true  ]).should == 1
+        dragons.count(:name, :conditions => [ statement, false ]).should == 1
+        dragons.count(:name, :conditions => [ statement, true  ]).should == 1
       end
     end
   end
 
   describe '#min' do
-    describe 'with no arguments' do
-      it 'should raise an error' do
-        lambda { @dragons.min }.should raise_error(ArgumentError)
+    context 'with no arguments' do
+      it 'raises an error' do
+        expect { dragons.min }.to raise_error(ArgumentError)
       end
     end
 
-    describe 'with a property name' do
-      it 'should provide the lowest value of an Integer property' do
-        @dragons.min(:toes_on_claw).should == 3
-        @countries.min(:population).should == 82369548
+    context 'with a property name' do
+      it 'provides the lowest value of an Integer property' do
+        dragons.min(:toes_on_claw).should == 3
+        countries.min(:population).should == 82369548
       end
 
-      it 'should provide the lowest value of a Float property' do
-        @countries.min(:birth_rate).should be_kind_of(Float)
-        @countries.min(:birth_rate).should >= 7.87 - @approx_by  # approx match
-        @countries.min(:birth_rate).should <= 7.87 + @approx_by  # approx match
+      it 'provides the lowest value of a Float property' do
+        countries.min(:birth_rate).should be_kind_of(Float)
+        countries.min(:birth_rate).should >= 7.87 - @approx_by  # approx match
+        countries.min(:birth_rate).should <= 7.87 + @approx_by  # approx match
       end
 
-      it 'should provide the lowest value of a BigDecimal property' do
-        @countries.min(:gold_reserve_value).should be_kind_of(BigDecimal)
-        @countries.min(:gold_reserve_value).should == BigDecimal('1217050983400.0')
+      it 'provides the lowest value of a BigDecimal property' do
+        countries.min(:gold_reserve_value).should be_kind_of(BigDecimal)
+        countries.min(:gold_reserve_value).should == BigDecimal('1217050983400.0')
       end
 
-      it 'should provide the lowest value of a DateTime property' do
+      it 'provides the lowest value of a DateTime property' do
         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
+          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
-        @dragons.min(:birth_on).should be_kind_of(Date)
-        @dragons.min(:birth_on).should == @birth_on
+      it 'provides the lowest value of a Date property' do
+        dragons.min(:birth_on).should be_kind_of(Date)
+        dragons.min(:birth_on).should == @birth_on
       end
 
-      it 'should provide the lowest value of a Time property' do
-        @dragons.min(:birth_time).should be_kind_of(Time)
-        @dragons.min(:birth_time).to_s.should == @birth_time.to_s
+      it 'provides the lowest value of a Time property' do
+        dragons.min(:birth_time).should be_kind_of(Time)
+        dragons.min(:birth_time).to_s.should == @birth_time.to_s
       end
 
-      it 'should provide the lowest value when conditions provided' do
-        @dragons.min(:toes_on_claw, :is_fire_breathing => true).should  == 4
-        @dragons.min(:toes_on_claw, :is_fire_breathing => false).should == 3
+      it 'provides the lowest value when conditions provided' do
+        dragons.min(:toes_on_claw, :is_fire_breathing => true).should  == 4
+        dragons.min(:toes_on_claw, :is_fire_breathing => false).should == 3
       end
     end
   end
 
   describe '#max' do
-    describe 'with no arguments' do
-      it 'should raise an error' do
-        lambda { @dragons.max }.should raise_error(ArgumentError)
+    context 'with no arguments' do
+      it 'raises an error' do
+        expect { dragons.max }.to raise_error(ArgumentError)
       end
     end
 
-    describe 'with a property name' do
-      it 'should provide the highest value of an Integer property' do
-        @dragons.max(:toes_on_claw).should == 5
-        @countries.max(:population).should == 1330044605
+    context 'with a property name' do
+      it 'provides the highest value of an Integer property' do
+        dragons.max(:toes_on_claw).should == 5
+        countries.max(:population).should == 1330044605
       end
 
-      it 'should provide the highest value of a Float property' do
-        @countries.max(:birth_rate).should be_kind_of(Float)
-        @countries.max(:birth_rate).should >= 20.04 - @approx_by  # approx match
-        @countries.max(:birth_rate).should <= 20.04 + @approx_by  # approx match
+      it 'provides the highest value of a Float property' do
+        countries.max(:birth_rate).should be_kind_of(Float)
+        countries.max(:birth_rate).should >= 20.04 - @approx_by  # approx match
+        countries.max(:birth_rate).should <= 20.04 + @approx_by  # approx match
       end
 
-      it 'should provide the highest value of a BigDecimal property' do
-        @countries.max(:gold_reserve_value).should == BigDecimal('22589877164500.0')
+      it 'provides the highest value of a BigDecimal property' do
+        countries.max(:gold_reserve_value).should == BigDecimal('22589877164500.0')
       end
 
-      it 'should provide the highest value of a DateTime property' do
+      it 'provides the highest value of a DateTime property' do
         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
+          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
-        @dragons.min(:birth_on).should be_kind_of(Date)
-        @dragons.min(:birth_on).should == @birth_on
+      it 'provides the highest value of a Date property' do
+        dragons.min(:birth_on).should be_kind_of(Date)
+        dragons.min(:birth_on).should == @birth_on
       end
 
-      it 'should provide the highest value of a Time property' do
-        @dragons.min(:birth_time).should be_kind_of(Time)
-        @dragons.min(:birth_time).to_s.should == @birth_time.to_s
+      it 'provides the highest value of a Time property' do
+        dragons.min(:birth_time).should be_kind_of(Time)
+        dragons.min(:birth_time).to_s.should == @birth_time.to_s
       end
 
-      it 'should provide the highest value when conditions provided' do
-        @dragons.max(:toes_on_claw, :is_fire_breathing => true).should  == 5
-        @dragons.max(:toes_on_claw, :is_fire_breathing => false).should == 3
+      it 'provides the highest value when conditions provided' do
+        dragons.max(:toes_on_claw, :is_fire_breathing => true).should  == 5
+        dragons.max(:toes_on_claw, :is_fire_breathing => false).should == 3
       end
     end
   end
 
   describe '#avg' do
-    describe 'with no arguments' do
-      it 'should raise an error' do
-        lambda { @dragons.avg }.should raise_error(ArgumentError)
+    context 'with no arguments' do
+      it 'raises an error' do
+        expect { dragons.avg }.to raise_error(ArgumentError)
       end
     end
 
-    describe 'with a property name' do
-      it 'should provide the average value of an Integer property' do
-        @dragons.avg(:toes_on_claw).should be_kind_of(Float)
-        @dragons.avg(:toes_on_claw).should == 4.0
+    context 'with a property name' do
+      it 'provides the average value of an Integer property' do
+        dragons.avg(:toes_on_claw).should be_kind_of(Float)
+        dragons.avg(:toes_on_claw).should == 4.0
       end
 
-      it 'should provide the average value of a Float property' do
+      it 'provides the average value of a Float property' do
         mean_birth_rate = (13.71 + 14.18 + 16.04 + 11.03 + 7.87 + 20.04 + 8.18) / 7
-        @countries.avg(:birth_rate).should be_kind_of(Float)
-        @countries.avg(:birth_rate).should >= mean_birth_rate - @approx_by  # approx match
-        @countries.avg(:birth_rate).should <= mean_birth_rate + @approx_by  # approx match
+        countries.avg(:birth_rate).should be_kind_of(Float)
+        countries.avg(:birth_rate).should >= mean_birth_rate - @approx_by  # approx match
+        countries.avg(:birth_rate).should <= mean_birth_rate + @approx_by  # approx match
       end
 
-      it 'should provide the average value of a BigDecimal property' do
+      it 'provides the average value of a BigDecimal property' do
         mean_gold_reserve_value = ((600.0 + 8133.50 + 438.20 + 765.20 + 3417.40) * @gold_tonne_price) / 5
-        @countries.avg(:gold_reserve_value).should be_kind_of(BigDecimal)
-        @countries.avg(:gold_reserve_value).should == BigDecimal(mean_gold_reserve_value.to_s)
+        countries.avg(:gold_reserve_value).should be_kind_of(BigDecimal)
+        countries.avg(:gold_reserve_value).should == BigDecimal(mean_gold_reserve_value.to_s)
       end
 
-      it 'should provide the average value when conditions provided' do
-        @dragons.avg(:toes_on_claw, :is_fire_breathing => true).should  == 4.5
-        @dragons.avg(:toes_on_claw, :is_fire_breathing => false).should == 3
+      it 'provides the average value when conditions provided' do
+        dragons.avg(:toes_on_claw, :is_fire_breathing => true).should  == 4.5
+        dragons.avg(:toes_on_claw, :is_fire_breathing => false).should == 3
       end
     end
   end
 
   describe '#sum' do
-    describe 'with no arguments' do
-      it 'should raise an error' do
-        lambda { @dragons.sum }.should raise_error(ArgumentError)
+    context 'with no arguments' do
+      it 'raises an error' do
+        expect { dragons.sum }.to raise_error(ArgumentError)
       end
     end
 
-    describe 'with a property name' do
-      it 'should provide the sum of values for an Integer property' do
-        @dragons.sum(:toes_on_claw).should == 12
+    context 'with a property name' do
+      it 'provides the sum of values for an Integer property' do
+        dragons.sum(:toes_on_claw).should == 12
 
         total_population = 1330044605 + 303824646 + 191908598 + 140702094 +
                            127288419 + 109955400 + 82369548
-        @countries.sum(:population).should == total_population
+        countries.sum(:population).should == total_population
       end
 
-      it 'should provide the sum of values for a Float property' do
+      it 'provides the sum of values for a Float property' do
         total_tonnes = 600.0 + 8133.5 + 438.2 + 765.2 + 3417.4
-        @countries.sum(:gold_reserve_tonnes).should be_kind_of(Float)
-        @countries.sum(:gold_reserve_tonnes).should >= total_tonnes - @approx_by  # approx match
-        @countries.sum(:gold_reserve_tonnes).should <= total_tonnes + @approx_by  # approx match
+        countries.sum(:gold_reserve_tonnes).should be_kind_of(Float)
+        countries.sum(:gold_reserve_tonnes).should >= total_tonnes - @approx_by  # approx match
+        countries.sum(:gold_reserve_tonnes).should <= total_tonnes + @approx_by  # approx match
       end
 
-      it 'should provide the sum of values for a BigDecimal property' do
-        @countries.sum(:gold_reserve_value).should == BigDecimal('37090059214100.0')
+      it 'provides the sum of values for a BigDecimal property' do
+        countries.sum(:gold_reserve_value).should == BigDecimal('37090059214100.0')
       end
 
-      it 'should provide the average value when conditions provided' do
-        @dragons.sum(:toes_on_claw, :is_fire_breathing => true).should  == 9
-        @dragons.sum(:toes_on_claw, :is_fire_breathing => false).should == 3
+      it 'provides the average value when conditions provided' do
+        dragons.sum(:toes_on_claw, :is_fire_breathing => true).should  == 9
+        dragons.sum(:toes_on_claw, :is_fire_breathing => false).should == 3
       end
     end
   end
 
   describe '#aggregate' do
-    describe 'with no arguments' do
-      it 'should raise an error' do
-        lambda { @dragons.aggregate }.should raise_error(ArgumentError)
+    context 'with no arguments' do
+      it 'raises an error' do
+        expect { dragons.aggregate }.to raise_error(ArgumentError)
       end
     end
 
-    describe 'with only aggregate fields specified' do
-      it 'should provide aggregate results' do
-        results = @dragons.aggregate(:all.count, :name.count, :toes_on_claw.min, :toes_on_claw.max, :toes_on_claw.avg, :toes_on_claw.sum)
+    context 'with only aggregate fields specified' do
+      it 'provides aggregate results' do
+        results = dragons.aggregate(:all.count, :name.count, :toes_on_claw.min, :toes_on_claw.max, :toes_on_claw.avg, :toes_on_claw.sum)
         results.should == [ 3, 2, 3, 5, 4.0, 12 ]
       end
     end
 
-    describe 'with aggregate fields and a property to group by' do
-      it 'should provide aggregate results' do
-        results = @dragons.aggregate(:all.count, :name.count, :toes_on_claw.min, :toes_on_claw.max, :toes_on_claw.avg, :toes_on_claw.sum, :is_fire_breathing)
+    context 'with aggregate fields and a property to group by' do
+      it 'provides aggregate results' do
+        results = dragons.aggregate(:all.count, :name.count, :toes_on_claw.min, :toes_on_claw.max, :toes_on_claw.avg, :toes_on_claw.sum, :is_fire_breathing)
         results.should == [ [ 1, 1, 3, 3, 3.0, 3, false ], [ 2, 1, 4, 5, 4.5, 9, true ] ]
       end
     end
   end
 
   describe 'query path issue' do
-    it "should not break when a query path is specified" do
-      dragon = @dragons.first(Dragon.knight.name => 'Chuck')
+    it 'does not break when a query path is specified' do
+      dragon = dragons.first(Dragon.knight.name => 'Chuck')
       dragon.name.should == 'George'
     end
   end
 end
 
 shared_examples_for 'count with no arguments' do
-  it 'should count the results' do
-    @dragons.count.should  == 3
+  it 'counts the results' do
+    dragons.count.should  == 3
 
-    @countries.count.should == 7
+    countries.count.should == 7
   end
 
-  it 'should count the results with conditions having operators' do
-    @dragons.count(:toes_on_claw.gt => 3).should == 2
+  it 'counts the results with conditions having operators' do
+    dragons.count(:toes_on_claw.gt => 3).should == 2
 
-    @countries.count(:birth_rate.lt => 12).should == 3
-    @countries.count(:population.gt => 1000000000).should == 1
-    @countries.count(:population.gt => 2000000000).should == 0
-    @countries.count(:population.lt => 10).should == 0
+    countries.count(:birth_rate.lt => 12).should == 3
+    countries.count(:population.gt => 1000000000).should == 1
+    countries.count(:population.gt => 2000000000).should == 0
+    countries.count(:population.lt => 10).should == 0
   end
 
-  it 'should count the results with raw conditions' do
+  it 'counts the results with raw conditions' do
     dragon_statement = 'is_fire_breathing = ?'
-    @dragons.count(:conditions => [ dragon_statement, false ]).should == 1
-    @dragons.count(:conditions => [ dragon_statement, true  ]).should == 2
+    dragons.count(:conditions => [ dragon_statement, false ]).should == 1
+    dragons.count(:conditions => [ dragon_statement, true  ]).should == 2
   end
 end

metadata

@@ -1,8 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: dm-aggregates
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 1.1.0
+  hash: 15424023
+  prerelease: 6
+  segments: 
+  - 1
+  - 2
+  - 0
+  - rc
+  - 1
+  version: 1.2.0.rc1
 platform: ruby
 authors: 
 - Foy Savas
@@ -10,53 +17,74 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-16 00:00:00 -07:00
-default_executable: 
+date: 2011-09-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: dm-core
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.1.0
-  type: :runtime
+        hash: 15424023
+        segments: 
+        - 1
+        - 2
+        - 0
+        - rc
+        - 1
+        version: 1.2.0.rc1
   prerelease: false
-  version_requirements: *id001
+  requirement: *id001
+  name: dm-core
 - !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.5.2
-  type: :development
+        hash: 7
+        segments: 
+        - 1
+        - 6
+        - 4
+        version: 1.6.4
   prerelease: false
-  version_requirements: *id002
+  requirement: *id002
+  name: jeweler
 - !ruby/object:Gem::Dependency 
-  name: rake
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.8.7
-  type: :development
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
+        version: 0.9.2
   prerelease: false
-  version_requirements: *id003
+  requirement: *id003
+  name: rake
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.3.1
-  type: :development
+        hash: 31
+        segments: 
+        - 1
+        - 3
+        - 2
+        version: 1.3.2
   prerelease: false
-  version_requirements: *id004
+  requirement: *id004
+  name: rspec
 description: DataMapper plugin providing support for aggregates on collections
 email: foysavas [a] gmail [d] com
 executables: []
@@ -95,7 +123,6 @@ files:
 - tasks/spec.rake
 - tasks/yard.rake
 - tasks/yardstick.rake
-has_rdoc: true
 homepage: http://github.com/datamapper/dm-aggregates
 licenses: []
 
@@ -109,25 +136,27 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: "0"
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: DataMapper plugin providing support for aggregates on collections
-test_files: 
-- spec/isolated/require_after_setup_spec.rb
-- spec/isolated/require_before_setup_spec.rb
-- spec/isolated/require_spec.rb
-- spec/public/collection_spec.rb
-- spec/public/model_spec.rb
-- spec/public/shared/aggregate_shared_spec.rb
-- spec/spec_helper.rb
+test_files: []
+