squealer 2.2.1 → 2.2.2

data/Rakefile

@@ -10,8 +10,8 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |gemspec|
     gemspec.name = "squealer"
-    gemspec.summary = "Document-oriented database to RDBMS exports"
-    gemspec.description = "Exports MongoDB to MySQL or PostgreSQL."
+    gemspec.summary = "Export document-oriented database to RDBMS"
+    gemspec.description = "A Ruby DSL for exporting MongoDB to MySQL or PostgreSQL. You don't need to install both, just one. Use EXPORT_DBMS=[mysql|postgres] environment variable to specify the appropriate adapter."
     gemspec.email = "joshua.graham@grahamis.com"
     gemspec.homepage = "http://github.com/delitescere/squealer/"
     gemspec.authors = ["Josh Graham", "Durran Jordan", "Matt Yoho", "Bernerd Schaefer"]

data/VERSION

@@ -1 +1 @@
-2.2.1
+2.2.2

data/lib/squealer/database.rb

@@ -1,8 +1,8 @@
-require 'mongo'
-require 'data_objects'
-
 require 'singleton'
 
+require 'mongo'
+# data_objects required under export_to dependant on adapter requested in EXPORT_DBMS
+
 module Squealer
   class Database
     include Singleton
@@ -15,11 +15,14 @@ module Squealer
     def export_to(adapter, host, username, password, name)
       require "do_#{adapter}"
 
-      @@all_export_connections ||= []
-      @export_do.dispose if @export_do
-
-      @export_do = DataObjects::Connection.new("#{adapter}://#{username}:#{password}@#{host}/#{name}")
-      @@all_export_connections << @export_do
+      @export_do.release if @export_do
+      creds = ""
+      creds << username if username
+      creds << ":#{password}" if password
+      at_host = ""
+      at_host << "#{creds}@" unless creds.empty?
+      at_host << host
+      @export_do = DataObjects::Connection.new("#{adapter}://#{at_host}/#{name}")
     end
 
     def import
@@ -51,7 +54,7 @@ module Squealer
       def eval(string)
         @dbc.eval(string)
       end
-    end
+    end # Connection
 
     class Source
       attr_reader :counts, :cursor
@@ -78,12 +81,7 @@ module Squealer
         end
         @progress_bar.finish if @progress_bar
       end
-    end
+    end # Source
 
-    private
-
-    def dispose_all_connections
-      @@all_export_connections.each {|c| c.dispose if c} if defined?(@@all_export_connections)
-    end
   end
 end

data/lib/squealer/target.rb

@@ -49,7 +49,7 @@ module Squealer
         (eval "#{@table_name}['_id']", @binding, __FILE__, __LINE__)
       ).to_s
     end
-3
+
     def verify_table_name_in_scope
       table = eval "#{@table_name}", @binding, __FILE__, __LINE__
       raise ArgumentError, "The variable '#{@table_name}' is not a hashmap" unless table.is_a? Hash

data/spec/integration/export_a_record_spec.rb

@@ -1,17 +1,9 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/./spec_helper_dbms')
 
 describe "Exporting" do
-  before do
-    truncate_export_tables
-  end
-
   let(:databases) { Squealer::Database.instance }
   let(:today) { Date.today }
 
-  def prepare_export_database
-    databases.export_to($db_adapter, 'localhost', $db_user, '', $db_name)
-  end
-
   def squeal_basic_users_document(user=users_document)
     target(:user) do
       assign(:name)
@@ -61,7 +53,7 @@ describe "Exporting" do
   end
 
   let :first_users_record do
-    dbc = databases.instance_variable_get('@export_do')
+    dbc = databases.export
     reader = dbc.create_command(%{SELECT * FROM "user"}).execute_reader
     result = reader.each { |x| break x }
     reader.close
@@ -69,7 +61,7 @@ describe "Exporting" do
   end
 
   let :first_activity_record do
-    dbc = databases.instance_variable_get('@export_do')
+    dbc = databases.export
     reader = dbc.create_command(%{SELECT * FROM "activity"}).execute_reader
     result = reader.each { |x| break x }
     reader.close
@@ -78,7 +70,6 @@ describe "Exporting" do
 
   context "a new record" do
     it "saves the data correctly" do
-      prepare_export_database
       squeal_basic_users_document
       result = first_users_record
 
@@ -99,7 +90,6 @@ describe "Exporting" do
     end
 
     it "saves embedded documents correctly" do
-      prepare_export_database
       squeal_users_document_with_activities
       result = first_activity_record
 
@@ -112,7 +102,6 @@ describe "Exporting" do
 
   context "an existing record" do
     it "updates the data correctly" do
-      prepare_export_database
       squeal_basic_users_document
       squeal_basic_users_document(users_document.merge('foreign' => false, 'gender' => 'F'))
 
@@ -135,7 +124,6 @@ describe "Exporting" do
     end
 
     it "updates the child record correctly" do
-      prepare_export_database
       squeal_users_document_with_activities(users_document.merge('activities' => [{ :_id => 'a1', 'name' => 'Be expansionist', 'due_date' => as_time(today + 1) }]))
       result = first_activity_record
 

data/spec/integration/imports_from_mongodb.rb

@@ -0,0 +1,166 @@
+require File.expand_path(File.dirname(__FILE__) + '/./spec_helper_dbms')
+
+describe Squealer::Database do
+  it "is a singleton" do
+    Squealer::Database.respond_to?(:instance).should be_true
+  end
+
+  describe "import" do
+    let(:databases) { Squealer::Database.instance }
+
+
+    it "takes an import database" do
+      databases.send(:instance_variable_get, '@import_dbc').should be_a_kind_of(Mongo::DB)
+    end
+
+    it "returns a squealer connection object" do
+      databases.import.should be_a_kind_of(Squealer::Database::Connection)
+    end
+
+    it "delegates eval to Mongo" do
+      databases.send(:instance_variable_get, '@import_dbc').eval('db.getName()').should == $db_name
+      databases.import.eval('db.getName()').should == $db_name
+    end
+  end
+
+  describe "source" do
+    let(:databases) { Squealer::Database.instance }
+
+    before { databases.import_from('localhost', 27017, $db_name) }
+
+    it "returns a Source" do
+      databases.import.source('foo').should be_a_kind_of(Squealer::Database::Source)
+    end
+
+    describe "Source::cursor" do
+      it "returns a databases cursor" do
+        databases.import.source('foo').cursor.should be_a_kind_of(Mongo::Cursor)
+      end
+    end
+
+    context "an empty collection" do
+      subject { databases.import.source('foo') }
+
+      it "counts a total of zero" do
+        subject.counts[:total].should == 0
+      end
+
+      it "counts zero imported" do
+        subject.counts[:imported].should == 0
+      end
+
+      it "counts zero exported" do
+        subject.counts[:exported].should == 0
+      end
+    end
+
+    context "a collection with two documents" do
+      let(:mongo) { Squealer::Database.instance.import.send(:instance_variable_get, '@dbc') }
+
+      subject do
+        mongo.collection('foo').save({'name' => 'Bar'});
+        mongo.collection('foo').save({'name' => 'Baz'});
+        source = databases.import.source('foo') # activate the counter
+        source.send(:instance_variable_set, :@progress_bar, nil)
+        Squealer::ProgressBar.send(:class_variable_set, :@@progress_bar, nil)
+        source
+      end
+
+      after do
+        mongo.collection('foo').drop
+      end
+
+      it "returns a Source" do
+        subject.should be_a_kind_of(Squealer::Database::Source)
+      end
+
+      it "counts a total of two" do
+        subject.counts[:total].should == 2
+      end
+
+      context "before iterating" do
+        it "counts zero imported" do
+          subject.counts[:imported].should == 0
+        end
+
+        it "counts zero exported" do
+          subject.counts[:exported].should == 0
+        end
+      end
+
+      context "after iterating" do
+        before do
+          subject.each {}
+        end
+
+        it "counts two imported" do
+          subject.counts[:imported].should == 2
+        end
+
+        it "counts two exported" do
+          subject.counts[:exported].should == 2
+        end
+      end
+
+      context "real squeal" do
+        # before { pending "interactive_view" }
+        it "exports that stuff to SQL" do
+          databases.export_to($do_adapter, 'localhost', $do_user, $do_pass, $db_name)
+          databases.import.source("users").each do |user|
+            target(:user) do |target|
+              target.instance_variable_get('@row_id').should == user['_id'].to_s
+              assign(:organization_id)
+              assign(:name)
+
+              #TODO: Update README to highlight that all embedded docs should have an _id
+              # as all Ruby mappers for MongoDB make one. (according to Durran)
+              user.activities.each do |activity|
+                target(:activity) do |target|
+                  assign(:user_id)
+                  assign(:name)
+                  assign(:due_date)
+                end
+              end
+            end
+          end
+        end
+      end
+
+    end
+
+  end
+
+  describe "export" do
+    let(:databases) { Squealer::Database.instance }
+
+    it "creates a DataObjects connection to the export database" do
+      databases.export_to($do_adapter, 'localhost', $do_user, $do_pass, $db_name)
+      databases.instance_variable_get('@export_do').should be_a_kind_of DataObjects::Connection
+    end
+  end
+
+  describe "upsertable?" do
+    subject { Squealer::Database.instance }
+
+    if defined?(DataObjects::Mysql)
+      context "mysql connection" do
+        before do
+          subject.export_to('mysql', 'localhost', $do_user, $do_pass, 'mysql')
+        end
+
+        it { should be_upsertable }
+      end
+    end
+
+    if defined?(DataObjects::Postgres)
+      context "postgres connection" do
+        before do
+          subject.export_to('postgres', 'localhost', $do_user, $do_pass, 'postgres')
+        end
+
+        it { should_not be_upsertable }
+      end
+    end
+  end
+
+end

data/spec/integration/spec_helper_dbms.rb

@@ -0,0 +1,111 @@
+require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + "/./spec_helper_dbms_#{ENV['EXPORT_DBMS']||'mysql'}")
+
+Spec::Runner.configure do |config|
+  config.before(:suite) do
+    $db_name = "squealer_test_export_#{object_id}"
+    create_export_db($db_name)
+    create_import_db($db_name)
+  end
+
+  config.after(:suite) do
+    DataObjects::Pooling.pools.each {|pool| pool.flush!}
+    drop_export_test_db($db_name)
+
+    drop_mongo
+  end
+
+  config.before(:each) do
+    if self.class.example_implementations.first.first.location =~ %r{/spec/integration/}
+      Squealer::Database.instance.export_to($do_adapter, $do_host, $do_user, $do_pass, $db_name)
+      truncate_export_tables(Squealer::Database.instance.export)
+    end
+  end
+  config.after(:each) do
+    if self.class.example_implementations.first.first.location =~ %r{/spec/integration/}
+      Squealer::Database.instance.export.release
+    end
+  end
+end
+
+def create_import_db(name)
+  Squealer::Database.instance.import_from('localhost', 27017, name)
+  @mongo = Squealer::Database.instance.import.instance_variable_get('@dbc')
+  drop_mongo
+  seed_import
+end
+
+def drop_mongo
+  @mongo.eval('db.dropDatabase()') if @mongo
+end
+
+def seed_import
+  hashrocket = @mongo.collection('organizations').save({ :name => 'Hashrocket' })
+  zorganization = @mongo.collection('organizations').save({ :name => 'Zorganization', :disabled_date => as_time(Date.today) })
+
+  users = [
+    { :name => 'Josh Graham', :dob => as_time(Date.parse('01-Jan-1971')), :gender => 'M',
+      :organization_id => hashrocket,
+      :activities => [
+        { :_id => id, :name => 'Develop squealer', :due_date => as_time(Date.today + 1) },
+        { :_id => id, :name => 'Organize speakerconf.com', :due_date => as_time(Date.today + 30) },
+        { :_id => id, :name => 'Hashrocket party', :due_date => as_time(Date.today + 7) }
+      ]
+    },
+    { :name => 'Bernerd Schaefer', :dob => as_time(Date.parse('31-Dec-1985')), :gender => 'M',
+      :organization_id => hashrocket,
+      :activities => [
+        { :_id => id, :name => 'Retype all of the code Josh wrote in squealer', :due_date => as_time(Date.today + 2) },
+        { :_id => id, :name => 'Listen to rare Thelonius Monk EP', :due_date => as_time(Date.today) },
+        { :_id => id, :name => 'Practice karaoke', :due_date => as_time(Date.today + 7) }
+      ]
+    },
+    { :name => 'Your momma', :dob => as_time(Date.parse('15-Jun-1955')), :gender => 'F',
+      :organization_id => zorganization,
+      :activities => [
+        { :_id => id, :name => 'Cook me some pie', :due_date => as_time(Date.today) },
+        { :_id => id, :name => 'Make me a sammich', :due_date => as_time(Date.today) }
+      ]
+    }
+  ]
+
+  users.each { |user| @mongo.collection('users').save user }
+end
+
+
+def truncate_export_tables(dbc)
+  %w{user activity organization}.each do |t|
+    text = %{TRUNCATE TABLE "#{t}"}
+    dbc.create_command(text).execute_non_query
+  end
+end
+
+def non_query(text)
+  dbc = do_conn
+  dbc.create_command(text).execute_non_query
+  dbc.release
+end
+
+def drop_export_test_db(name)
+  dbc = do_conn_default
+  dbc.create_command("DROP DATABASE IF EXISTS #{name}").execute_non_query
+  dbc.release
+end
+
+def do_conn
+  DataObjects::Connection.new("#{$do_adapter}://#{at_host}/#{$db_name}")
+end
+
+def do_conn_default
+  DataObjects::Connection.new("#{$do_adapter}://#{at_host}/#{$do_adapter}")
+end
+
+def at_host
+  creds = ""
+  creds << $do_user if $do_user
+  creds << ":#{$do_pass}" if $do_pass
+
+  at_host = ""
+  at_host << "#{creds}@" unless creds.empty?
+  at_host << $do_host
+end

data/spec/{spec_helper_dbms_mysql.rb → integration/spec_helper_dbms_mysql.rb}

@@ -1,19 +1,17 @@
+require 'do_mysql'
+
+$do_adapter = 'mysql'
+$do_host = 'localhost'
+$do_user = 'root'
+$do_pass = ''
+
 def create_export_db(name)
-  require 'do_mysql'
-  $db_adapter = 'mysql'
-  dbc = DataObjects::Connection.new("mysql://root@localhost/mysql")
+  dbc = do_conn_default
   dbc.create_command("DROP DATABASE IF EXISTS #{name}").execute_non_query
   dbc.create_command("CREATE DATABASE #{name}").execute_non_query
   dbc.create_command("SET sql_mode='ANSI_QUOTES'").execute_non_query
+  dbc.release
   create_export_tables
-  dbc.dispose
-end
-
-def drop_export_test_db(name)
-  @export_dbc.dispose if @export_dbc
-  dbc = DataObjects::Connection.new("mysql://root@localhost/mysql")
-  dbc.create_command("DROP DATABASE IF EXISTS #{name}").execute_non_query
-  dbc.dispose
 end
 
 def create_export_tables
@@ -50,8 +48,3 @@ def create_export_tables
   COMMAND
   non_query(command)
 end
-
-def export_dbc
-  $db_user ||= 'root'
-  @export_dbc ||= DataObjects::Connection.new("mysql://root@localhost/#{$db_name}")
-end

data/spec/{spec_helper_dbms_postgres.rb → integration/spec_helper_dbms_postgres.rb}

@@ -1,18 +1,16 @@
+require 'do_postgres'
+
+$do_adapter = 'postgres'
+$do_host = 'localhost'
+$do_user = nil 
+$do_pass = nil
+
 def create_export_db(name)
-  require 'do_postgres'
-  $db_adapter = 'postgres'
-  dbc = DataObjects::Connection.new("postgres://localhost/postgres")
+  dbc = do_conn_default
   dbc.create_command("DROP DATABASE IF EXISTS #{name}").execute_non_query
   dbc.create_command("CREATE DATABASE #{name}").execute_non_query
+  dbc.release
   create_export_tables
-  dbc.dispose
-end
-
-def drop_export_test_db(name)
-  @export_dbc.dispose if @export_dbc
-  dbc = DataObjects::Connection.new("postgres://localhost/postgres")
-  dbc.create_command("DROP DATABASE IF EXISTS #{name}").execute_non_query
-  dbc.dispose
 end
 
 def create_export_tables
@@ -49,8 +47,3 @@ def create_export_tables
   COMMAND
   non_query(command)
 end
-
-def export_dbc
-  $db_user ||= ''
-  @export_dbc ||= DataObjects::Connection.new("postgres://localhost/#{$db_name}")
-end

data/spec/spec_helper.rb

@@ -4,89 +4,13 @@ require 'rubygems'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
 require 'squealer'
-require "spec_helper_dbms_#{ENV['EXPORT_DBMS']||'mysql'}"
-
-Spec::Runner.configure do |config|
-  config.before(:suite) do
-    $db_name = "test_export_#{object_id}"
-    create_export_db($db_name)
-    create_import_db($db_name)
-  end
-
-  config.after(:suite) do
-    Squealer::Database.instance.send(:dispose_all_connections)
-    drop_export_test_db($db_name)
-
-    drop_mongo
-  end
-
-  config.after(:each) do
-    @export_dbc.dispose if @export_dbc
-  end
-
-  def create_import_db(name)
-    Squealer::Database.instance.import_from('localhost', 27017, name)
-    @mongo = Squealer::Database.instance.import.instance_variable_get('@dbc')
-    drop_mongo
-    seed_import
-  end
-
-  def drop_mongo
-    @mongo.eval('db.dropDatabase()') if @mongo
-  end
 
-  def seed_import
-    hashrocket = @mongo.collection('organizations').save({ :name => 'Hashrocket' })
-    zorganization = @mongo.collection('organizations').save({ :name => 'Zorganization', :disabled_date => as_time(Date.today) })
-
-    users = [
-      { :name => 'Josh Graham', :dob => as_time(Date.parse('01-Jan-1971')), :gender => 'M',
-        :organization_id => hashrocket,
-        :activities => [
-          { :_id => id, :name => 'Develop squealer', :due_date => as_time(Date.today + 1) },
-          { :_id => id, :name => 'Organize speakerconf.com', :due_date => as_time(Date.today + 30) },
-          { :_id => id, :name => 'Hashrocket party', :due_date => as_time(Date.today + 7) }
-        ]
-      },
-      { :name => 'Bernerd Schaefer', :dob => as_time(Date.parse('31-Dec-1985')), :gender => 'M',
-        :organization_id => hashrocket,
-        :activities => [
-          { :_id => id, :name => 'Retype all of the code Josh wrote in squealer', :due_date => as_time(Date.today + 2) },
-          { :_id => id, :name => 'Listen to rare Thelonius Monk EP', :due_date => as_time(Date.today) },
-          { :_id => id, :name => 'Practice karaoke', :due_date => as_time(Date.today + 7) }
-        ]
-      },
-      { :name => 'Your momma', :dob => as_time(Date.parse('15-Jun-1955')), :gender => 'F',
-        :organization_id => zorganization,
-        :activities => [
-          { :_id => id, :name => 'Cook me some pie', :due_date => as_time(Date.today) },
-          { :_id => id, :name => 'Make me a sammich', :due_date => as_time(Date.today) }
-        ]
-      }
-    ]
-
-    users.each { |user| @mongo.collection('users').save user }
-  end
-
-
-  def truncate_export_tables
-    non_query('TRUNCATE TABLE "user"')
-    non_query('TRUNCATE TABLE "activity"')
-    non_query('TRUNCATE TABLE "organization"')
-  end
-
-  def as_time(date)
-    Time.parse(date.to_s)
-  end
-
-  def non_query(text)
-    export_dbc.create_command(text).execute_non_query
-  end
+def as_time(date)
+  Time.parse(date.to_s)
+end
 
-  def id
-    require 'digest/sha1'
-    (Digest::SHA1.hexdigest rand.to_s)[0,24]
-  end
+def id
+  require 'digest/sha1'
+  (Digest::SHA1.hexdigest rand.to_s)[0,24]
 end

data/spec/squealer/database_spec.rb

@@ -1,163 +1,4 @@
 require 'spec_helper'
-require 'mongo'
 
 describe Squealer::Database do
-  it "is a singleton" do
-    Squealer::Database.respond_to?(:instance).should be_true
-  end
-
-  describe "import" do
-    let(:databases) { Squealer::Database.instance }
-
-
-    it "takes an import database" do
-      databases.send(:instance_variable_get, '@import_dbc').should be_a_kind_of(Mongo::DB)
-    end
-
-    it "returns a squealer connection object" do
-      databases.import.should be_a_kind_of(Squealer::Database::Connection)
-    end
-
-    it "delegates eval to Mongo" do
-      databases.send(:instance_variable_get, '@import_dbc').eval('db.getName()').should == $db_name
-      databases.import.eval('db.getName()').should == $db_name
-    end
-  end
-
-  describe "source" do
-    let(:databases) { Squealer::Database.instance }
-
-    before { databases.import_from('localhost', 27017, $db_name) }
-
-    it "returns a Source" do
-      databases.import.source('foo').should be_a_kind_of(Squealer::Database::Source)
-    end
-
-    describe "Source::cursor" do
-      it "returns a databases cursor" do
-        databases.import.source('foo').cursor.should be_a_kind_of(Mongo::Cursor)
-      end
-    end
-
-    context "an empty collection" do
-      subject { databases.import.source('foo') }
-
-      it "counts a total of zero" do
-        subject.counts[:total].should == 0
-      end
-
-      it "counts zero imported" do
-        subject.counts[:imported].should == 0
-      end
-
-      it "counts zero exported" do
-        subject.counts[:exported].should == 0
-      end
-    end
-
-    context "a collection with two documents" do
-      let(:mongo) { Squealer::Database.instance.import.send(:instance_variable_get, '@dbc') }
-
-      subject do
-        mongo.collection('foo').save({'name' => 'Bar'});
-        mongo.collection('foo').save({'name' => 'Baz'});
-        source = databases.import.source('foo') # activate the counter
-        source.send(:instance_variable_set, :@progress_bar, nil)
-        Squealer::ProgressBar.send(:class_variable_set, :@@progress_bar, nil)
-        source
-      end
-
-      after do
-        mongo.collection('foo').drop
-      end
-
-      it "returns a Source" do
-        subject.should be_a_kind_of(Squealer::Database::Source)
-      end
-
-      it "counts a total of two" do
-        subject.counts[:total].should == 2
-      end
-
-      context "before iterating" do
-        it "counts zero imported" do
-          subject.counts[:imported].should == 0
-        end
-
-        it "counts zero exported" do
-          subject.counts[:exported].should == 0
-        end
-      end
-
-      context "after iterating" do
-        before do
-          subject.each {}
-        end
-
-        it "counts two imported" do
-          subject.counts[:imported].should == 2
-        end
-
-        it "counts two exported" do
-          subject.counts[:exported].should == 2
-        end
-      end
-
-      context "real squeal" do
-        # before { pending "interactive_view" }
-        it "exports that stuff to SQL" do
-          databases.export_to($db_adapter, 'localhost', $db_user, '', $db_name)
-          databases.import.source("users").each do |user|
-            target(:user) do |target|
-              target.instance_variable_get('@row_id').should == user['_id'].to_s
-              assign(:organization_id)
-              assign(:name)
-
-              #TODO: Update README to highlight that all embedded docs should have an _id
-              # as all Ruby mappers for MongoDB make one. (according to Durran)
-              user.activities.each do |activity|
-                target(:activity) do |target|
-                  assign(:user_id)
-                  assign(:name)
-                  assign(:due_date)
-                end
-              end
-            end
-          end
-        end
-      end
-
-    end
-
-  end
-
-  describe "export" do
-    let(:databases) { Squealer::Database.instance }
-
-    it "takes an export database" do
-      databases.export_to($db_adapter, 'localhost', $db_user, '', $db_name)
-      databases.instance_variable_get('@export_do').should_not be_nil
-    end
-  end
-
-  describe "upsertable?" do
-    subject { Squealer::Database.instance }
-
-    context "mysql connection" do
-      before do
-        subject.export_to('mysql', 'localhost', 'root', '', 'mysql')
-      end
-
-      it { should be_upsertable }
-    end
-
-    context "postgres connection" do
-      before do
-        subject.export_to('postgres', 'localhost', '', '', 'postgres')
-      end
-
-      it { should_not be_upsertable }
-    end
-  end
-
 end

data/spec/squealer/object_spec.rb

@@ -30,11 +30,6 @@ describe Object do
       target(:test_table) { nil }
     end
 
-    it "uses the export database connection" do
-      mock_mysql
-      target(:test_table) { nil }
-    end
-
   end
 
   describe "#assign" do
@@ -112,6 +107,8 @@ describe Object do
   end
 
   def mock_mysql
+    require 'data_objects'
+
     my = mock(DataObjects::Connection)
     comm = mock(DataObjects::Command)
     Squealer::Database.instance.should_receive(:export).at_least(:once).and_return(my)

data/spec/squealer/target_spec.rb

@@ -281,3 +281,8 @@ module Squealer
     end
   end
 end
+
+module BSON
+  class ObjectID; end
+end
+

data/squealer.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{squealer}
-  s.version = "2.2.1"
+  s.version = "2.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Josh Graham", "Durran Jordan", "Matt Yoho", "Bernerd Schaefer"]
-  s.date = %q{2010-06-23}
+  s.date = %q{2010-06-29}
   s.default_executable = %q{skewer}
-  s.description = %q{Exports MongoDB to MySQL or PostgreSQL.}
+  s.description = %q{A Ruby DSL for exporting MongoDB to MySQL or PostgreSQL. You don't need to install both, just one. Use EXPORT_DBMS=[mysql|postgres] environment variable to specify the appropriate adapter.}
   s.email = %q{joshua.graham@grahamis.com}
   s.executables = ["skewer"]
   s.extra_rdoc_files = [
@@ -36,10 +36,12 @@ Gem::Specification.new do |s|
      "lib/squealer/target.rb",
      "lib/tasks/jeweler.rake",
      "spec/integration/export_a_record_spec.rb",
+     "spec/integration/imports_from_mongodb.rb",
+     "spec/integration/spec_helper_dbms.rb",
+     "spec/integration/spec_helper_dbms_mysql.rb",
+     "spec/integration/spec_helper_dbms_postgres.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
-     "spec/spec_helper_dbms_mysql.rb",
-     "spec/spec_helper_dbms_postgres.rb",
      "spec/squealer/database_spec.rb",
      "spec/squealer/hash_spec.rb",
      "spec/squealer/object_spec.rb",
@@ -51,12 +53,14 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.6}
-  s.summary = %q{Document-oriented database to RDBMS exports}
+  s.summary = %q{Export document-oriented database to RDBMS}
   s.test_files = [
     "spec/integration/export_a_record_spec.rb",
+     "spec/integration/imports_from_mongodb.rb",
+     "spec/integration/spec_helper_dbms.rb",
+     "spec/integration/spec_helper_dbms_mysql.rb",
+     "spec/integration/spec_helper_dbms_postgres.rb",
      "spec/spec_helper.rb",
-     "spec/spec_helper_dbms_mysql.rb",
-     "spec/spec_helper_dbms_postgres.rb",
      "spec/squealer/database_spec.rb",
      "spec/squealer/hash_spec.rb",
      "spec/squealer/object_spec.rb",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 2
-  - 1
-  version: 2.2.1
+  - 2
+  version: 2.2.2
 platform: ruby
 authors: 
 - Josh Graham
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-23 00:00:00 -05:00
+date: 2010-06-29 00:00:00 -05:00
 default_executable: skewer
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -104,7 +104,7 @@ dependencies:
         version: 1.3.0
   type: :development
   version_requirements: *id006
-description: Exports MongoDB to MySQL or PostgreSQL.
+description: A Ruby DSL for exporting MongoDB to MySQL or PostgreSQL. You don't need to install both, just one. Use EXPORT_DBMS=[mysql|postgres] environment variable to specify the appropriate adapter.
 email: joshua.graham@grahamis.com
 executables: 
 - skewer
@@ -131,10 +131,12 @@ files:
 - lib/squealer/target.rb
 - lib/tasks/jeweler.rake
 - spec/integration/export_a_record_spec.rb
+- spec/integration/imports_from_mongodb.rb
+- spec/integration/spec_helper_dbms.rb
+- spec/integration/spec_helper_dbms_mysql.rb
+- spec/integration/spec_helper_dbms_postgres.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- spec/spec_helper_dbms_mysql.rb
-- spec/spec_helper_dbms_postgres.rb
 - spec/squealer/database_spec.rb
 - spec/squealer/hash_spec.rb
 - spec/squealer/object_spec.rb
@@ -170,12 +172,14 @@ rubyforge_project:
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: Document-oriented database to RDBMS exports
+summary: Export document-oriented database to RDBMS
 test_files: 
 - spec/integration/export_a_record_spec.rb
+- spec/integration/imports_from_mongodb.rb
+- spec/integration/spec_helper_dbms.rb
+- spec/integration/spec_helper_dbms_mysql.rb
+- spec/integration/spec_helper_dbms_postgres.rb
 - spec/spec_helper.rb
-- spec/spec_helper_dbms_mysql.rb
-- spec/spec_helper_dbms_postgres.rb
 - spec/squealer/database_spec.rb
 - spec/squealer/hash_spec.rb
 - spec/squealer/object_spec.rb