mysql2xxxx 0.1.1 → 0.2.0

data/README.rdoc

@@ -2,9 +2,9 @@
 
 ==Binaries
 
-    mysql2csv --user=dbuser --password=dbpassword --database=dbname [--charset=utf8] [--encoding=UTF-8] --execute="select * from automobile_makes"
-    mysql2json --user=dbuser --password=dbpassword --database=dbname [--charset=utf8] [--encoding=UTF-8] --execute="select * from automobile_makes"
-    mysql2xml --user=dbuser --password=dbpassword --database=dbname [--charset=utf8] [--encoding=UTF-8] --execute="select * from automobile_makes"
+    mysql2csv --user=dbuser --password=dbpassword --database=dbname --execute="select * from automobile_makes"
+    mysql2json --user=dbuser --password=dbpassword --database=dbname --execute="select * from automobile_makes"
+    mysql2xml --user=dbuser --password=dbpassword --database=dbname --execute="select * from automobile_makes"
 
 To see all options
 
@@ -25,7 +25,7 @@ Note also that if you're running it inside a Rails application, it will default
 ==Well-formedness
 
 * CSV output depends on FasterCSV <tt>to_csv</tt>
-* JSON output depends on ActiveSupport <tt>to_json</tt>
+* JSON output depends on Florian Frank's JSON <tt>JSON.generate</tt>
 * XML output is written manually, but looks like the output of <tt>mysql [hyphen][hyphen]xml</tt>
 
 Copyright 2011 Seamus Abshere

data/Rakefile

@@ -1,5 +1,6 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
+require 'bundler/setup'
 
 require 'rake'
 require 'rake/testtask'

data/benchmark/benchmark.rb

@@ -3,7 +3,7 @@
 ENV['HERE'] = File.dirname(__FILE__)
 ENV['DBUSER'] = 'root'
 ENV['DBPASSWORD'] = 'password'
-ENV['DBNAME'] = 'data1'
+ENV['DBNAME'] = 'mysql2xxxx_benchmark'
 ENV['MEMPROF_REPORT_PATH'] = File.expand_path('memprof.txt')
 ENV['DUMP_PATH'] = File.expand_path('a.dump')
 ENV['EXECUTE'] = 'SELECT * FROM five_thousand_rows'

data/benchmark/results/0.0.4-20110314190640.txt

@@ -136,12 +136,12 @@ Memprof object counts (top 25):
      18 ./benchmark/../lib/mysql2xxxx/writer.rb:33:__node__
      14 ./benchmark/../lib/mysql2xxxx/writer/xml.rb:12:__node__
      12 ./benchmark/../lib/mysql2xxxx/writer.rb:11:__node__
-     12 ./benchmark/../lib/mysql2xxxx/properties.rb:32:__node__
-     12 ./benchmark/../lib/mysql2xxxx/properties.rb:28:__node__
-     12 ./benchmark/../lib/mysql2xxxx/properties.rb:24:__node__
-     12 ./benchmark/../lib/mysql2xxxx/properties.rb:20:__node__
+     12 ./benchmark/../lib/mysql2xxxx/config.rb:32:__node__
+     12 ./benchmark/../lib/mysql2xxxx/config.rb:28:__node__
+     12 ./benchmark/../lib/mysql2xxxx/config.rb:24:__node__
+     12 ./benchmark/../lib/mysql2xxxx/config.rb:20:__node__
      11 ./benchmark/../lib/mysql2xxxx/writer/xml.rb:4:__node__
-     10 ./benchmark/../lib/mysql2xxxx/properties.rb:36:__node__
+     10 ./benchmark/../lib/mysql2xxxx/config.rb:36:__node__
       9 ./benchmark/../lib/mysql2xxxx/writer.rb:26:__node__
       8 ./benchmark/../lib/mysql2xxxx/writer.rb:73:__node__
       8 ./benchmark/../lib/mysql2xxxx/writer.rb:32:__node__

data/benchmark/results/0.0.4-20110315110535-ruby18.txt

@@ -137,13 +137,13 @@ Memprof object counts (top 25):
      22 ./benchmark/../lib/mysql2xxxx/writer.rb:35:__node__
      20 ./benchmark/../lib/mysql2xxxx/writer.rb:16:__node__
      14 ./benchmark/../lib/mysql2xxxx/writer/xml.rb:12:__node__
-     14 ./benchmark/../lib/mysql2xxxx/properties.rb:18:__node__
+     14 ./benchmark/../lib/mysql2xxxx/config.rb:18:__node__
      12 ./benchmark/../lib/mysql2xxxx/writer.rb:11:__node__
-     12 ./benchmark/../lib/mysql2xxxx/properties.rb:36:__node__
-     12 ./benchmark/../lib/mysql2xxxx/properties.rb:32:__node__
-     12 ./benchmark/../lib/mysql2xxxx/properties.rb:14:__node__
-     12 ./benchmark/../lib/mysql2xxxx/properties.rb:10:__node__
+     12 ./benchmark/../lib/mysql2xxxx/config.rb:36:__node__
+     12 ./benchmark/../lib/mysql2xxxx/config.rb:32:__node__
+     12 ./benchmark/../lib/mysql2xxxx/config.rb:14:__node__
+     12 ./benchmark/../lib/mysql2xxxx/config.rb:10:__node__
      11 ./benchmark/../lib/mysql2xxxx/writer/xml.rb:4:__node__
      10 ./benchmark/../lib/mysql2xxxx/writer.rb:34:__node__
-     10 ./benchmark/../lib/mysql2xxxx/properties.rb:40:__node__
+     10 ./benchmark/../lib/mysql2xxxx/config.rb:40:__node__
       9 ./benchmark/../lib/mysql2xxxx/writer.rb:26:__node__

data/bin/mysql2csv

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require "mysql2xxxx"
+require 'mysql2xxxx/cli'
 
 cli = Mysql2xxxx::Cli.new
 cli.parse_options

data/bin/mysql2json

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require "mysql2xxxx"
+require 'mysql2xxxx/cli'
 
 cli = Mysql2xxxx::Cli.new
 cli.parse_options

data/bin/mysql2xml

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require "mysql2xxxx"
+require 'mysql2xxxx/cli'
 
 cli = Mysql2xxxx::Cli.new
 cli.parse_options

data/lib/mysql2xxxx.rb

@@ -3,20 +3,17 @@ unless RUBY_VERSION >= '1.9'
 end
 require 'active_support'
 require 'active_support/version'
-%w{
-  active_support/core_ext/object
-  active_support/core_ext/string
-  active_support/core_ext/hash
-}.each do |active_support_3_requirement|
-  require active_support_3_requirement
-end if ::ActiveSupport::VERSION::MAJOR == 3
+require 'active_support/core_ext' if ::ActiveSupport::VERSION::MAJOR >= 3
+
+# will use mysql2 as soon as :stream => true is supported
+# https://github.com/brianmario/mysql2/pull/223
 require 'mysql'
 
+require 'mysql2xxxx/config'
+require 'mysql2xxxx/writer'
+require 'mysql2xxxx/writer/json'
+require 'mysql2xxxx/writer/csv'
+require 'mysql2xxxx/writer/xml'
+
 module Mysql2xxxx
-  autoload :JSON, 'mysql2xxxx/writer/json'
-  autoload :CSV, 'mysql2xxxx/writer/csv'
-  autoload :XML, 'mysql2xxxx/writer/xml'
-  autoload :Writer, 'mysql2xxxx/writer'
-  autoload :Properties, 'mysql2xxxx/properties'
-  autoload :Cli, 'mysql2xxxx/cli'
 end

data/lib/mysql2xxxx/cli.rb

@@ -3,7 +3,7 @@ require 'mixlib/cli'
 module Mysql2xxxx
   class Cli
     include ::Mixlib::CLI
-    %w{ user password host Port database charset encoding }.each do |o|
+    %w{ user password host Port database }.each do |o|
       option o.downcase.to_sym,
         :short => "-#{o[0,1]} #{o.upcase}",
         :long  => "--#{o.downcase}=#{o.upcase}",

data/lib/mysql2xxxx/config.rb

@@ -0,0 +1,59 @@
+module Mysql2xxxx
+  class Config
+    attr_reader :options
+    def initialize(options = {})
+      @options = options.symbolize_keys
+    end
+    
+    def user
+      options[:user] || active_record_config.try(:[], :username)
+    end
+    
+    def password
+      options[:password] || active_record_config.try(:[], :password)
+    end
+    
+    def host
+      options[:host] || active_record_config.try(:[], :host)
+    end
+    
+    def port
+      options[:port] || active_record_config.try(:[], :port)
+    end
+    
+    def socket
+      options[:socket] || active_record_config.try(:[], :socket)
+    end
+    
+    def database
+      options[:database] || active_record_connection.try(:current_database)
+    end
+    
+    def execute
+      options[:execute]
+    end
+    
+    # Whether to write \N instead of a blank string for NULL. This is helpful for mysqlimport.
+    #
+    # Only applies to CSV
+    def slash_n
+      options.fetch :slash_n, false
+    end
+        
+    private
+    
+    def active_record_connection
+      if defined?(::ActiveRecord)
+        ::ActiveRecord::Base.connection
+      end
+    rescue
+      # oh well
+    end
+    
+    def active_record_config
+      if active_record_connection
+        active_record_connection.instance_variable_get :@config
+      end
+    end
+  end
+end

data/lib/mysql2xxxx/version.rb

@@ -1,3 +1,3 @@
 module Mysql2xxxx
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/mysql2xxxx/writer.rb

@@ -1,16 +1,16 @@
 require 'stringio'
-if ::RUBY_VERSION >= '1.9'
-  require 'ensure/encoding'
-else
-  require 'iconv'
-end
+require 'iconv'
 
 module Mysql2xxxx
   class Writer
-    attr_reader :properties
+    MYSQL_CHARSET = 'utf8'
+    ICONV_TO = 'UTF-8//TRANSLIT'
+    ICONV_FROM = 'UTF-8'
+    
+    attr_reader :config
     
     def initialize(options = {})
-      @properties = Properties.new options
+      @config = Config.new options
     end
     
     def keys
@@ -19,7 +19,7 @@ module Mysql2xxxx
         
     def last_statement
       return @last_statement if @last_statement.is_a? ::String
-      statements = properties.execute.split(';').select { |statement| statement.to_s.strip.length > 0 }
+      statements = config.execute.split(';').select { |statement| statement.to_s.strip.length > 0 }
       @last_statement = statements.pop
       statements.each do |statement|
         dbh.query statement
@@ -37,8 +37,8 @@ module Mysql2xxxx
     def dbh
       return @dbh if @dbh.is_a? ::Mysql
       @dbh = ::Mysql.init
-      @dbh.options ::Mysql::SET_CHARSET_NAME, properties.charset
-      @dbh.real_connect properties.host, properties.user, properties.password, properties.database, properties.port, properties.socket
+      @dbh.options ::Mysql::SET_CHARSET_NAME, MYSQL_CHARSET
+      @dbh.real_connect config.host, config.user, config.password, config.database, config.port, config.socket
       # so that we can use_result instead of store_result
       @dbh.query_with_result = false
       @dbh
@@ -61,24 +61,16 @@ module Mysql2xxxx
     end
     
     def recode_as_utf8(raw_str)
-      return if raw_str.nil?
-      if ::RUBY_VERSION >= '1.9'
-        $stderr.puts "[mysql2xxxx] Raw - #{raw_str}" if ::ENV['MYSQL2XXXX_DEBUG'] == 'true'
-        recoded_str = raw_str.ensure_encoding 'UTF-8', :external_encoding => properties.encoding, :invalid_characters => :transcode
-        $stderr.puts "[mysql2xxxx] Recoded - #{recoded_str}" if ::ENV['MYSQL2XXXX_DEBUG'] == 'true'
-        recoded_str
-      else
-        $stderr.puts "[mysql2xxxx] Raw - #{raw_str}" if ::ENV['MYSQL2XXXX_DEBUG'] == 'true'
-        recoded_str = ::Iconv.conv('UTF-8//TRANSLIT', properties.encoding, raw_str.to_s + ' ')[0..-2]
-        $stderr.puts "[mysql2xxxx] Recoded - #{recoded_str}" if ::ENV['MYSQL2XXXX_DEBUG'] == 'true'
-        recoded_str
+      unless raw_str.nil?
+        [ iconv.iconv(raw_str), iconv.iconv(nil) ].join
       end
     end
     
     def close
+      @dead = true
+      iconv.close
       result.free
       dbh.close
-      @dead = true
     end
     
     def to_s
@@ -94,10 +86,16 @@ module Mysql2xxxx
     end
     
     def to_path(path)
-      f = ::File.open(path, 'w')
+      f = ::RUBY_VERSION >= '1.9' ? ::File.open(path, 'w', :binmode => true) : ::File.open(path, 'w')
       to_file f
       f.close
       nil
     end
+    
+    private
+    
+    def iconv
+      @iconv ||= ::Iconv.new(ICONV_TO, ICONV_FROM)
+    end
   end
 end

data/lib/mysql2xxxx/writer/csv.rb

@@ -6,10 +6,22 @@ end
 
 module Mysql2xxxx
   class CSV < Writer
+    SLASH_N = '\N'.freeze
     def to_file(f)
-      f.write keys.to_csv
+      slash_n = config.slash_n
+
+      if slash_n
+        f.write keys.map { |v| v.nil? ? SLASH_N : v }.to_csv
+      else
+        f.write keys.to_csv
+      end
+      
       stream_arrays do |ary|
-        f.write ary.to_csv
+        if slash_n
+          f.write ary.map { |v| v.nil? ? SLASH_N : v }.to_csv
+        else
+          f.write ary.to_csv
+        end
       end
       nil
     end

data/lib/mysql2xxxx/writer/json.rb

@@ -1,8 +1,4 @@
-%w{
-  active_support/json/encoding
-}.each do |active_support_3_requirement|
-  require active_support_3_requirement
-end if ::ActiveSupport::VERSION::MAJOR == 3
+require 'json'
 
 module Mysql2xxxx
   class JSON < Writer
@@ -15,7 +11,7 @@ module Mysql2xxxx
         else
           f.write ','
         end
-        f.write hsh.to_json
+        f.write ::JSON.generate(hsh)
       end
       f.write ']'
       nil

data/lib/mysql2xxxx/writer/xml.rb

@@ -9,7 +9,7 @@ module Mysql2xxxx
     # i tried to use builder, but the String#to_xs nonsense got in the way
     def to_file(f)
       f.write %{<?xml version="1.0" encoding="utf-8" ?>}
-      f.write %{<resultset statement="#{properties.execute.to_xs}" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">}
+      f.write %{<resultset statement="#{config.execute.to_xs}" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">}
       stream_arrays do |ary|
         f.write %{<row>}
         ary.each_with_index do |v, i|

data/mysql2xxxx.gemspec

@@ -24,8 +24,9 @@ Gem::Specification.new do |s|
   s.add_dependency 'mixlib-cli'
   s.add_dependency 'fast_xs'
   s.add_dependency 'fastercsv'
-  s.add_dependency 'ensure-encoding'
+  s.add_dependency 'json'
   
+  s.add_development_dependency 'rake'
   s.add_development_dependency 'activerecord'
   s.add_development_dependency 'shell-executer'
   s.add_development_dependency 'posix-spawn'

data/test/test_mysql2xxxx.rb

@@ -6,7 +6,7 @@ class TestMysql2xxxx < Test::Unit::TestCase
     a = Mysql2xxxx::JSON.new @options
     str = a.to_s
     assert str.include?('Acura')
-    assert str.include?(%q{Citro\u00ebn})
+    assert str.include?('Citroën')
     assert !str.include?('DaimlerChrysler')
   end
 
@@ -25,4 +25,11 @@ class TestMysql2xxxx < Test::Unit::TestCase
     assert str.include?('Citro&#235;n')
     assert !str.include?('DaimlerChrysler')
   end
+  
+  def test_4_slash_n_for_nulls
+    a = Mysql2xxxx::CSV.new @options
+    assert a.to_s.include?(',,')
+    b = Mysql2xxxx::CSV.new @options.merge(:slash_n => true)
+    assert b.to_s.include?(',\N,')
+  end
 end

metadata

@@ -1,140 +1,148 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mysql2xxxx
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.0
   prerelease: 
-  version: 0.1.1
 platform: ruby
-authors: 
+authors:
 - Seamus Abshere
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-18 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-16 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2154830840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.3.10
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mysql
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2154830840
+- !ruby/object:Gem::Dependency
+  name: mysql
+  requirement: &2154830240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mixlib-cli
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2154830240
+- !ruby/object:Gem::Dependency
+  name: mixlib-cli
+  requirement: &2154829640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: fast_xs
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2154829640
+- !ruby/object:Gem::Dependency
+  name: fast_xs
+  requirement: &2154828940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: fastercsv
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2154828940
+- !ruby/object:Gem::Dependency
+  name: fastercsv
+  requirement: &2154828140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: ensure-encoding
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2154828140
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &2154821260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2154821260
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2154820760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: shell-executer
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *2154820760
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &2154820120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: posix-spawn
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *2154820120
+- !ruby/object:Gem::Dependency
+  name: shell-executer
+  requirement: &2154819500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2154819500
+- !ruby/object:Gem::Dependency
+  name: posix-spawn
+  requirement: &2154818880 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug19
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *2154818880
+- !ruby/object:Gem::Dependency
+  name: ruby-debug19
+  requirement: &2154818240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id010
-description: Gives you binaries like mysql2csv, mysql2json, and mysql2xml, and Ruby classes to match.
-email: 
+  prerelease: false
+  version_requirements: *2154818240
+description: Gives you binaries like mysql2csv, mysql2json, and mysql2xml, and Ruby
+  classes to match.
+email:
 - seamus@abshere.net
-executables: 
+executables:
 - mysql2csv
 - mysql2json
 - mysql2xml
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gemtest
 - .gitignore
 - Gemfile
@@ -153,7 +161,7 @@ files:
 - bin/mysql2xml
 - lib/mysql2xxxx.rb
 - lib/mysql2xxxx/cli.rb
-- lib/mysql2xxxx/properties.rb
+- lib/mysql2xxxx/config.rb
 - lib/mysql2xxxx/version.rb
 - lib/mysql2xxxx/writer.rb
 - lib/mysql2xxxx/writer/csv.rb
@@ -169,35 +177,32 @@ files:
 - test/test_multiline_sql.rb
 - test/test_mysql2xxxx.rb
 - test/test_well_formedness.rb
-has_rdoc: true
 homepage: https://github.com/seamusabshere/mysql2xxxx
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: mysql2xxxx
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: In a memory-sensitive way (but not fast), dump mysql tables to JSON, CSV, XML.
-test_files: 
+summary: In a memory-sensitive way (but not fast), dump mysql tables to JSON, CSV,
+  XML.
+test_files:
 - test/fixtures/automobile_make_years.sql
 - test/fixtures/automobile_makes.sql
 - test/helper.rb

data/lib/mysql2xxxx/properties.rb

@@ -1,71 +0,0 @@
-module Mysql2xxxx
-  class Properties
-    attr_reader :options
-    def initialize(options = {})
-      @options = options.dup
-      @options.stringify_keys!
-    end
-    
-    def user
-      options['user'] || active_record_config.try(:[], :username)
-    end
-    
-    def password
-      options['password'] || active_record_config.try(:[], :password)
-    end
-    
-    def host
-      options['host'] || active_record_config.try(:[], :host)
-    end
-    
-    # MySQL connection charset
-    #
-    # If you change this, you also have to change :encoding
-    #
-    # Default: utf8
-    def charset
-      options['charset'] || 'utf8'
-    end
-    
-    # Encoding
-    #
-    # If you change this, you also have to change :charset
-    #
-    # Default: UTF-8
-    def encoding
-      options['encoding'] || 'UTF-8'
-    end
-    
-    def port
-      options['port'] || active_record_config.try(:[], :port)
-    end
-    
-    def socket
-      options['socket'] || active_record_config.try(:[], :socket)
-    end
-    
-    def database
-      options['database'] || active_record_connection.try(:current_database)
-    end
-    
-    def execute
-      options['execute']
-    end
-        
-    private
-    
-    def active_record_connection
-      if defined?(::ActiveRecord)
-        ::ActiveRecord::Base.connection
-      end
-    rescue
-      # oh well
-    end
-    
-    def active_record_config
-      if active_record_connection
-        active_record_connection.instance_variable_get :@config
-      end
-    end
-  end
-end