comma-heaven 0.6.0 → 0.6.1

data/lib/comma-heaven/sqler/column.rb

@@ -8,7 +8,7 @@ module CommaHeaven
       end
       
       def joins
-        case parent
+        sql = case parent
         when HasManyColumns
           if parent.options[:by] == 'row'
             <<-EOS
@@ -33,7 +33,11 @@ module CommaHeaven
             ON #{parent.parent.table_alias}.#{model.primary_key} = #{table_alias}.#{association.primary_key_name}
           EOS
         else ''
-        end.gsub(/\n/, '').squeeze(' ').strip
+        end
+        
+        sql << " AND #{table_alias}.#{association.klass.primary_key} IN (SELECT #{association.klass.primary_key} FROM #{association.quoted_table_name} WHERE #{model.send(:sanitize_sql, association.options[:conditions])})" if parent.respond_to?(:association) && association.options[:conditions]
+
+        sql.gsub(/\n/, '').squeeze(' ').strip
       end
       
       def sql_as

data/lib/comma-heaven/sqler/columns.rb

@@ -32,12 +32,12 @@ module CommaHeaven
       end
       
       def table_alias(method = :pluralize)
-        return prefix + case method
-        when :pluralize then
-          [((parent && parent.parent) ? parent.table_alias(method) : nil), table, index].compact.join('_')
-        when :singularize then
-          [((parent && parent.parent) ? parent.table_alias(method) : nil), model.name.underscore, index].compact.join('_')
-        end
+        t = case self
+          when HasManyColumns, BelongsToColumns, HasOneColumns then association.name.to_s.send(method)
+          else table.to_s.send(method)
+          end
+        
+        return prefix + [((parent && parent.parent) ? parent.table_alias(method) : nil), t, index].compact.join('_')
       end
       
       def prefix

data/spec/active_record/to_comma_heaven_spec.rb

@@ -243,5 +243,20 @@ Ulivo,150,0
 Pero (marzo 2011),10,
 EOS
   end
-
+  
+  it "should allow export of multiple relationships referring to same table" do
+    export = {
+      :name => {0 => {:include => '1', :as => ''}}, 
+      :age => {1 => {:include => '0', :as => ''}}, 
+      :leafs            => {2 => {:export => {
+        :position => {3 => {:include => '1', :as => ''}}}, :limit => 3}}, 
+      :matching_o_leafs => {4 => {:export => {
+        :position => {5 => {:include => '1', :as => ''}}}, :limit => 3}}}
+    
+    Tree.to_comma_heaven(:export => export).to_csv.should == <<-EOS
+tree_name,leaf_0_position,leaf_1_position,leaf_2_position,matching_o_leaf_0_position,matching_o_leaf_1_position,matching_o_leaf_2_position
+Olmo,top,middle,bottom,top,,bottom
+Ulivo,0,5,,,,
+EOS
+  end
 end

data/spec/spec_helper.rb

@@ -71,6 +71,7 @@ Spec::Runner.configure do |config|
     class Tree < ActiveRecord::Base
       belongs_to :gardener
       has_many :leafs, :dependent => :destroy
+      has_many :matching_o_leafs, :class_name => 'Leaf', :conditions => ['position LIKE ?', '%o%']
       
       named_scope :that_begins_with_o, {:conditions => ['name LIKE ?', 'o%']}
     end

data/spec/sqler/columns_spec.rb

@@ -192,4 +192,24 @@ describe "Columns" do
     Gardener.scoped(:joins => columns.joins).count.should == 2
     Gardener.scoped(:joins => columns.joins, :select => columns.select).first.attributes.to_a.length.should == 16
   end
+  
+  it "should allow export of multiple relationships referring to same table" do
+    export = {
+      :name => {0 => {:include => '1', :as => ''}}, 
+      :age => {1 => {:include => '0', :as => ''}}, 
+      :leafs            => {2 => {:export => {
+        :position => {3 => {:include => '1', :as => ''}}}, :limit => 3}}, 
+      :matching_o_leafs => {4 => {:export => {
+        :position => {5 => {:include => '1', :as => ''}}}, :limit => 3}}}
+    
+    columns = CommaHeaven::Sqler::Columns.new(Tree, export)
+    
+    columns.joins.should  =~ /_leafs_0/
+    columns.joins.should  =~ /_leafs_1/
+    columns.joins.should  =~ /_leafs_2/
+
+    columns.joins.should  =~ /_matching_o_leafs_0/
+    columns.joins.should  =~ /_matching_o_leafs_1/
+    columns.joins.should  =~ /_matching_o_leafs_2/
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: comma-heaven
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors: 
 - Silvano Stralla
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-16 00:00:00 +02:00
+date: 2011-05-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency