mochigome 0.1.13 → 0.1.14

data/TODO

@@ -6,3 +6,4 @@
 - Some kind of single-page preview on the edit screen would be cool. Maybe use FOP with fake data and the PNG output option?
 - Automatically set default to 0 on sum and count aggregation
 - Treat through-associations as hints for preferred paths
+- Better handling of nil in subgroup fields

data/lib/mochigome_ver.rb

@@ -1,3 +1,3 @@
 module Mochigome
-  VERSION = "0.1.13"
+  VERSION = "0.1.14"
 end

data/lib/model_extensions.rb

@@ -96,6 +96,9 @@ module Mochigome
   # for this kind of stuff and also put the standard aggregation functions
   # in there?
 
+  # FIXME All this lambda{|t| stuff is just needlessly confusing for
+  # the little good that it accomplishes.
+
   def self.null_unless(pred, value_func)
     case_expr(
       lambda {|t| pred.call(value_func.call(t))},
@@ -114,6 +117,28 @@ module Mochigome
     }
   end
 
+  def self.multi_case_expr(cond_results, else_val = nil)
+    lambda {|t|
+      Arel::Nodes::SqlLiteral.new(
+        "(CASE " +
+        cond_results.map{|cond, result|
+          "WHEN #{arel_exprify(cond, t)} THEN #{arel_exprify(result, t)}"
+        } +
+        (else_val ? "ELSE #{arel_exprify(else_val, t)}" : "") +
+        "END)"
+      )
+    }
+  end
+
+  def self.sql_bool_to_string(attr, prefix = "")
+    case_expr(
+      Arel::Nodes::NamedFunction.new('lower', [attr]).
+        in(["true", "t", 1, "1", "y", "yes"]),
+      "#{prefix}Yes",
+      "#{prefix}No"
+    )
+  end
+
   private
 
   def self.arel_exprify(e, t = nil)

data/lib/subgroup_model.rb

@@ -8,10 +8,15 @@ module Mochigome
     def initialize(model, attr)
       @model = model
       @attr = attr
-      if @model.mochigome_focus_settings
-        s = @model.mochigome_focus_settings
-        # @attr_expr will just be nil if there's no custom subgroup expr here
+      s = @model.mochigome_focus_settings
+      if s && s.options[:custom_subgroup_exprs][attr]
         @attr_expr = s.options[:custom_subgroup_exprs][attr]
+      elsif @model.columns_hash[@attr.to_s].try(:type) == :boolean
+        @attr_expr = Mochigome::sql_bool_to_string(
+          model.arel_table[@attr], "#{human_name.titleize}: "
+        ).call(model.arel_table)
+      else
+        @attr_expr = nil
       end
       @focus_settings = Mochigome::ReportFocusSettings.new(@model)
       @focus_settings.type_name "#{@model.human_name} #{@attr.to_s.humanize}"
@@ -23,7 +28,8 @@ module Mochigome
     end
 
     def human_name
-      "#{@model.human_name} #{@attr.to_s.humanize}"
+      # Get rid of duplicate words (i.e. School$school_type)
+      "#{@model.human_name} #{@attr.to_s.humanize}".split.map(&:downcase).uniq.join(" ")
     end
 
     def real_model?

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

@@ -2,3 +2,4 @@ test:
   adapter: mysql2
   database: "mochi_test"
   username: root
+  password: root

data/test/app_root/db/migrate/20110817163830_create_tables.rb

@@ -24,6 +24,7 @@ class CreateTables < ActiveRecord::Migration
       t.date :birth_date
       t.string :phone_number
       t.string :email_address
+      t.boolean :is_awesome
       t.timestamps
     end
 

data/test/factories.rb

@@ -21,6 +21,7 @@ FactoryGirl.define do
     birth_date { 30.years.ago }
     phone_number "800-555-1212"
     email_address { "#{first_name}.#{last_name}@example.com".downcase }
+    is_awesome false
   end
 
   factory :store_product do

data/test/unit/query_test.rb

@@ -15,7 +15,8 @@ describe Mochigome::Query do
     @john = create(:owner, :first_name => "John", :last_name => "Smith")
     @store_x = create(:store, :name => "John's Store", :owner => @john)
 
-    @jane = create(:owner, :first_name => "Jane", :last_name => "Doe")
+    @jane = create(:owner, :first_name => "Jane", :last_name => "Doe",
+                  :is_awesome => true)
     @store_y = create(:store, :name => "Jane's Store (North)", :owner => @jane)
     @store_z = create(:store, :name => "Jane's Store (South)", :owner => @jane)
 
@@ -180,6 +181,18 @@ describe Mochigome::Query do
     assert_equal "Product A", (data_node/1/0/0/0).name
   end
 
+  it "can subgroup layers by boolean attributes" do
+    q = Mochigome::Query.new(
+      [Mochigome::SubgroupModel.new(Owner, :is_awesome), Owner, Store, Product]
+    )
+    data_node = q.run
+    assert_equal "Owner Is Awesome: No", (data_node/0).name
+    assert_equal "John Smith", (data_node/0/0).name
+    assert_equal "John's Store", (data_node/0/0/0).name
+    assert_equal "Product A", (data_node/0/0/0/0).name
+    assert_equal "Owner Is Awesome: Yes", (data_node/1).name
+  end
+
   it "can subgroup layers by attributes without including layer model" do
     q = Mochigome::Query.new(
       [Mochigome::SubgroupModel.new(Owner, :last_name)],
@@ -247,7 +260,7 @@ describe Mochigome::Query do
     # Store X, Product C
     assert_equal "Product C", (data_node/0/0/1).name
     assert_equal 3, (data_node/0/0/1)['Sales count']
-    assert_equal (3*@product_c.price).to_s, (data_node/0/0/1)['Gross'].to_s
+    assert_equal (3*@product_c.price).to_f.to_s, (data_node/0/0/1)['Gross'].to_f.to_s
     # Store Z, Product C
     assert_equal "Product C", (data_node/1/1/0).name
     assert_equal 2, (data_node/1/1/0)['Sales count']
@@ -259,7 +272,7 @@ describe Mochigome::Query do
     # Store Z, Product C
     assert_equal "Product C", (data_node/1/0/0).name
     assert_equal 2, (data_node/1/0/0)['Sales count']
-    assert_equal (2*@product_c.price).to_s, (data_node/1/0/0)['Gross'].to_s
+    assert_equal (2*@product_c.price).to_f.to_s, (data_node/1/0/0)['Gross'].to_f.to_s
   end
 
   it "collects aggregate data in subgroups" do
@@ -369,8 +382,8 @@ describe Mochigome::Query do
     data_node = q.run()
     assert_equal "John's Store", (data_node/0/0).name
     assert_equal 8, (data_node/0/0)['Sales count']
-    assert_equal (5*@product_a.price + 3*@product_c.price).to_s,
-      (data_node/0/0)['Gross'].to_s
+    assert_equal (5*@product_a.price + 3*@product_c.price).to_f.to_s,
+      (data_node/0/0)['Gross'].to_f.to_s
   end
 
   it "can do conditional counts" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mochigome
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 1
-  - 13
-  version: 0.1.13
+  - 14
+  version: 0.1.14
 platform: ruby
 authors: 
 - David Mike Simon
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-27 00:00:00 Z
+date: 2012-06-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -28,10 +28,10 @@ dependencies:
         - 2
         - 1
         version: "2.1"
-  requirement: *id001
-  prerelease: false
   type: :runtime
+  requirement: *id001
   name: arel
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -42,10 +42,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id002
-  prerelease: false
   type: :runtime
+  requirement: *id002
   name: ruport
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -56,10 +56,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id003
-  prerelease: false
   type: :runtime
+  requirement: *id003
   name: nokogiri
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -70,10 +70,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id004
-  prerelease: false
   type: :runtime
+  requirement: *id004
   name: rgl
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -84,10 +84,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
-  prerelease: false
   type: :runtime
+  requirement: *id005
   name: activerecord
+  prerelease: false
 description: Report generator that graphs over ActiveRecord associations
 email: david.mike.simon@gmail.com
 executables: []