birddog 0.0.5 → 0.0.6

data/lib/birddog/birddog.rb

@@ -204,8 +204,8 @@ module Birddog
     private :define_common_aggregates_for
 
     def _common_average_for(model)
-      define_static_scope(:_birddog_average) do |field, value|
-        field_name = "average_#{field}"
+      define_static_scope(:_birddog_average) do |field, field_alias, value|
+        field_name = "#{field_alias}#{field}"
         scope = { :select => @model.arel_table[field].average.as(field_name) }
         warn_common_aggregate_conditional if conditional?(value)
         scope
@@ -214,8 +214,8 @@ module Birddog
     private :_common_average_for
 
     def _common_sum_for(model)
-      define_static_scope(:_birddog_sum) do |field, value|
-        field_name = "sum_#{field}"
+      define_static_scope(:_birddog_sum) do |field, field_alias, value|
+        field_name = "#{field_alias}#{field}"
         scope = { :select => @model.arel_table[field].sum.as(field_name) }
         warn_common_aggregate_conditional if conditional?(value)
         scope
@@ -224,8 +224,8 @@ module Birddog
     private :_common_sum_for
       
     def _common_minimum_for(model)
-      define_static_scope(:_birddog_minimum) do |field, value|
-        field_name = "minimum_#{field}"
+      define_static_scope(:_birddog_minimum) do |field, field_alias, value|
+        field_name = "#{field_alias}#{field}"
         scope = { :select => @model.arel_table[field].minimum.as(field_name) }
         warn_common_aggregate_conditional if conditional?(value)
         scope
@@ -234,8 +234,8 @@ module Birddog
     private :_common_minimum_for
 
     def _common_maximum_for(model)
-      define_static_scope(:_birddog_maximum) do |field, value|
-        field_name = "maximum_#{field}"
+      define_static_scope(:_birddog_maximum) do |field, field_alias, value|
+        field_name = "#{field_alias}#{field}"
         scope = { :select => @model.arel_table[field].maximum.as(field_name) }
         warn_common_aggregate_conditional if conditional?(value)
         scope
@@ -246,33 +246,38 @@ module Birddog
     def aggregate_scope_for(model, key, value)
       aggregate_scope = nil
       field_name = nil
+      field_alias = nil
       key = key.to_s
 
       case 
-      when key =~ /^(average_)([a-zA-Z_]*)/ && @averagable.include?($2.to_sym) then
+      when key =~ /^(average_|avg_)([a-zA-Z_]*)/ && @averagable.include?($2.to_sym) then
         aggregate_scope = "_birddog_average"
+        field_alias = $1
         field_name = $2
       when key =~ /^(sum_)([a-zA-Z_]*)/ && @sumable.include?($2.to_sym) then
         aggregate_scope = "_birddog_sum"
+        field_alias = $1
         field_name = $2
-      when key =~ /^(minimum_)([a-zA-Z_]*)/ && @minimumable.include?($2.to_sym) then
+      when key =~ /^(minimum_|min_)([a-zA-Z_]*)/ && @minimumable.include?($2.to_sym) then
         aggregate_scope = "_birddog_minimum"
+        field_alias = $1
         field_name = $2
-      when key =~ /^(maximum_)([a-zA-Z_]*)/ && @maximumable.include?($2.to_sym) then
+      when key =~ /^(maximum_|max_)([a-zA-Z_]*)/ && @maximumable.include?($2.to_sym) then
         aggregate_scope = "_birddog_maximum"
+        field_alias = $1
         field_name = $2
       end
 
-      [aggregate_scope, field_name]
+      [field_name, field_alias, aggregate_scope]
     end
     private :aggregate_scope_for
  
     def scope_for(model, key, value)
-      scope_name, field = aggregate_scope_for(model, key, value)
+      field, field_alias, scope_name = aggregate_scope_for(model, key, value)
       scope_name = scope_name_for(key) unless scope_name
 
       if model.respond_to?(scope_name)
-        send_params = [field, value].compact
+        send_params = [field, field_alias, value].compact
         model.__send__(scope_name, *send_params)
       else
         model.scoped

data/lib/birddog/version.rb

@@ -1,3 +1,3 @@
 module Birddog
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/specs/common_aggregates_spec.rb

@@ -17,13 +17,23 @@ describe Birddog::Birddog do
 
     it "creates a query on the column desired when scope is average_*" do 
       sql = Product.scopes_for_query("average_value").to_sql
-      sql.must_match(/value/)
+      sql.must_match(/average_value/)
+    end
+
+    it "creates a query on the column desired when scope is avg_*" do 
+      sql = Product.scopes_for_query("avg_value").to_sql
+      sql.must_match(/avg_value/)
     end
 
     it "calculates the average and returns it in the result set" do 
       avg = Product.scopes_for_query("average_value").first
       avg.average_value.must_equal((100 + 200 + 10) / 3.0)
     end
+
+    it "calculates the avg and returns it in the result set" do 
+      avg = Product.scopes_for_query("avg_value").first
+      avg.avg_value.must_equal((100 + 200 + 10) / 3.0)
+    end
   end
 
   describe "minimumable" do 
@@ -33,13 +43,23 @@ describe Birddog::Birddog do
 
     it "creates a query on the column desired when scope is minimum_*" do 
       sql = Product.scopes_for_query("minimum_value").to_sql
-      sql.must_match(/minimum/)
+      sql.must_match(/minimum_value/)
+    end
+
+    it "creates a query on the column desired when scope is min_*" do 
+      sql = Product.scopes_for_query("min_value").to_sql
+      sql.must_match(/min_value/)
     end
 
     it "calculates the minimum and returns it in the result set" do 
       avg = Product.scopes_for_query("minimum_value").first
       avg.minimum_value.must_equal(10)
     end
+
+    it "calculates the min and returns it in the result set" do 
+      avg = Product.scopes_for_query("min_value").first
+      avg.min_value.must_equal(10)
+    end
   end
 
   describe "maximumable" do 
@@ -49,13 +69,23 @@ describe Birddog::Birddog do
 
     it "creates a query on the column desired when scope is maximum_*" do 
       sql = Product.scopes_for_query("maximum_value").to_sql
-      sql.must_match(/maximum/)
+      sql.must_match(/maximum_value/)
+    end
+
+    it "creates a query on the column desired when scope is max_*" do 
+      sql = Product.scopes_for_query("max_value").to_sql
+      sql.must_match(/max_value/)
     end
 
     it "calculates the maximum and returns it in the result set" do 
       avg = Product.scopes_for_query("maximum_value").first
       avg.maximum_value.must_equal(200)
     end
+
+    it "calculates the max and returns it in the result set" do 
+      avg = Product.scopes_for_query("max_value").first
+      avg.max_value.must_equal(200)
+    end
   end
 
   describe "sumable" do 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: birddog
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &12855260 !ruby/object:Gem::Requirement
+  requirement: &12901960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12855260
+  version_requirements: *12901960
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &12854640 !ruby/object:Gem::Requirement
+  requirement: &12901400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12854640
+  version_requirements: *12901400
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &12854040 !ruby/object:Gem::Requirement
+  requirement: &12900740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12854040
+  version_requirements: *12900740
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &12853440 !ruby/object:Gem::Requirement
+  requirement: &12899920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12853440
+  version_requirements: *12899920
 - !ruby/object:Gem::Dependency
   name: chronic
-  requirement: &12852700 !ruby/object:Gem::Requirement
+  requirement: &12899480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12852700
+  version_requirements: *12899480
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &12852260 !ruby/object:Gem::Requirement
+  requirement: &12899060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12852260
+  version_requirements: *12899060
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &12851700 !ruby/object:Gem::Requirement
+  requirement: &12898400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12851700
+  version_requirements: *12898400
 - !ruby/object:Gem::Dependency
   name: squeel
-  requirement: &12850900 !ruby/object:Gem::Requirement
+  requirement: &12897540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12850900
+  version_requirements: *12897540
 description: Seeeeeeeee Readme
 email:
 - brandonsdewitt@gmail.com
@@ -139,7 +139,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1855020977643402553
+      hash: -3806611019993035456
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -148,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1855020977643402553
+      hash: -3806611019993035456
 requirements: []
 rubyforge_project: birddog
 rubygems_version: 1.8.10