mochigome 0.1.1 → 0.1.2

data/lib/mochigome_ver.rb

@@ -1,3 +1,3 @@
 module Mochigome
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/model_extensions.rb

@@ -16,6 +16,10 @@ module Mochigome
         true
       end
 
+      def to_real_model
+        self
+      end
+
       # TODO: Use this instead of calling Table.new all over the place
       def arel_table
         Arel::Table.new(table_name)

data/lib/model_graph.rb

@@ -1,3 +1,5 @@
+# TODO: Write some unit tests for this module
+
 require 'rgl/adjacency'
 require 'rgl/traversal'
 
@@ -28,7 +30,7 @@ module Mochigome
     end
 
     def relation_over_path(path, rel = nil)
-      real_path = path.map{|e| (e.real_model? ? e : e.model)}.uniq
+      real_path = path.map(&:to_real_model).uniq
       # Project ensures that we return a Rel, not a Table, even if path is empty
       rel ||= real_path.first.arel_table.project
       (0..(real_path.size-2)).each do |i|
@@ -50,8 +52,8 @@ module Mochigome
         src = path.last
         tgt = model_queue.shift
         next if src == tgt
-        real_src = src.real_model? ? src : src.model
-        real_tgt = tgt.real_model? ? tgt : tgt.model
+        real_src = src.to_real_model
+        real_tgt = tgt.to_real_model
         unless real_src == real_tgt
           seg = @shortest_paths[[real_src,real_tgt]]
           unless seg

data/lib/query.rb

@@ -192,7 +192,7 @@ module Mochigome
       @spine_layers = layers
       @spine = @model_graph.path_thru(layers) or
         raise QueryError.new("No valid path thru #{layers.inspect}") #TODO Test
-      @models = Set.new @spine
+      @models = Set.new @spine.map(&:to_real_model)
       @rel = @model_graph.relation_over_path(@spine)
 
       @spine_layers.each{|m| select_model_id(m)}
@@ -245,7 +245,7 @@ module Mochigome
     end
 
     def join_on_path(path)
-      path = path.map{|e| (e.real_model? ? e : e.model)}.uniq
+      path = path.map(&:to_real_model).uniq
       (0..(path.size-2)).map{|i| [path[i], path[i+1]]}.each do |src, tgt|
         add_join_link src, tgt
       end

data/lib/subgroup_model.rb

@@ -25,6 +25,10 @@ module Mochigome
       false
     end
 
+    def to_real_model
+      @model
+    end
+
     def arel_table
       @model.arel_table
     end

data/test/unit/query_test.rb

@@ -172,12 +172,12 @@ describe Mochigome::Query do
 
   it "can subgroup layers by attributes without including layer model" do
     q = Mochigome::Query.new(
-      [Mochigome::SubgroupModel.new(Owner, :last_name), Store, Product]
+      [Mochigome::SubgroupModel.new(Owner, :last_name)],
+      :aggregate_sources => [Sale]
     )
     data_node = q.run
     assert_equal "Smith", (data_node/1).name
-    assert_equal "John's Store", (data_node/1/0).name
-    assert_equal "Product A", (data_node/1/0/0).name
+    assert_equal 8, (data_node/1)['Sales count']
   end
 
   # TODO: Test diamond patterns

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mochigome
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - David Mike Simon
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-10 00:00:00 Z
+date: 2012-04-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement