db-sync 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9a3c1fd55f036e03a864d7327dba19fcf657051
-  data.tar.gz: 3b7b1e8c906bbc3dfadccc51c64b429065918e89
+  metadata.gz: 4bef6c074030fc6547c0805a20e284a5fd8e71af
+  data.tar.gz: 4b961e94877e81150a7bfcfa93e57d6395cce481
 SHA512:
-  metadata.gz: 9e71e6b82d3d62db13b1762168d23839ba372ff58b47ec91d5b9797fd0f692bfc1f008244b5dee5329fe32a05be5baf646603b76b09642db6bfa93064c76f98b
-  data.tar.gz: 58cd9176573229749f4ee020b571b91e77adcf1a2f2efdf0d379e9adde41a862675cbda1768f1e7b12e21c765fd99ba485dac3b210ec44a8b6a64fecfc734000
+  metadata.gz: 806b73455ee1664e88fd030bbdccb57817ef58da0a8ece91b309cab2986655df1b7c17bfb9af96b654595d1b068ffc172b853f7711eb6ebc97c255ba09a9bfb8
+  data.tar.gz: 918a47cd7e01e4c9c7964a44a79db4b102abcb7b65721767b91cf67cd79e3e340826456c16ed86fde5aaad3756dbf91587769f99f06a1bf83c0dc559f42e9ecf

data/lib/db/sync.rb

@@ -9,7 +9,12 @@ module Db
   class Sync
     include ActiveSupport::Configurable
 
-    def self.sync_up
+    def log
+      @log ||= []
+    end
+
+    def sync_up(commit = true)
+      @log = []
       # TODO: change to row by row loading
       working_tables.each do |table|
         table_model = data_model(table)
@@ -17,47 +22,58 @@ module Db
 
         data = File.read(table_filename(table))
         all_records = YAML.load(data)
-        current_records = table_model.records.map(&:attributes)
+        current_records = table_model.records
 
         diff = Db::Sync::Diff.new(current_records, all_records, table_model.pkey)
-        insert_records(table, diff.inserts)
-        delete_records(table, diff.deletes)
-        update_records(table, diff.updates)
+        insert_records(table, diff.inserts, commit)
+        delete_records(table, diff.deletes, commit)
+        update_records(table, diff.updates, commit)
       end
     end
 
-    def self.insert_records(table, inserts)
+    def insert_records(table, inserts, commit = true)
       inserts.each do |record|
+        log << "[#{table}] INSERT #{record}"
+        next unless commit
+
         insert_manager = Arel::InsertManager.new(ActiveRecord::Base)
         arel_model = Arel::Table.new(table)
         insert_data = record.map do |key, value|
           [arel_model[key], value]
         end
+
         insert_manager.insert(insert_data)
         # print "#{insert_manager.to_sql}\n"
         ActiveRecord::Base.connection.execute(insert_manager.to_sql)
       end
     end
 
-    def self.delete_records(table, deletes)
+    def delete_records(table, deletes, commit = false)
       arel_model = Arel::Table.new(table)
 
       deletes.each do |delete_params|
+        log << "[#{table}] DELETE #{delete_params}"
+        next unless commit
+
         delete_manager = Arel::DeleteManager.new(ActiveRecord::Base)
         delete_manager.from(arel_model)
         delete_data = delete_params.map do |key, value|
           [arel_model[key].eq(value)]
         end
+
         delete_manager.where(delete_data)
         # print "#{delete_manager.to_sql}\n"
         ActiveRecord::Base.connection.execute(delete_manager.to_sql)
       end
     end
 
-    def self.update_records(table, updates)
+    def update_records(table, updates, commit = false)
       arel_model = Arel::Table.new(table)
 
       updates.each do |update|
+        log << "[#{table}] UPDATE #{update[:key]} with #{update[:changes]}"
+        next unless commit
+
         update_manager = Arel::UpdateManager.new(ActiveRecord::Base)
         update_key = update[:key].map do |key, value|
           [arel_model[key].eq(value)]
@@ -65,13 +81,14 @@ module Db
         update_changes = update[:changes].map do |key, value|
           [arel_model[key], value]
         end
+
         update_manager.table(arel_model).where(update_key).set(update_changes)
         # print "#{update_manager.to_sql}\n"
         ActiveRecord::Base.connection.execute(update_manager.to_sql)
       end
     end
 
-    def self.sync_down
+    def sync_down
       # TODO: change to row by row saving
       working_tables.each do |table|
         File.open(table_filename(table), 'w') do |f|
@@ -81,32 +98,32 @@ module Db
       end
     end
 
-    def self.table_model_records(table)
+    def table_model_records(table)
       # TODO: Some kind of paging
       table_model = data_model(table)
-      table_model.records.map(&:attributes)
+      table_model.records
     end
 
-    def self.working_tables
+    def working_tables
       config.tables || all_tables
     end
 
-    def self.all_tables
+    def all_tables
       ActiveRecord::Base.connection.tables.reject do |table|
         %w(schema_info, schema_migrations).include?(table)
       end
     end
 
-    def self.table_filename(table)
+    def table_filename(table)
       # TODO: change data with custom dir
       File.join(Rails.root || '.', 'db', 'data', "#{table}.yml")
     end
 
-    def self.configure
+    def configure
       yield(config)
     end
 
-    def self.data_model(table)
+    def data_model(table)
       result = Class.new(Db::Sync::Model)
       result.table_name = table
       result

data/lib/db/sync/model.rb

@@ -23,7 +23,18 @@ class Db::Sync::Model < ActiveRecord::Base
     end
   end
 
+  def self.ordered_attributes
+    pkey + (attribute_names - pkey).sort
+  end
+
   def self.records
-    order(pkey)
+    attributes_order = ordered_attributes
+    order(pkey).map do |record|
+      res = {}
+      attributes_order.each do |key|
+        res[key] = record[key]
+      end
+      res
+    end
   end
 end

data/lib/db/sync/version.rb

@@ -1,5 +1,5 @@
 module Db
   class Sync
-    VERSION = '0.0.4'.freeze
+    VERSION = '0.0.5'.freeze
   end
 end

data/lib/tasks/db-sync.rake

@@ -2,12 +2,24 @@ namespace :db do
   namespace :sync do
     desc 'Download data from the databse into files.'
     task down: :environment do
-      Db::Sync.sync_down
+      synchronizer = Db::Sync.new
+      synchronizer.sync_down
     end
 
     desc 'Upload data from the files into the database.'
     task up: :environment do
-      Db::Sync.sync_up
+      commit = ENV['commit'] == 'true'
+      synchronizer = Db::Sync.new
+      sync_up_and_print(synchronizer, commit)
+      if !commit && synchronizer.log.present?
+        print "Commit Changes? [y/n]\n"
+        sync_up_and_print(synchronizer, true) if STDIN.gets.chomp == 'y'
+      end
     end
   end
 end
+
+def self.sync_up_and_print(synchronizer, commit)
+  synchronizer.sync_up(commit)
+  print synchronizer.log.join("\n") + "\n"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: db-sync
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Vasil Joskov