Merge pull request #128 from tekin/global-non-expiring-ids

Allow expires_in to be configured to nil globally

Author: kaspth

lib/global_id/railtie.rb

@@ -19,11 +19,11 @@ class Railtie < Rails::Railtie # :nodoc:
       default_app_name = app.railtie_name.remove('_application').dasherize
 
       GlobalID.app = app.config.global_id.app ||= default_app_name
-      SignedGlobalID.expires_in = app.config.global_id.expires_in ||= default_expires_in
+      SignedGlobalID.expires_in = app.config.global_id.fetch(:expires_in, default_expires_in)
 
       config.after_initialize do
         GlobalID.app = app.config.global_id.app ||= default_app_name
-        SignedGlobalID.expires_in = app.config.global_id.expires_in ||= default_expires_in
+        SignedGlobalID.expires_in = app.config.global_id.fetch(:expires_in, default_expires_in)
 
         app.config.global_id.verifier ||= begin
           GlobalID::Verifier.new(app.key_generator.generate_key('signed_global_ids'))

test/cases/railtie_test.rb

@@ -29,6 +29,12 @@ def setup
     assert_equal 'foo', GlobalID.app
   end
 
+  test 'SignedGlobalID.expires_in can be explicitly set to nil with config.global_id.expires_in' do
+    @app.config.global_id.expires_in = nil
+    @app.initialize!
+    assert_nil SignedGlobalID.expires_in
+  end
+
   test 'config.global_id can be used to set configurations after the railtie has been loaded' do
     @app.config.eager_load = true
     @app.config.before_eager_load do
@@ -41,6 +47,17 @@ def setup
     assert_equal 1.year, SignedGlobalID.expires_in
   end
 
+  test 'config.global_id can be used to explicitly set SignedGlobalID.expires_in to nil after the railtie has been loaded' do
+    @app.config.eager_load = true
+    @app.config.before_eager_load do
+      @app.config.global_id.expires_in = nil
+    end
+
+    @app.initialize!
+    assert_nil SignedGlobalID.expires_in
+  end
+
+
   test 'SignedGlobalID.verifier defaults to Blog::Application.message_verifier(:signed_global_ids) when secret_key_base is present' do
     @app.initialize!
     message = {id: 42}