txdb 2.1.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f78d330f2df64d6ccfe5bf87fae14eb81bc2f187
-  data.tar.gz: 4db1ddc08a4a01c03c2458843d6cd9648ba0a1b3
+  metadata.gz: 4a966477654b1b80565361f216d6a1a6a60fceb9
+  data.tar.gz: d8e8673ffc3fdd4852512555ca11dccb784a662b
 SHA512:
-  metadata.gz: 54034a53d6127b8b372db66fb6f84a8411b7264774ea17f6c637059d3b29020bc87f8b944a886d9d3b48fe01d073c46600ca5b20fb35787ece6dc23f0cd63137
-  data.tar.gz: d5c9d18a27ac021720af42778f2110d528377d3ce76ecfab743c8e4bd11c299fd5e24984e3cae1d2e4c38d7f6b0fc6a095ab1ca7fb1f824164b28fcd009b7672
+  metadata.gz: 6674b957a2fe939d2aa417f1c4ad33c232ebf8c33db1e3f62833cc531a6ce94797e84bacd8d34c99ca5d171d46ba780e01ee348c1b3e4ba4c49d666ba47fe18e
+  data.tar.gz: 49a34afa1522fa915039cf2c62efc3f0cde7418c7af0508ab7b8c19d3345b795276ff70243491eafcc4c0585f476e88f2dba20949428a3e2c9e06bfdea3b66f1

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

@@ -7,13 +7,23 @@ module Txdb
       module Helpers
         def origin_table_name(table_name)
           ActiveSupport::Inflector.pluralize(
-            table_name.sub(/_translations\z/, '')
-          )
+            origin_table_name_singular(table_name)
+          ).to_sym
+        end
+
+        def origin_column_name(table_name)
+          "#{origin_table_name_singular(table_name)}_id".to_sym
         end
 
         def resource_slug_for(table)
           Txgh::Utils.slugify("#{table.database.name}-#{table.name}")
         end
+
+        private
+
+        def origin_table_name_singular(table_name)
+          table_name.sub(/_translations\z/, '')
+        end
       end
 
       Helpers.extend(Helpers)

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

@@ -47,12 +47,12 @@ module Txdb
         end
 
         def content
-          @content ||= { origin_table_name(table.name) => content_for_records }
+          @content ||= { table.name => content_for_records }
         end
 
         def content_for_records
           iterator.each_with_object({}) do |record, ret|
-            ret[record[:id]] = content_for_record(record)
+            ret[record[origin_column]] = content_for_record(record)
           end
         end
 
@@ -66,6 +66,10 @@ module Txdb
           end
         end
 
+        def origin_column
+          origin_column_name(table.name)
+        end
+
         def iterator
           @iterator ||= Iterators::GlobalizeIterator.new(table)
         end

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

@@ -15,23 +15,23 @@ module Txdb
 
         def write_content(resource, locale)
           content = deserialize_content(resource.content)
-          content = content.fetch(origin_table_name(table.name), {})
+          content = content.fetch(table.name, {})
 
-          content.each_pair do |id, fields|
-            update_row(id, fields, locale)
+          content.each_pair do |parent_id, fields|
+            update_row(parent_id, fields, locale)
           end
         end
 
         private
 
-        def update_row(id, fields, locale)
+        def update_row(parent_id, fields, locale)
           row = table.connection.where(
-            foreign_key.to_sym => id, locale: locale
+            origin_column => parent_id, locale: locale
           )
 
           if row.empty?
             table.connection << fields
-              .merge(foreign_key.to_sym => id, locale: locale)
+              .merge(origin_column => parent_id, locale: locale)
               .merge(created_at)
               .merge(updated_at)
           else
@@ -57,8 +57,8 @@ module Txdb
           YAML.load(content)
         end
 
-        def foreign_key
-          @foreign_key ||= table.name.sub(/_translations/, '_id')
+        def origin_column
+          origin_column_name(table.name)
         end
       end
 

data/lib/txdb/iterators/auto_increment_iterator.rb

@@ -29,7 +29,7 @@ module Txdb
             last_value = record[column]
           end
 
-          counter = last_value + 1
+          counter = last_value + 1 if last_value
         end
       end
 
@@ -48,12 +48,13 @@ module Txdb
       private
 
       def records_since(counter)
-        sql_column = Sequel.expr(column)
+        sql_column = Sequel.qualify(table_name, column)
 
         table.connection
+          .select_all(table_name)
           .from(table_name)
           .where { sql_column >= counter }
-          .order(column)
+          .order(sql_column)
           .limit(batch_size)
       end
 

data/lib/txdb/iterators/globalize_iterator.rb

@@ -5,8 +5,22 @@ module Txdb
 
       include Backends::Globalize::Helpers
 
-      def table_name
-        origin_table_name(table.name)
+      def records_since(counter)
+        super
+          .join(origin_table, column => origin_column)
+          .where(locale_column => table.source_lang)
+      end
+
+      def locale_column
+        Sequel.qualify(table_name, :locale)
+      end
+
+      def origin_column
+        Sequel.qualify(table_name, origin_column_name(table_name))
+      end
+
+      def origin_table
+        Sequel.expr(origin_table_name(table_name))
       end
     end
   end

data/lib/txdb/version.rb

@@ -1,3 +1,3 @@
 module Txdb
-  VERSION = '2.1.0'
+  VERSION = '3.0.0'
 end

data/spec/backends/globalize/helpers_spec.rb

@@ -7,12 +7,12 @@ 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')
-      expect(origin).to eq('widgets')
+      expect(origin).to eq(:widgets)
     end
 
     it 'handles unusual pluralizations (via ActiveSupport::Inflector)' do
       origin = Globalize::Helpers.origin_table_name('ox_translations')
-      expect(origin).to eq('oxen')
+      expect(origin).to eq(:oxen)
     end
   end
 

data/spec/backends/globalize/reader_spec.rb

@@ -11,6 +11,9 @@ describe Globalize::Reader, globalize_config: true do
     it 'reads data from the given table and returns an array of resources' do
       sprocket_id = widgets.connection.insert(name: 'sprocket')
       flange_id = widgets.connection.insert(name: 'flange')
+
+      widget_translations.connection.insert(widget_id: sprocket_id, locale: 'en', name: 'sprocket')
+      widget_translations.connection.insert(widget_id: flange_id, locale: 'en', 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')
 
@@ -27,9 +30,9 @@ describe Globalize::Reader, globalize_config: true do
 
       expect(resource.content).to eq(
         YAML.dump(
-          'widgets' => {
-            1 => { 'name' => 'sprocket' },
-            2 => { 'name' => 'flange' }
+          'widget_translations' => {
+            sprocket_id => { 'name' => 'sprocket' },
+            flange_id => { 'name' => 'flange' }
           }
         )
       )

data/spec/backends/globalize/writer_spec.rb

@@ -22,10 +22,15 @@ describe Globalize::Writer, globalize_config: true do
     context 'with some content' do
       before(:each) do
         @sprocket_id = widgets.connection.insert(name: 'sprocket')
+
+        sprocket_en_id = widget_translations.connection.insert(
+          widget_id: @sprocket_id, name: 'sprocket', locale: 'en'
+        )
+
         @writer = Globalize::Writer.new(widget_translations)
 
         @content = YAML.dump(
-          'widgets' => {
+          'widget_translations' => {
             @sprocket_id => { name: 'sproqueta' }
           }
         )
@@ -35,10 +40,10 @@ describe Globalize::Writer, globalize_config: true do
 
       it 'inserts the translations into the database' do
         expect { @writer.write_content(@resource, 'es') }.to(
-          change { widget_translations.connection.count }.from(0).to(1)
+          change { widget_translations.connection.count }.from(1).to(2)
         )
 
-        translation = widget_translations.connection.first
+        translation = widget_translations.connection.order(:id).last
 
         expect(translation).to include(
           widget_id: @sprocket_id, name: 'sproqueta', locale: 'es'
@@ -56,7 +61,7 @@ describe Globalize::Writer, globalize_config: 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.connection.first
+            translation = widget_translations.connection.order(:id).last
             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
@@ -73,7 +78,7 @@ describe Globalize::Writer, globalize_config: true do
 
             # record already exists, so should get updated with new timestamp
             @writer.write_content(@resource, 'es')
-            translation = widget_translations.connection.first
+            translation = widget_translations.connection.order(:id).last
             expect(translation[:updated_at].to_i).to eq(today.utc.to_i)
           end
         end
@@ -82,14 +87,19 @@ describe Globalize::Writer, globalize_config: true do
 
     it 'updates the record if it already exists' do
       sprocket_id = widgets.connection.insert(name: 'sprocket')
-      sprocket_trans_id = widget_translations.connection.insert(
+
+      sprocket_en_id = widget_translations.connection.insert(
+        widget_id: sprocket_id, locale: 'en', name: 'sprocket'
+      )
+
+      sprocket_es_id = widget_translations.connection.insert(
         widget_id: sprocket_id, locale: 'es', name: 'sproqueta'
       )
 
       writer = Globalize::Writer.new(widget_translations)
 
       content = YAML.dump(
-        'widgets' => {
+        'widget_translations' => {
           sprocket_id => { name: 'sproqueta2' }
         }
       )
@@ -100,7 +110,7 @@ describe Globalize::Writer, globalize_config: true do
         change { widget_translations.connection.count }
       )
 
-      translation = widget_translations.connection.where(id: sprocket_trans_id).first
+      translation = widget_translations.connection.where(id: sprocket_es_id).first
       expect(translation).to include(name: 'sproqueta2')
     end
   end

data/spec/iterators/globalize_iterator_spec.rb

@@ -13,6 +13,7 @@ describe GlobalizeIterator, test_config: true do
 
       create_table(:team_translations) do
         primary_key :id
+        integer :team_id
         string :name, translate: true
         string :locale
         source_lang 'en'
@@ -30,8 +31,10 @@ describe GlobalizeIterator, test_config: true do
 
   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' }
+      team_id = teams_table.connection.insert(name: team)
+      team_translations_table.connection.insert(
+        name: team, team_id: team_id, locale: 'en'
+      )
     end
 
     entries = iterator.map { |entry| entry[:name] }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: txdb
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Cameron Dutro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-07 00:00:00.000000000 Z
+date: 2016-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport