dm-aggregates 0.9.7 → 0.9.8

data/History.txt

@@ -1 +1,6 @@
+=== 0.9.8 / 2008-12-07
 
+* 2 minor enhancements:
+
+  * Collection#size now uses #count if unloaded
+  * Added Model#size, which defers to #count

data/Manifest.txt

@@ -12,6 +12,10 @@ lib/dm-aggregates/model.rb
 lib/dm-aggregates/repository.rb
 lib/dm-aggregates/support/symbol.rb
 lib/dm-aggregates/version.rb
-spec/integration/aggregates_spec.rb
+spec/public/collection_spec.rb
+spec/public/model_spec.rb
+spec/public/shared/aggregate_shared_spec.rb
 spec/spec.opts
 spec/spec_helper.rb
+tasks/install.rb
+tasks/spec.rb

data/Rakefile

@@ -1,58 +1,25 @@
-require 'rubygems'
-require 'spec'
-require 'spec/rake/spectask'
 require 'pathname'
+require 'rubygems'
 
-ROOT = Pathname(__FILE__).dirname.expand_path
-require ROOT + 'lib/dm-aggregates/version'
-
-AUTHOR = "Foy Savas"
-EMAIL  = "foysavas@gmail.com"
-GEM_NAME = "dm-aggregates"
-GEM_VERSION = DataMapper::More::Aggregates::VERSION
-GEM_DEPENDENCIES = [["dm-core", GEM_VERSION]]
-GEM_CLEAN = ["log", "pkg"]
-GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.txt LICENSE TODO ] }
-
-PROJECT_NAME = "datamapper"
-PROJECT_URL  = "http://github.com/sam/dm-more/tree/master/dm-aggregates"
-PROJECT_DESCRIPTION = PROJECT_SUMMARY = "DataMapper plugin providing support for aggregates, functions on collections and datasets"
-
-require ROOT.parent + 'tasks/hoe'
-
-task :default => [ :spec ]
-
-WIN32 = (RUBY_PLATFORM =~ /win32|mingw|cygwin/) rescue nil
-SUDO  = WIN32 ? '' : ('sudo' unless ENV['SUDOLESS'])
-
-desc "Install #{GEM_NAME} #{GEM_VERSION} (default ruby)"
-task :install => [ :package ] do
-  sh "#{SUDO} gem install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources", :verbose => false
-end
+ROOT    = Pathname(__FILE__).dirname.expand_path
+JRUBY   = RUBY_PLATFORM =~ /java/
+WINDOWS = Gem.win_platform?
+SUDO    = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS'])
 
-desc "Uninstall #{GEM_NAME} #{GEM_VERSION} (default ruby)"
-task :uninstall => [ :clobber ] do
-  sh "#{SUDO} gem uninstall #{GEM_NAME} -v#{GEM_VERSION} -I -x", :verbose => false
-end
+require ROOT + 'lib/dm-aggregates/version'
 
-namespace :jruby do
-  desc "Install #{GEM_NAME} #{GEM_VERSION} with JRuby"
-  task :install => [ :package ] do
-    sh %{#{SUDO} jruby -S gem install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources}, :verbose => false
-  end
-end
+AUTHOR = 'Foy Savas'
+EMAIL  = 'foysavas [a] gmail [d] com'
+GEM_NAME = 'dm-aggregates'
+GEM_VERSION = DataMapper::Aggregates::VERSION
+GEM_DEPENDENCIES = [['dm-core', "~>#{GEM_VERSION}"]]
+GEM_CLEAN = %w[ log pkg coverage ]
+GEM_EXTRAS = { :has_rdoc => true, :extra_rdoc_files => %w[ README.txt LICENSE TODO History.txt ] }
 
-desc 'Run specifications'
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
-  t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s)
+PROJECT_NAME = 'datamapper'
+PROJECT_URL  = "http://github.com/sam/dm-more/tree/master/#{GEM_NAME}"
+PROJECT_DESCRIPTION = PROJECT_SUMMARY = 'DataMapper plugin providing support for aggregates, functions on collections and datasets'
 
-  begin
-    t.rcov = ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true
-    t.rcov_opts << '--exclude' << 'spec'
-    t.rcov_opts << '--text-summary'
-    t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
-  rescue Exception
-    # rcov not installed
-  end
+[ ROOT, ROOT.parent ].each do |dir|
+  Pathname.glob(dir.join('tasks/**/*.rb').to_s).each { |f| require f }
 end

data/TODO

@@ -1,6 +0,0 @@
-TODO
-====
-
----
-TODO tickets may also be found in the DataMapper Issue Tracker:
-http://wm.lighthouseapp.com/projects/4819-datamapper/overview

data/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/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/dm-aggregates/version.rb

@@ -1,7 +1,5 @@
 module DataMapper
-  module More
-    module Aggregates
-      VERSION = "0.9.7"
-    end
+  module Aggregates
+    VERSION = '0.9.8'
   end
 end

data/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.8'
 require 'dm-core'
 
 

data/spec/public/collection_spec.rb

@@ -0,0 +1,15 @@
+require 'pathname'
+require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
+
+if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
+  describe DataMapper::Collection do
+    it_should_behave_like 'It Has Setup Resources'
+
+    before :all do
+      @dragons   = Dragon.all
+      @countries = Country.all
+    end
+
+    it_should_behave_like 'An Aggregatable Class'
+  end
+end

data/spec/public/model_spec.rb

@@ -0,0 +1,15 @@
+require 'pathname'
+require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
+
+if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
+  describe DataMapper::Model do
+    it_should_behave_like 'It Has Setup Resources'
+
+    before :all do
+      @dragons   = Dragon
+      @countries = Country
+    end
+
+    it_should_behave_like 'An Aggregatable Class'
+  end
+end

data/spec/public/shared/aggregate_shared_spec.rb

@@ -0,0 +1,327 @@
+shared_examples_for 'It Has Setup Resources' do
+  before :all do
+    # A simplistic example, using with an Integer property
+    class Knight
+      include DataMapper::Resource
+
+      property :id,   Serial
+      property :name, String
+    end
+
+    class Dragon
+      include DataMapper::Resource
+
+      property :id,                Serial
+      property :name,              String
+      property :is_fire_breathing, TrueClass
+      property :toes_on_claw,      Integer
+      property :birth_at,          DateTime
+      property :birth_on,          Date
+      property :birth_time,        Time
+
+      belongs_to :knight
+    end
+
+    # A more complex example, with BigDecimal and Float properties
+    # Statistics taken from CIA World Factbook:
+    # https://www.cia.gov/library/publications/the-world-factbook/
+    class Country
+      include DataMapper::Resource
+
+      property :id,                  Serial
+      property :name,                String,     :nullable => false
+      property :population,          Integer
+      property :birth_rate,          Float,      :precision => 4,  :scale => 2
+      property :gold_reserve_tonnes, Float,      :precision => 6,  :scale => 2
+      property :gold_reserve_value,  BigDecimal, :precision => 15, :scale => 1  # approx. value in USD
+    end
+
+    DataMapper.auto_migrate!
+
+    @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')
+
+    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_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)
+
+    @approx_by = 0.000001
+  end
+end
+
+shared_examples_for 'An Aggregatable Class' do
+  describe '#size' do
+    it_should_behave_like 'count with no arguments'
+  end
+
+  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
+      end
+
+      it 'should count 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
+        statement = 'is_fire_breathing = ?'
+        @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)
+      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
+      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
+      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')
+      end
+
+      it 'should provide the lowest value of a DateTime property' do
+        @dragons.min(:birth_at).should be_kind_of(DateTime)
+        @dragons.min(:birth_at).to_s.should == @birth_at.to_s
+      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).to_s.should == @birth_on.to_s
+      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
+      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
+      end
+    end
+  end
+
+  describe '#max' do
+    describe 'with no arguments' do
+      it 'should raise an error' do
+        lambda { @dragons.max }.should 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
+      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
+      end
+
+      it 'should provide 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
+        @dragons.min(:birth_at).should be_kind_of(DateTime)
+        @dragons.min(:birth_at).to_s.should == @birth_at.to_s
+      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).to_s.should == @birth_on.to_s
+      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
+      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
+      end
+    end
+  end
+
+  describe '#avg' do
+    describe 'with no arguments' do
+      it 'should raise an error' do
+        lambda { @dragons.avg }.should 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
+      end
+
+      it 'should provide 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
+      end
+
+      it 'should provide 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)
+      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
+      end
+    end
+  end
+
+  describe '#sum' do
+    describe 'with no arguments' do
+      it 'should raise an error' do
+        lambda { @dragons.sum }.should 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
+
+        total_population = 1330044605 + 303824646 + 191908598 + 140702094 +
+                           127288419 + 109955400 + 82369548
+        @countries.sum(:population).should == total_population
+      end
+
+      it 'should provide 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
+      end
+
+      it 'should provide 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
+      end
+    end
+  end
+
+  describe '#aggregate' do
+    describe 'with no arguments' do
+      it 'should raise an error' do
+        lambda { @dragons.aggregate }.should 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)
+        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)
+        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')
+      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
+
+    @countries.count.should == 7
+  end
+
+  it 'should count 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
+  end
+
+  it 'should count 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
+  end
+end

data/spec/spec.opts

@@ -1,2 +1 @@
---format specdoc
 --colour

data/spec/spec_helper.rb

@@ -1,20 +1,19 @@
-require 'rubygems'
 require 'pathname'
-require Pathname(__FILE__).dirname.expand_path.parent + 'lib/dm-aggregates'
+require 'rubygems'
+
+SPEC_ROOT = Pathname(__FILE__).dirname.expand_path
+require SPEC_ROOT.parent + 'lib/dm-aggregates'
+Pathname.glob((SPEC_ROOT + '{lib,*/shared}/**/*.rb').to_s).each { |f| require f }
 
 def load_driver(name, default_uri)
   return false if ENV['ADAPTER'] != name.to_s
 
-  lib = "do_#{name}"
-
   begin
-    gem lib, '~>0.9.7'
-    require lib
     DataMapper.setup(name, ENV["#{name.to_s.upcase}_SPEC_URI"] || default_uri)
     DataMapper::Repository.adapters[:default] =  DataMapper::Repository.adapters[name]
     true
-  rescue Gem::LoadError => e
-    warn "Could not load #{lib}: #{e}"
+  rescue LoadError => e
+    warn "Could not load do_#{name}: #{e}"
     false
   end
 end

data/tasks/install.rb

@@ -0,0 +1,13 @@
+def sudo_gem(cmd)
+  sh "#{SUDO} #{RUBY} -S gem #{cmd}", :verbose => false
+end
+
+desc "Install #{GEM_NAME} #{GEM_VERSION}"
+task :install => [ :package ] do
+  sudo_gem "install --local pkg/#{GEM_NAME}-#{GEM_VERSION} --no-update-sources"
+end
+
+desc "Uninstall #{GEM_NAME} #{GEM_VERSION}"
+task :uninstall => [ :clobber ] do
+  sudo_gem "uninstall #{GEM_NAME} -v#{GEM_VERSION} -Ix"
+end

data/tasks/spec.rb

@@ -0,0 +1,25 @@
+begin
+  gem 'rspec', '~>1.1.11'
+  require 'spec'
+  require 'spec/rake/spectask'
+
+  task :default => [ :spec ]
+
+  desc 'Run specifications'
+  Spec::Rake::SpecTask.new(:spec) do |t|
+    t.spec_opts << '--options' << 'spec/spec.opts' if File.exists?('spec/spec.opts')
+    t.spec_files = Pathname.glob((ROOT + 'spec/**/*_spec.rb').to_s)
+
+    begin
+      gem 'rcov', '~>0.8'
+      t.rcov = JRUBY ? false : (ENV.has_key?('NO_RCOV') ? ENV['NO_RCOV'] != 'true' : true)
+      t.rcov_opts << '--exclude' << 'spec'
+      t.rcov_opts << '--text-summary'
+      t.rcov_opts << '--sort' << 'coverage' << '--sort-reverse'
+    rescue LoadError
+      # rcov not installed
+    end
+  end
+rescue LoadError
+  # rspec not installed
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-aggregates
 version: !ruby/object:Gem::Version 
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors: 
 - Foy Savas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-18 00:00:00 -08:00
+date: 2008-12-07 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,23 +18,13 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.7
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.8.2
+        version: 0.9.8
     version: 
 description: DataMapper plugin providing support for aggregates, functions on collections and datasets
 email: 
-- foysavas@gmail.com
+- foysavas [a] gmail [d] com
 executables: []
 
 extensions: []
@@ -43,6 +33,7 @@ extra_rdoc_files:
 - README.txt
 - LICENSE
 - TODO
+- History.txt
 files: 
 - History.txt
 - LICENSE
@@ -58,9 +49,13 @@ files:
 - lib/dm-aggregates/repository.rb
 - lib/dm-aggregates/support/symbol.rb
 - lib/dm-aggregates/version.rb
-- spec/integration/aggregates_spec.rb
+- spec/public/collection_spec.rb
+- spec/public/model_spec.rb
+- spec/public/shared/aggregate_shared_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
+- tasks/install.rb
+- tasks/spec.rb
 has_rdoc: true
 homepage: http://github.com/sam/dm-more/tree/master/dm-aggregates
 post_install_message: 

data/spec/integration/aggregates_spec.rb

@@ -1,330 +0,0 @@
-require 'pathname'
-require Pathname(__FILE__).dirname.expand_path.parent + 'spec_helper'
-
-if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
-  describe 'DataMapper::Resource' do
-    before :all do
-      # A simplistic example, using with an Integer property
-      class Knight
-        include DataMapper::Resource
-
-        property :id,   Serial
-        property :name, String
-      end
-
-      class Dragon
-        include DataMapper::Resource
-
-        property :id,                Serial
-        property :name,              String
-        property :is_fire_breathing, TrueClass
-        property :toes_on_claw,      Integer
-        property :birth_at,          DateTime
-        property :birth_on,          Date
-        property :birth_time,        Time
-
-        belongs_to :knight
-      end
-
-      # A more complex example, with BigDecimal and Float properties
-      # Statistics taken from CIA World Factbook:
-      # https://www.cia.gov/library/publications/the-world-factbook/
-      class Country
-        include DataMapper::Resource
-
-        property :id,                  Serial
-        property :name,                String,     :nullable => false
-        property :population,          Integer
-        property :birth_rate,          Float,      :precision => 4,  :scale => 2
-        property :gold_reserve_tonnes, Float,      :precision => 6,  :scale => 2
-        property :gold_reserve_value,  BigDecimal, :precision => 15, :scale => 1  # approx. value in USD
-      end
-
-      [ Dragon, Country, Knight ].each { |m| m.auto_migrate! }
-
-      @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')
-
-      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_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)
-
-      @approx_by = 0.000001
-    end
-
-    def target(klass, target_type)
-      target_type == :collection ? klass.all : klass
-    end
-
-    [ :model, :collection ].each do |target_type|
-      describe ".count on a #{target_type}" do
-        describe 'with no arguments' do
-          it 'should count the results' do
-            target(Dragon, target_type).count.should  == 3
-
-            target(Country, target_type).count.should == 7
-          end
-
-          it 'should count the results with conditions having operators' do
-            target(Dragon, target_type).count(:toes_on_claw.gt => 3).should == 2
-
-            target(Country, target_type).count(:birth_rate.lt => 12).should == 3
-            target(Country, target_type).count(:population.gt => 1000000000).should == 1
-            target(Country, target_type).count(:population.gt => 2000000000).should == 0
-            target(Country, target_type).count(:population.lt => 10).should == 0
-          end
-
-          it 'should count the results with raw conditions' do
-            dragon_statement = 'is_fire_breathing = ?'
-            target(Dragon, target_type).count(:conditions => [ dragon_statement, false ]).should == 1
-            target(Dragon, target_type).count(:conditions => [ dragon_statement, true  ]).should == 2
-          end
-        end
-
-        describe 'with a property name' do
-          it 'should count the results' do
-            target(Dragon, target_type).count(:name).should == 2
-          end
-
-          it 'should count the results with conditions having operators' do
-            target(Dragon, target_type).count(:name, :toes_on_claw.gt => 3).should == 1
-          end
-
-          it 'should count the results with raw conditions' do
-            statement = 'is_fire_breathing = ?'
-            target(Dragon, target_type).count(:name, :conditions => [ statement, false ]).should == 1
-            target(Dragon, target_type).count(:name, :conditions => [ statement, true  ]).should == 1
-          end
-        end
-      end
-
-      describe ".min on a #{target_type}" do
-        describe 'with no arguments' do
-          it 'should raise an error' do
-            lambda { target(Dragon, target_type).min }.should raise_error(ArgumentError)
-          end
-        end
-
-        describe 'with a property name' do
-          it 'should provide the lowest value of an Integer property' do
-            target(Dragon, target_type).min(:toes_on_claw).should == 3
-            target(Country, target_type).min(:population).should == 82369548
-          end
-
-          it 'should provide the lowest value of a Float property' do
-            target(Country, target_type).min(:birth_rate).should be_kind_of(Float)
-            target(Country, target_type).min(:birth_rate).should >= 7.87 - @approx_by  # approx match
-            target(Country, target_type).min(:birth_rate).should <= 7.87 + @approx_by  # approx match
-          end
-
-          it 'should provide the lowest value of a BigDecimal property' do
-            target(Country, target_type).min(:gold_reserve_value).should be_kind_of(BigDecimal)
-            target(Country, target_type).min(:gold_reserve_value).should == BigDecimal('1217050983400.0')
-          end
-
-          it 'should provide the lowest value of a DateTime property' do
-            target(Dragon, target_type).min(:birth_at).should be_kind_of(DateTime)
-            target(Dragon, target_type).min(:birth_at).to_s.should == @birth_at.to_s
-          end
-
-          it 'should provide the lowest value of a Date property' do
-            target(Dragon, target_type).min(:birth_on).should be_kind_of(Date)
-            target(Dragon, target_type).min(:birth_on).to_s.should == @birth_on.to_s
-          end
-
-          it 'should provide the lowest value of a Time property' do
-            target(Dragon, target_type).min(:birth_time).should be_kind_of(Time)
-            target(Dragon, target_type).min(:birth_time).to_s.should == @birth_time.to_s
-          end
-
-          it 'should provide the lowest value when conditions provided' do
-            target(Dragon, target_type).min(:toes_on_claw, :is_fire_breathing => true).should  == 4
-            target(Dragon, target_type).min(:toes_on_claw, :is_fire_breathing => false).should == 3
-          end
-        end
-      end
-
-      describe ".max on a #{target_type}" do
-        describe 'with no arguments' do
-          it 'should raise an error' do
-            lambda { target(Dragon, target_type).max }.should raise_error(ArgumentError)
-          end
-        end
-
-        describe 'with a property name' do
-          it 'should provide the highest value of an Integer property' do
-            target(Dragon, target_type).max(:toes_on_claw).should == 5
-            target(Country, target_type).max(:population).should == 1330044605
-          end
-
-          it 'should provide the highest value of a Float property' do
-            target(Country, target_type).max(:birth_rate).should be_kind_of(Float)
-            target(Country, target_type).max(:birth_rate).should >= 20.04 - @approx_by  # approx match
-            target(Country, target_type).max(:birth_rate).should <= 20.04 + @approx_by  # approx match
-          end
-
-          it 'should provide the highest value of a BigDecimal property' do
-            target(Country, target_type).max(:gold_reserve_value).should == BigDecimal('22589877164500.0')
-          end
-
-          it 'should provide the highest value of a DateTime property' do
-            target(Dragon, target_type).min(:birth_at).should be_kind_of(DateTime)
-            target(Dragon, target_type).min(:birth_at).to_s.should == @birth_at.to_s
-          end
-
-          it 'should provide the highest value of a Date property' do
-            target(Dragon, target_type).min(:birth_on).should be_kind_of(Date)
-            target(Dragon, target_type).min(:birth_on).to_s.should == @birth_on.to_s
-          end
-
-          it 'should provide the highest value of a Time property' do
-            target(Dragon, target_type).min(:birth_time).should be_kind_of(Time)
-            target(Dragon, target_type).min(:birth_time).to_s.should == @birth_time.to_s
-          end
-
-          it 'should provide the highest value when conditions provided' do
-            target(Dragon, target_type).max(:toes_on_claw, :is_fire_breathing => true).should  == 5
-            target(Dragon, target_type).max(:toes_on_claw, :is_fire_breathing => false).should == 3
-          end
-        end
-      end
-
-      describe ".avg on a #{target_type}" do
-        describe 'with no arguments' do
-          it 'should raise an error' do
-            lambda { target(Dragon, target_type).avg }.should raise_error(ArgumentError)
-          end
-        end
-
-        describe 'with a property name' do
-          it 'should provide the average value of an Integer property' do
-            target(Dragon, target_type).avg(:toes_on_claw).should be_kind_of(Float)
-            target(Dragon, target_type).avg(:toes_on_claw).should == 4.0
-          end
-
-          it 'should provide 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
-            target(Country, target_type).avg(:birth_rate).should be_kind_of(Float)
-            target(Country, target_type).avg(:birth_rate).should >= mean_birth_rate - @approx_by  # approx match
-            target(Country, target_type).avg(:birth_rate).should <= mean_birth_rate + @approx_by  # approx match
-          end
-
-          it 'should provide 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
-            target(Country, target_type).avg(:gold_reserve_value).should be_kind_of(BigDecimal)
-            target(Country, target_type).avg(:gold_reserve_value).should == BigDecimal(mean_gold_reserve_value.to_s)
-          end
-
-          it 'should provide the average value when conditions provided' do
-            target(Dragon, target_type).avg(:toes_on_claw, :is_fire_breathing => true).should  == 4.5
-            target(Dragon, target_type).avg(:toes_on_claw, :is_fire_breathing => false).should == 3
-          end
-        end
-      end
-
-      describe ".sum on a #{target_type}" do
-        describe 'with no arguments' do
-          it 'should raise an error' do
-            lambda { target(Dragon, target_type).sum }.should raise_error(ArgumentError)
-          end
-        end
-
-        describe 'with a property name' do
-          it 'should provide the sum of values for an Integer property' do
-            target(Dragon, target_type).sum(:toes_on_claw).should == 12
-
-            total_population = 1330044605 + 303824646 + 191908598 + 140702094 +
-                               127288419 + 109955400 + 82369548
-            target(Country, target_type).sum(:population).should == total_population
-          end
-
-          it 'should provide the sum of values for a Float property' do
-            total_tonnes = 600.0 + 8133.5 + 438.2 + 765.2 + 3417.4
-            target(Country, target_type).sum(:gold_reserve_tonnes).should be_kind_of(Float)
-            target(Country, target_type).sum(:gold_reserve_tonnes).should >= total_tonnes - @approx_by  # approx match
-            target(Country, target_type).sum(:gold_reserve_tonnes).should <= total_tonnes + @approx_by  # approx match
-          end
-
-          it 'should provide the sum of values for a BigDecimal property' do
-            target(Country, target_type).sum(:gold_reserve_value).should == BigDecimal('37090059214100.0')
-          end
-
-          it 'should provide the average value when conditions provided' do
-            target(Dragon, target_type).sum(:toes_on_claw, :is_fire_breathing => true).should  == 9
-            target(Dragon, target_type).sum(:toes_on_claw, :is_fire_breathing => false).should == 3
-          end
-        end
-      end
-
-      describe ".aggregate on a #{target_type}" do
-        describe 'with no arguments' do
-          it 'should raise an error' do
-            lambda { target(Dragon, target_type).aggregate }.should raise_error(ArgumentError)
-          end
-        end
-
-        describe 'with only aggregate fields specified' do
-          it 'should provide aggregate results' do
-            results = target(Dragon, target_type).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 = target(Dragon, target_type).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 = Dragon.first(Dragon.knight.name => 'Chuck')
-          dragon.name.should == 'George'
-        end
-      end
-    end
-  end
-end