dm-aggregates 0.9.6 → 0.9.7

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

@@ -52,12 +52,10 @@ module DataMapper
           case property
             when Query::Operator
               aggregate_field_statement(repository, property.operator, property.target, qualify)
-            when Property
+            when Property, Query::Path
               original_property_to_column_name(repository, property, qualify)
-      when Query::Path
-        original_property_to_column_name(repository, property, qualify)
             else
-              raise ArgumentError, "+property+ must be a DataMapper::Query::Operator or a DataMapper::Property, but was a #{property.class} (#{property.inspect})"
+              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
 

data/lib/dm-aggregates/aggregate_functions.rb

@@ -160,7 +160,8 @@ module DataMapper
       query = scoped_query(query)
 
       if query.fields.any? { |p| p.kind_of?(Property) }
-        query.repository.aggregate(query.update(:unique => true))
+        # explicitly specify the fields to circumvent a bug in Query#update
+        query.repository.aggregate(query.update(:fields => query.fields, :unique => true))
       else
         query.repository.aggregate(query).first  # only return one row
       end

data/lib/dm-aggregates/version.rb

@@ -1,7 +1,7 @@
 module DataMapper
   module More
     module Aggregates
-      VERSION = "0.9.6"
+      VERSION = "0.9.7"
     end
   end
 end

data/spec/integration/aggregates_spec.rb

@@ -5,12 +5,12 @@ 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
+      class Knight
+        include DataMapper::Resource
 
-    property :id,								Serial
-    property :name,							String
-   end
+        property :id,   Serial
+        property :name, String
+      end
 
       class Dragon
         include DataMapper::Resource
@@ -23,10 +23,9 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
         property :birth_on,          Date
         property :birth_time,        Time
 
-    belongs_to :knight
+        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/
@@ -47,8 +46,8 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
       @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')
+      @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 )
@@ -320,12 +319,12 @@ if HAS_SQLITE3 || HAS_MYSQL || HAS_POSTGRES
         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
+      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

data/spec/spec_helper.rb

@@ -8,7 +8,7 @@ def load_driver(name, default_uri)
   lib = "do_#{name}"
 
   begin
-    gem lib, '>=0.9.5'
+    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]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dm-aggregates
 version: !ruby/object:Gem::Version 
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors: 
 - Foy Savas
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-12 00:00:00 -06:00
+date: 2008-11-18 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.6
+        version: 0.9.7
     version: 
 - !ruby/object:Gem::Dependency 
   name: hoe
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.7.0
+        version: 1.8.2
     version: 
 description: DataMapper plugin providing support for aggregates, functions on collections and datasets
 email: 
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: datamapper
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: DataMapper plugin providing support for aggregates, functions on collections and datasets