Don't store invalid styles in the session. Faster cache

Author: fbacall

app/controllers/citations_controller.rb

@@ -11,6 +11,6 @@ def fetch
   private
 
   def set_citation_style
-    session[:citation_style] = params[:style] if params[:style].present?
+    session[:citation_style] = params[:style] if params[:style].present? && Seek::Citations.valid_style?(params[:style])
   end
 end

lib/seek/citations.rb

@@ -29,9 +29,7 @@ def self.style_pairs
     end
 
     def self.valid_styles
-      Rails.cache.fetch("citation-styles-set") do
-        Set.new(style_pairs.map(&:last))
-      end
+      @valid_styles ||= Set.new(style_pairs.map(&:last))
     end
 
     def self.doi_to_csl(doi)
@@ -56,10 +54,14 @@ def self.style_dictionary_path
       Rails.root.join('config/default_data/csl_styles.yml')
     end
 
+    def self.valid_style?(style)
+      valid_styles.include?(style)
+    end
+
     private
 
     def self.validate_style(style)
-      raise Seek::Citations::InvalidStyleException unless valid_styles.include?(style)
+      raise Seek::Citations::InvalidStyleException unless valid_style?(style)
     end
   end
 end

test/integration/citation_style_test.rb

@@ -23,7 +23,9 @@ def setup
 
     new_style = 'journal-of-infectious-diseases'
 
+    assert_nil session[:citation_style]
     get citation_path(@doi, style: new_style, format: :js), xhr: true
+    assert_equal new_style, session[:citation_style]
 
     get model_path(@model)
     assert_select '#citation' do
@@ -35,6 +37,12 @@ def setup
     end
   end
 
+  test 'does not remember style if invalid style chosen' do
+    assert_nil session[:citation_style]
+    get citation_path(@doi, style: 'ghdfgkhdfjkghdkj', format: :js), xhr: true
+    assert_nil session[:citation_style]
+  end
+
   test 'handles invalid style selection' do
     doi_citation_mock