deltaconveyor 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4cec384a6d6beb17140bbf639626d1c9af0e0c4
-  data.tar.gz: d10128dba99d415c9ba0c7ba39ac0f5015aee446
+  metadata.gz: 6b6a21e28386560cc9f41bf2b56e67e850b8a028
+  data.tar.gz: 90ff8165dc997c5226cf3572db6b448983725d4c
 SHA512:
-  metadata.gz: 1f8591eea8de3441d27d27da237961692ec07436e8a54ff6352722f50fdb09f94a3037b4df3a11bca2dad674355ebe6c4e8c17f9dbe02650750fc0852a417fce
-  data.tar.gz: 94073eedc038e499dc6813284dd066911ec70761917aa653c6b5113490864f08e8faa63f50cb57f74048d21481973d0edee3d0fee35b9bc1cbcc31ad7aea2e1e
+  metadata.gz: 43ae49ae35561b099105b638332c6732ae9537ae2450025242929112a919ccd18401ebbe6f36038840d09da010bd9974bee6bafd7f25d382168b504754d442e7
+  data.tar.gz: 802b72c51ddb79545dcfc1dabfd6890b4aedb2613717c1421450391029186f9065ad17bb889373da22915d7d1424fa459910f0cf4de91bccfe2942396a5c765d

data/.rspec

@@ -1,2 +1,3 @@
 --format documentation
 --color
+-r rspec-power_assert

data/deltaconveyor.gemspec

@@ -24,4 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rspec-power_assert"
+  spec.add_development_dependency "pry"
+  spec.add_development_dependency "pry-byebug"
 end

data/lib/deltaconveyor.rb

@@ -1,25 +1,31 @@
 require "deltaconveyor/version"
 require "deltaconveyor/row"
-require "deltaconveyor/config"
+require "deltaconveyor/option"
 require "deltaconveyor/container"
 
 module Deltaconveyor
-  def self.import(data, container, force_remove: false)
+  class InvalidRowError < StandardError; end
+  class RemovingOriginalError < StandardError; end
+  def self.import(data, option, container, force_remove: false)
     originals = container.originals
-    config = container.config
 
-    rows = data.map { |d| config.row_class.from_json(d, container) }
+    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
+
     invalids = rows.reject(&:valid?)
     if invalids.size > 0
-      config.error_logger 'Error: Some data has errors.'
+      option.logger.error 'Error: Some data has errors.'
       invalids.each do |invalid|
-        config.error_logger invalid.errors.messages.to_s
+        option.logger.error invalid.errors.messages.to_s
       end
-      raise 'Not Imported.'
+      raise InvalidRowError, 'Not Imported.'
     end
 
-    original_hash = originals.index_by { |d| config.original_key(d) }
-    new_hash = rows.index_by(&:key)
+    option_keys = Array(option.key)
+    original_hash = index_by_keys(originals, option_keys)
+    new_hash = index_by_keys(rows, option_keys)
 
     original_keys = original_hash.keys
     new_keys = new_hash.keys
@@ -29,38 +35,92 @@ module Deltaconveyor
     adding_keys = new_keys - intersection_keys
 
     if remove_keys.size > 0 && !force_remove
-      config.error_logger 'Error: Some data is facing to remove but `force_remove` flag is false'
-      config.error_logger 'so import is stopped.'
-      config.error_logger 'Removing keys:'
-      config.error_logger remove_keys
-      raise 'Not Imported.'
+      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
+
+    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
+
+      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
+
+      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.'
+      end
+      hash[pk] = elem
+    end
+    hash
 
     remove_keys.each do |key|
       original_data = original_hash[key]
       raise 'Bug.' unless original_data
-      config.info_logger "Remove #{key}"
+      option.logger.info "Remove #{key}"
       original_data.destroy!
     end
-    config.info_logger 'Removing Phase is finished.'
+    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
 
-      config.row_class.update!(original_data, new_data, container)
+      new_data.update!(original_data)
     end
-    config.info_logger 'Updating Phase is finished.'
+    option.logger.info 'Updating Phase is finished.'
 
     adding_keys.each do |key|
       new_data = new_hash[key]
       raise 'Bug.' unless new_data
 
-      config.info_logger "Insert #{key}"
-      new_data.save!(container)
+      option.logger.info "Insert #{key}"
+      new_data.save!
     end
-    config.info_logger 'Adding Phase is finished.'
+    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.'
+      end
+      hash[pk] = elem
+    end
+    hash
+  end
 end

data/lib/deltaconveyor/container.rb

@@ -1,9 +1,9 @@
 module Deltaconveyor
   class Container
-    attr_accessor :config, :originals
+    attr_accessor :originals
 
-    def initialize
-      self.config = Deltaconveyor::Config.new
+    def initialize(originals: nil)
+      self.originals = originals
     end
   end
 end

data/lib/deltaconveyor/option.rb

@@ -0,0 +1,15 @@
+require 'logger'
+
+module Deltaconveyor
+  class Option
+    DEFAULT_LOGGER = Logger.new(STDOUT)
+
+    attr_accessor :row_class, :key, :logger
+
+    def initialize(row_class: nil, key: nil, logger: nil)
+      self.row_class = row_class
+      self.logger = logger || DEFAULT_LOGGER
+      self.key = key || :id
+    end
+  end
+end

data/lib/deltaconveyor/row.rb

@@ -1,19 +1,21 @@
 module Deltaconveyor
   class Row
+    attr_accessor :container
+
     def self.from_json(row_json, container)
       raise 'You must implement .from_json method in class extends Row.'
     end
 
-    def self.update!(original, row, container)
-      raise 'You must implement .update! method in class extends Row.'
+    def update!(original)
+      raise 'You must implement #update! method in class extends Row.'
     end
 
-    def save!(container)
+    def save!
       raise 'You must implement #save! method in class extends Row.'
     end
 
     def key
-      raise 'You must implement #key method in class extends Row.'
+      :id
     end
 
     def valid?

data/lib/deltaconveyor/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deltaconveyor
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - qsona
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-16 00:00:00.000000000 Z
+date: 2017-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-power_assert
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: TBD
 email:
 - u999sona@cpost.plala.or.jp
@@ -70,8 +112,8 @@ files:
 - bin/setup
 - deltaconveyor.gemspec
 - lib/deltaconveyor.rb
-- lib/deltaconveyor/config.rb
 - lib/deltaconveyor/container.rb
+- lib/deltaconveyor/option.rb
 - lib/deltaconveyor/row.rb
 - lib/deltaconveyor/version.rb
 homepage: https://github.com/qsona/deltaconveyor

data/lib/deltaconveyor/config.rb

@@ -1,21 +0,0 @@
-module Deltaconveyor
-  class Config
-    DEFAULT_ORIGINAL_KEY_PROC = ->(original) { original.id }
-    DEFAULT_INFO_LOGGER_PROC = ->(*args) { puts *args }
-    DEFAULT_ERROR_LOGGER_PROC = ->(*args) { STDERR.puts *args }
-
-    attr_accessor :row_class, :original_key_proc, :info_logger_proc, :error_logger_proc
-
-    def original_key(original)
-      (original_key_proc || DEFAULT_ORIGINAL_KEY_PROC).call(original)
-    end
-
-    def info_logger(*args)
-      (info_logger_proc || DEFAULT_INFO_LOGGER_PROC).call(*args)
-    end
-
-    def error_logger(*args)
-      (error_logger_proc || DEFAULT_ERROR_LOGGER_PROC).call(*args)
-    end
-  end
-end