inscriber 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ec919613c940e0e278b4fb2e49293d814c2f6f9
-  data.tar.gz: 33dedd834052be647abd4ae6278a110c342e268b
+  metadata.gz: 578b5c78426129ced7b22f36a0aaca5c5275a159
+  data.tar.gz: 24c528c8badb4d05bf48e84d4a7cff9a11350b6d
 SHA512:
-  metadata.gz: 96d457dc86d3c4aa33866f90ec308313a131b061c0f521877d11bee7ec9e3564b3e10f2889be7f5f4e862a29fc08e8fc4de51396ca6e1582ded4972b789bf630
-  data.tar.gz: 2abb5e92a3c9361c7d3a64760b1adf6ae499a9373f95c180c91f80cc6535c6e5a099225e52daed6335ce12007415255bd0379dd95c53ccca20ae3f05aad6c65b
+  metadata.gz: 906422022b20215cb7b0fb7cc5e361ab1209bd1388899664e8156bb63d22724468190087afb580c0a7a98279313f3da64112091975f84f0197593f14e8ffe270
+  data.tar.gz: edf01572cc48ad15ab7602764c93156f5c49bd7e301cd887b7668cbf3ea47510051b14ef4753ce12b0a0f233a8e01ca6d22d205236e86e7725d8ce06b6f3f7e3

data/lib/inscriber/downloader.rb

@@ -14,7 +14,7 @@ module Inscriber
         records = records_from_table(table[:name]).all
         unless records.empty?
           records.each do |record|
-            record_hash[record[:id]] = generate_hash_from_record(record, table)
+            record_hash[record[original_column_name(table[:name])]] = generate_hash_from_record(record, table)
           end
           @result_hash[table[:name]] = record_hash
         end
@@ -34,7 +34,6 @@ module Inscriber
 
     def generate_hash_from_record(record, table)
       record.select{ |k,v| table[:columns].include? k.to_s }
-        .merge(original_column_name(table[:name]).to_s => record[original_column_name(table[:name])])
         .inject({}){ |h, (k,v)| h[k.to_s] = v; h }.to_h
     end
   end

data/lib/inscriber/inserter.rb

@@ -3,17 +3,17 @@ require 'yaml'
 module Inscriber
   class Inserter
     class << self
+      include TableHelpers
       def insert(database)
         database.locales.each do |locale|
           file_path = "#{database.input_dir}/#{database.file_name}"
           if File.exist? "#{file_path}.#{locale}.yml"
-            data          = YAML.load_file("#{file_path}.#{locale}.yml")
-            source_data   = YAML.load_file("#{file_path}.#{database.source_lang}.yml")
+            data = YAML.load_file("#{file_path}.#{locale}.yml")
 
             data[locale].each do |table, records|
               records_array = []
               records.each do |k,v|
-                records_array << source_data[database.source_lang][table][k].merge(v)
+                records_array << v.merge(original_column_name(table) => k)
               end
               opts = { database: database, table: table, records: records_array, locale: locale }
               upload_data_to_db(opts)

data/lib/inscriber/version.rb

@@ -1,3 +1,3 @@
 module Inscriber
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

data/spec/downloader_spec.rb

@@ -20,7 +20,7 @@ describe Inscriber::Downloader do
 
       expect(download.keys).to include 'test_translations'
       expect(download['test_translations'].values.first["body"]).to eq 'test string'
-      expect(download['test_translations'].values.first["test_id"]).to eq 1
+      expect(download['test_translations'].keys).to include 1
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inscriber
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Ian Florentino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-08 00:00:00.000000000 Z
+date: 2017-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel