dm-aggregates 1.0.0.rc2 → 1.0.0.rc3

data/Gemfile

@@ -71,7 +71,7 @@
 source 'http://rubygems.org'
 
 DATAMAPPER = 'git://github.com/datamapper'
-DM_VERSION = '~> 1.0.0.rc2'
+DM_VERSION = '~> 1.0.0.rc3'
 
 group :runtime do # Runtime dependencies (as in the gemspec)
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2009 Foy Savas
+Copyright (c) 2010 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

@@ -10,12 +10,12 @@ begin
     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.homepage    = 'http://github.com/datamapper/%s' % gem.name
     gem.authors     = [ 'Foy Savas' ]
 
     gem.rubyforge_project = 'datamapper'
 
-    gem.add_dependency 'dm-core', '~> 1.0.0.rc2'
+    gem.add_dependency 'dm-core', '~> 1.0.0.rc3'
 
     gem.add_development_dependency 'rspec', '~> 1.3'
   end

data/VERSION

@@ -1 +1 @@
-1.0.0.rc2
+1.0.0.rc3

data/dm-aggregates.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{dm-aggregates}
-  s.version = "1.0.0.rc2"
+  s.version = "1.0.0.rc3"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Foy Savas"]
-  s.date = %q{2010-05-19}
+  s.date = %q{2010-05-27}
   s.description = %q{DataMapper plugin providing support for aggregates on collections}
   s.email = %q{foysavas [a] gmail [d] com}
   s.extra_rdoc_files = [
@@ -25,13 +25,16 @@ Gem::Specification.new do |s|
      "VERSION",
      "dm-aggregates.gemspec",
      "lib/dm-aggregates.rb",
-     "lib/dm-aggregates/adapters/data_objects_adapter.rb",
+     "lib/dm-aggregates/adapters/dm-do-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/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",
@@ -45,14 +48,17 @@ Gem::Specification.new do |s|
      "tasks/yard.rake",
      "tasks/yardstick.rake"
   ]
-  s.homepage = %q{http://github.com/datamapper/dm-more/tree/master/dm-aggregates}
+  s.homepage = %q{http://github.com/datamapper/dm-aggregates}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{datamapper}
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{DataMapper plugin providing support for aggregates on collections}
   s.test_files = [
-    "spec/public/collection_spec.rb",
+    "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"
@@ -63,14 +69,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.0.rc2"])
+      s.add_runtime_dependency(%q<dm-core>, ["~> 1.0.0.rc3"])
       s.add_development_dependency(%q<rspec>, ["~> 1.3"])
     else
-      s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc2"])
+      s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc3"])
       s.add_dependency(%q<rspec>, ["~> 1.3"])
     end
   else
-    s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc2"])
+    s.add_dependency(%q<dm-core>, ["~> 1.0.0.rc3"])
     s.add_dependency(%q<rspec>, ["~> 1.3"])
   end
 end

data/lib/dm-aggregates.rb

@@ -1,6 +1,5 @@
 require 'dm-core'
 
-require 'dm-aggregates/adapters/data_objects_adapter'
 require 'dm-aggregates/aggregate_functions'
 require 'dm-aggregates/collection'
 require 'dm-aggregates/core_ext/symbol'
@@ -15,19 +14,53 @@ rescue LoadError
 end
 
 module DataMapper
-  class Repository
-    include Aggregates::Repository
+  module Aggregates
+    def self.include_aggregate_api
+      [ :Repository, :Model, :Collection, :Query ].each do |name|
+        DataMapper.const_get(name).send(:include, const_get(name))
+      end
+      Adapters::AbstractAdapter.descendants.each do |adapter_class|
+        Adapters.include_aggregate_api(ActiveSupport::Inflector.demodulize(adapter_class.name))
+      end
+    end
   end
 
-  module Model
-    include Aggregates::Model
-  end
+  module Adapters
 
-  class Collection
-    include Aggregates::Collection
-  end
+    def self.include_aggregate_api(const_name)
+      require aggregate_extensions(const_name)
+      if Aggregates.const_defined?(const_name)
+        adapter = const_get(const_name)
+        adapter.send(:include, aggregate_module(const_name))
+      end
+    rescue LoadError
+      # Silently ignore the fact that no adapter extensions could be required
+      # This means that the adapter in use doesn't support aggregates
+    end
 
-  class Query
-    include Aggregates::Query
-  end
-end
+    def self.aggregate_module(const_name)
+      Aggregates.const_get(const_name)
+    end
+
+    class << self
+    private
+      # @api private
+      def aggregate_extensions(const_name)
+        name = adapter_name(const_name)
+        name = 'do' if name == 'dataobjects'
+        "dm-aggregates/adapters/dm-#{name}-adapter"
+      end
+    end
+
+    extendable do
+      # @api private
+      def const_added(const_name)
+        include_aggregate_api(const_name)
+        super
+      end
+    end
+  end # module Adapters
+
+  Aggregates.include_aggregate_api
+
+end # module DataMapper

data/lib/dm-aggregates/adapters/{data_objects_adapter.rb → dm-do-adapter.rb}

@@ -1,9 +1,7 @@
 module DataMapper
   module Aggregates
     module DataObjectsAdapter
-      def self.included(base)
-        base.send(:include, SQL)
-      end
+      extend Chainable
 
       def aggregate(query)
         fields = query.fields
@@ -63,63 +61,40 @@ module DataMapper
         property.load(value)
       end
 
-      module SQL
-        def self.included(base)
-          base.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-            # FIXME: figure out a cleaner approach than AMC
-            alias property_to_column_name_without_operator property_to_column_name
-            alias property_to_column_name property_to_column_name_with_operator
-          RUBY
-        end
-
-        def property_to_column_name_with_operator(property, qualify)
+      chainable do
+        def property_to_column_name(property, qualify)
           case property
             when DataMapper::Query::Operator
               aggregate_field_statement(property.operator, property.target, qualify)
 
             when Property, DataMapper::Query::Path
-              property_to_column_name_without_operator(property, qualify)
+              super
 
             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
+      end
 
-        def aggregate_field_statement(aggregate_function, property, qualify)
-          column_name = if aggregate_function == :count && property == :all
-            '*'
-          else
-            property_to_column_name(property, qualify)
-          end
-
-          function_name = case aggregate_function
-            when :count then 'COUNT'
-            when :min   then 'MIN'
-            when :max   then 'MAX'
-            when :avg   then 'AVG'
-            when :sum   then 'SUM'
-            else raise "Invalid aggregate function: #{aggregate_function.inspect}"
-          end
-
-          "#{function_name}(#{column_name})"
+      def aggregate_field_statement(aggregate_function, property, qualify)
+        column_name = if aggregate_function == :count && property == :all
+          '*'
+        else
+          property_to_column_name(property, qualify)
         end
-      end # module SQL
-    end # class DataObjectsAdapter
-  end # module Aggregates
-
-  module Adapters
-    extendable do
 
-      # TODO: document
-      # @api private
-      def const_added(const_name)
-        if DataMapper::Aggregates.const_defined?(const_name)
-          adapter = const_get(const_name)
-          adapter.send(:include, DataMapper::Aggregates.const_get(const_name))
+        function_name = case aggregate_function
+          when :count then 'COUNT'
+          when :min   then 'MIN'
+          when :max   then 'MAX'
+          when :avg   then 'AVG'
+          when :sum   then 'SUM'
+          else raise "Invalid aggregate function: #{aggregate_function.inspect}"
         end
 
-        super
+        "#{function_name}(#{column_name})"
       end
-    end
-  end # module Adapters
+
+    end # class DataObjectsAdapter
+  end # module Aggregates
 end # module DataMapper

data/spec/isolated/require_after_setup_spec.rb

@@ -0,0 +1,21 @@
+require 'spec'
+require 'isolated/require_spec'
+require 'dm-core/spec/setup'
+
+# To really test this behavior, this spec needs to be run in isolation and not
+# as part of the typical rake spec run, which requires dm-aggregates upfront
+
+if %w[ postgres mysql sqlite oracle sqlserver ].include?(ENV['ADAPTER'])
+
+  describe "require 'dm-aggregates after calling DataMapper.setup" do
+
+    before(:all) do
+      @adapter = DataMapper::Spec.adapter
+      require 'dm-aggregates'
+    end
+
+    it_should_behave_like "require 'dm-aggregates'"
+
+  end
+
+end

data/spec/isolated/require_before_setup_spec.rb

@@ -0,0 +1,21 @@
+require 'spec'
+require 'isolated/require_spec'
+require 'dm-core/spec/setup'
+
+# To really test this behavior, this spec needs to be run in isolation and not
+# as part of the typical rake spec run, which requires dm-aggregates upfront
+
+if %w[ postgres mysql sqlite oracle sqlserver ].include?(ENV['ADAPTER'])
+
+  describe "require 'dm-aggregates' before calling DataMapper.setup" do
+
+    before(:all) do
+      require 'dm-aggregates'
+      @adapter = DataMapper::Spec.adapter
+    end
+
+    it_should_behave_like "require 'dm-aggregates'"
+
+  end
+
+end

data/spec/isolated/require_spec.rb

@@ -0,0 +1,13 @@
+shared_examples_for "require 'dm-aggregates'" do
+
+  %w[ Repository Model Collection Query ].each do |name|
+    it "should include the aggregate api in DataMapper::#{name}" do
+      (DataMapper.const_get(name) < DataMapper::Aggregates.const_get(name)).should be(true)
+    end
+  end
+
+  it "should include the aggregate api into the adapter" do
+    @adapter.respond_to?(:aggregate).should be(true)
+  end
+
+end

data/spec/rcov.opts

@@ -1,4 +1,4 @@
---exclude "spec"
+--exclude "spec,^/"
 --sort coverage
 --callsites
 --xrefs

data/spec/spec_helper.rb

@@ -49,6 +49,7 @@ Spec::Runner.configure do |config|
       property :gold_reserve_tonnes, Float,   :precision => 6,  :scale => 2
       property :gold_reserve_value,  Decimal, :precision => 15, :scale => 1  # approx. value in USD
     end
+    DataMapper.finalize
 
   end
 end

data/tasks/spec.rake

@@ -35,4 +35,7 @@ rescue LoadError
   end
 end
 
+task :spec => :check_dependencies
+task :rcov => :check_dependencies
+
 task :default => :spec

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: dm-aggregates
 version: !ruby/object:Gem::Version 
-  hash: 977940575
+  hash: 977940572
   prerelease: true
   segments: 
   - 1
   - 0
   - 0
-  - rc2
-  version: 1.0.0.rc2
+  - rc3
+  version: 1.0.0.rc3
 platform: ruby
 authors: 
 - Foy Savas
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-19 00:00:00 -07:00
+date: 2010-05-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,13 +27,13 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 977940575
+        hash: 977940572
         segments: 
         - 1
         - 0
         - 0
-        - rc2
-        version: 1.0.0.rc2
+        - rc3
+        version: 1.0.0.rc3
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -69,13 +69,16 @@ files:
 - VERSION
 - dm-aggregates.gemspec
 - lib/dm-aggregates.rb
-- lib/dm-aggregates/adapters/data_objects_adapter.rb
+- lib/dm-aggregates/adapters/dm-do-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/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
@@ -89,7 +92,7 @@ files:
 - tasks/yard.rake
 - tasks/yardstick.rake
 has_rdoc: true
-homepage: http://github.com/datamapper/dm-more/tree/master/dm-aggregates
+homepage: http://github.com/datamapper/dm-aggregates
 licenses: []
 
 post_install_message: 
@@ -125,6 +128,9 @@ 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