dm-aggregates 0.10.1 → 0.10.2

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2008 Foy Savas
+Copyright (c) 2009 Foy Savas
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -1,24 +1,29 @@
-require 'pathname'
+require 'rubygems'
+require 'rake'
 
-ROOT    = Pathname(__FILE__).dirname.expand_path
-JRUBY   = RUBY_PLATFORM =~ /java/
-WINDOWS = Gem.win_platform?
-SUDO    = (WINDOWS || JRUBY) ? '' : ('sudo' unless ENV['SUDOLESS'])
+begin
+  gem 'jeweler', '~> 1.4'
+  require 'jeweler'
 
-require ROOT + 'lib/dm-aggregates/version'
+  Jeweler::Tasks.new do |gem|
+    gem.name        = 'dm-aggregates'
+    gem.summary     = 'DataMapper plugin providing support for aggregates on collections'
+    gem.description = gem.summary
+    gem.email       = 'foysavas [a] gmail [d] com'
+    gem.homepage    = 'http://github.com/datamapper/dm-more/tree/master/%s' % gem.name
+    gem.authors     = [ 'Foy Savas' ]
 
-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.rdoc LICENSE TODO History.rdoc ] }
+    gem.rubyforge_project = 'datamapper'
 
-PROJECT_NAME = 'datamapper'
-PROJECT_URL  = "http://github.com/datamapper/dm-more/tree/master/#{GEM_NAME}"
-PROJECT_DESCRIPTION = PROJECT_SUMMARY = 'DataMapper plugin providing support for aggregates, functions on collections and datasets'
+    gem.add_dependency 'dm-core', '~> 0.10.2'
 
-[ ROOT, ROOT.parent ].each do |dir|
-  Pathname.glob(dir.join('tasks/**/*.rb').to_s).each { |f| require f }
+    gem.add_development_dependency 'rspec', '~> 1.2.9'
+    gem.add_development_dependency 'yard',  '~> 0.4.0'
+  end
+
+  Jeweler::GemcutterTasks.new
+
+  FileList['tasks/**/*.rake'].each { |task| import task }
+rescue LoadError
+  puts 'Jeweler (or a dependency) not available. Install it with: gem install jeweler'
 end

data/VERSION

@@ -0,0 +1 @@
+0.10.2

data/dm-aggregates.gemspec

@@ -0,0 +1,71 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{dm-aggregates}
+  s.version = "0.10.2"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Foy Savas"]
+  s.date = %q{2009-12-11}
+  s.description = %q{DataMapper plugin providing support for aggregates on collections}
+  s.email = %q{foysavas [a] gmail [d] com}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "dm-aggregates.gemspec",
+     "lib/dm-aggregates.rb",
+     "lib/dm-aggregates/adapters/data_objects_adapter.rb",
+     "lib/dm-aggregates/aggregate_functions.rb",
+     "lib/dm-aggregates/collection.rb",
+     "lib/dm-aggregates/core_ext/symbol.rb",
+     "lib/dm-aggregates/model.rb",
+     "lib/dm-aggregates/query.rb",
+     "lib/dm-aggregates/repository.rb",
+     "spec/public/collection_spec.rb",
+     "spec/public/model_spec.rb",
+     "spec/public/shared/aggregate_shared_spec.rb",
+     "spec/rcov.opts",
+     "spec/spec.opts",
+     "spec/spec_helper.rb",
+     "tasks/ci.rake",
+     "tasks/metrics.rake",
+     "tasks/spec.rake",
+     "tasks/yard.rake",
+     "tasks/yardstick.rake"
+  ]
+  s.homepage = %q{http://github.com/datamapper/dm-more/tree/master/dm-aggregates}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{datamapper}
+  s.rubygems_version = %q{1.3.5}
+  s.summary = %q{DataMapper plugin providing support for aggregates on collections}
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<dm-core>, ["~> 0.10.2"])
+      s.add_development_dependency(%q<rspec>, ["~> 1.2.9"])
+      s.add_development_dependency(%q<yard>, ["~> 0.4.0"])
+    else
+      s.add_dependency(%q<dm-core>, ["~> 0.10.2"])
+      s.add_dependency(%q<rspec>, ["~> 1.2.9"])
+      s.add_dependency(%q<yard>, ["~> 0.4.0"])
+    end
+  else
+    s.add_dependency(%q<dm-core>, ["~> 0.10.2"])
+    s.add_dependency(%q<rspec>, ["~> 1.2.9"])
+    s.add_dependency(%q<yard>, ["~> 0.4.0"])
+  end
+end
+

data/lib/dm-aggregates.rb

@@ -5,7 +5,6 @@ require 'dm-aggregates/core_ext/symbol'
 require 'dm-aggregates/model'
 require 'dm-aggregates/query'
 require 'dm-aggregates/repository'
-require 'dm-aggregates/version'
 
 module DataMapper
   class Repository

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

@@ -72,24 +72,24 @@ module DataMapper
           RUBY
         end
 
-        def property_to_column_name_with_operator(property, qualify)
+        def property_to_column_name_with_operator(property, qualify, qualifier = nil)
           case property
             when DataMapper::Query::Operator
-              aggregate_field_statement(property.operator, property.target, qualify)
+              aggregate_field_statement(property.operator, property.target, qualify, qualifier)
 
             when Property, DataMapper::Query::Path
-              property_to_column_name_without_operator(property, qualify)
+              property_to_column_name_without_operator(property, qualify, qualifier)
 
             else
               raise ArgumentError, "+property+ must be a DataMapper::Query::Operator, a DataMapper::Property or a Query::Path, but was a #{property.class} (#{property.inspect})"
           end
         end
 
-        def aggregate_field_statement(aggregate_function, property, qualify)
+        def aggregate_field_statement(aggregate_function, property, qualify, qualifier)
           column_name = if aggregate_function == :count && property == :all
             '*'
           else
-            property_to_column_name(property, qualify)
+            property_to_column_name(property, qualify, qualifier)
           end
 
           function_name = case aggregate_function

data/lib/dm-aggregates/aggregate_functions.rb

@@ -1,6 +1,8 @@
 module DataMapper
   module Aggregates
     module Functions
+      include Extlib::Assertions
+
       # Count results (given the conditions)
       #
       # @example the count of all friends
@@ -35,7 +37,7 @@ module DataMapper
           assert_kind_of 'property', property_by_name(property_name), Property
         end
 
-        aggregate(query.merge(:fields => [ property_name ? property_name.count : :all.count ]))
+        aggregate(query.merge(:fields => [ property_name ? property_name.count : :all.count ])).to_i
       end
 
       # Get the lowest value of a property
@@ -174,7 +176,8 @@ module DataMapper
           raise ArgumentError, 'property name must not be nil'
         end
 
-        type = property_by_name(name).type
+        property = property_by_name(name)
+        type     = property.custom? ? property.primitive : property.type
 
         unless types.include?(type)
           raise ArgumentError, "#{name} must be #{types * ' or '}, but was #{type}"

data/lib/dm-aggregates/query.rb

@@ -15,7 +15,7 @@ module DataMapper
         operators.each do |operator|
           target = operator.target
 
-          unless target == :all || target.kind_of?(Property) && target.model == model && @properties.include?(target)
+          unless target == :all || @properties.include?(target)
             raise ArgumentError, "+options[:fields]+ entry #{target.inspect} does not map to a property in #{model}"
           end
         end

data/lib/dm-aggregates/repository.rb

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

data/spec/public/collection_spec.rb

@@ -10,5 +10,97 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
     end
 
     it_should_behave_like 'An Aggregatable Class'
+
+    describe 'ignore invalid query' do
+      before :all do
+        @dragons = @dragons.all(:id => [])
+      end
+
+      [ :size, :count ].each do |method|
+        describe "##{method}" do
+          it 'should return 0' do
+            @dragons.send(method).should == 0
+          end
+        end
+      end
+
+      describe '#min' do
+        it 'should return nil' do
+          @dragons.min(:id).should == nil
+        end
+      end
+
+      describe '#max' do
+        it 'should return nil' do
+          @dragons.max(:id).should == nil
+        end
+      end
+
+      describe '#avg' do
+        it 'should return nil' do
+          @dragons.avg(:id).should == nil
+        end
+      end
+
+      describe '#sum' do
+        it 'should return nil' do
+          @dragons.sum(:id).should == nil
+        end
+      end
+
+      describe '#aggregate' do
+        it 'should return nil' do
+          @dragons.aggregate(:id).should == []
+        end
+      end
+    end
+
+    describe 'with collections created with Set operations' do
+      before do
+        @collection = @dragons.all(:name => 'George') | @dragons.all(:name => 'Puff')
+      end
+
+      describe '#size' do
+        subject { @collection.size }
+
+        it { should == 2 }
+      end
+
+      describe '#count' do
+        subject { @collection.count }
+
+        it { should == 2 }
+      end
+
+      describe '#min' do
+        subject { @collection.min(:toes_on_claw) }
+
+        it { should == 3 }
+      end
+
+      describe '#max' do
+        subject { @collection.max(:toes_on_claw) }
+
+        it { should == 4 }
+      end
+
+      describe '#avg' do
+        subject { @collection.avg(:toes_on_claw) }
+
+        it { should == 3.5 }
+      end
+
+      describe '#sum' do
+        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)}
+
+        it { should == [ 2, 2, 3, 4, 3.5, 7 ] }
+      end
+    end
   end
 end

data/spec/public/shared/aggregate_shared_spec.rb

@@ -19,7 +19,7 @@ shared_examples_for 'It Has Setup Resources' do
       property :birth_on,          Date
       property :birth_time,        Time
 
-      belongs_to :knight, :nullable => true
+      belongs_to :knight, :required => false
     end
 
     # A more complex example, with BigDecimal and Float properties
@@ -29,7 +29,7 @@ shared_examples_for 'It Has Setup Resources' do
       include DataMapper::Resource
 
       property :id,                  Serial
-      property :name,                String,     :nullable => false
+      property :name,                String,     :required => true
       property :population,          Integer
       property :birth_rate,          Float,      :precision => 4,  :scale => 2
       property :gold_reserve_tonnes, Float,      :precision => 6,  :scale => 2
@@ -38,9 +38,9 @@ shared_examples_for 'It Has Setup Resources' do
 
     DataMapper.auto_migrate!
 
-    @birth_at   = DateTime.now
-    @birth_on   = Date.parse(@birth_at.to_s)
-    @birth_time = Time.parse(@birth_at.to_s)
+    @birth_time = Time.now
+    @birth_at   = @birth_time.to_datetime
+    @birth_on   = @birth_time.send(:to_date)
 
     @chuck = Knight.create(:name => 'Chuck')
     @larry = Knight.create(:name => 'Larry')
@@ -146,7 +146,7 @@ shared_examples_for 'An Aggregatable Class' do
 
       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
+        @dragons.min(:birth_on).should == @birth_on
       end
 
       it 'should provide the lowest value of a Time property' do
@@ -191,7 +191,7 @@ shared_examples_for 'An Aggregatable Class' do
 
       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
+        @dragons.min(:birth_on).should == @birth_on
       end
 
       it 'should provide the highest value of a Time property' do

data/spec/rcov.opts

@@ -0,0 +1,6 @@
+--exclude "spec"
+--sort coverage
+--callsites
+--xrefs
+--profile
+--text-summary

data/spec/spec.opts

@@ -1,2 +1,4 @@
 --colour
 --loadby random
+--format profile
+--backtrace

data/tasks/ci.rake

@@ -0,0 +1 @@
+task :ci => [ :verify_measurements, 'metrics:all' ]

data/tasks/metrics.rake

@@ -0,0 +1,36 @@
+begin
+  require 'metric_fu'
+rescue LoadError
+  namespace :metrics do
+    task :all do
+      abort 'metric_fu is not available. In order to run metrics:all, you must: gem install metric_fu'
+    end
+  end
+end
+
+begin
+  require 'reek/adapters/rake_task'
+
+  Reek::RakeTask.new do |t|
+    t.fail_on_error = true
+    t.verbose       = false
+    t.source_files  = 'lib/**/*.rb'
+  end
+rescue LoadError
+  task :reek do
+    abort 'Reek is not available. In order to run reek, you must: gem install reek'
+  end
+end
+
+begin
+  require 'roodi'
+  require 'roodi_task'
+
+  RoodiTask.new do |t|
+    t.verbose = false
+  end
+rescue LoadError
+  task :roodi do
+    abort 'Roodi is not available. In order to run roodi, you must: gem install roodi'
+  end
+end

data/tasks/spec.rake

@@ -0,0 +1,41 @@
+spec_defaults = lambda do |spec|
+  spec.pattern    = 'spec/**/*_spec.rb'
+  spec.libs      << 'lib' << 'spec'
+  spec.spec_opts << '--options' << 'spec/spec.opts'
+end
+
+begin
+  require 'spec/rake/spectask'
+
+  Spec::Rake::SpecTask.new(:spec, &spec_defaults)
+rescue LoadError
+  task :spec do
+    abort 'rspec is not available. In order to run spec, you must: gem install rspec'
+  end
+end
+
+begin
+  require 'rcov'
+  require 'spec/rake/verify_rcov'
+
+  Spec::Rake::SpecTask.new(:rcov) do |rcov|
+    spec_defaults.call(rcov)
+    rcov.rcov      = true
+    rcov.rcov_opts = File.read('spec/rcov.opts').split(/\s+/)
+  end
+
+  RCov::VerifyTask.new(:verify_rcov => :rcov) do |rcov|
+    rcov.threshold = 100
+  end
+rescue LoadError
+  %w[ rcov verify_rcov ].each do |name|
+    task name do
+      abort "rcov is not available. In order to run #{name}, you must: gem install rcov"
+    end
+  end
+end
+
+task :spec => :check_dependencies
+task :rcov => :check_dependencies
+
+task :default => :spec

data/tasks/yard.rake

@@ -0,0 +1,9 @@
+begin
+  require 'yard'
+
+  YARD::Rake::YardocTask.new
+rescue LoadError
+  task :yard do
+    abort 'YARD is not available. In order to run yard, you must: gem install yard'
+  end
+end

data/tasks/yardstick.rake

@@ -0,0 +1,19 @@
+begin
+  require 'pathname'
+  require 'yardstick/rake/measurement'
+  require 'yardstick/rake/verify'
+
+  # yardstick_measure task
+  Yardstick::Rake::Measurement.new
+
+  # verify_measurements task
+  Yardstick::Rake::Verify.new do |verify|
+    verify.threshold = 100
+  end
+rescue LoadError
+  %w[ yardstick_measure verify_measurements ].each do |name|
+    task name.to_s do
+      abort "Yardstick is not available. In order to run #{name}, you must: gem install yardstick"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-aggregates
 version: !ruby/object:Gem::Version 
-  version: 0.10.1
+  version: 0.10.2
 platform: ruby
 authors: 
 - Foy Savas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-30 00:00:00 -07:00
+date: 2009-12-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,29 +18,45 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.10.1
+        version: 0.10.2
     version: 
-description: DataMapper plugin providing support for aggregates, functions on collections and datasets
-email: 
-- foysavas [a] gmail [d] com
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 1.2.9
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: yard
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        version: 0.4.0
+    version: 
+description: DataMapper plugin providing support for aggregates on collections
+email: foysavas [a] gmail [d] com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- README.rdoc
 - LICENSE
-- TODO
-- History.rdoc
+- README.rdoc
 files: 
-- History.rdoc
 - LICENSE
-- Manifest.txt
 - README.rdoc
 - Rakefile
-- TODO
+- VERSION
+- dm-aggregates.gemspec
 - lib/dm-aggregates.rb
 - lib/dm-aggregates/adapters/data_objects_adapter.rb
 - lib/dm-aggregates/aggregate_functions.rb
@@ -49,22 +65,24 @@ files:
 - lib/dm-aggregates/model.rb
 - lib/dm-aggregates/query.rb
 - lib/dm-aggregates/repository.rb
-- lib/dm-aggregates/version.rb
 - spec/public/collection_spec.rb
 - spec/public/model_spec.rb
 - spec/public/shared/aggregate_shared_spec.rb
+- spec/rcov.opts
 - spec/spec.opts
 - spec/spec_helper.rb
-- tasks/install.rb
-- tasks/spec.rb
+- tasks/ci.rake
+- tasks/metrics.rake
+- tasks/spec.rake
+- tasks/yard.rake
+- tasks/yardstick.rake
 has_rdoc: true
 homepage: http://github.com/datamapper/dm-more/tree/master/dm-aggregates
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --main
-- README.rdoc
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -85,6 +103,6 @@ rubyforge_project: datamapper
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: DataMapper plugin providing support for aggregates, functions on collections and datasets
+summary: DataMapper plugin providing support for aggregates on collections
 test_files: []
 

data/History.rdoc

@@ -1,29 +0,0 @@
-=== 0.10.1 / 2009-09-30
-
-* No changes this version
-
-=== 0.10.0 / 2009-09-15
-
-* Updated to work with dm-core 0.10.0
-
-=== 0.9.11 / 2009-03-29
-
-* No changes this version
-
-=== 0.9.10 / 2009-01-19
-
-* No changes this version
-
-=== 0.9.9 / 2009-01-04
-
-* 2 bug fixes:
-
-  * Removed count optimization for Model#size
-  * Removed count optimization for Collection#size
-
-=== 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

@@ -1,22 +0,0 @@
-History.rdoc
-LICENSE
-Manifest.txt
-README.rdoc
-Rakefile
-TODO
-lib/dm-aggregates.rb
-lib/dm-aggregates/adapters/data_objects_adapter.rb
-lib/dm-aggregates/aggregate_functions.rb
-lib/dm-aggregates/collection.rb
-lib/dm-aggregates/core_ext/symbol.rb
-lib/dm-aggregates/model.rb
-lib/dm-aggregates/query.rb
-lib/dm-aggregates/repository.rb
-lib/dm-aggregates/version.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/lib/dm-aggregates/version.rb

@@ -1,5 +0,0 @@
-module DataMapper
-  module Aggregates
-    VERSION = '0.10.1'.freeze
-  end
-end

data/tasks/install.rb

@@ -1,13 +0,0 @@
-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 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

@@ -1,25 +0,0 @@
-begin
-  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.libs      << 'lib' << 'spec' # needed for CI rake spec task, duplicated in spec_helper
-
-    begin
-      require 'rcov'
-      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
-    rescue SyntaxError
-      # rcov syntax invalid
-    end
-  end
-rescue LoadError
-  # rspec not installed
-end