bible270 0.16.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3190cb926559301bfff8450c5e4f3d32867d84528c795782f33786c8f49b5a9f
-  data.tar.gz: df04e7e7a97b995c86c3440a81bea7db90360617cb990bc60975aca5d11e1669
+  metadata.gz: f5518f1eb25a21f7610ea80c8cd46e1d49690716bf98b5644fb3fa443f920a0e
+  data.tar.gz: 384ec828a091ed3c71abeb71a1d5b5f7d1cb7ff707f997511ca5e6d411cc5095
 SHA512:
-  metadata.gz: a535dc114386b817d3e501ebb363d52f5898e8d99b10212a414c0bb760fb1f707cc09ed24298ffbeccc7e648f87ee9afadedd2bdcf0951253a3e8aa6d3348bda
-  data.tar.gz: 66b8697402e10bfd1ac99b6aa3b08728a1116521d93dbfbb41ecd2e979b7f34682f185786f27d5a23c154d892470ec679b3e596d01c220da99764fc545e361e6
+  metadata.gz: f222369a58be11fb62c8fd76be668aad9010f76f3d88e9d9820d562eefce7becbe7e9b4fd7dd4dfa5e2408c256762fdd91da44942447328fa69782698e387789
+  data.tar.gz: c1f881c35558530bb27636a2fcd27a0f40ebb9cdc37e9f07cc10fda04aa78ddcfff65f8b210575c10640b46400616727e28ddc3b8594fd9cfa91dd19ac658a3b

data/app/mailers/bible270/notice_mailer.rb

@@ -35,23 +35,28 @@ module Bible270
 
     # A mailer has no request, so the host is config.mailer_host or nothing. No
     # link is better than a broken one.
+    #
+    # The mount prefix needs no help: a mounted engine's url_helpers already
+    # resolve it from the real mount point in routes.rb. Passing script_name from
+    # config.mount_at was worse than useless — ignored when blank, and overriding
+    # the true prefix when not, so a config that disagreed with routes.rb would
+    # have produced links to nowhere.
     def day_url_for(day)
-      host = Bible270.config.mailer_host
-      return nil if host.blank?
-
-      Bible270::Engine.routes.url_helpers.day_url(
-        day, host: host, protocol: host.start_with?('localhost') ? 'http' : 'https'
-      )
-    rescue StandardError
-      nil
+      engine_url(:day_url, day)
     end
 
     def admin_url_for(reader)
+      engine_url(:admin_reader_url, reader)
+    end
+
+    def engine_url(helper, *)
       host = Bible270.config.mailer_host
       return nil if host.blank?
 
-      Bible270::Engine.routes.url_helpers.admin_reader_url(
-        reader, host: host, protocol: host.start_with?('localhost') ? 'http' : 'https'
+      Bible270::Engine.routes.url_helpers.public_send(
+        helper, *,
+        host: host,
+        protocol: host.start_with?('localhost') ? 'http' : 'https'
       )
     rescue StandardError
       nil

data/lib/bible270/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bible270
-  VERSION = '0.16.0'
+  VERSION = '0.16.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bible270
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.1
 platform: ruby
 authors:
 - Andrew vonderLuft