mochigome 0.0.2 → 0.0.3

data/Gemfile

@@ -6,6 +6,7 @@ gem 'ruport'
 gem 'rgl'
 
 gem 'sqlite3'
+gem 'mysql'
 gem 'factory_girl', '2.0.4'
 gem 'rcov'
 gem 'ruby-prof'

data/Gemfile.lock

@@ -22,6 +22,7 @@ GEM
     minitest (2.5.0)
     mynyml-redgreen (0.7.1)
       term-ansicolor (>= 1.0.4)
+    mysql (2.8.1)
     nokogiri (1.5.0)
     pdf-writer (1.1.8)
       color (>= 1.4.0)
@@ -60,6 +61,7 @@ DEPENDENCIES
   factory_girl (= 2.0.4)
   minitest
   mynyml-redgreen
+  mysql
   nokogiri
   rails (= 2.3.12)
   rcov

data/lib/mochigome_ver.rb

@@ -1,3 +1,3 @@
 module Mochigome
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/model_extensions.rb

@@ -32,7 +32,7 @@ module Mochigome
       end
 
       AGGREGATION_FUNCS = {
-        'count' => 'count()',
+        'count' => 'count(*)',
         'distinct' => 'count(distinct %s)',
         'average' => 'avg(%s)',
         'avg' => 'avg(%s)',
@@ -151,11 +151,24 @@ module Mochigome
           else
             row = assoc_object.send(assoc.name).first(:select => sel_expr, :conditions => cond_expr)
           end
-          h[agg[:name]] = row.x
+          h[agg[:name]] = self.class.auto_numerify(row.x)
         end
       end
       h
     end
+
+    def self.auto_numerify(data)
+      # It's already some more specific type, leave it alone
+      return data unless data.is_a?(String)
+
+      # Try to turn data into an integer or float if appropriate
+      data = data.strip
+      if data =~ /\A[+-]?\d+(\.\d+)?\Z/
+        return ($1 and !$1.blank?) ? data.to_f : data.to_i
+      else
+        return data
+      end
+    end
   end
 
   class ReportFocusSettings

data/test/app_root/config/database-my.yml

@@ -0,0 +1,4 @@
+test:
+  adapter: mysql
+  database: "mochigome_testing"
+  username: root

data/test/app_root/config/environment.rb

@@ -8,6 +8,9 @@ Rails::Initializer.run do |config|
   if ENV['PSQL_TEST_MODE']
     puts "Using postgresql for a test database"
     config.database_configuration_file = "#{RAILS_ROOT}/config/database-pg.yml"
+  elsif ENV['MYSQL_TEST_MODE']
+    puts "Using mysql for a test database"
+    config.database_configuration_file = "#{RAILS_ROOT}/config/database-my.yml"
   else
     puts "Using sqlite for a test database"
   end

data/test/test_helper.rb

@@ -3,9 +3,10 @@ ENV['RAILS_ENV'] = 'test'
 prev_dir = Dir.getwd
 begin
   Dir.chdir("#{File.dirname(__FILE__)}/..")
-  
+
   begin
     # Used when running test files directly
+    $LOAD_PATH << File.dirname(__FILE__)
     $LOAD_PATH << "#{File.dirname(__FILE__)}/../lib"
     require "#{File.dirname(__FILE__)}/app_root/config/environment"
   rescue LoadError

data/test/unit/model_extensions_test.rb

@@ -1,5 +1,31 @@
 require File.expand_path(File.dirname(__FILE__) + '/../test_helper')
 
+describe "an input string" do
+  it "will be converted by auto_numerify to an integer if appropriate" do
+    [35, -35, 0].each do |n|
+      result = Mochigome::ReportFocus.auto_numerify(n.to_s)
+      assert_equal n, result
+      assert_kind_of Integer, result
+    end
+  end
+
+  it "will be converted by auto_numerify to a float if appropriate" do
+    [-35.5, 35.5, 0.0].each do |n|
+      result = Mochigome::ReportFocus.auto_numerify(n.to_s)
+      assert_in_delta n, result
+      assert_kind_of Float, result
+    end
+  end
+
+  it "will remain a string if it is not numeric" do
+    ["", "zero", "yeehah", "foo0.0" "9.2bar"].each do |s|
+      result = Mochigome::ReportFocus.auto_numerify(s)
+      assert_equal s, result
+      assert_kind_of String, result
+    end
+  end
+end
+
 describe "an ActiveRecord model" do
   before do
     @model_class = Class.new(ActiveRecord::Base)
@@ -264,7 +290,7 @@ describe "an ActiveRecord model" do
     # Peeking in past API to make sure it set the expressions correctly
     assert_equal [
       {:name => "Whales average x", :expr => "avg(x)"},
-      {:name => "Whales Count", :expr => "count()"},
+      {:name => "Whales Count", :expr => "count(*)"},
       {:name => "Whales sum x", :expr => "sum(x)"}
     ], @model_class.mochigome_aggregations
   end
@@ -292,7 +318,7 @@ describe "an ActiveRecord model" do
       has_mochigome_aggregations [{"Blue Sales" => ["count", "color='blue'"]}]
     end
     assert_equal [
-      {:name => "Blue Sales", :expr => "count()", :conditions => "color='blue'"}
+      {:name => "Blue Sales", :expr => "count(*)", :conditions => "color='blue'"}
     ], @model_class.mochigome_aggregations
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mochigome
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - David Mike Simon
@@ -91,6 +91,7 @@ files:
 - test/app_root/app/models/store.rb
 - test/app_root/app/models/store_product.rb
 - test/app_root/config/boot.rb
+- test/app_root/config/database-my.yml
 - test/app_root/config/database-pg.yml
 - test/app_root/config/database.yml
 - test/app_root/config/environment.rb