v3.5.0 with R update to 4.4.3, updating deprecated Ruby functions

.github/workflows/build-deploy-pr.yaml

@@ -1,18 +1,20 @@
 name: build-deploy-pr
 on:
   pull_request:
+  repository_dispatch:
+    types: [release-build, force-rebuild]
 jobs:
   deploy-images:
     runs-on: ubuntu-latest
     env:
       registry: ghcr.io
-      username: degauss-org
+      username: ${{ github.event.organization.login || github.repository_owner }}
       repository: geocoder
     strategy:
       fail-fast: false
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: create latest tag variable
         run: |
           container="${{ env.registry }}/${{ env.username}}/${{ env.repository }}:latest"
@@ -31,7 +33,7 @@ jobs:
           docker run --rm -v "${PWD}/test":/tmp ${{ env.container }} my_address_file.csv 0.6
           docker run --rm -v "${PWD}/test":/tmp ${{ env.container }} my_address_file.csv all
       - name: login to ghcr
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.registry }}
           username: ${{ env.username }}

.github/workflows/build-deploy-release.yaml

@@ -2,26 +2,28 @@ name: build-deploy-release
 on:
   release:
     types: [published]
+  repository_dispatch:
+    types: [release-build, force-rebuild]
 jobs:
   deploy-images:
     runs-on: ubuntu-latest
     env:
       registry: ghcr.io
-      username: degauss-org
+      username: ${{ github.event.organization.login || github.repository_owner }}
       repository: geocoder
     strategy:
       fail-fast: false
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: create latest tag variable
         run: |
-          container="${{ env.registry }}/${{ env.username}}/${{ env.repository }}:latest"
+          container="${{ env.registry }}/${{ env.username }}/${{ env.repository }}:latest"
           echo "container=${container}" >> $GITHUB_ENV
       - name: create release tag variable
         if: github.event_name == 'release'
         run: |
-          versioned="${{ env.registry }}/${{ env.username}}/${{ env.repository }}:${GITHUB_REF##*/}"
+          versioned="${{ env.registry }}/${{ env.username }}/${{ env.repository }}:${GITHUB_REF##*/}"
           echo "versioned=${versioned}" >> $GITHUB_ENV
       - name: build container
         run: |
@@ -32,7 +34,7 @@ jobs:
           docker run --rm -v "${PWD}/test":/tmp ${{ env.container }} my_address_file.csv 0.6
           docker run --rm -v "${PWD}/test":/tmp ${{ env.container }} my_address_file.csv all
       - name: login to ghcr
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.registry }}
           username: ${{ env.username }}

.github/workflows/build-manual.yml

@@ -0,0 +1,70 @@
+name: Manually Rebuild Docker
+
+on:
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: "Optional image tag to push (e.g., v1.2.3). If empty, use repo tag at HEAD or short SHA."
+        required: false
+        default: ""
+
+jobs:
+  deploy-images:
+    runs-on: ubuntu-latest
+    env:
+      REGISTRY: ghcr.io
+      USERNAME: ${{ github.event.organization.login || github.repository_owner }}
+      REPOSITORY: geocoder
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0  # needed to read tags
+
+      - name: Determine image tags
+        shell: bash
+        run: |
+          set -euo pipefail
+          IMAGE="${REGISTRY}/${USERNAME}/${REPOSITORY}"
+
+          INPUT_TAG="${{ github.event.inputs.tag }}"
+          if [ -n "$INPUT_TAG" ]; then
+            TAG="$INPUT_TAG"
+          else
+            # Use exact tag at HEAD if present; otherwise short SHA
+            TAG="$(git describe --tags --exact-match 2>/dev/null || true)"
+            if [ -z "$TAG" ]; then
+              TAG="$(git rev-parse --short HEAD)"
+            fi
+          fi
+
+          echo "image=${IMAGE}" >> "$GITHUB_ENV"
+          echo "tag=${TAG}" >> "$GITHUB_ENV"
+          echo "versioned=${IMAGE}:${TAG}" >> "$GITHUB_ENV"
+          echo "latest=${IMAGE}:latest" >> "$GITHUB_ENV"
+
+          echo "Will publish tags:"
+          echo " - ${IMAGE}:${TAG}"
+          echo " - ${IMAGE}:latest"
+
+      - name: Build image
+        run: |
+          docker build -t "${{ env.versioned }}" -t "${{ env.latest }}" .
+
+      - name: Test image
+        run: |
+          docker run --rm -v "${PWD}/test":/tmp "${{ env.versioned }}" my_address_file.csv
+          docker run --rm -v "${PWD}/test":/tmp "${{ env.versioned }}" my_address_file.csv 0.6
+          docker run --rm -v "${PWD}/test":/tmp "${{ env.versioned }}" my_address_file.csv all
+
+      - name: Login to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ env.USERNAME }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Push images
+        run: |
+          docker push "${{ env.versioned }}"
+          docker push "${{ env.latest }}"

Dockerfile

@@ -1,8 +1,8 @@
-FROM rocker/r-ver:4.4.1
+FROM ghcr.io/rocker-org/r-ver:4.4.3
 
 # DeGAUSS container metadata
 ENV degauss_name="geocoder"
-ENV degauss_version="3.4.0"
+ENV degauss_version="3.5.0"
 ENV degauss_description="geocodes"
 ENV degauss_argument="valid_geocode_score_threshold [default: 0.5]"
 
@@ -48,7 +48,8 @@ WORKDIR /app
 
 # install required version of renv
 RUN R --quiet -e "install.packages('remotes', repos = c(CRAN = 'https://packagemanager.posit.co/cran/latest'))"
-RUN R --quiet -e "remotes::install_github('rstudio/renv@v1.0.7')"
+RUN R --quiet -e "remotes::install_github('rstudio/renv@v1.1.5')"
+
 
 COPY renv.lock .
 RUN R --quiet -e "renv::restore(repos = c(CRAN = 'https://packagemanager.posit.co/cran/latest'))"

entrypoint.R

@@ -157,5 +157,4 @@ if (opt$score_threshold != "all") {
                       wrap = TRUE
   )
   knitr::kable(geocode_summary %>% dplyr::select(geocode_result, `n (%)`))
-}
-
+}

lib/geocoder/README.md

@@ -0,0 +1,5 @@
+# Ruby Geocoder
+
+See this reposotiory for more information.
+
+[https://github.com/geocommons/geocoder](https://github.com/geocommons/geocoder)

lib/geocoder/us.rb

@@ -7,7 +7,7 @@
 # General usage is as follows:
 #
 #  >> require 'geocoder/us'
-#  >> db = Geocoder::US::Database.new("/opt/tiger/geocoder.db")
+#  >> db = Geocoder::US::Database.new("/opt/geocoder.db")
 #  >> p db.geocode("1600 Pennsylvania Av, Washington DC")
 #
 #  [{:pretyp=>"", :street=>"Pennsylvania", :sufdir=>"NW", :zip=>"20502",

lib/geocoder/us/database.rb

@@ -39,7 +39,7 @@ def initialize (filename, options = {})
                   :create => false, :dbtype => 1}
       options = defaults.merge options
       raise ArgumentError, "can't find database #{filename}" \
-        unless options[:create] or File.exists? filename
+        unless options[:create] or File.exist? filename
       @db = SQLite3::Database.new( filename )
       @st = {}
       @dbtype = options[:dbtype]
@@ -153,7 +153,7 @@ def execute_statement (st, *params)
         result = st.execute(*params)
         columns = result.columns.map {|c| c.to_sym}
         result.each {|row|
-           rows << Hash[*(columns.zip(row).flatten)]}
+           rows << columns.zip(row).to_h}
 
       end
       if @debug
@@ -630,7 +630,7 @@ def clean_record! (record)
         unless record[:score].nil?
       record.keys.each {|k| record[k] = "" if record[k].nil? } # clean up nils
       record.delete :components unless @debug
-      record.delete_if {|k,v| k.is_a? Fixnum or
+      record.delete_if {|k,v| k.is_a? Integer or
           [:geometry, :side, :tlid, :fid, :fid1, :fid2, :street_phone,
            :city_phone, :fromhn, :tohn, :paflag, :flipped, :street_score,
            :city_score, :priority, :fips_class, :fips_place, :status].include? k}