pumi 0.20.1 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d857da41c2b8a128557b1873beff3d2683d794e551d59dfd61965a9d8b3bc5e5
-  data.tar.gz: 3d78f6d138a40503ffe9bddeaafb3b7e04c0261f167b9ba10d7c65ceea103a09
+  metadata.gz: fec870afd721f5e9497b0d95e07fa4f8e7763dbc0d1d731d2e8c5cd9b73f8bbf
+  data.tar.gz: f5177a9d88aad3fec18cb5dc689fe703d8fadebc7b299333a53987f45f56d09a
 SHA512:
-  metadata.gz: 24cd42c794943e7bdf7ae09fe04977f58e08e93e99823a93a3e7356f4c9988e106e37cb6526438c24a9b44c6057dd63ed9f9dcb40f8f08a171e617319c6d5943
-  data.tar.gz: '0107993da6bad77d3233bd4b37f32cdb040d4ddf0327606edb11d1eee8cb1c818c1d0743e76dea1fb6a319cd4a6f03f459c39a964109791c8dfb48ab5406bf0d'
+  metadata.gz: 516e0b65a0ec6f3dc1fd85994e8006bb73f7512057e0830493289c993fcba1a36b99f986568680e95b80c4623ba79ea37adfc66111918b1da6deef0407babbeb
+  data.tar.gz: 2d03b95d0ab96fb4626d508eb549600243c916b4f3504c452f225d976fb21d073fffb6db7c8f78b27885c9e435186255ea72308cde798bd277c8e307122a9415

data/.github/workflows/build.yml

@@ -8,7 +8,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1

data/.github/workflows/release.yml

@@ -16,7 +16,7 @@ jobs:
           bump-minor-pre-major: true
           version-file: "lib/pumi/version.rb"
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         if: ${{ steps.release.outputs.release_created }}
 
       - uses: ruby/setup-ruby@v1

data/.github/workflows/update_data.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup Ruby
         uses: ruby/setup-ruby@v1

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [0.21.0](https://github.com/dwilkie/pumi/compare/v0.20.2...v0.21.0) (2023-10-06)
+
+
+### Features
+
+* Update data ([7876bbf](https://github.com/dwilkie/pumi/commit/7876bbfc7ce1ff8ee45819ea5e20a3302cf0cf85))
+
+## [0.20.2](https://github.com/dwilkie/pumi/compare/v0.20.1...v0.20.2) (2023-08-08)
+
+
+### Bug Fixes
+
+* NCDD parser ([fa41129](https://github.com/dwilkie/pumi/commit/fa411290c1c120150efdca01a8335ad3ae67add1))
+
 ## [0.20.1](https://github.com/dwilkie/pumi/compare/v0.20.0...v0.20.1) (2023-08-02)
 
 

data/data/villages.yml

@@ -3194,8 +3194,8 @@ villages:
       en: Village
   '01060207':
     name:
-      km: កន្ទួត
-      latin: Kantuot
+      km: ភ្នំកន្ទួត
+      latin: Phnom Kantuot
     administrative_unit:
       km: ភូមិ
       latin: Phum

data/lib/pumi/data_source/ncdd.rb

@@ -27,6 +27,14 @@ module Pumi
         "ភូមិ" => AdministrativeUnit.new(en: "Village", km: "ភូមិ", latin: "Phum", code_length: 8, group: "villages")
       }.freeze
 
+      attr_accessor :existing_data
+
+      def initialize(data_files: default_data_files)
+        @existing_data = data_files.each_with_object({}) do |data_file, result|
+          result[data_file.type] = data_file.read
+        end
+      end
+
       def load_data!(source_dir: "tmp", output_dir: "data")
         source_files(source_dir).each do |file|
           parse_source_file(file)
@@ -37,6 +45,10 @@ module Pumi
 
       private
 
+      def data
+        @data ||= {}
+      end
+
       def parse_source_file(file)
         CSV.read(file, headers: CSV_HEADERS).each do |csv_row|
           row = build_row(csv_row)
@@ -44,14 +56,10 @@ module Pumi
           next unless row.code
           next if row.administrative_unit.code_length != row.code.length
 
-          write_location(row)
+          add_data(row)
         end
       end
 
-      def data
-        @data ||= {}
-      end
-
       def build_row(row)
         Row.new(
           code: parse_location_code(row),
@@ -69,9 +77,10 @@ module Pumi
         code
       end
 
-      def write_location(row)
+      def add_data(row)
         data[row.administrative_unit.group] ||= {}
-        data[row.administrative_unit.group][row.code] = {
+        data[row.administrative_unit.group][row.code] = existing_data.dig(row.administrative_unit.group, row.code) || {}
+        data[row.administrative_unit.group][row.code].merge!(
           "name" => {
             "km" => row.name_km,
             "latin" => row.name_latin
@@ -81,7 +90,7 @@ module Pumi
             "latin" => row.administrative_unit.latin,
             "en" => row.administrative_unit.en
           }
-        }
+        )
       end
 
       def source_files(source_dir)
@@ -95,6 +104,14 @@ module Pumi
           DataFile.new(data_group).write(data.fetch(data_group), data_directory: output_dir)
         end
       end
+
+      def default_data_files
+        [
+          DataFile.new(:districts),
+          DataFile.new(:communes),
+          DataFile.new(:villages)
+        ]
+      end
     end
   end
 end

data/lib/pumi/version.rb

@@ -1,3 +1,3 @@
 module Pumi
-  VERSION = "0.20.1".freeze
+  VERSION = "0.21.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pumi
 version: !ruby/object:Gem::Version
-  version: 0.20.1
+  version: 0.21.0
 platform: ruby
 authors:
 - David Wilkie
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-08-02 00:00:00.000000000 Z
+date: 2023-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler