mysql2xxxx 0.0.2 → 0.0.3

data/lib/mysql2xxxx.rb

@@ -7,13 +7,13 @@ require 'active_support/version'
 }.each do |active_support_3_requirement|
   require active_support_3_requirement
 end if ::ActiveSupport::VERSION::MAJOR == 3
+require 'mysql2'
 
 module Mysql2xxxx
   autoload :JSON, 'mysql2xxxx/json'
   autoload :CSV, 'mysql2xxxx/csv'
   autoload :XML, 'mysql2xxxx/xml'
   autoload :Properties, 'mysql2xxxx/properties'
-  autoload :Client, 'mysql2xxxx/client'
   autoload :ExtraOutputs, 'mysql2xxxx/extra_outputs'
   autoload :Cli, 'mysql2xxxx/cli'
 end

data/lib/mysql2xxxx/csv.rb

@@ -14,13 +14,10 @@ module Mysql2xxxx
       @properties = Properties.new options
     end
     
-    def client
-      @client ||= Client.new properties
-    end
-
     def to_file(f)
+      @client = ::Mysql2::Client.new properties.database_config
       keys = nil
-      client.select_each(properties.execute) do |hsh|
+      @client.query(properties.execute).each do |hsh|
         unless keys
           keys = hsh.keys
           f.write keys.to_csv
@@ -28,6 +25,8 @@ module Mysql2xxxx
         f.write keys.inject([]) { |memo, k| memo.push hsh[k] }.to_csv
       end
       nil
+    ensure
+      @client.try :close
     end
   end
 end

data/lib/mysql2xxxx/json.rb

@@ -14,14 +14,11 @@ module Mysql2xxxx
       @properties = Properties.new options
     end
     
-    def client
-      @client ||= Client.new properties
-    end
-
     def to_file(f)
+      @client = ::Mysql2::Client.new properties.database_config
       first = true
       f.write '['
-      client.select_each(properties.execute) do |hsh|
+      @client.query(properties.execute).each do |hsh|
         line = if first
           first = false
           hsh.to_json
@@ -32,6 +29,8 @@ module Mysql2xxxx
       end
       f.write ']'
       nil
+    ensure
+      @client.try :close
     end
   end
 end

data/lib/mysql2xxxx/properties.rb

@@ -43,9 +43,11 @@ module Mysql2xxxx
     private
     
     def active_record_connection
-      if defined? ::ActiveRecord
+      if defined?(::ActiveRecord)
         ::ActiveRecord::Base.connection
       end
+    rescue
+      # oh well
     end
     
     def active_record_config

data/lib/mysql2xxxx/version.rb

@@ -1,3 +1,3 @@
 module Mysql2xxxx
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/mysql2xxxx/xml.rb

@@ -8,16 +8,13 @@ module Mysql2xxxx
       @properties = Properties.new options
     end
     
-    def client
-      @client ||= Client.new properties
-    end
-
     # this matches the xml generated by "mysql --xml"
     # i tried to use builder, but the String#to_xs nonsense got in the way
     def to_file(f)
+      @client = ::Mysql2::Client.new properties.database_config
       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">}
-      client.select_each(properties.execute) do |hsh|
+      @client.query(properties.execute).each do |hsh|
         f.write %{<row>}
         hsh.each do |k, v|
           f.write %{<field name="#{k.to_xs}"#{' xsi:nil="true"' if v.nil?}>#{v.to_s.to_xs}</field>}
@@ -26,6 +23,8 @@ module Mysql2xxxx
       end
       f.write %{</resultset>}
       nil
+    ensure
+      @client.try :close
     end
   end
 end

data/mysql2xxxx.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Seamus Abshere"]
   s.email       = ["seamus@abshere.net"]
-  s.homepage    = ""
+  s.homepage    = "https://github.com/seamusabshere/mysql2xxxx"
   s.summary     = %q{In a memory-sensitive way (but not fast), dump mysql tables to JSON, CSV, XML.}
   s.description = %q{Gives you binaries like mysql2csv, mysql2json, and mysql2xml, and Ruby classes to match.}
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mysql2xxxx
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Seamus Abshere
@@ -153,7 +153,6 @@ files:
 - bin/mysql2xml
 - lib/mysql2xxxx.rb
 - lib/mysql2xxxx/cli.rb
-- lib/mysql2xxxx/client.rb
 - lib/mysql2xxxx/csv.rb
 - lib/mysql2xxxx/extra_outputs.rb
 - lib/mysql2xxxx/json.rb
@@ -170,7 +169,7 @@ files:
 - test/test_mysql2xxxx.rb
 - test/test_well_formedness.rb
 has_rdoc: true
-homepage: ""
+homepage: https://github.com/seamusabshere/mysql2xxxx
 licenses: []
 
 post_install_message: 

data/lib/mysql2xxxx/client.rb

@@ -1,18 +0,0 @@
-require 'mysql2'
-module Mysql2xxxx
-  class Client
-    attr_reader :properties
-    def initialize(properties)
-      @properties = properties
-    end
-    def select_each(sql, &blk)
-      mysql2.query(sql).each do |hsh|
-        yield hsh
-      end
-    end
-    private
-    def mysql2
-      @mysql2 ||= ::Mysql2::Client.new properties.database_config
-    end
-  end
-end