gov_codes 0.1.0 → 0.1.2

data/lib/gov_codes/data_loader.rb

@@ -11,65 +11,78 @@ module GovCodes
 
     def data(lookup: $LOAD_PATH)
       data = {}
+      lookup_array = Array(lookup)
+      return data if lookup_array.empty?
 
-      namespace_parts = name.split("::")
-        .map { |it| it.gsub(/([A-Z])([a-z])/, '_\1\2').downcase }
-        .map { |it| it.sub(/^_/, "") }
+      # Add the gem's lib directory to the lookup path
+      gem_lib_dir = File.expand_path("..", __dir__)
+      lookup_paths = [gem_lib_dir] + lookup_array
 
-      # Append .yml to the last item
+      # Convert namespace to file path parts (e.g., "GovCodes::AFSC::Enlisted" -> ["gov_codes", "afsc", "enlisted.yml"])
+      namespace_parts = name.split("::")
+        .map { |part| part.gsub(/([A-Z])([a-z])/, '_\1\2').downcase.sub(/^_/, "") }
       namespace_parts[-1] = "#{namespace_parts[-1]}.yml"
 
-      # Iterate through each path in the lookup array
-      files = lookup.map do |dir|
+      # Find all existing YAML files in lookup paths
+      lookup_paths.filter_map do |dir|
         yaml_path = File.join(dir, *namespace_parts)
         yaml_path if File.exist?(yaml_path)
-      end
-        .compact
-        .uniq
-      files.each do |path|
-        data.merge!(YAML.load_file(path, symbolize_names: true))
+      end.uniq.each do |path|
+        yaml_data = YAML.load_file(path, symbolize_names: true)
+        data.merge!(yaml_data) if yaml_data.is_a?(Hash)
+      rescue Psych::SyntaxError, TypeError
+        # Handle invalid YAML gracefully
+        next
       end
 
       data
     end
 
     def reset_data(lookup: $LOAD_PATH)
-      remove_const(:DATA)
+      remove_const(:DATA) if const_defined?(:DATA, false)
       const_set(:DATA, data(lookup:).freeze)
-      remove_const(:CODES)
+      remove_const(:CODES) if const_defined?(:CODES, false)
       const_set(:CODES, {})
     end
 
+    # Load and merge a flat overlay YAML map (e.g. a consumer acronyms overlay)
+    # named +basename+ under gov_codes/afsc across the load path. Files loaded
+    # later win, so a consumer file merges over any shipped one. Returns {} when
+    # none exist; malformed files are skipped (graceful degradation).
+    def flat_overlay(basename, lookup: $LOAD_PATH)
+      merged = {}
+      gem_lib_dir = File.expand_path("..", __dir__)
+      ([gem_lib_dir] + Array(lookup)).uniq.each do |dir|
+        path = File.join(dir, "gov_codes", "afsc", basename)
+        next unless File.exist?(path)
+
+        overlay = YAML.load_file(path, symbolize_names: true)
+        merged.merge!(overlay) if overlay.is_a?(Hash)
+      rescue Psych::SyntaxError, TypeError
+        next
+      end
+      merged
+    end
+
     def find_name_recursive(result)
-      # Start with the career field (e.g., "1N")
       base_code = result[:career_field].to_sym
+      base_data = self::DATA[base_code]
+      return "Unknown" unless base_data
 
-      loaded_data = self::DATA
-      # Look up in the codes hash
-      if loaded_data[base_code]
-        # If we have a subcategory, try to find a more specific name
-        if result[:subcategory] &&
-            loaded_data.dig(base_code, :subcategories) &&
-            loaded_data.dig(base_code, :subcategories, result[:subcategory])
-
-          subdivision = loaded_data.dig(base_code, :subcategories, result[:subcategory])
-          # If we have a shredout, try to find an even more specific name
-          if result[:shredout] &&
-              subdivision.dig(:subcategories) &&
-              subdivision.dig(:subcategories, result[:shredout])
-            return subdivision.dig(:subcategories, result[:shredout], :name)
+      # Try subcategory lookup if present
+      if result[:subcategory]
+        subdivision = base_data.dig(:subcategories, result[:subcategory])
+        if subdivision
+          # Try shredout lookup if present
+          if result[:shredout]
+            shredout_name = subdivision.dig(:subcategories, result[:shredout], :name)
+            return shredout_name if shredout_name
           end
-
-          # Return the subdivision name if no shredout match
-          return subdivision.dig(:name)
+          return subdivision[:name] if subdivision[:name]
         end
-
-        # Return the base name if no subdivision match
-        return loaded_data.dig(base_code, :name)
       end
 
-      # Return a default if no match found
-      "Unknown"
+      base_data[:name] || "Unknown"
     end
   end
 end

data/lib/gov_codes/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GovCodes
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gov_codes
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Jim Gay
@@ -22,11 +22,43 @@ files:
 - CHANGELOG.md
 - README.md
 - Rakefile
+- checksums/gov_codes-0.1.0.gem.sha512
+- checksums/gov_codes-0.1.1.gem.sha512
 - lib/gov_codes.rb
 - lib/gov_codes/afsc.rb
 - lib/gov_codes/afsc/enlisted.rb
-- lib/gov_codes/afsc/enlisted.yml
 - lib/gov_codes/afsc/officer.rb
+- lib/gov_codes/afsc/releases.rb
+- lib/gov_codes/afsc/releases.yml
+- lib/gov_codes/afsc/releases/dafecd/2025-10-31/enlisted.yml
+- lib/gov_codes/afsc/releases/dafecd/2025-10-31/ri.yml
+- lib/gov_codes/afsc/releases/dafocd/2025-10-31/officer.yml
+- lib/gov_codes/afsc/releases/dafocd/2025-10-31/ri.yml
+- lib/gov_codes/afsc/ri.rb
+- lib/gov_codes/dafecd/index_builder.rb
+- lib/gov_codes/dafecd/patterns.rb
+- lib/gov_codes/dafecd/publication.rb
+- lib/gov_codes/dafecd/record_splitter.rb
+- lib/gov_codes/dafecd/ri_sdi/change_date.rb
+- lib/gov_codes/dafecd/ri_sdi/config.rb
+- lib/gov_codes/dafecd/ri_sdi/index_builder.rb
+- lib/gov_codes/dafecd/ri_sdi/ri_list_parser.rb
+- lib/gov_codes/dafecd/ri_sdi/sdi_card_parser.rb
+- lib/gov_codes/dafecd/ri_sdi/sdi_section_splitter.rb
+- lib/gov_codes/dafecd/ri_sdi/section_slicer.rb
+- lib/gov_codes/dafecd/ri_sdi/title.rb
+- lib/gov_codes/dafecd/ri_sdi/title_overrides/dafecd.yml
+- lib/gov_codes/dafecd/ri_sdi/title_overrides/dafocd.yml
+- lib/gov_codes/dafecd/shredout_acronyms.rb
+- lib/gov_codes/dafecd/shredout_degluer.rb
+- lib/gov_codes/dafecd/shredout_overrides/dafecd.yml
+- lib/gov_codes/dafecd/shredout_overrides/dafocd.yml
+- lib/gov_codes/dafecd/shredout_parser.rb
+- lib/gov_codes/dafecd/specialty_parser.rb
+- lib/gov_codes/dafecd/text.rb
+- lib/gov_codes/dafecd/title_degluer.rb
+- lib/gov_codes/dafecd/title_overrides.yml
+- lib/gov_codes/dafecd/title_overrides/dafocd.yml
 - lib/gov_codes/data_loader.rb
 - lib/gov_codes/version.rb
 - sig/gov_codes.rbs
@@ -43,14 +75,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.1.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Handle codes used by the US government.
 test_files: []