comma-heaven 0.5.5 → 0.6.0

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

@@ -38,7 +38,7 @@ module CommaHeaven
       
       def sql_as
         return as % index if as
-        return [table_alias(:singularize), attribute].compact.join('_')
+        return [table_alias(:singularize).gsub(/^_+/, ''), attribute].compact.join('_')
       end
 
       protected

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

@@ -32,14 +32,21 @@ module CommaHeaven
       end
       
       def table_alias(method = :pluralize)
-        case method
-        when :pluralize
-          return [((parent && parent.parent) ? parent.table_alias(method) : nil), table, index].compact.join('_')
-        when :singularize
-          return [((parent && parent.parent) ? parent.table_alias(method) : nil), model.name.underscore, index].compact.join('_')
+        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
       end
       
+      def prefix
+        return case self
+          when HasManyColumns, BelongsToColumns, HasOneColumns then "_"
+          else ''
+          end
+      end
+      
       protected
         def limit 
           (options[:limit] || 1).to_i

data/spec/sqler/belongs_to_association_spec.rb

@@ -8,14 +8,14 @@ describe "BelongsToColumns" do
   
   it "should build correct SQL select clause" do
     column = CommaHeaven::Sqler::BelongsToColumns.new(@association, {:age => {4 => {:include => '1', :as => ''}}}, 1, @leaf)
-    column.select.should == "trees.age AS \"tree_age\""
+    column.select.should == "_trees.age AS \"tree_age\""
   end
 
   it "should build correct SQL joins clause" do
     column = CommaHeaven::Sqler::BelongsToColumns.new(@association, {:age => {4 => {:include => '1', :as => ''}}}, 1, @leaf)
     column.joins.should == <<-EOS.gsub(/\n/, ' ').squeeze(' ').strip
-LEFT JOIN "trees" AS trees
- ON trees.id = leafs.tree_id
+LEFT JOIN "trees" AS _trees
+ ON _trees.id = leafs.tree_id
 EOS
   end
 end

data/spec/sqler/columns_spec.rb

@@ -146,23 +146,23 @@ describe "Columns" do
    
   it "should build correct SQL select and joins clauses exporting has many association" do
     columns = CommaHeaven::Sqler::Columns.new(Tree, {:name => {0 => {:include => '1', :as => ''}}, :age => {1 => {:include => '1', :as => ''}}, :leafs => {2 => {:export => {:position => {4 => {:include => '1', :as => ''}}}, :limit => '3'}}})
-    columns.select.should == 'trees.name AS "tree_name", trees.age AS "tree_age", leafs_0.position AS "leaf_0_position", leafs_1.position AS "leaf_1_position", leafs_2.position AS "leaf_2_position"'
+    columns.select.should == 'trees.name AS "tree_name", trees.age AS "tree_age", _leafs_0.position AS "leaf_0_position", _leafs_1.position AS "leaf_1_position", _leafs_2.position AS "leaf_2_position"'
     columns.joins.should  =~ /LEFT JOIN/
   end
   
   it "should build correct SQL select and joins clauses exporting belongs to association" do
     columns = CommaHeaven::Sqler::Columns.new(Tree, {:name => {0 => {:include => '1', :as => ''}}, :age => {1 => {:include => '1', :as => ''}}, :gardener => {2 => {:export => {:surname => {4 => {:include => '1', :as => ''}}}}}})
-    columns.select.should == 'trees.name AS "tree_name", trees.age AS "tree_age", gardeners.surname AS "gardener_surname"'
-    columns.joins.should  =~ /\sgardeners\s/
+    columns.select.should == 'trees.name AS "tree_name", trees.age AS "tree_age", _gardeners.surname AS "gardener_surname"'
+    columns.joins.should  =~ /\s_gardeners\s/
     columns.joins.should  =~ /LEFT JOIN/
   end
   
   it "should build corrent SQL select and joins clauses for deeper associations" do
     columns = CommaHeaven::Sqler::Columns.new(Gardener, {:name => {0 => {:include => '1', :as => ''}}, :trees => {1 => {:export => {:name => {0 => {:include => '1', :as => ''}}, :age => {1 => {:include => '1', :as => ''}}, :gardener => {2 => {:export => {:surname => {4 => {:include => '1', :as => ''}}}}}}, :limit => 3}}})
-    columns.select.should == 'gardeners.name AS "gardener_name", trees_0.name AS "tree_0_name", trees_0.age AS "tree_0_age", trees_0_gardeners.surname AS "tree_0_gardener_surname", trees_1.name AS "tree_1_name", trees_1.age AS "tree_1_age", trees_1_gardeners.surname AS "tree_1_gardener_surname", trees_2.name AS "tree_2_name", trees_2.age AS "tree_2_age", trees_2_gardeners.surname AS "tree_2_gardener_surname"'
+    columns.select.should == 'gardeners.name AS "gardener_name", _trees_0.name AS "tree_0_name", _trees_0.age AS "tree_0_age", __trees_0_gardeners.surname AS "tree_0_gardener_surname", _trees_1.name AS "tree_1_name", _trees_1.age AS "tree_1_age", __trees_1_gardeners.surname AS "tree_1_gardener_surname", _trees_2.name AS "tree_2_name", _trees_2.age AS "tree_2_age", __trees_2_gardeners.surname AS "tree_2_gardener_surname"'
     columns.joins.should  =~ /LEFT JOIN/
-    columns.joins.should  =~ /trees/
-    columns.joins.should  =~ /gardeners/
+    columns.joins.should  =~ /_trees/
+    columns.joins.should  =~ /_gardeners/
   end
 
   it "should build corrent SQL select and joins clauses for deeper and deeper associations" do
@@ -187,7 +187,7 @@ describe "Columns" do
     columns.joins.should  =~ /trees/
     columns.joins.should  =~ /gardeners/
     columns.joins.should  =~ /leafs/
-    columns.select.should == 'gardeners.name AS "gardener_name", trees_0.name AS "tree_0_name", trees_0.age AS "tree_0_age", trees_0_gardeners.surname AS "tree_0_gardener_surname", trees_0_leafs_0.position AS "tree_0_leaf_0_position", trees_0_leafs_1.position AS "tree_0_leaf_1_position", trees_1.name AS "tree_1_name", trees_1.age AS "tree_1_age", trees_1_gardeners.surname AS "tree_1_gardener_surname", trees_1_leafs_0.position AS "tree_1_leaf_0_position", trees_1_leafs_1.position AS "tree_1_leaf_1_position", trees_2.name AS "tree_2_name", trees_2.age AS "tree_2_age", trees_2_gardeners.surname AS "tree_2_gardener_surname", trees_2_leafs_0.position AS "tree_2_leaf_0_position", trees_2_leafs_1.position AS "tree_2_leaf_1_position"'
+    columns.select.should == 'gardeners.name AS "gardener_name", _trees_0.name AS "tree_0_name", _trees_0.age AS "tree_0_age", __trees_0_gardeners.surname AS "tree_0_gardener_surname", __trees_0_leafs_0.position AS "tree_0_leaf_0_position", __trees_0_leafs_1.position AS "tree_0_leaf_1_position", _trees_1.name AS "tree_1_name", _trees_1.age AS "tree_1_age", __trees_1_gardeners.surname AS "tree_1_gardener_surname", __trees_1_leafs_0.position AS "tree_1_leaf_0_position", __trees_1_leafs_1.position AS "tree_1_leaf_1_position", _trees_2.name AS "tree_2_name", _trees_2.age AS "tree_2_age", __trees_2_gardeners.surname AS "tree_2_gardener_surname", __trees_2_leafs_0.position AS "tree_2_leaf_0_position", __trees_2_leafs_1.position AS "tree_2_leaf_1_position"'
     
     Gardener.scoped(:joins => columns.joins).count.should == 2
     Gardener.scoped(:joins => columns.joins, :select => columns.select).first.attributes.to_a.length.should == 16

data/spec/sqler/has_many_columns_spec.rb

@@ -8,20 +8,20 @@ describe "HasManyColumns" do
   
   it "should build correct SQL select clause" do
     column = CommaHeaven::Sqler::HasManyColumns.new(@association, {:position => {4 => {:include => '1', :as => ''}}}, 1, @tree, 1, :limit => '3')
-    column.select.should == 'leafs_1.position AS "leaf_1_position"'
+    column.select.should == '_leafs_1.position AS "leaf_1_position"'
   end
 
   it "should build correct SQL select clause for multiple fields" do
     column = CommaHeaven::Sqler::HasManyColumns.new(@association, {:position => {4 => {:include => '1', :as => ''}}, :size => {5 => {:include => '1', :as => ''}}}, 1, @tree, 1, :limit => '3')
-    column.select.should == 'leafs_1.position AS "leaf_1_position", leafs_1.size AS "leaf_1_size"'
+    column.select.should == '_leafs_1.position AS "leaf_1_position", _leafs_1.size AS "leaf_1_size"'
   end
   
   it "should build correct SQL joins clause" do
     column = CommaHeaven::Sqler::HasManyColumns.new(@association, {:position => {4 => {:include => '1', :as => ''}}}, 1, @tree, 1, :limit => '3')
     column.joins.should == <<-EOS.gsub(/\n/, ' ').squeeze(' ').strip
-LEFT JOIN "leafs" AS leafs_1
-  ON trees.id = leafs_1.tree_id
-  AND leafs_1.id = (SELECT id FROM "leafs" WHERE tree_id = trees.id LIMIT 1, 1)
+LEFT JOIN "leafs" AS _leafs_1
+  ON trees.id = _leafs_1.tree_id
+  AND _leafs_1.id = (SELECT id FROM "leafs" WHERE tree_id = trees.id LIMIT 1, 1)
 EOS
   end
 end

data/spec/sqler/has_one_association_spec.rb

@@ -8,14 +8,14 @@ describe "HasOneColumns" do
   
   it "should build correct SQL select clause" do
     column = CommaHeaven::Sqler::HasOneColumns.new(@association, {:name => {4 => {:include => '1', :as => ''}}}, 1, @gardener)
-    column.select.should == "gardener_clones.name AS \"gardener_clone_name\""
+    column.select.should == "_gardener_clones.name AS \"gardener_clone_name\""
   end
 
   it "should build correct SQL joins clause" do
     column = CommaHeaven::Sqler::HasOneColumns.new(@association, {:name => {4 => {:include => '1', :as => ''}}}, 1, @gardener)
     column.joins.should == <<-EOS.gsub(/\n/, ' ').squeeze(' ').strip
-LEFT JOIN "gardener_clones" AS gardener_clones
- ON gardeners.id = gardener_clones.gardener_id
+LEFT JOIN "gardener_clones" AS _gardener_clones
+ ON gardeners.id = _gardener_clones.gardener_id
 EOS
   end
 end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: comma-heaven
 version: !ruby/object:Gem::Version 
-  hash: 1
-  prerelease: false
-  segments: 
-  - 0
-  - 5
-  - 5
-  version: 0.5.5
+  prerelease: 
+  version: 0.6.0
 platform: ruby
 authors: 
 - Silvano Stralla
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-08 00:00:00 +01:00
+date: 2011-05-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,11 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 2
-        - 9
         version: 1.2.9
   type: :development
   version_requirements: *id001
@@ -42,9 +32,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id002
@@ -56,26 +43,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :runtime
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: fastercsv
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :runtime
-  version_requirements: *id004
 description: CommaHeaven permits easy exports of Rails models to CSV
 email: silvano.stralla@sistrall.it
 executables: []
@@ -121,32 +91,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: CSV exporter for Rails
-test_files: 
-- spec/active_record/to_comma_heaven_spec.rb
-- spec/export_spec.rb
-- spec/spec_helper.rb
-- spec/sqler/belongs_to_association_spec.rb
-- spec/sqler/column_spec.rb
-- spec/sqler/columns_spec.rb
-- spec/sqler/has_many_columns_spec.rb
-- spec/sqler/has_one_association_spec.rb
+test_files: []
+