deltaconveyor 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b6a21e28386560cc9f41bf2b56e67e850b8a028
-  data.tar.gz: 90ff8165dc997c5226cf3572db6b448983725d4c
+  metadata.gz: 712223865ad3f96330a2693b159d4d1b07606059
+  data.tar.gz: c6ca40ef25658c369f609fd479cfc0c5706c0412
 SHA512:
-  metadata.gz: 43ae49ae35561b099105b638332c6732ae9537ae2450025242929112a919ccd18401ebbe6f36038840d09da010bd9974bee6bafd7f25d382168b504754d442e7
-  data.tar.gz: 802b72c51ddb79545dcfc1dabfd6890b4aedb2613717c1421450391029186f9065ad17bb889373da22915d7d1424fa459910f0cf4de91bccfe2942396a5c765d
+  metadata.gz: f0c5743616da52a2ac2881d7e1191cfab80a52e4e5c2813dea2aa681cdedd974660ccc291c566d8da6a9f8aab54e7da8b836e545923db77600dcaf24e944b1e6
+  data.tar.gz: 7d6c519fcaa0f1d337c10067a1edeb6f65338d42959a5fe7d39b2d025d229d80d75ffbbedec0b5815c583bb59d3229adc447bf40f338177d7f7f1642ae5f77ad

data/lib/deltaconveyor/row.rb

@@ -14,10 +14,6 @@ module Deltaconveyor
       raise 'You must implement #save! method in class extends Row.'
     end
 
-    def key
-      :id
-    end
-
     def valid?
       raise 'You must implement #valid? method in class extends Row.'
     end

data/lib/deltaconveyor/version.rb

@@ -1,3 +1,3 @@
 module Deltaconveyor
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/deltaconveyor.rb

@@ -7,120 +7,95 @@ module Deltaconveyor
   class InvalidRowError < StandardError; end
   class RemovingOriginalError < StandardError; end
   def self.import(data, option, container, force_remove: false)
-    originals = container.originals
+    Importer.new(option, container, force_remove: force_remove).import(data)
+  end
 
-    passes_container = option.row_class.method(:from_json).parameters.size == 2
-    rows = data.map do |d|
-      passes_container ? option.row_class.from_json(d, container) : option.row_class.from_json(d)
-    end
+  class Importer
 
-    invalids = rows.reject(&:valid?)
-    if invalids.size > 0
-      option.logger.error 'Error: Some data has errors.'
-      invalids.each do |invalid|
-        option.logger.error invalid.errors.messages.to_s
-      end
-      raise InvalidRowError, 'Not Imported.'
+    def initialize(option, container, force_remove: false)
+      @option = option
+      @container = container
+      @force_remove = force_remove
     end
 
-    option_keys = Array(option.key)
-    original_hash = index_by_keys(originals, option_keys)
-    new_hash = index_by_keys(rows, option_keys)
+    attr_reader :option, :container, :force_remove
 
-    original_keys = original_hash.keys
-    new_keys = new_hash.keys
+    def import(data)
+      originals = container.originals
 
-    intersection_keys = original_keys & new_keys
-    remove_keys = original_keys - intersection_keys
-    adding_keys = new_keys - intersection_keys
-
-    if remove_keys.size > 0 && !force_remove
-      option.logger.error 'Error: Some data is facing to remove but `force_remove` flag is false'
-      option.logger.error 'so import is stopped.'
-      option.logger.error 'Removing keys:'
-      option.logger.error remove_keys
-      raise RemovingOriginalError, 'Not Imported.'
-    end
+      passes_container = option.row_class.method(:from_json).parameters.size == 2
+      rows = data.map do |d|
+        passes_container ? option.row_class.from_json(d, container) : option.row_class.from_json(d)
+      end
 
-    remove_keys.each do |key|
-      original_data = original_hash[key]
-      raise 'Bug.' unless original_data
-      option.logger.info "Remove #{key}"
-      # TODO: rethink
-      original_data.destroy!
-    end
-    option.logger.info 'Removing Phase is finished.'
+      invalids = rows.reject(&:valid?)
+      if invalids.size > 0
+        option.logger.error 'Error: Some data has errors.'
+        invalids.each do |invalid|
+          option.logger.error invalid.errors.messages.to_s
+        end
+        raise InvalidRowError, 'Not Imported.'
+      end
 
-    intersection_keys.each do |key|
-      original_data = original_hash[key]
-      new_data = new_hash[key]
-      raise 'Bug.' unless original_data && new_data
+      option_keys = Array(option.key)
+      original_hash = index_by_keys(originals, option_keys)
+      new_hash = index_by_keys(rows, option_keys)
 
-      new_data.update!(original_data)
-    end
-    option.logger.info 'Updating Phase is finished.'
+      original_keys = original_hash.keys
+      new_keys = new_hash.keys
 
-    adding_keys.each do |key|
-      new_data = new_hash[key]
-      raise 'Bug.' unless new_data
+      intersection_keys = original_keys & new_keys
+      remove_keys = original_keys - intersection_keys
+      adding_keys = new_keys - intersection_keys
 
-      option.logger.info "Insert #{key}"
-      new_data.save!
-    end
-    option.logger.info 'Adding Phase is finished.'
-    nil
-  end
-
-  def self.index_by_keys(arr, keys)
-    hash = {}
-    arr.each do |elem|
-      pk = keys.map { |key| elem.send(key) }
-      unless hash[pk].nil?
-        option.logger.error "not unique key #{pk}"
-        raise 'Not Imported.'
+      if remove_keys.size > 0 && !force_remove
+        option.logger.error 'Error: Some data is facing to remove but `force_remove` flag is false'
+        option.logger.error 'so import is stopped.'
+        option.logger.error 'Removing keys:'
+        option.logger.error remove_keys
+        raise RemovingOriginalError, 'Not Imported.'
       end
-      hash[pk] = elem
-    end
-    hash
 
-    remove_keys.each do |key|
-      original_data = original_hash[key]
-      raise 'Bug.' unless original_data
-      option.logger.info "Remove #{key}"
-      original_data.destroy!
-    end
-    option.logger.info 'Removing Phase is finished.'
+      remove_keys.each do |key|
+        original_data = original_hash[key]
+        raise 'Bug.' unless original_data
+        option.logger.info "Remove #{key}"
+        # TODO: rethink
+        original_data.destroy!
+      end
+      option.logger.info 'Removing Phase is finished.'
 
-    intersection_keys.each do |key|
-      original_data = original_hash[key]
-      new_data = new_hash[key]
-      raise 'Bug.' unless original_data && new_data
+      intersection_keys.each do |key|
+        original_data = original_hash[key]
+        new_data = new_hash[key]
+        raise 'Bug.' unless original_data && new_data
 
-      new_data.update!(original_data)
-    end
-    option.logger.info 'Updating Phase is finished.'
+        new_data.update!(original_data)
+      end
+      option.logger.info 'Updating Phase is finished.'
 
-    adding_keys.each do |key|
-      new_data = new_hash[key]
-      raise 'Bug.' unless new_data
+      adding_keys.each do |key|
+        new_data = new_hash[key]
+        raise 'Bug.' unless new_data
 
-      option.logger.info "Insert #{key}"
-      new_data.save!
+        option.logger.info "Insert #{key}"
+        new_data.save!
+      end
+      option.logger.info 'Adding Phase is finished.'
+      nil
     end
-    option.logger.info 'Adding Phase is finished.'
-    nil
-  end
 
-  def self.index_by_keys(arr, keys)
-    hash = {}
-    arr.each do |elem|
-      pk = keys.map { |key| elem.send(key) }
-      unless hash[pk].nil?
-        option.logger.error "Error: not unique key #{pk}"
-        raise 'Not Imported.'
+    def index_by_keys(arr, keys)
+      hash = {}
+      arr.each do |elem|
+        pk = keys.map { |key| elem.send(key) }
+        unless hash[pk].nil?
+          option.logger.error "Error: not unique key #{pk}"
+          raise 'Not Imported.'
+        end
+        hash[pk] = elem
       end
-      hash[pk] = elem
+      hash
     end
-    hash
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deltaconveyor
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - qsona
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-30 00:00:00.000000000 Z
+date: 2018-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler