txdb 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e59bfc3e60354b89d0a572dc8639ecc1bec5146
-  data.tar.gz: 05599e91b876f536edabd4f05163f769fbf2a2c5
+  metadata.gz: 0c2c319827b4fdab7a23880e83db01a22cbff37f
+  data.tar.gz: e4daed35214662b575b686607b825b29fed8aed7
 SHA512:
-  metadata.gz: 7903d1a0966bc7428dce7de537418ba437e06e48ec95032c4fb21bcc513c8703552c28183be6e23b6271b2f5b921d8ebe5eb4e27500c005c3316590daa84f7a2
-  data.tar.gz: 470a4c9d4d8df0a31f8d8c1275384dab4ba8c487266a6093ad44299ba42e12f61ea0b750e1c814a9b5c2e289204b1b110b83bf8aa5c93c204beb2d74cd3a21e4
+  metadata.gz: c0e524ba754bed238ccf5647f1711c357cf87a59fd558fb6fa69e06732c6570eb4486f87de36634f9488d79499db1b1e36acd86ebb3836e791684e35aa472f94
+  data.tar.gz: 78b1aa0ada81ef0c9369b46177a4dedf6db6a5fcd07c31151167544dac9bfe69bc0178eeb5b8ce35b525d90210f0b40d9569cba5acc6b36de235d794f984a004

data/lib/txdb.rb

@@ -9,6 +9,7 @@ module Txdb
   autoload :Downloader,       'txdb/downloader'
   autoload :Handlers,         'txdb/handlers'
   autoload :Hooks,            'txdb/app'
+  autoload :Iterators,        'txdb/iterators'
   autoload :Response,         'txdb/response'
   autoload :ResponseHelpers,  'txdb/response_helpers'
   autoload :Table,            'txdb/table'

data/lib/txdb/backends/globalize/reader.rb

@@ -51,7 +51,7 @@ module Txdb
         end
 
         def content_for_records
-          each_record.each_with_object({}) do |record, ret|
+          iterator.each_with_object({}) do |record, ret|
             ret[record[:id]] = content_for_record(record)
           end
         end
@@ -61,33 +61,13 @@ module Txdb
             value = record[col.to_sym]
 
             unless value.to_s.strip.empty?
-              ret[col] = value
+              ret[col.to_s] = value
             end
           end
         end
 
-        def each_record
-          return to_enum(__method__) unless block_given?
-
-          counter = 0
-          last_id = nil
-
-          loop do
-            records = table.db
-              .from(origin_table_name(table.name))
-              .where { id >= counter }
-              .order(:id)
-              .limit(50)
-
-            break if records.count == 0
-
-            records.each do |record|
-              yield record
-              last_id = record[:id]
-            end
-
-            counter = last_id + 1
-          end
+        def iterator
+          @iterator ||= Iterators::GlobalizeIterator.new(table)
         end
       end
 

data/lib/txdb/backends/globalize/writer.rb

@@ -25,10 +25,12 @@ module Txdb
         private
 
         def update_row(id, fields, locale)
-          row = table.db.where(foreign_key.to_sym => id, locale: locale)
+          row = table.connection.where(
+            foreign_key.to_sym => id, locale: locale
+          )
 
           if row.empty?
-            table.db << fields
+            table.connection << fields
               .merge(foreign_key.to_sym => id, locale: locale)
               .merge(created_at)
               .merge(updated_at)
@@ -38,12 +40,12 @@ module Txdb
         end
 
         def created_at
-          return {} unless table.db.columns.include?(:created_at)
+          return {} unless table.connection.columns.include?(:created_at)
           { created_at: get_utc_time }
         end
 
         def updated_at
-          return {} unless table.db.columns.include?(:updated_at)
+          return {} unless table.connection.columns.include?(:updated_at)
           { updated_at: get_utc_time }
         end
 

data/lib/txdb/database.rb

@@ -25,16 +25,21 @@ module Txdb
       end
     end
 
-    def db
-      @db ||= Sequel.connect(connection_string, max_connections: pool)
+    def connection
+      @connection ||= Sequel.connect(connection_string, max_connections: pool)
     end
 
     def from(*args, &block)
-      db.from(*args, &block)
+      connection.from(*args, &block)
     end
 
     def transifex_api
       transifex_project.api
     end
+
+    def find_table(name)
+      name = name.to_s
+      tables.find { |table| table.name == name }
+    end
   end
 end

data/lib/txdb/downloader.rb

@@ -3,8 +3,8 @@ require 'txgh'
 module Txdb
   class Downloader
     class << self
-      def download(database)
-        new(database).download
+      def download(database, locale)
+        new(database).download(locale)
       end
     end
 

data/lib/txdb/iterators.rb

@@ -0,0 +1,6 @@
+module Txdb
+  module Iterators
+    autoload :AutoIncrementIterator, 'txdb/iterators/auto_increment_iterator'
+    autoload :GlobalizeIterator,     'txdb/iterators/globalize_iterator'
+  end
+end

data/lib/txdb/iterators/auto_increment_iterator.rb

@@ -0,0 +1,61 @@
+module Txdb
+  module Iterators
+    class AutoIncrementIterator
+      include Enumerable
+
+      DEFAULT_BATCH_SIZE = 50
+      DEFAULT_COLUMN = :id
+
+      attr_reader :table, :batch_size, :column
+
+      def initialize(table, options = {})
+        @table = table
+        @batch_size = options.fetch(:batch_size, DEFAULT_BATCH_SIZE)
+        @column = options.fetch(:column, DEFAULT_COLUMN)
+      end
+
+      def each
+        return to_enum(__method__) unless block_given?
+
+        counter = 0
+        last_value = nil
+        sql_column = Sequel.expr(column)
+
+        loop do
+          records = table.connection
+            .from(table_name)
+            .where { sql_column >= counter }
+            .order(column)
+            .limit(batch_size)
+
+          break if records.count == 0
+
+          records.each do |record|
+            yield record
+            last_value = record[column]
+          end
+
+          counter = last_value + 1
+        end
+      end
+
+      alias_method :each_record, :each
+
+      def compact_map
+        return to_enum(__method__) unless block_given?
+
+        each_with_object([]) do |elem, ret|
+          if val = yield(elem)
+            ret << val
+          end
+        end
+      end
+
+      private
+
+      def table_name
+        table.name
+      end
+    end
+  end
+end

data/lib/txdb/iterators/globalize_iterator.rb

@@ -0,0 +1,13 @@
+module Txdb
+  module Iterators
+    class GlobalizeIterator < AutoIncrementIterator
+      private
+
+      include Backends::Globalize::Helpers
+
+      def table_name
+        origin_table_name(table.name)
+      end
+    end
+  end
+end

data/lib/txdb/table.rb

@@ -12,8 +12,8 @@ module Txdb
       @source_lang = options.fetch(:source_lang)
     end
 
-    def db
-      database.db.from(name)
+    def connection
+      database.connection.from(name)
     end
 
     def read_content

data/lib/txdb/version.rb

@@ -1,3 +1,3 @@
 module Txdb
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/spec/backends/globalize/helpers_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
-require 'spec_helpers/test_db'
+require 'spec_helpers/test_configurator'
 
 include Txdb::Backends
 
-describe Globalize::Helpers, test_db: true do
+describe Globalize::Helpers, test_config: true do
   describe '.origin_table_name' do
     it 'pluralizes and removes the translations suffix' do
       origin = Globalize::Helpers.origin_table_name('widget_translations')
@@ -17,8 +17,15 @@ describe Globalize::Helpers, test_db: true do
   end
 
   describe '#resource_slug_for' do
-    let(:database) { TestDb.database }
-    let(:table) { database.tables.first }
+    let(:database) do
+      Txdb::TestConfigurator.setup do
+        create_table(:my_table) do
+          primary_key :id
+        end
+      end
+    end
+
+    let(:table) { database.find_table(:my_table) }
 
     it 'constructs a slug from the database and table names' do
       expect(Globalize::Helpers.resource_slug_for(table)).to eq(

data/spec/backends/globalize/reader_spec.rb

@@ -1,28 +1,28 @@
 require 'spec_helper'
-require 'spec_helpers/globalize_db'
+require 'spec_helpers/globalize_configurator'
 require 'yaml'
 
 include Txdb::Backends
 
-describe Globalize::Reader, globalize_db: true do
+describe Globalize::Reader, globalize_config: true do
   include_context :globalize
 
   describe '#read_content' do
     it 'reads data from the given table and returns an array of resources' do
-      sprocket_id = widgets.insert(name: 'sprocket')
-      flange_id = widgets.insert(name: 'flange')
-      widget_translations.insert(widget_id: sprocket_id, locale: 'es', name: 'sproqueta')
-      widget_translations.insert(widget_id: flange_id, locale: 'es', name: 'flango')
+      sprocket_id = widgets.connection.insert(name: 'sprocket')
+      flange_id = widgets.connection.insert(name: 'flange')
+      widget_translations.connection.insert(widget_id: sprocket_id, locale: 'es', name: 'sproqueta')
+      widget_translations.connection.insert(widget_id: flange_id, locale: 'es', name: 'flango')
 
-      reader = Globalize::Reader.new(widget_translations_table)
+      reader = Globalize::Reader.new(widget_translations)
       resources = reader.read_content
       expect(resources.size).to eq(1)
       resource = resources.first
 
-      expect(resource.source_file).to eq(widget_translations_table.name)
+      expect(resource.source_file).to eq(widget_translations.name)
       expect(resource.project_slug).to eq(database.transifex_project.project_slug)
       expect(resource.resource_slug).to(
-        eq(Globalize::Helpers.resource_slug_for(widget_translations_table))
+        eq(Globalize::Helpers.resource_slug_for(widget_translations))
       )
 
       expect(resource.content).to eq(

data/spec/backends/globalize/writer_spec.rb

@@ -1,12 +1,12 @@
 require 'active_support/core_ext/numeric/time'
 require 'spec_helper'
-require 'spec_helpers/globalize_db'
+require 'spec_helpers/globalize_configurator'
 require 'timecop'
 require 'yaml'
 
 include Txdb::Backends
 
-describe Globalize::Writer, globalize_db: true do
+describe Globalize::Writer, globalize_config: true do
   include_context :globalize
 
   describe '#write_content' do
@@ -21,8 +21,8 @@ describe Globalize::Writer, globalize_db: true do
 
     context 'with some content' do
       before(:each) do
-        @sprocket_id = widgets.insert(name: 'sprocket')
-        @writer = Globalize::Writer.new(widget_translations_table)
+        @sprocket_id = widgets.connection.insert(name: 'sprocket')
+        @writer = Globalize::Writer.new(widget_translations)
 
         @content = YAML.dump(
           'widgets' => {
@@ -35,10 +35,10 @@ describe Globalize::Writer, globalize_db: true do
 
       it 'inserts the translations into the database' do
         expect { @writer.write_content(@resource, 'es') }.to(
-          change { widget_translations.count }.from(0).to(1)
+          change { widget_translations.connection.count }.from(0).to(1)
         )
 
-        translation = widget_translations.first
+        translation = widget_translations.connection.first
 
         expect(translation).to include(
           widget_id: @sprocket_id, name: 'sproqueta', locale: 'es'
@@ -47,7 +47,7 @@ describe Globalize::Writer, globalize_db: true do
 
       context 'with created_at and updated_at columns' do
         before(:each) do
-          GlobalizeDb.db.alter_table(:widget_translations) do
+          database.connection.alter_table(:widget_translations) do
             add_column :created_at, Time
             add_column :updated_at, Time
           end
@@ -56,7 +56,7 @@ describe Globalize::Writer, globalize_db: true do
         it 'fills in the created_at and updated_at columns' do
           Timecop.freeze(Time.now) do
             @writer.write_content(@resource, 'es')
-            translation = widget_translations.first
+            translation = widget_translations.connection.first
             expect(translation[:created_at].to_i).to eq(Time.now.utc.to_i)
             expect(translation[:updated_at].to_i).to eq(Time.now.utc.to_i)
           end
@@ -68,12 +68,12 @@ describe Globalize::Writer, globalize_db: true do
           today = Time.now + 1.day  # groundhog day
 
           Timecop.freeze(today) do
-            translation = widget_translations.first
+            translation = widget_translations.connection.first
             expect(translation[:updated_at].to_i).to_not eq(today.utc.to_i)
 
             # record already exists, so should get updated with new timestamp
             @writer.write_content(@resource, 'es')
-            translation = widget_translations.first
+            translation = widget_translations.connection.first
             expect(translation[:updated_at].to_i).to eq(today.utc.to_i)
           end
         end
@@ -81,12 +81,12 @@ describe Globalize::Writer, globalize_db: true do
     end
 
     it 'updates the record if it already exists' do
-      sprocket_id = widgets.insert(name: 'sprocket')
-      sprocket_trans_id = widget_translations.insert(
+      sprocket_id = widgets.connection.insert(name: 'sprocket')
+      sprocket_trans_id = widget_translations.connection.insert(
         widget_id: sprocket_id, locale: 'es', name: 'sproqueta'
       )
 
-      writer = Globalize::Writer.new(widget_translations_table)
+      writer = Globalize::Writer.new(widget_translations)
 
       content = YAML.dump(
         'widgets' => {
@@ -97,10 +97,10 @@ describe Globalize::Writer, globalize_db: true do
       resource = Txdb::TxResource.new(base_resource, content)
 
       expect { writer.write_content(resource, 'es') }.to_not(
-        change { widget_translations.count }
+        change { widget_translations.connection.count }
       )
 
-      translation = widget_translations.where(id: sprocket_trans_id).first
+      translation = widget_translations.connection.where(id: sprocket_trans_id).first
       expect(translation).to include(name: 'sproqueta2')
     end
   end

data/spec/config_spec.rb

@@ -1,5 +1,5 @@
 require 'spec_helper'
-require 'spec_helpers/test_db'
+require 'spec_helpers/test_configurator'
 require 'tempfile'
 require 'yaml'
 
@@ -10,9 +10,23 @@ describe Txdb::Config do
     Txdb::Config.instance_variable_set(:@raw_config, nil)
   end
 
+  let(:config) do
+    {
+      databases: [
+        Txdb::TestConfigurator.base_config.tap do |base_config|
+          base_config[:tables] << {
+            name: 'my_table',
+            source_lang: 'en',
+            columns: []
+          }
+        end
+      ]
+    }
+  end
+
   describe '.databases' do
     it 'loads config from a string' do
-      with_env('TXDB_CONFIG' => "raw://#{YAML.dump(TestDb.raw_config)}") do
+      with_env('TXDB_CONFIG' => "raw://#{YAML.dump(config)}") do
         expect(Txdb::Config.databases.size).to eq(1)
         database = Txdb::Config.databases.first
 
@@ -25,7 +39,7 @@ describe Txdb::Config do
 
     it 'loads config from a file' do
       file = Tempfile.new('translations')
-      file.write(YAML.dump(TestDb.raw_config))
+      file.write(YAML.dump(config))
       file.flush
 
       with_env('TXDB_CONFIG' => "file://#{file.path}") do
@@ -45,14 +59,14 @@ describe Txdb::Config do
 
   describe '.each_table' do
     it 'returns an enumerator' do
-      expect(Txdb::Config.each_table).to be_a(Enumerator)
+      with_env('TXDB_CONFIG' => "raw://#{YAML.dump(config)}") do
+        expect(Txdb::Config.each_table).to be_a(Enumerator)
+      end
     end
 
     it 'yields each table in each database' do
       # set up another database with another table so we can make sure the
       # method loops over more than one db, yielding tables from each
-      config = TestDb.raw_config.dup
-      config[:databases] = config[:databases].dup
       config[:databases] << config[:databases].first.merge(
         database: 'spec/test2.sqlite3',
         tables: [

data/spec/database_spec.rb

@@ -1,18 +1,20 @@
 require 'spec_helper'
-require 'spec_helpers/test_db'
+require 'spec_helpers/test_configurator'
 
 include Txdb
 
-describe Database, test_db: true do
-  let(:database) { TestDb.database }
+describe Database, test_config: true do
+  let(:database) do
+    TestConfigurator.setup
+  end
 
   describe '#db' do
     it 'provides access to the database connection' do
-      expect(database.db).to be_a(Sequel::SQLite::Database)
+      expect(database.connection).to be_a(Sequel::SQLite::Database)
     end
 
     it 'sets the max number of connections as specified in the config' do
-      expect(database.db.pool.max_size).to eq(database.pool)
+      expect(database.connection.pool.max_size).to eq(database.pool)
     end
   end
 

data/spec/downloader_spec.rb

@@ -1,11 +1,18 @@
 require 'spec_helper'
-require 'spec_helpers/test_db'
+require 'spec_helpers/test_configurator'
 require 'spec_helpers/test_backend'
 
 include Txdb
 
-describe Downloader, test_db: true do
-  let(:database) { TestDb.database }
+describe Downloader, test_config: true do
+  let(:database) do
+    TestConfigurator.setup do
+      create_table(:foo) do
+        primary_key :id
+      end
+    end
+  end
+
   let(:downloader) { Downloader.new(database) }
   let(:transifex_api) { double(:transifex_api) }
 

data/spec/handlers/hook_handler_spec.rb

@@ -1,17 +1,24 @@
 require 'spec_helper'
 require 'spec_helpers/test_backend'
-require 'spec_helpers/test_db'
+require 'spec_helpers/test_configurator'
 require 'uri'
 require 'yaml'
 
 include Txdb
 include Txdb::Handlers
 
-describe HookHandler do
+describe HookHandler, test_config: true do
   include Rack::Test::Methods
 
-  let(:database) { TestDb.database }
-  let(:table) { database.tables.first }
+  let(:database) do
+    TestConfigurator.setup do
+      create_table(:foo) do
+        primary_key :id
+      end
+    end
+  end
+
+  let(:table) { database.find_table(:foo) }
   let(:project) { database.transifex_project }
   let(:resource) { TestBackend.resource }
 

data/spec/handlers/triggers/pull_handler_spec.rb

@@ -1,16 +1,23 @@
 require 'spec_helper'
 require 'spec_helpers/test_backend'
-require 'spec_helpers/test_db'
+require 'spec_helpers/test_configurator'
 require 'uri'
 require 'yaml'
 
 include Txdb::Handlers::Triggers
 
-describe PullHandler do
+describe PullHandler, test_config: true do
   include Rack::Test::Methods
 
-  let(:database) { TestDb.database }
-  let(:table) { database.tables.first }
+  let(:database) do
+    Txdb::TestConfigurator.setup do
+      create_table(:foo) do
+        primary_key :id
+      end
+    end
+  end
+
+  let(:table) { database.find_table(:foo) }
   let(:project) { database.transifex_project }
 
   def app

data/spec/handlers/triggers/push_handler_spec.rb

@@ -1,16 +1,23 @@
 require 'spec_helper'
 require 'spec_helpers/test_backend'
-require 'spec_helpers/test_db'
+require 'spec_helpers/test_configurator'
 require 'uri'
 require 'yaml'
 
 include Txdb::Handlers::Triggers
 
-describe PushHandler do
+describe PushHandler, test_config: true do
   include Rack::Test::Methods
 
-  let(:database) { TestDb.database }
-  let(:table) { database.tables.first }
+  let(:database) do
+    Txdb::TestConfigurator.setup do
+      create_table(:foo) do
+        primary_key :id
+      end
+    end
+  end
+
+  let(:table) { database.find_table(:foo) }
   let(:project) { database.transifex_project }
 
   def app

data/spec/iterators/auto_increment_iterator_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+require 'spec_helpers/test_configurator'
+
+include Txdb::Iterators
+
+describe AutoIncrementIterator, test_config: true do
+  let(:database) do
+    Txdb::TestConfigurator.setup do
+      create_table(:teams) do
+        primary_key :id
+        string :name, translate: true
+        source_lang 'en'
+      end
+    end
+  end
+
+  let(:table) { database.tables.first }
+  let(:teams) { %w(seahawks warriors giants mariners sounders) }
+
+  let(:iterator) do
+    AutoIncrementIterator.new(table)
+  end
+
+  it 'iterates sequentially over every database entry' do
+    entries = teams.map { |team| { name: team } }
+    entries.each { |entry| table.connection << entry }
+
+    iterator.each do |db_entry|
+      entries.delete_if { |entry| db_entry[:name] == entry[:name] }
+    end
+
+    expect(entries).to be_empty
+  end
+end

data/spec/iterators/globalize_iterator_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+require 'spec_helpers/test_configurator'
+
+include Txdb::Iterators
+
+describe GlobalizeIterator, test_config: true do
+  let(:database) do
+    Txdb::TestConfigurator.setup do
+      create_table(:teams) do
+        primary_key :id
+        string :name
+      end
+
+      create_table(:team_translations) do
+        primary_key :id
+        string :name, translate: true
+        string :locale
+        source_lang 'en'
+      end
+    end
+  end
+
+  let(:teams_table) { database.find_table(:teams) }
+  let(:team_translations_table) { database.find_table(:team_translations) }
+  let(:teams) { %w(seahawks warriors giants mariners sounders) }
+
+  let(:iterator) do
+    GlobalizeIterator.new(team_translations_table)
+  end
+
+  it 'iterates over the items in the parent table' do
+    teams.each do |team|
+      teams_table.connection << { name: team }
+      team_translations_table.connection << { name: "#{team}-es", locale: 'es' }
+    end
+
+    entries = iterator.map { |entry| entry[:name] }
+
+    # should be equivalent to the English team names, since it should have
+    # iterated over entries in the parent table, not the translations table
+    expect(entries.sort).to eq(teams.sort)
+  end
+end

data/spec/spec_helpers/globalize_configurator.rb

@@ -0,0 +1,41 @@
+require 'spec_helpers/test_configurator'
+
+module Txdb
+  # The globalize configurator uses the functionality in the test configurator
+  # to create a couple of test tables for testing globalize-specific scenarios.
+  class GlobalizeConfigurator < TestConfigurator
+    class << self
+      def setup(&block)
+        super do
+          create_table(:widgets) do
+            primary_key :id
+            string :name
+          end
+
+          create_table(:widget_translations) do
+            primary_key :id
+            integer :widget_id
+            string :locale
+            string :name, translate: true
+            source_lang 'en'
+          end
+
+          block.call if block
+        end
+      end
+    end
+  end
+end
+
+RSpec.shared_context(:globalize) do
+  let(:database) { Txdb::GlobalizeConfigurator.setup }
+  let(:widgets) { database.find_table(:widgets) }
+  let(:widget_translations) { database.find_table(:widget_translations) }
+end
+
+RSpec.configure do |config|
+  config.around(:each) do |example|
+    Txdb::GlobalizeConfigurator.reset_db if example.metadata[:globalize_config]
+    example.run
+  end
+end

data/spec/spec_helpers/test_configurator.rb

@@ -0,0 +1,156 @@
+require 'spec_helpers/env_helpers'
+require 'spec_helpers/test_backend'
+require 'yaml'
+
+module Txdb
+  # The test configurator is responsible for creating test databases and tables.
+  # It creates actual SQLite tables and the corresponding Table and Database
+  # config objects that are usually constructed from config.yml. The SQLite
+  # database is deleted and old instances of TestConfigurator are released to
+  # the garbage collector before each test run. Set the test_config: true tag on
+  # your top-level RSpec describe blocks to activate this cleanup behavior.
+  #
+  # Example:
+  #
+  # describe MyClass, test_config: true do
+  #   let(:database) do
+  #     TestConfigurator.setup do
+  #       create_table :my_table do
+  #         primary_key :id
+  #         string :name, translate: true
+  #       end
+  #     end
+  #   end
+  # end
+  #
+  # Any field marked with translate: true will be added to the list of columns
+  # to translate in the corresponding Table object.
+  #
+  # TestConfigurator.setup returns an instance of Database, which can be used
+  # anywhere a Database instance is required. For example, you can use the
+  # return value to create a downloader:
+  #
+  # it 'downloads some stuff' do
+  #   Txdb::Downloader.new(database).download('ko')
+  # end
+  class TestConfigurator
+    class << self
+      def setup(&block)
+        test_config = new.tap do |test_config|
+          test_config.instance_eval(&block) if block
+        end
+
+        databases << test_config.database
+        databases.last
+      end
+
+      def reset_db
+        databases.clear
+
+        if File.exist?('spec/test.sqlite3')
+          File.unlink('spec/test.sqlite3')
+        end
+      end
+
+      def databases
+        @databases ||= []
+      end
+
+      def base_config
+        {
+          adapter: 'sqlite',
+          backend: 'test-backend',
+          username: 'username',
+          password: 'password',
+          database: 'spec/test.sqlite3',
+          transifex: {
+            organization: 'myorg',
+            project_slug: 'myproject',
+            username: 'username',
+            password: 'password',
+            webhook_secret: '123abc'
+          },
+          tables: []
+        }
+      end
+    end
+
+    attr_reader :database
+
+    def initialize
+      @database = Txdb::Database.new(self.class.base_config)
+    end
+
+    def connection
+      database.connection
+    end
+
+    def create_table(name, &block)
+      # sequel won't create the table unless it has at least one column
+      connection.create_table(name) { integer :remove_me_blarg_blarg }
+      creator = TableCreator.new(name, database, &block)
+      database.tables << creator.table
+      connection.alter_table(name) { drop_column :remove_me_blarg_blarg }
+    end
+  end
+
+  class TableCreator
+    attr_reader :name, :database, :columns, :source_lang
+
+    def initialize(name, database, &block)
+      @name = name
+      @database = database
+      @columns = []
+      @first = true
+      instance_eval(&block)
+    end
+
+    def primary_key(column, *args)
+      connection.alter_table(name) { add_primary_key(column, *args) }
+    end
+
+    def string(column, *args)
+      add_column(column, :string, *args)
+    end
+
+    def integer(column, *args)
+      add_column(column, :integer, *args)
+    end
+
+    def source_lang(lang)
+      @source_lang = lang
+    end
+
+    def table
+      Txdb::Table.new(
+        database, {
+          name: name.to_s, columns: columns, source_lang: @source_lang
+        }
+      )
+    end
+
+    private
+
+    def add_column(column, type, *args)
+      columns << column if translate?(args)
+      connection.alter_table(name) { add_column(column, type, *args) }
+    end
+
+    def connection
+      database.connection
+    end
+
+    def translate?(args)
+      args.any? do |arg|
+        arg.is_a?(Hash) && arg[:translate]
+      end
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.around(:each) do |example|
+    Txdb::TestConfigurator.reset_db if example.metadata[:test_config]
+    example.run
+  end
+end

data/spec/table_spec.rb

@@ -1,17 +1,24 @@
 require 'spec_helper'
-require 'spec_helpers/test_db'
+require 'spec_helpers/test_configurator'
 require 'yaml'
 
 include Txdb
 
-describe Table, test_db: true do
-  let(:database) { TestDb.database }
-  let(:table) { database.tables.first }
+describe Table, test_config: true do
+  let(:database) do
+    TestConfigurator.setup do
+      create_table(:my_table) do
+        primary_key :id
+      end
+    end
+  end
+
+  let(:table) { database.find_table(:my_table) }
 
-  describe '#db' do
+  describe '#connection' do
     it 'returns a dataset primed to select from the table' do
-      expect(table.db).to be_a(Sequel::Dataset)
-      expect(table.db.sql).to eq('SELECT * FROM `my_table`')
+      expect(table.connection).to be_a(Sequel::Dataset)
+      expect(table.connection.sql).to eq('SELECT * FROM `my_table`')
     end
   end
 

data/spec/transifex_project_spec.rb

@@ -1,10 +1,13 @@
 require 'spec_helper'
-require 'spec_helpers/test_db'
+require 'spec_helpers/test_configurator'
 
 include Txdb
 
-describe TransifexProject, test_db: true do
-  let(:database) { TestDb.database }
+describe TransifexProject, test_config: true do
+  let(:database) do
+    TestConfigurator.setup
+  end
+
   let(:project) { database.transifex_project }
 
   describe '#api' do

data/spec/uploader_spec.rb

@@ -1,11 +1,18 @@
 require 'spec_helper'
-require 'spec_helpers/test_db'
+require 'spec_helpers/test_configurator'
 require 'spec_helpers/test_backend'
 
 include Txdb
 
-describe Uploader, test_db: true do
-  let(:database) { TestDb.database }
+describe Uploader, test_config: true do
+  let(:database) do
+    TestConfigurator.setup do
+      create_table(:foo) do
+        primary_key :id
+      end
+    end
+  end
+
   let(:uploader) { Uploader.new(database) }
   let(:transifex_api) { double(:transifex_api) }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: txdb
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-27 00:00:00.000000000 Z
+date: 2016-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -80,6 +80,9 @@ files:
 - lib/txdb/handlers/triggers/handler.rb
 - lib/txdb/handlers/triggers/pull_handler.rb
 - lib/txdb/handlers/triggers/push_handler.rb
+- lib/txdb/iterators.rb
+- lib/txdb/iterators/auto_increment_iterator.rb
+- lib/txdb/iterators/globalize_iterator.rb
 - lib/txdb/response.rb
 - lib/txdb/response_helpers.rb
 - lib/txdb/table.rb
@@ -98,11 +101,13 @@ files:
 - spec/handlers/hook_handler_spec.rb
 - spec/handlers/triggers/pull_handler_spec.rb
 - spec/handlers/triggers/push_handler_spec.rb
+- spec/iterators/auto_increment_iterator_spec.rb
+- spec/iterators/globalize_iterator_spec.rb
 - spec/spec_helper.rb
 - spec/spec_helpers/env_helpers.rb
-- spec/spec_helpers/globalize_db.rb
+- spec/spec_helpers/globalize_configurator.rb
 - spec/spec_helpers/test_backend.rb
-- spec/spec_helpers/test_db.rb
+- spec/spec_helpers/test_configurator.rb
 - spec/table_spec.rb
 - spec/test.sqlite3
 - spec/transifex_project_spec.rb

data/spec/spec_helpers/globalize_db.rb

@@ -1,60 +0,0 @@
-require 'spec_helpers/test_db'
-
-class GlobalizeDb < TestDb
-  class << self
-    def database
-      @database ||= Txdb::Database.new(
-        raw_config[:databases].first.merge(
-          backend: Txdb::Backends.get('globalize'),
-          tables: [{
-            name: 'widget_translations',
-            source_lang: 'en',
-            columns: %w(name)
-          }]
-        )
-      )
-    end
-
-    def setup_db
-      db.create_table(:widgets) do
-        primary_key :id
-        string :name
-      end
-
-      db.create_table(:widget_translations) do
-        primary_key :id
-        integer :widget_id
-        string :locale
-        string :name
-      end
-    end
-
-    def widgets
-      db[:widgets]
-    end
-
-    def widget_translations
-      db[:widget_translations]
-    end
-
-    def widget_translations_table
-      database.tables.find do |table|
-        table.name == 'widget_translations'
-      end
-    end
-  end
-end
-
-RSpec.shared_context(:globalize) do
-  let(:widgets) { GlobalizeDb.widgets }
-  let(:widget_translations) { GlobalizeDb.widget_translations }
-  let(:widget_translations_table) { GlobalizeDb.widget_translations_table }
-  let(:database) { GlobalizeDb.database }
-end
-
-RSpec.configure do |config|
-  config.around(:each) do |example|
-    GlobalizeDb.reset_db if example.metadata[:globalize_db]
-    example.run
-  end
-end

data/spec/spec_helpers/test_db.rb

@@ -1,76 +0,0 @@
-require 'spec_helpers/env_helpers'
-require 'spec_helpers/test_backend'
-require 'yaml'
-
-class TestDb
-  class << self
-    def db
-      @db ||= database.db
-    end
-
-    def database
-      @database ||= Txdb::Database.new(raw_config[:databases].first)
-    end
-
-    def db_path
-      File.join(File.dirname(__FILE__), '../test.sqlite3')
-    end
-
-    def raw_config
-      @config ||= deep_freeze({
-        databases: [{
-          adapter: 'sqlite',
-          backend: 'test-backend',
-          username: 'username',
-          password: 'password',
-          database: 'spec/test.sqlite3',
-          transifex: {
-            organization: 'myorg',
-            project_slug: 'myproject',
-            username: 'username',
-            password: 'password',
-            webhook_secret: '123abc'
-          },
-          tables: [{
-            name: 'my_table',
-            source_lang: 'en',
-            columns: %w(my_column)
-          }]
-        }]
-      })
-    end
-
-    def reset_db
-      db.tables.each { |t| db.drop_table(t) }
-      setup_db
-    end
-
-    def setup_db
-      # no-op
-    end
-
-    private
-
-    def deep_freeze(obj)
-      case obj
-        when Hash
-          obj.each_with_object({}) do |(k, v), ret|
-            ret[k] = deep_freeze(v)
-          end.freeze
-
-        when Array
-          obj.map { |elem| deep_freeze(elem) }.freeze
-
-        else
-          obj
-      end
-    end
-  end
-end
-
-RSpec.configure do |config|
-  config.around(:each) do |example|
-    TestDb.reset_db if example.metadata[:test_db]
-    example.run
-  end
-end