comma-heaven 0.7.2 → 0.7.3

data/Gemfile

@@ -11,4 +11,5 @@ group :development do
   gem "jeweler", "~> 1.8.3"
   gem 'simplecov', :require => false
   gem 'sqlite3'
+  gem 'mysql2', '0.2.7'
 end

data/Gemfile.lock

@@ -9,30 +9,31 @@ GEM
     activesupport (2.3.14)
     diff-lcs (1.1.3)
     git (1.2.5)
-    jeweler (1.8.3)
+    jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
-    json (1.6.6)
-    multi_json (1.3.1)
-    rack (1.1.2)
+    json (1.7.5)
+    multi_json (1.3.6)
+    mysql2 (0.2.7)
+    rack (1.1.3)
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
-    rspec (2.9.0)
-      rspec-core (~> 2.9.0)
-      rspec-expectations (~> 2.9.0)
-      rspec-mocks (~> 2.9.0)
-    rspec-core (2.9.0)
-    rspec-expectations (2.9.1)
+    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)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.9.0)
-    simplecov (0.6.1)
+    rspec-mocks (2.11.3)
+    simplecov (0.7.1)
       multi_json (~> 1.0)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
-    sqlite3 (1.3.5)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    sqlite3 (1.3.6)
 
 PLATFORMS
   ruby
@@ -42,6 +43,7 @@ DEPENDENCIES
   activerecord (< 3.0.0)
   bundler (>= 1.0.0)
   jeweler (~> 1.8.3)
+  mysql2 (= 0.2.7)
   rdoc (~> 3.12)
   rspec (>= 1.2.9)
   simplecov

data/VERSION

@@ -1 +1 @@
-0.7.2
+0.7.3

data/comma-heaven.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "comma-heaven"
-  s.version = "0.7.2"
+  s.version = "0.7.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Silvano Stralla"]
-  s.date = "2012-10-20"
+  s.date = "2012-10-22"
   s.description = "CommaHeaven permits easy exports of Rails models to CSV"
   s.email = "silvano.stralla@sistrall.it"
   s.extra_rdoc_files = [
@@ -64,6 +64,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
+      s.add_development_dependency(%q<mysql2>, ["= 0.2.7"])
     else
       s.add_dependency(%q<activerecord>, ["< 3.0.0"])
       s.add_dependency(%q<actionpack>, ["< 3.0.0"])
@@ -73,6 +74,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
       s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
+      s.add_dependency(%q<mysql2>, ["= 0.2.7"])
     end
   else
     s.add_dependency(%q<activerecord>, ["< 3.0.0"])
@@ -83,6 +85,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
     s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
+    s.add_dependency(%q<mysql2>, ["= 0.2.7"])
   end
 end
 

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

@@ -19,22 +19,26 @@ module CommaHeaven
         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)
           
-          find(:all, :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 
+          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

data/lib/comma-heaven/export.rb

@@ -31,8 +31,7 @@ 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
       
-      ids = klass.scoped(current_scope).find(:all, :select => "#{klass.table_name}.#{klass.primary_key}").map(&:id)
-      klass.scoped(:conditions => ['id IN (?)', ids]).to_comma_heaven(tch_options.symbolize_keys).to_csv(csv_options.symbolize_keys)
+      klass.scoped(current_scope).to_comma_heaven(tch_options.symbolize_keys).to_csv(csv_options.symbolize_keys)
     end
 
     private

data/spec/export_spec.rb

@@ -41,6 +41,11 @@ describe "Export" do
       Tree.to_comma_heaven(:export => {:name => {0 => {}}, :age => {1 => {}}}).to_csv
   end
 
+  it "should export scoped model" do
+    Tree.scoped(:conditions => {:name => 'Ulivo'}).export(@params).save.should ==
+      Tree.scoped(:conditions => {:name => 'Ulivo'}).to_comma_heaven(@params).to_csv
+  end
+
   it "should export to CSV using customized options made available through FasterCSV" do
     Tree.export(:export => {:name => {0 => {}}, :age => {1 => {}}}, :col_sep => ";", :force_quotes => true).save.should ==
       Tree.to_comma_heaven(:export => {:name => {0 => {}}, :age => {1 => {}}}).to_csv(:col_sep => ";", :force_quotes => true)

data/spec/spec_helper.rb

@@ -11,44 +11,49 @@ ENV['TZ'] = 'UTC'
 Time.zone = 'Eastern Time (US & Canada)'
 
 ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
+# ActiveRecord::Base.establish_connection(:adapter => "mysql2", :database => "comma-heaven-test", :user => 'root', :password => '')
 ActiveRecord::Base.configurations = true
+# ActiveRecord::Base.logger = Logger.new(STDOUT)
 
 ActiveRecord::Schema.verbose = false
-ActiveRecord::Schema.define(:version => 1) do
-  create_table :gardeners do |t|
-    t.string :name
-    t.string :surname
-    t.datetime :birthdate
-  end
-  
-  create_table :gardener_clones do |t|
-    t.integer :gardener_id
-    t.string :name
-    t.string :surname
-  end
-  
-  create_table :trees do |t|
-    t.string :name
-    t.integer :age
-    t.integer :gardener_id
-  end
-  
-  create_table :leafs do |t|
-    t.integer :tree_id
-    t.string :position
-    t.float :size
-    t.float :height_from_ground
-  end
-  
-  create_table :cells do |t|
-    t.integer :leaf_id
-    t.float :weight
-    t.float :lat
-    t.float :lng
-  end
-end
 
 RSpec.configure do |config|
+  config.before(:all) do
+    ActiveRecord::Schema.define(:version => 1) do
+      create_table :gardeners do |t|
+        t.string :name
+        t.string :surname
+        t.datetime :birthdate
+      end
+      
+      create_table :gardener_clones do |t|
+        t.integer :gardener_id
+        t.string :name
+        t.string :surname
+      end
+      
+      create_table :trees do |t|
+        t.string :name
+        t.integer :age
+        t.integer :gardener_id
+      end
+      
+      create_table :leafs do |t|
+        t.integer :tree_id
+        t.string :position
+        t.float :size
+        t.float :height_from_ground
+      end
+      
+      create_table :cells do |t|
+        t.integer :leaf_id
+        t.float :weight
+        t.float :lat
+        t.float :lng
+      end
+    end
+  end
+
   config.before(:each) do
     class Gardener < ActiveRecord::Base
       has_many :trees
@@ -90,4 +95,14 @@ RSpec.configure do |config|
     Object.send(:remove_const, :Leaf)
     Object.send(:remove_const, :Cell)
   end
+
+  config.after(:all) do
+    ActiveRecord::Schema.define(:version => 2) do
+      drop_table :gardeners
+      drop_table :gardener_clones
+      drop_table :trees
+      drop_table :leafs
+      drop_table :cells
+    end
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: comma-heaven
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors: 
 - Silvano Stralla
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-20 00:00:00 Z
+date: 2012-10-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -100,6 +100,17 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: mysql2
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.2.7
+  type: :development
+  prerelease: false
+  version_requirements: *id009
 description: CommaHeaven permits easy exports of Rails models to CSV
 email: silvano.stralla@sistrall.it
 executables: []
@@ -151,7 +162,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2387181132478427829
+      hash: 2399762168738389712
       segments: 
       - 0
       version: "0"