Merge pull request #2319 from mamhoff/raise-on-wrong-locale

Raise on non-existing locale

app/controllers/alchemy/api/base_controller.rb

@@ -5,17 +5,18 @@ class Api::BaseController < Alchemy::BaseController
     layout false
     respond_to :json
 
-    rescue_from CanCan::AccessDenied,         with: :render_not_authorized
+    rescue_from CanCan::AccessDenied, with: :render_not_authorized
     rescue_from ActiveRecord::RecordNotFound, with: :render_not_found
+    rescue_from ActionController::RoutingError, with: :render_not_found
 
     private
 
     def render_not_authorized
-      render json: {error: "Not authorized"}, status: 403
+      render json: { error: "Not authorized" }, status: 403
     end
 
     def render_not_found
-      render json: {error: "Record not found"}, status: 404
+      render json: { error: "Record not found" }, status: 404
     end
   end
 end

lib/alchemy/controller_actions.rb

@@ -75,7 +75,8 @@ def set_alchemy_language(lang = nil)
 
     def load_alchemy_language_from_params
       if params[:locale].present?
-        Language.find_by_code(params[:locale])
+        Language.find_by_code(params[:locale]) ||
+          raise(ActionController::RoutingError, "Language not found")
       end
     end
 

spec/libraries/controller_actions_spec.rb

@@ -158,13 +158,12 @@
       context "for language that does not exist" do
         before do
           allow(controller).to receive(:params).and_return(locale: "fo")
-          controller.send :set_alchemy_language
         end
 
-        it "should set the language to default" do
-          expect(assigns(:language)).to eq(default_language)
-          expect(Alchemy::Language.current).to eq(default_language)
-          expect(controller.session).to include_language_information_for(default_language)
+        it "should raise an error" do
+          expect do
+            controller.send :set_alchemy_language
+          end.to raise_exception(ActionController::RoutingError, "Language not found")
         end
       end
     end