comma-heaven 0.8.1 → 0.8.2

data/Gemfile

@@ -1,10 +1,11 @@
 source "http://rubygems.org"
 
-gem "activerecord", "< 4.0.0"
-gem "actionpack",   "< 4.0.0"
+gem "activerecord", ENV['AGAINST'] || "< 4.0" 
+gem "actionpack",   ENV['AGAINST'] || "< 4.0" 
 gem "fastercsv" unless RUBY_VERSION > "1.9"
 
 group :development do
+  gem 'rake'
   gem "rspec", ">= 1.2.9"
   gem "rdoc", "~> 3.12"
   gem "bundler", ">= 1.0.0"
@@ -13,4 +14,8 @@ group :development do
   gem 'sqlite3'
   gem 'mysql2', '0.2.7'
   gem 'awesome_print'
+  gem 'guard'
+  gem "guard-shell", "~> 0.5.1"
+  gem 'rb-fsevent', '~> 0.9'
+  gem 'rb-readline'
 end

data/Gemfile.lock

@@ -1,34 +1,45 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionpack (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
+    actionpack (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
-      rack (~> 1.4.0)
+      rack (~> 1.4.5)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
       sprockets (~> 2.2.1)
-    activemodel (3.2.9)
-      activesupport (= 3.2.9)
+    activemodel (3.2.13)
+      activesupport (= 3.2.13)
       builder (~> 3.0.0)
-    activerecord (3.2.9)
-      activemodel (= 3.2.9)
-      activesupport (= 3.2.9)
+    activerecord (3.2.13)
+      activemodel (= 3.2.13)
+      activesupport (= 3.2.13)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activesupport (3.2.9)
-      i18n (~> 0.6)
+    activesupport (3.2.13)
+      i18n (= 0.6.1)
       multi_json (~> 1.0)
     arel (3.0.2)
     awesome_print (1.1.0)
     builder (3.0.4)
-    diff-lcs (1.1.3)
+    coderay (1.0.9)
+    diff-lcs (1.2.4)
     erubis (2.7.0)
+    ffi (1.8.1)
+    formatador (0.2.4)
     git (1.2.5)
-    hike (1.2.1)
+    guard (1.8.0)
+      formatador (>= 0.2.4)
+      listen (>= 1.0.0)
+      lumberjack (>= 1.0.2)
+      pry (>= 0.9.10)
+      thor (>= 0.14.6)
+    guard-shell (0.5.1)
+      guard (>= 1.1.0)
+    hike (1.2.2)
     i18n (0.6.1)
     jeweler (1.8.4)
       bundler (~> 1.0)
@@ -36,48 +47,71 @@ GEM
       rake
       rdoc
     journey (1.0.4)
-    json (1.7.5)
-    multi_json (1.3.7)
+    json (1.8.0)
+    listen (1.1.3)
+      rb-fsevent (>= 0.9.3)
+      rb-inotify (>= 0.9)
+      rb-kqueue (>= 0.2)
+    lumberjack (1.0.3)
+    method_source (0.8.1)
+    multi_json (1.7.3)
     mysql2 (0.2.7)
-    rack (1.4.1)
+    pry (0.9.12.2)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rake (10.0.0)
-    rdoc (3.12)
+    rake (10.0.4)
+    rb-fsevent (0.9.3)
+    rb-inotify (0.9.0)
+      ffi (>= 0.5.0)
+    rb-kqueue (0.2.0)
+      ffi (>= 0.5.0)
+    rb-readline (0.5.0)
+    rdoc (3.12.2)
       json (~> 1.4)
-    rspec (2.12.0)
-      rspec-core (~> 2.12.0)
-      rspec-expectations (~> 2.12.0)
-      rspec-mocks (~> 2.12.0)
-    rspec-core (2.12.0)
-    rspec-expectations (2.12.0)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.0)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.1)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    sprockets (2.2.1)
+    slop (3.4.5)
+    sprockets (2.2.2)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sqlite3 (1.3.6)
-    tilt (1.3.3)
-    tzinfo (0.3.35)
+    sqlite3 (1.3.7)
+    thor (0.18.1)
+    tilt (1.4.1)
+    tzinfo (0.3.37)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionpack (< 4.0.0)
-  activerecord (< 4.0.0)
+  actionpack (< 4.0)
+  activerecord (< 4.0)
   awesome_print
   bundler (>= 1.0.0)
+  guard
+  guard-shell (~> 0.5.1)
   jeweler (~> 1.8.3)
   mysql2 (= 0.2.7)
+  rake
+  rb-fsevent (~> 0.9)
+  rb-readline
   rdoc (~> 3.12)
   rspec (>= 1.2.9)
   simplecov

data/Guardfile

@@ -0,0 +1,9 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+guard :shell do
+  watch(%r{(lib|spec)/.*}) do 
+    system %Q{export AGAINST="~> 2.3.0" && (bundle --quiet || bundle install --quiet) && bundle exec rake spec}
+    system %Q{export AGAINST="~> 3.0" && (bundle --quiet || bundle install --quiet) && bundle exec rake spec}
+  end
+end

data/VERSION

@@ -1 +1 @@
-0.8.1
+0.8.2

data/comma-heaven.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "comma-heaven"
-  s.version = "0.8.1"
+  s.version = "0.8.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Silvano Stralla"]
-  s.date = "2013-04-16"
+  s.date = "2013-05-24"
   s.description = "CommaHeaven permits easy exports of Rails models to CSV"
   s.email = "silvano.stralla@sistrall.it"
   s.extra_rdoc_files = [
@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
     ".document",
     "Gemfile",
     "Gemfile.lock",
+    "Guardfile",
     "LICENSE",
     "README.rdoc",
     "Rakefile",
@@ -56,8 +57,9 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, ["< 4.0.0"])
-      s.add_runtime_dependency(%q<actionpack>, ["< 4.0.0"])
+      s.add_runtime_dependency(%q<activerecord>, ["< 4.0"])
+      s.add_runtime_dependency(%q<actionpack>, ["< 4.0"])
+      s.add_development_dependency(%q<rake>, [">= 0"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
@@ -66,9 +68,14 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<mysql2>, ["= 0.2.7"])
       s.add_development_dependency(%q<awesome_print>, [">= 0"])
+      s.add_development_dependency(%q<guard>, [">= 0"])
+      s.add_development_dependency(%q<guard-shell>, ["~> 0.5.1"])
+      s.add_development_dependency(%q<rb-fsevent>, ["~> 0.9"])
+      s.add_development_dependency(%q<rb-readline>, [">= 0"])
     else
-      s.add_dependency(%q<activerecord>, ["< 4.0.0"])
-      s.add_dependency(%q<actionpack>, ["< 4.0.0"])
+      s.add_dependency(%q<activerecord>, ["< 4.0"])
+      s.add_dependency(%q<actionpack>, ["< 4.0"])
+      s.add_dependency(%q<rake>, [">= 0"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
@@ -77,10 +84,15 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<mysql2>, ["= 0.2.7"])
       s.add_dependency(%q<awesome_print>, [">= 0"])
+      s.add_dependency(%q<guard>, [">= 0"])
+      s.add_dependency(%q<guard-shell>, ["~> 0.5.1"])
+      s.add_dependency(%q<rb-fsevent>, ["~> 0.9"])
+      s.add_dependency(%q<rb-readline>, [">= 0"])
     end
   else
-    s.add_dependency(%q<activerecord>, ["< 4.0.0"])
-    s.add_dependency(%q<actionpack>, ["< 4.0.0"])
+    s.add_dependency(%q<activerecord>, ["< 4.0"])
+    s.add_dependency(%q<actionpack>, ["< 4.0"])
+    s.add_dependency(%q<rake>, [">= 0"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])
@@ -89,6 +101,10 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<mysql2>, ["= 0.2.7"])
     s.add_dependency(%q<awesome_print>, [">= 0"])
+    s.add_dependency(%q<guard>, [">= 0"])
+    s.add_dependency(%q<guard-shell>, ["~> 0.5.1"])
+    s.add_dependency(%q<rb-fsevent>, ["~> 0.9"])
+    s.add_dependency(%q<rb-readline>, [">= 0"])
   end
 end
 

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

@@ -16,6 +16,16 @@ module CommaHeaven
       def foreign_key_for(an_association)
         an_association.respond_to?(:foreign_key) ? an_association.foreign_key : an_association.primary_key_name
       end
+
+      def table_alias(method = :pluralize)
+        t = association.name.to_s.send(method)
+        
+        return prefix + [((parent && parent.parent) ? parent.table_alias(method) : nil), t, index].compact.join('_')
+      end
+
+      def prefix
+        return "_"
+      end
     end
   end
 end

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

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

data/spec/active_record/to_comma_heaven_spec.rb

@@ -192,7 +192,7 @@ Bob,5,2.0
 EOS
   end
 
-  it 'should manage has_many :through associations (exporting by row)' do
+  it 'should manage has_many :through associations (exporting by column)' do
     Gardener.to_comma_heaven(:export => { :name  => {0 => {}},
                                           :leafs => {1 => { :limit => 3,
                                                             :export => { :position => {0 => {}},

data/spec/export_spec.rb

@@ -2,15 +2,17 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Export" do
   before(:each) do
+    garden = Garden.create(:name => 'Camdem')
+
     alice = Gardener.create(:name => 'Alice')
     bob   = Gardener.create(:name => 'Bob')
     
-    olmo = Tree.create(:name => 'Olmo', :age => 100, :gardener => alice)
+    olmo = Tree.create(:name => 'Olmo', :age => 100, :gardener => alice, :garden => garden)
     olmo.leafs.create(:position => 'top')
     olmo.leafs.create(:position => 'middle')
     olmo.leafs.create(:position => 'bottom')
 
-    ulivo = Tree.create(:name => 'Ulivo', :age => 150, :gardener => bob)
+    ulivo = Tree.create(:name => 'Ulivo', :age => 150, :gardener => bob, :garden => garden)
     ulivo.leafs.create(:position => '0', :height_from_ground => 1)
     ulivo.leafs.create(:position => '5', :height_from_ground => 2)
 
@@ -20,6 +22,13 @@ describe "Export" do
                       "leafs" => {"2" => {"export" => { "position" => {"3" => {"as" => "", "include" => '1'} },
                                                           "height_from_ground" => {"4" => {'as' => '', :include => '1'} } } } } } }
   end
+
+  it 'should export even models with explicitly set names, without making errors with pluralization' do
+    expect do 
+      Garden.export({ 'export' => { "name"  => {"0" => {"as" => '', 'include' => '1'} },
+                                    "trees" => {"1" => @params.merge(:limit => 3)} } }).save
+    end.to_not raise_error(Exception)
+  end
   
   it 'should make available columns available as methods' do
     Tree.export(@params).leafs.should be_instance_of(CommaHeaven::Export)

data/spec/spec_helper.rb

@@ -18,11 +18,15 @@ ActiveRecord::Base.configurations = true
 
 ActiveRecord::Schema.verbose = false
 
-puts ActiveRecord::VERSION::MAJOR
+puts ActiveRecord::VERSION::STRING
 
 RSpec.configure do |config|
   config.before(:all) do
     ActiveRecord::Schema.define(:version => 1) do
+      create_table :gardens_ruben_the_prince do |t|
+        t.string :name
+      end
+
       create_table :gardeners do |t|
         t.string :name
         t.string :surname
@@ -39,6 +43,7 @@ RSpec.configure do |config|
         t.string :name
         t.integer :age
         t.integer :gardener_id
+        t.integer :garden_id
       end
       
       create_table :leaves do |t|
@@ -69,6 +74,7 @@ RSpec.configure do |config|
     end
     
     class Tree < ActiveRecord::Base
+      belongs_to :garden
       belongs_to :gardener
       has_many :leafs, :dependent => :destroy
       has_many :matching_o_leafs, :class_name => 'Leaf', :conditions => ['position LIKE ?', '%o%']
@@ -76,26 +82,44 @@ RSpec.configure do |config|
 
     case ActiveRecord::VERSION::MAJOR
     when 1, 2
+      class Garden < ActiveRecord::Base
+        set_table_name 'gardens_ruben_the_prince'
+        has_many :trees
+      end
+
       class Tree < ActiveRecord::Base
         named_scope :that_begins_with_o, {:conditions => ['name LIKE ?', 'o%']}
       end
+  
+      class Leaf < ActiveRecord::Base
+        set_table_name 'leaves'
+
+        belongs_to :tree
+        has_many :cells
+      end
     else
+      class Garden < ActiveRecord::Base
+        self.table_name = 'gardens_ruben_the_prince'
+        has_many :trees
+      end
+
       class Tree < ActiveRecord::Base
         scope :that_begins_with_o, {:conditions => ['name LIKE ?', 'o%']}
       end
-    end      
 
-    class Leaf < ActiveRecord::Base
-      self.table_name = 'leaves'
+      class Leaf < ActiveRecord::Base
+        self.table_name = 'leaves'
+
+        belongs_to :tree
+        has_many :cells
+      end
+    end      
 
-      belongs_to :tree
-      has_many :cells
-    end
-    
     class Cell < ActiveRecord::Base
       belongs_to :leaf
     end
 
+    Garden.destroy_all
     Gardener.destroy_all
     GardenerClone.destroy_all
     Tree.destroy_all
@@ -103,15 +127,9 @@ RSpec.configure do |config|
     Cell.destroy_all
   end
   
-  # config.after(:each) do
-  #   Object.send(:remove_const, :Gardener)
-  #   Object.send(:remove_const, :Tree)
-  #   Object.send(:remove_const, :Leaf)
-  #   Object.send(:remove_const, :Cell)
-  # end
-
   config.after(:all) do
     ActiveRecord::Schema.define(:version => 2) do
+      drop_table :gardens_ruben_the_prince
       drop_table :gardeners
       drop_table :gardener_clones
       drop_table :trees

metadata

@@ -2,14 +2,14 @@
 name: comma-heaven
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Silvano Stralla
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-16 00:00:00.000000000 Z
+date: 2013-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   prerelease: false
@@ -19,13 +19,13 @@ dependencies:
     requirements:
     - - <
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.0'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - <
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.0'
     none: false
 - !ruby/object:Gem::Dependency
   prerelease: false
@@ -35,13 +35,29 @@ dependencies:
     requirements:
     - - <
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.0'
     none: false
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - <
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.0'
+    none: false
+- !ruby/object:Gem::Dependency
+  prerelease: false
+  name: rake
+  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
@@ -171,6 +187,70 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
     none: false
+- !ruby/object:Gem::Dependency
+  prerelease: false
+  name: guard
+  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
+  name: guard-shell
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+    none: false
+- !ruby/object:Gem::Dependency
+  prerelease: false
+  name: rb-fsevent
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    none: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    none: false
+- !ruby/object:Gem::Dependency
+  prerelease: false
+  name: rb-readline
+  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
 description: CommaHeaven permits easy exports of Rails models to CSV
 email: silvano.stralla@sistrall.it
 executables: []
@@ -182,6 +262,7 @@ files:
 - .document
 - Gemfile
 - Gemfile.lock
+- Guardfile
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -220,7 +301,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       segments:
       - 0
-      hash: 3192761689763648763
+      hash: -1422923307113918860
       version: '0'
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement