mochigome 0.1.2 → 0.1.3

data/lib/data_node.rb

@@ -41,9 +41,9 @@ module Mochigome
       @children[idx]
     end
 
-    def dup
+    def clone
       twin = super
-      twin.instance_variable_set(:@children, @children.map{|c| c.dup})
+      twin.instance_variable_set(:@children, @children.map{|c| c.clone})
       twin
     end
 

data/lib/mochigome_ver.rb

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

data/lib/model_graph.rb

@@ -29,10 +29,10 @@ module Mochigome
       r
     end
 
-    def relation_over_path(path, rel = nil)
+    def relation_over_path(path)
       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
+      rel = real_path.first.arel_table.project
       (0..(real_path.size-2)).each do |i|
         rel = relation_func(real_path[i], real_path[i+1]).call(rel)
       end

data/lib/query.rb

@@ -87,7 +87,7 @@ module Mochigome
       eos
       root.comment.gsub!(/(\n|^) +/, "\\1")
 
-      r = @ids_rel.dup
+      r = @ids_rel.clone
       r.apply_condition(cond)
       ids_table = @layer_types.first.connection.select_all(r.to_sql)
       fill_layers(ids_table, {[] => root}, @layer_types)
@@ -124,9 +124,9 @@ module Mochigome
         dn[:internal_type] = model.name
 
         cur_to_parent.fetch(obj.id).each do |parent_ids_seq|
-          duped = dn.dup
-          parents.fetch(parent_ids_seq) << duped
-          layer[parent_ids_seq + [obj.id]] = duped
+          cloned = dn.clone
+          parents.fetch(parent_ids_seq) << cloned
+          layer[parent_ids_seq + [obj.id]] = cloned
         end
       end
 
@@ -218,9 +218,8 @@ module Mochigome
 
     def clone
       c = super
-      c.instance_variable_set :@spine, @spine.dup
-      c.instance_variable_set :@models, @models.dup
-      c.instance_variable_set :@rel, @rel.project
+      c.instance_variable_set :@models, @models.clone
+      c.instance_variable_set :@rel, @rel.clone
       c
     end
 

data/test/unit/data_node_test.rb

@@ -16,9 +16,9 @@ describe Mochigome::DataNode do
     assert_equal "bar", datanode.name
   end
 
-  it "can be duplicated deeply" do
+  it "can be cloned deeply" do
     datanode = Mochigome::DataNode.new(:foo, :bar)
-    twin = datanode.dup
+    twin = datanode.clone
     datanode << Mochigome::DataNode.new(:xyzzy, :froboz)
     assert_empty twin.children
     datanode.name = "Mike"

data/test/unit/query_test.rb

@@ -386,6 +386,17 @@ describe Mochigome::Query do
       data_node['Products sum price']
   end
 
+  it "allows grouping and aggregation on same class with another condition" do
+    # This query is a pointless use of aggregates, but it still shouldn't
+    # crash, which it has when similar queries were ran in JSAS.
+    q = Mochigome::Query.new(
+      [Product],
+      :aggregate_sources => [Product]
+    )
+    data_node = q.run([@store_x])
+    assert_equal 1, data_node["Expensive products"]
+  end
+
   it "does not include hidden aggregation fields in output" do
     q = Mochigome::Query.new(
       [Owner, Store],

metadata

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