comma-heaven 0.7.3 → 0.8.0

data/Gemfile

@@ -1,7 +1,7 @@
 source "http://rubygems.org"
 
-gem "activerecord", "< 3.0.0"
-gem "actionpack",   "< 3.0.0"
+gem "activerecord", "< 4.0.0"
+gem "actionpack",   "< 4.0.0"
 gem "fastercsv" unless RUBY_VERSION > "1.9"
 
 group :development do
@@ -12,4 +12,5 @@ group :development do
   gem 'simplecov', :require => false
   gem 'sqlite3'
   gem 'mysql2', '0.2.7'
+  gem 'awesome_print'
 end

data/Gemfile.lock

@@ -1,46 +1,80 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionpack (2.3.14)
-      activesupport (= 2.3.14)
-      rack (~> 1.1.0)
-    activerecord (2.3.14)
-      activesupport (= 2.3.14)
-    activesupport (2.3.14)
+    actionpack (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
+      builder (~> 3.0.0)
+      erubis (~> 2.7.0)
+      journey (~> 1.0.4)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.9)
+      activesupport (= 3.2.9)
+      builder (~> 3.0.0)
+    activerecord (3.2.9)
+      activemodel (= 3.2.9)
+      activesupport (= 3.2.9)
+      arel (~> 3.0.2)
+      tzinfo (~> 0.3.29)
+    activesupport (3.2.9)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
+    arel (3.0.2)
+    awesome_print (1.1.0)
+    builder (3.0.4)
     diff-lcs (1.1.3)
+    erubis (2.7.0)
     git (1.2.5)
+    hike (1.2.1)
+    i18n (0.6.1)
     jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
+    journey (1.0.4)
     json (1.7.5)
-    multi_json (1.3.6)
+    multi_json (1.3.7)
     mysql2 (0.2.7)
-    rack (1.1.3)
-    rake (0.9.2.2)
+    rack (1.4.1)
+    rack-cache (1.2)
+      rack (>= 0.4)
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rake (10.0.0)
     rdoc (3.12)
       json (~> 1.4)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
+    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.11.3)
+    rspec-mocks (2.12.0)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
+    sprockets (2.2.1)
+      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)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  actionpack (< 3.0.0)
-  activerecord (< 3.0.0)
+  actionpack (< 4.0.0)
+  activerecord (< 4.0.0)
+  awesome_print
   bundler (>= 1.0.0)
   jeweler (~> 1.8.3)
   mysql2 (= 0.2.7)

data/VERSION

@@ -1 +1 @@
-0.7.3
+0.8.0

data/comma-heaven.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "comma-heaven"
-  s.version = "0.7.3"
+  s.version = "0.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Silvano Stralla"]
-  s.date = "2012-10-22"
+  s.date = "2012-11-14"
   s.description = "CommaHeaven permits easy exports of Rails models to CSV"
   s.email = "silvano.stralla@sistrall.it"
   s.extra_rdoc_files = [
@@ -56,8 +56,8 @@ 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>, ["< 3.0.0"])
-      s.add_runtime_dependency(%q<actionpack>, ["< 3.0.0"])
+      s.add_runtime_dependency(%q<activerecord>, ["< 4.0.0"])
+      s.add_runtime_dependency(%q<actionpack>, ["< 4.0.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"])
@@ -65,9 +65,10 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<mysql2>, ["= 0.2.7"])
+      s.add_development_dependency(%q<awesome_print>, [">= 0"])
     else
-      s.add_dependency(%q<activerecord>, ["< 3.0.0"])
-      s.add_dependency(%q<actionpack>, ["< 3.0.0"])
+      s.add_dependency(%q<activerecord>, ["< 4.0.0"])
+      s.add_dependency(%q<actionpack>, ["< 4.0.0"])
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
@@ -75,10 +76,11 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<mysql2>, ["= 0.2.7"])
+      s.add_dependency(%q<awesome_print>, [">= 0"])
     end
   else
-    s.add_dependency(%q<activerecord>, ["< 3.0.0"])
-    s.add_dependency(%q<actionpack>, ["< 3.0.0"])
+    s.add_dependency(%q<activerecord>, ["< 4.0.0"])
+    s.add_dependency(%q<actionpack>, ["< 4.0.0"])
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])
@@ -86,6 +88,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<mysql2>, ["= 0.2.7"])
+    s.add_dependency(%q<awesome_print>, [">= 0"])
   end
 end
 

data/lib/comma-heaven.rb

@@ -17,4 +17,9 @@ require 'comma-heaven/sqler/belongs_to_columns'
 require 'comma-heaven/export'
 
 ActiveRecord::Base.send(:extend, CommaHeaven::Export::Implementation)
-ActiveRecord::Base.send(:extend, CommaHeaven::ActiveRecord::ClassMethods)
+
+case ActiveRecord::VERSION::MAJOR
+when 1 then ActiveRecord::Base.send(:extend, CommaHeaven::ActiveRecord::ClassMethods::Rails1)
+when 2 then ActiveRecord::Base.send(:extend, CommaHeaven::ActiveRecord::ClassMethods::Rails2)
+else        ActiveRecord::Base.send(:extend, CommaHeaven::ActiveRecord::ClassMethods::Rails3)
+end

data/lib/comma-heaven/active_record/to_comma_heaven.rb

@@ -1,47 +1,95 @@
 module CommaHeaven
   module ActiveRecord
     module ClassMethods
-      def self.extended(base)
-        base.class_eval do
-          base.class_inheritable_accessor :comma_heaven_columns
-          base.comma_heaven_columns = []
+      module Rails3
+        def self.extended(base)
+          base.class_eval do
+            base.class_attribute :comma_heaven_columns
+            base.comma_heaven_columns = []
+            
+            base.class_attribute :comma_heaven_associations
+            base.comma_heaven_associations = []
+          end
+        end
+        
+        def to_comma_heaven(options = {})
+          options.symbolize_keys!
+          options[:limit] = options[:limit].to_i if options[:limit].kind_of?(String)
+          options[:converter] ||= lambda { |v| v }
           
-          base.class_inheritable_accessor :comma_heaven_associations
-          base.comma_heaven_associations = []
+          FasterCSV::Table.new([]).tap do |table|
+            columns = CommaHeaven::Sqler::Columns.new(self, options[:export])
+            headers = columns.sql_as
+
+            ids = select("#{table_name}.#{primary_key}").limit(options[:limit]).all.map(&:id)
+            
+            unscoped do
+              where(["#{columns.table_alias}.#{primary_key} IN (?)", ids]).limit(options[:limit]).joins(columns.joins).select(columns.select).all.each do |resource|
+                fields = columns.sql_as.inject([]) do |acc, field|
+                  value = resource.send(field)
+                  
+                  if options[:format]
+                    begin 
+                      value = value.to_time.strftime(options[:format][:datetime]) if value =~ %r{^(\d{4,4})-(\d{2,2})-(\d{2,2})} && options[:format][:datetime]
+                    rescue 
+                    end
+                  end
+                  
+                  acc << options[:converter].call(value)
+                end
+                
+                table << FasterCSV::Row.new(headers, fields)
+              end
+            end
+          end
         end
       end
-      
-      def to_comma_heaven(options = {})
-        options.symbolize_keys!
-        options[:limit] = options[:limit].to_i if options[:limit].kind_of?(String)
-        options[:converter] ||= lambda { |v| v }
-        
-        FasterCSV::Table.new([]).tap do |table|
-          columns = CommaHeaven::Sqler::Columns.new(self, options[:export])
-          headers = columns.sql_as
 
-          ids = find(:all, :select => "#{table_name}.#{primary_key}", :limit => options[:limit]).map(&:id)
+      module Rails2
+        def self.extended(base)
+          base.class_eval do
+            base.class_inheritable_accessor :comma_heaven_columns
+            base.comma_heaven_columns = []
+            
+            base.class_inheritable_accessor :comma_heaven_associations
+            base.comma_heaven_associations = []
+          end
+        end
+        
+        def to_comma_heaven(options = {})
+          options.symbolize_keys!
+          options[:limit] = options[:limit].to_i if options[:limit].kind_of?(String)
+          options[:converter] ||= lambda { |v| v }
           
-          with_exclusive_scope do
-            find(:all, :conditions => ["#{columns.table_alias}.#{primary_key} IN (?)", ids], :limit => options[:limit], :joins => columns.joins, :select => columns.select).each do |resource|
-              fields = columns.sql_as.inject([]) do |acc, field|
-                value = resource.send(field)
-                
-                if options[:format]
-                  begin 
-                    value = value.to_time.strftime(options[:format][:datetime]) if value =~ %r{^(\d{4,4})-(\d{2,2})-(\d{2,2})} && options[:format][:datetime]
-                  rescue 
+          FasterCSV::Table.new([]).tap do |table|
+            columns = CommaHeaven::Sqler::Columns.new(self, options[:export])
+            headers = columns.sql_as
+
+            ids = find(:all, :select => "#{table_name}.#{primary_key}", :limit => options[:limit]).map(&:id)
+            
+            with_exclusive_scope do
+              find(:all, :conditions => ["#{columns.table_alias}.#{primary_key} IN (?)", ids], :limit => options[:limit], :joins => columns.joins, :select => columns.select).each do |resource|
+                fields = columns.sql_as.inject([]) do |acc, field|
+                  value = resource.send(field)
+                  
+                  if options[:format]
+                    begin 
+                      value = value.to_time.strftime(options[:format][:datetime]) if value =~ %r{^(\d{4,4})-(\d{2,2})-(\d{2,2})} && options[:format][:datetime]
+                    rescue 
+                    end
                   end
+                  
+                  acc << options[:converter].call(value)
                 end
                 
-                acc << options[:converter].call(value)
+                table << FasterCSV::Row.new(headers, fields)
               end
-              
-              table << FasterCSV::Row.new(headers, fields)
             end
           end
         end
       end
+
+      Rails1 = Rails2
     end
   end
 end

data/lib/comma-heaven/export.rb

@@ -4,7 +4,27 @@ module CommaHeaven
   class Export
     module Implementation
       def export(options = {})
-        Export.new(self, scope(:find), options)
+        Export.new(self, export_scope, options)
+      end
+
+      module Rails3
+        def export_scope
+          scoped
+        end
+      end
+
+      module Rails2
+        def export_scope
+          scoped(scope(:find))
+        end
+      end
+
+      Rails1 = Rails2
+
+      case ::ActiveRecord::VERSION::MAJOR
+      when 1 then include Rails1
+      when 2 then include Rails2
+      else        include Rails3
       end
     end
     
@@ -31,7 +51,9 @@ module CommaHeaven
       csv_options = all_options.slice(*FasterCSV::DEFAULT_OPTIONS.keys)
       tch_options = all_options.except(*FasterCSV::DEFAULT_OPTIONS.keys) # TCH means To Comma Heaven
       
-      klass.scoped(current_scope).to_comma_heaven(tch_options.symbolize_keys).to_csv(csv_options.symbolize_keys)
+      current_scope
+        .to_comma_heaven(tch_options.symbolize_keys)
+        .to_csv(csv_options.symbolize_keys)
     end
 
     private

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

@@ -12,6 +12,10 @@ module CommaHeaven
         self.index = index
         super(association.klass, export, options)
       end
+
+      def foreign_key_for(an_association)
+        an_association.respond_to?(:foreign_key) ? an_association.foreign_key : an_association.primary_key_name
+      end
     end
   end
 end

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

@@ -4,7 +4,7 @@ module CommaHeaven
       def join_clause
         <<-EOS
         LEFT JOIN #{quote(table)} AS #{table_alias}
-          ON #{table_alias}.#{model.primary_key} = #{parent.table_alias}.#{association.primary_key_name}
+          ON #{table_alias}.#{model.primary_key} = #{parent.table_alias}.#{foreign_key_for(association)}
         EOS
       end
     end

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

@@ -7,14 +7,14 @@ module CommaHeaven
         join = if association.options[:through]
           <<-EOS
             LEFT JOIN #{association.through_reflection.table_name} AS _#{association.through_reflection.table_name}#{table_alias}
-              ON #{parent.table_alias}.#{model.primary_key} = _#{association.through_reflection.table_name}#{table_alias}.#{association.primary_key_name}
+              ON #{parent.table_alias}.#{model.primary_key} = _#{association.through_reflection.table_name}#{table_alias}.#{foreign_key_for(association.through_reflection)}
             LEFT JOIN #{quote(table)} AS #{table_alias}
               ON _#{association.through_reflection.table_name}#{table_alias}.#{model.primary_key} = #{table_alias}.#{association.through_reflection.association_foreign_key}
           EOS
         else
           <<-EOS
             LEFT JOIN #{quote(table)} AS #{table_alias}
-              ON #{parent.table_alias}.#{model.primary_key} = #{table_alias}.#{association.primary_key_name}
+              ON #{parent.table_alias}.#{model.primary_key} = #{table_alias}.#{foreign_key_for(association)}
           EOS
         end
 
@@ -25,12 +25,12 @@ module CommaHeaven
                 ( SELECT #{association.quoted_table_name}.#{association.klass.primary_key} 
                   FROM #{association.quoted_table_name} 
                   JOIN #{association.through_reflection.table_name} ON #{association.quoted_table_name}.#{association.through_reflection.association_foreign_key} = #{association.through_reflection.table_name}.#{association.through_reflection.klass.primary_key}
-                  WHERE #{association.primary_key_name} = #{parent.table_alias}.#{model.primary_key} 
+                  WHERE #{foreign_key_for(association.through_reflection)} = #{parent.table_alias}.#{model.primary_key} 
                   LIMIT #{index}, 1 )
             EOS
           else
             <<-EOS
-              AND #{table_alias}.#{association.klass.primary_key} = (SELECT #{association.klass.primary_key} FROM #{association.quoted_table_name} WHERE #{association.primary_key_name} = #{parent.table_alias}.#{model.primary_key} LIMIT #{index}, 1)
+              AND #{table_alias}.#{association.klass.primary_key} = (SELECT #{association.klass.primary_key} FROM #{association.quoted_table_name} WHERE #{foreign_key_for(association)} = #{parent.table_alias}.#{model.primary_key} LIMIT #{index}, 1)
             EOS
           end
         end

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

@@ -4,7 +4,7 @@ module CommaHeaven
       def join_clause
         <<-EOS
         LEFT JOIN #{quote(table)} AS #{table_alias}
-          ON #{parent.table_alias}.#{model.primary_key} = #{table_alias}.#{association.primary_key_name}
+          ON #{parent.table_alias}.#{model.primary_key} = #{table_alias}.#{foreign_key_for(association)}
         EOS
       end
     end

data/spec/spec_helper.rb

@@ -1,3 +1,4 @@
+require "awesome_print"
 require 'simplecov'
 SimpleCov.start
 
@@ -17,6 +18,8 @@ ActiveRecord::Base.configurations = true
 
 ActiveRecord::Schema.verbose = false
 
+puts ActiveRecord::VERSION::MAJOR
+
 RSpec.configure do |config|
   config.before(:all) do
     ActiveRecord::Schema.define(:version => 1) do
@@ -69,10 +72,19 @@ RSpec.configure do |config|
       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
 
+    case ActiveRecord::VERSION::MAJOR
+    when 1, 2
+      class Tree < ActiveRecord::Base
+        named_scope :that_begins_with_o, {:conditions => ['name LIKE ?', 'o%']}
+      end
+    else
+      class Tree < ActiveRecord::Base
+        scope :that_begins_with_o, {:conditions => ['name LIKE ?', 'o%']}
+      end
+    end      
+
     class Leaf < ActiveRecord::Base
       belongs_to :tree
       has_many :cells
@@ -81,7 +93,7 @@ RSpec.configure do |config|
     class Cell < ActiveRecord::Base
       belongs_to :leaf
     end
-    
+
     Gardener.destroy_all
     GardenerClone.destroy_all
     Tree.destroy_all
@@ -89,12 +101,12 @@ 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(: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

metadata

@@ -2,7 +2,7 @@
 name: comma-heaven
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.3
+  version: 0.8.0
 platform: ruby
 authors: 
 - Silvano Stralla
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-22 00:00:00 Z
+date: 2012-11-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - <
       - !ruby/object:Gem::Version 
-        version: 3.0.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - <
       - !ruby/object:Gem::Version 
-        version: 3.0.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: *id002
@@ -111,6 +111,17 @@ dependencies:
   type: :development
   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
 description: CommaHeaven permits easy exports of Rails models to CSV
 email: silvano.stralla@sistrall.it
 executables: []
@@ -162,7 +173,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2399762168738389712
+      hash: -4302887848545016982
       segments: 
       - 0
       version: "0"