csv_patch 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 977122ff680c98f9e5165702a3130200b042df43
-  data.tar.gz: a6147f0ae26a876cbf11930790339d8152aa2f15
+SHA256:
+  metadata.gz: 4e4a65efd034bdead0d7c0208caaceeec96496fb8709318ccb1872a7536dff1c
+  data.tar.gz: 378c85f8935aff6d2f61add4fd9c05892fa67a4d50af2a869fb97a95328beae3
 SHA512:
-  metadata.gz: 1fad4cc967a08b68108f907b8015e2b3884d05f34f73656e67823196cdc1c6d1cf868c035654416eb2db44b6d069e5ea4d78e042a0d3f651f759c44d0e312588
-  data.tar.gz: d61c0e4b4a4210bb513cac29c14c059c6c48a0fa8ec3cd477e0b6e0937737dcd7b5d5889efa565be383d9861b7fc3e384a0c5a7aa6dcc656e39fb7cc4d7a2fec
+  metadata.gz: 71b81601407bdf4d917355020227cb8b19bb8590d3990915855be8b721bf30279f68d1cf9ec8dae2200a498faa1c18138aaf89839a2c873476a607c0e533833a
+  data.tar.gz: 59e81aabbec9f5d497b44c4268ef9defa209920f2caeb1c119cab218e615d4b4d8beb91a4deed8a404466c1ab1ac918d80811779ea5deeda0c12234b76bee213

data/Gemfile

@@ -1,3 +1,5 @@
+source 'https://rubygems.org'
+
 group :development, :test do
   gem 'jeweler'
   gem 'mocha'

data/Gemfile.lock

@@ -1,4 +1,5 @@
 GEM
+  remote: https://rubygems.org/
   specs:
     addressable (2.4.0)
     builder (3.2.4)
@@ -6,7 +7,7 @@ GEM
       thread_safe (~> 0.3, >= 0.3.1)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
-    git (1.6.0)
+    git (1.8.1)
       rchardet (~> 1.8)
     github_api (0.16.0)
       addressable (~> 2.4.0)
@@ -28,32 +29,32 @@ GEM
       rake
       rdoc
       semver2
-    jwt (2.2.1)
+    jwt (2.2.2)
     mime-types (2.99.3)
     mini_portile2 (2.4.0)
-    minitest (5.14.0)
-    mocha (1.11.2)
-    multi_json (1.14.1)
+    minitest (5.14.4)
+    mocha (1.12.0)
+    multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    nokogiri (1.10.9)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
-    oauth2 (1.4.4)
+    oauth2 (1.4.7)
       faraday (>= 0.8, < 2.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    psych (3.1.0)
-    rack (2.2.2)
-    rake (13.0.1)
+    psych (3.3.1)
+    rack (2.2.3)
+    rake (13.0.3)
     rchardet (1.8.0)
-    rdoc (6.2.1)
+    rdoc (6.3.0)
     semver2 (3.4.2)
     thread_safe (0.3.6)
 
 PLATFORMS
-  ruby
+  x86_64-linux
 
 DEPENDENCIES
   jeweler
@@ -61,4 +62,4 @@ DEPENDENCIES
   mocha
 
 BUNDLED WITH
-   2.1.4
+   2.2.15

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.2.0

data/csv_patch.gemspec

@@ -2,19 +2,19 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: csv_patch 1.1.0 ruby lib
+# stub: csv_patch 1.2.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "csv_patch"
-  s.version = "1.1.1"
+  s.name = "csv_patch".freeze
+  s.version = "1.2.0"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Lyudmil"]
-  s.date = "2015-11-03"
-  s.description = "Applies a list of changes in a given format to a CSV file"
-  s.email = "lyudmilangelov@gmail.com"
-  s.executables = ["csv_patch"]
+  s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib".freeze]
+  s.authors = ["Lyudmil".freeze]
+  s.date = "2021-04-06"
+  s.description = "Applies a list of changes in a given format to a CSV file".freeze
+  s.email = "lyudmilangelov@gmail.com".freeze
+  s.executables = ["csv_patch".freeze]
   s.files = [
     "Gemfile",
     "Gemfile.lock",
@@ -30,22 +30,25 @@ Gem::Specification.new do |s|
     "lib/csv_patch/revision.rb",
     "lib/csv_patch/stream_batch.rb"
   ]
-  s.rubygems_version = "2.2.2"
-  s.summary = "Apply diffs to a CSV file"
+  s.rubygems_version = "3.0.9".freeze
+  s.summary = "Apply diffs to a CSV file".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<mocha>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>.freeze, [">= 0"])
+      s.add_development_dependency(%q<mocha>.freeze, [">= 0"])
+      s.add_development_dependency(%q<minitest>.freeze, [">= 0"])
     else
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<mocha>, [">= 0"])
+      s.add_dependency(%q<jeweler>.freeze, [">= 0"])
+      s.add_dependency(%q<mocha>.freeze, [">= 0"])
+      s.add_dependency(%q<minitest>.freeze, [">= 0"])
     end
   else
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<mocha>, [">= 0"])
+    s.add_dependency(%q<jeweler>.freeze, [">= 0"])
+    s.add_dependency(%q<mocha>.freeze, [">= 0"])
+    s.add_dependency(%q<minitest>.freeze, [">= 0"])
   end
 end
 

data/lib/csv_patch/batches.rb

@@ -11,6 +11,7 @@ module CsvPatch
       @intermediate_files = []
       @input, @output     = options[:input], options[:output]
       @batches            = StreamBatch.new(options[:changes], options[:batch_size] || DEFAULT_BATCH_SIZE)
+      @id_column          = options[:id_column]
     end
 
     def execute
@@ -29,7 +30,12 @@ module CsvPatch
     end
 
     def patch_options batch
-      { input: input_for_next_patch, output: output_for_next_patch(batch), changes: batch.changes }
+      {
+        input: input_for_next_patch,
+        output: output_for_next_patch(batch),
+        changes: batch.changes,
+        id_column: @id_column
+      }
     end
 
     def close_intermediate_files

data/lib/csv_patch/patch.rb

@@ -12,7 +12,9 @@ module CsvPatch
       @input, @output   = CSV.new(options[:input]), options[:output]
 
       @revision_result  = Tempfile.new(TEMPFILE_NAME)
-      @revision         = Revision.new(options[:changes], @revision_result)
+      @revision         = Revision.new(
+        options[:changes], @revision_result, options[:id_column]
+      )
     end
 
     def apply

data/lib/csv_patch/revision.rb

@@ -4,9 +4,10 @@ module CsvPatch
 
   class Revision < Operation
 
-    def initialize changes, output_stream
+    def initialize changes, output_stream, id_column = nil
       @output_stream  = output_stream
       @changes        = changes
+      @id_column      = id_column
 
       header_line([])
     end
@@ -14,7 +15,9 @@ module CsvPatch
     def header_line line
       return unless line
 
-      @columns = line
+      @columns          = line
+      @id_column_index  = @columns.find_index(@id_column)
+
       mark_all_columns_empty
     end
 
@@ -23,9 +26,13 @@ module CsvPatch
     end
 
     def add_new_lines
-      @changes.values.each do |addition|
-        emit generate_new_row(addition)
-      end
+      @changes
+        .values
+        .reject { |change| change.nil? }
+        .reject { |change| change[:applied] }
+        .each do |addition|
+          emit generate_new_row(addition)
+        end
     end
 
     def column_metadata
@@ -74,7 +81,11 @@ module CsvPatch
     end
 
     def change_for row
-      @changes.delete id_of(row)
+      change = @changes[id_of(row)]
+      return nil if change.nil?
+
+      change[:applied] = true
+      change.reject { |k, _| k == :applied }
     end
 
     def update_schema_to_reflect change
@@ -83,7 +94,8 @@ module CsvPatch
     end
 
     def id_of row
-      row.first
+      return row.first if @id_column_index.nil?
+      row[@id_column_index]
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csv_patch
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Lyudmil
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-11-03 00:00:00.000000000 Z
+date: 2021-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jeweler
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  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: Applies a list of changes in a given format to a CSV file
 email: lyudmilangelov@gmail.com
 executables:
@@ -58,10 +72,10 @@ files:
 - lib/csv_patch/patch.rb
 - lib/csv_patch/revision.rb
 - lib/csv_patch/stream_batch.rb
-homepage: 
+homepage:
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -76,9 +90,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.3
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: Apply diffs to a CSV file
 test_files: []