mochigome 0.1.19 → 0.1.20

data/lib/mochigome_ver.rb

@@ -1,3 +1,3 @@
 module Mochigome
-  VERSION = "0.1.19"
+  VERSION = "0.1.20"
 end

data/lib/query.rb

@@ -38,6 +38,7 @@ module Mochigome
           options[:fields].reject{|a| a[:in_ruby]}
         agg_fields.each_with_index do |a, i|
           d_expr = a[:value_proc].call(data_model.arel_table)
+          d_expr = d_expr.expr if d_expr.respond_to?(:expr)
           agg_rel.select_expr(d_expr.as("d%03u" % i))
         end
 

data/lib/subgroup_model.rb

@@ -18,6 +18,9 @@ module Mochigome
       else
         @attr_expr = nil
       end
+      if @attr_expr && @attr_expr.respond_to?(:expr)
+        @attr_expr = @attr_expr.expr
+      end
       @focus_settings = Mochigome::ReportFocusSettings.new(@model)
       @focus_settings.type_name "#{@model.human_name} #{@attr.to_s.humanize}"
       @focus_settings.name lambda{|r| r.send(attr)}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mochigome
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 51
   prerelease: 
   segments: 
   - 0
   - 1
-  - 19
-  version: 0.1.19
+  - 20
+  version: 0.1.20
 platform: ruby
 authors: 
 - David Mike Simon
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-14 00:00:00 Z
+date: 2012-06-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement