comma-heaven 0.8.0 → 0.8.1

data/VERSION

@@ -1 +1 @@
-0.8.0
+0.8.1

data/comma-heaven.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "comma-heaven"
-  s.version = "0.8.0"
+  s.version = "0.8.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Silvano Stralla"]
-  s.date = "2012-11-14"
+  s.date = "2013-04-16"
   s.description = "CommaHeaven permits easy exports of Rails models to CSV"
   s.email = "silvano.stralla@sistrall.it"
   s.extra_rdoc_files = [
@@ -49,7 +49,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/sistrall/comma-heaven"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.13"
+  s.rubygems_version = "1.8.23"
   s.summary = "CSV exporter for Rails"
 
   if s.respond_to? :specification_version then

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

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

data/spec/active_record/to_comma_heaven_spec.rb

@@ -230,7 +230,8 @@ EOS
   end
   
   it "should allow denormalized export (also called 'by row')" do
-    Tree.to_comma_heaven(:export => {:name => {0 => {:include => '1', :as => ''}}, :age => {1 => {:include => '0', :as => ''}}, :leafs => {2 => {:export => {:position => {4 => {:include => '1', :as => ''}}}, :by => 'row', :limit => 3}}}).to_csv.should == <<-EOS
+    csv = Tree.to_comma_heaven(:export => {:name => {0 => {:include => '1', :as => ''}}, :age => {1 => {:include => '0', :as => ''}}, :leafs => {2 => {:export => {:position => {4 => {:include => '1', :as => ''}}}, :by => 'row', :limit => 3}}}).to_csv
+    ref = <<-EOS
 tree_name,leaf_position
 Olmo,bottom
 Olmo,middle
@@ -238,10 +239,12 @@ Olmo,top
 Ulivo,0
 Ulivo,5
 EOS
+    csv.split(/\n/).sort.should == ref.split(/\n/).sort
   end
 
   it "should allow denormalized export (also called 'by row')" do
-    Tree.to_comma_heaven(:export => {:name => {0 => {:include => '1', :as => ''}}, :age => {1 => {:include => '0', :as => ''}}, :leafs => {2 => {:export => {:position => {4 => {:include => '1', :as => ''}}}, :by => 'row', :limit => 3}}}).to_csv.should == <<-EOS
+    csv = Tree.to_comma_heaven(:export => {:name => {0 => {:include => '1', :as => ''}}, :age => {1 => {:include => '0', :as => ''}}, :leafs => {2 => {:export => {:position => {4 => {:include => '1', :as => ''}}}, :by => 'row', :limit => 3}}}).to_csv
+    ref = <<-EOS
 tree_name,leaf_position
 Olmo,bottom
 Olmo,middle
@@ -249,8 +252,10 @@ Olmo,top
 Ulivo,0
 Ulivo,5
 EOS
+    csv.split(/\n/).sort.should == ref.split(/\n/).sort
 
-    Tree.to_comma_heaven(:export => {:name => {0 => {}}, :gardener => {1 => {:export => {:name => {2 => {}}, :surname => {3 => {}}}}}, :leafs => {4 => {:export => {:position => {5 => {}}}, :by => 'row', :limit => 2}}}).to_csv.should == <<-EOS
+    csv = Tree.to_comma_heaven(:export => {:name => {0 => {}}, :gardener => {1 => {:export => {:name => {2 => {}}, :surname => {3 => {}}}}}, :leafs => {4 => {:export => {:position => {5 => {}}}, :by => 'row', :limit => 2}}}).to_csv
+    ref = <<-EOS
 tree_name,gardener_name,gardener_surname,leaf_position
 Olmo,Alice,,bottom
 Olmo,Alice,,middle
@@ -258,6 +263,7 @@ Olmo,Alice,,top
 Ulivo,Bob,,0
 Ulivo,Bob,,5
 EOS
+    csv.split(/\n/).sort.should == ref.split(/\n/).sort
   end
   
   

data/spec/spec_helper.rb

@@ -41,7 +41,7 @@ RSpec.configure do |config|
         t.integer :gardener_id
       end
       
-      create_table :leafs do |t|
+      create_table :leaves do |t|
         t.integer :tree_id
         t.string :position
         t.float :size
@@ -86,6 +86,8 @@ RSpec.configure do |config|
     end      
 
     class Leaf < ActiveRecord::Base
+      self.table_name = 'leaves'
+
       belongs_to :tree
       has_many :cells
     end
@@ -113,7 +115,7 @@ RSpec.configure do |config|
       drop_table :gardeners
       drop_table :gardener_clones
       drop_table :trees
-      drop_table :leafs
+      drop_table :leaves
       drop_table :cells
     end
   end

data/spec/sqler/belongs_to_association_spec.rb

@@ -15,7 +15,7 @@ describe "BelongsToColumns" 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
+ ON _trees.id = leaves.tree_id
 EOS
   end
 end

data/spec/sqler/has_many_columns_spec.rb

@@ -19,9 +19,9 @@ describe "HasManyColumns" do
   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
+LEFT JOIN "leaves" 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)
+  AND _leafs_1.id = (SELECT id FROM "leaves" WHERE tree_id = trees.id LIMIT 1, 1)
 EOS
   end
 
@@ -34,12 +34,12 @@ EOS
     column.joins.should == <<-EOS.gsub(/\n/, ' ').squeeze(' ').strip
 LEFT JOIN trees AS _trees_leafs_0 
   ON gardeners.id = _trees_leafs_0.gardener_id 
-LEFT JOIN "leafs" AS _leafs_0 
+LEFT JOIN "leaves" AS _leafs_0 
   ON _trees_leafs_0.id = _leafs_0.tree_id 
   AND _leafs_0.id = 
-    ( SELECT "leafs".id 
-      FROM "leafs" 
-      JOIN trees ON "leafs".tree_id = trees.id 
+    ( SELECT "leaves".id 
+      FROM "leaves" 
+      JOIN trees ON "leaves".tree_id = trees.id 
       WHERE gardener_id = gardeners.id LIMIT 0, 1 )
 EOS
   end

metadata

@@ -1,137 +1,184 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: comma-heaven
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
-authors: 
+authors:
 - Silvano Stralla
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-11-14 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-04-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  prerelease: false
   name: activerecord
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: 4.0.0
     none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - <
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 4.0.0
-  type: :runtime
+    none: false
+- !ruby/object:Gem::Dependency
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
   name: actionpack
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: 4.0.0
     none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - <
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 4.0.0
-  type: :runtime
+    none: false
+- !ruby/object:Gem::Dependency
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.2.9
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.2.9
-  type: :development
+    none: false
+- !ruby/object:Gem::Dependency
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
   name: rdoc
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.12'
     none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "3.12"
-  type: :development
+      - !ruby/object:Gem::Version
+        version: '3.12'
+    none: false
+- !ruby/object:Gem::Dependency
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
   name: bundler
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
-  type: :development
+    none: false
+- !ruby/object:Gem::Dependency
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
   name: jeweler
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.8.3
     none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.8.3
-  type: :development
+    none: false
+- !ruby/object:Gem::Dependency
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
   name: simplecov
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+- !ruby/object:Gem::Dependency
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
   name: sqlite3
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+- !ruby/object:Gem::Dependency
   prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
   name: mysql2
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.7
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 0.2.7
-  type: :development
+    none: false
+- !ruby/object:Gem::Dependency
   prerelease: false
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
   name: awesome_print
-  requirement: &id010 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *id010
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+    none: false
 description: CommaHeaven permits easy exports of Rails models to CSV
 email: silvano.stralla@sistrall.it
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - .document
 - Gemfile
 - Gemfile.lock
@@ -161,34 +208,31 @@ files:
 - spec/sqler/has_many_columns_spec.rb
 - spec/sqler/has_one_association_spec.rb
 homepage: http://github.com/sistrall/comma-heaven
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -4302887848545016982
-      segments: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 3192761689763648763
+      version: '0'
+  none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.13
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: CSV exporter for Rails
 test_files: []
-