mochigome 0.0.7 → 0.0.8

data/lib/formatting.rb

@@ -0,0 +1,7 @@
+module Mochigome
+  module Formatting
+    def self.percentify(n, d)
+      ("%.1f%%" % ((n.to_f*100)/d.to_f)) if (!d.nil? && d > 0)
+    end
+  end
+end

data/lib/mochigome.rb

@@ -3,6 +3,7 @@ require 'exceptions'
 require 'data_node'
 require 'query'
 require 'model_extensions'
+require 'formatting'
 require 'arel_rails2_hacks'
 
 ActiveRecord::Base.send(:include, Mochigome::ModelExtensions)

data/lib/mochigome_ver.rb

@@ -1,3 +1,3 @@
 module Mochigome
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/model_extensions.rb

@@ -291,7 +291,7 @@ module Mochigome
     end
 
     if vals.size == 1
-      vals << :id # TODO : Use real primary key
+      vals << :id # TODO : Use real primary key, only do this for appropriate agg funcs
     elsif vals.size != 2
       raise ModelSetupError.new "Wrong # of components for agg: #{obj.inspect}"
     end

data/lib/query.rb

@@ -51,16 +51,15 @@ module Mochigome
               break
             else
               # Route it from the closest layer model
-              @layers_path.each_with_index do |layer, i|
-                p = self.class.path_thru([layer, link_model]) + remainder.drop(1)
+              @layers_path.reverse.each do |layer|
+                p = self.class.path_thru([layer, link_model]) + remainder.drop(1) # TODO: Handle path_thru returning nil
                 next if (p.drop(1) & @layers_path).size > 0
                 next if p.uniq.size != p.size
-                if agg_path.nil? || p.size <= agg_path.size
+                if agg_path.nil? || p.size < agg_path.size
                   agg_path = p
-                  key_path = @layers_path.take(i+1)
+                  key_path = @layers_path
                 end
               end
-              break if agg_path # Use as much of f2d_path as we can
             end
           end
 
@@ -72,7 +71,7 @@ module Mochigome
           agg_data_rel = access_filtered_relation(agg_data_rel, @layers_path + agg_path)
           data_tbl = Arel::Table.new(data_model.table_name)
           agg_fields = data_model.mochigome_aggregation_settings.options[:fields].reject{|a| a[:in_ruby]}
-          agg_data_rel.project
+          agg_data_rel.project # FIXME ??? What is this for?
           agg_fields.each_with_index do |a, i|
             agg_data_rel.project(a[:value_proc].call(data_tbl).as("d#{i}"))
           end
@@ -86,6 +85,8 @@ module Mochigome
               end
               d_rel.where(cond) if cond
 
+              # FIXME: This subtable won't be necessary for all forms of aggregation.
+              # When we can avoid it, we should, because query performance is greatly increased.
               a_rel = Arel::SelectManager.new(
                 Arel::Table.engine,
                 Arel.sql("(#{d_rel.to_sql}) as mochigome_data")

data/test/unit/query_test.rb

@@ -239,9 +239,6 @@ describe Mochigome::Query do
     assert_equal 24, data_node['Sales count']
   end
 
-  # TODO: Include test here against the bug I saw in JSAS where
-  # it would avoid including the focus if there was a shorter path.
-
   it "does not collect aggregate data for layers below focus" do
     q = Mochigome::Query.new(
       [Owner, Store, Product, Category],

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mochigome
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - David Mike Simon
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-11 00:00:00 Z
+date: 2012-03-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -93,6 +93,7 @@ files:
 - lib/arel_rails2_hacks.rb
 - lib/data_node.rb
 - lib/exceptions.rb
+- lib/formatting.rb
 - lib/mochigome.rb
 - lib/mochigome_ver.rb
 - lib/model_extensions.rb