pumi 0.20.0 → 0.20.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eaa8457178792ba448db0779db4f0d06f194d45479189da114c85db397706993
-  data.tar.gz: 8718c98a46c204a6385acb16baa106dd35ca8b9801a6bbdbf8129af836e6fc8d
+  metadata.gz: dda968916deb1a189cdc8d34c36ffba69bd9c431779c09c19b0ce74e51077323
+  data.tar.gz: af0b679d64b9e8cccc4bfe05a70d6f4efdcc58948f7e6284d9c31c5e59fc43fb
 SHA512:
-  metadata.gz: ac507799b02d5cf04ae46fdb4e87ea64d011afa2ccab9bf8c2e07ac74b7687bd57178a20ffb507d915be150110f259d852ae6a1af86b3e410634599f298bdf0f
-  data.tar.gz: 1e047785a872f7344bcb724395b586299c70082611741f4f23f04b62782ec8cc74a3b1a5fda18a474727ae9b33edd0d7b918307a1b37f4493b1892bd1f7271cd
+  metadata.gz: 8764e9cbf4dec86829e938b2563cdc330df382f07d8128bb91105c27f87b8915542779f516aba9f0f56ffaa33c4f0ed7fe8b87e59dab1efabe9e285337fc5963
+  data.tar.gz: e8e93348ebec41b96b552d1256e0668ee3e29a4952cf24bb18d4022e506174710ba5644761f4c1df34261c799ad0ff56e5da8e9a8b7f8a53aa91b1b45c195d22

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [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)
+
+
+### Bug Fixes
+
+* Don't load bots and datasources by default ([#55](https://github.com/dwilkie/pumi/issues/55)) ([8abf5a0](https://github.com/dwilkie/pumi/commit/8abf5a06b4f98057c4c826ecde6be851e7c1db3f))
+
 ## [0.20.0](https://github.com/dwilkie/pumi/compare/v0.19.0...v0.20.0) (2023-07-31)
 
 

data/bin/parse_data

@@ -6,6 +6,8 @@
 
 require "bundler/setup"
 require "pumi"
+require "pumi/data_source/ncdd"
+require "pumi/data_source/wikipedia"
 
 Pumi::DataSource::NCDD.new.load_data!
 

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.0".freeze
+  VERSION = "0.20.2".freeze
 end

data/lib/pumi.rb

@@ -17,7 +17,6 @@ end
 
 require_relative "pumi/version"
 require_relative "pumi/administrative_unit"
-require_relative "pumi/bot"
 require_relative "pumi/location"
 require_relative "pumi/province"
 require_relative "pumi/district"
@@ -26,5 +25,3 @@ require_relative "pumi/geodata"
 require_relative "pumi/village"
 require_relative "pumi/parser"
 require_relative "pumi/data_file"
-require_relative "pumi/data_source"
-require_relative "pumi/wikipedia"

metadata

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