openstax_api 6.1.0 → 6.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6a937a25d58a26e40c74de96835de8ad1f4d2c7
-  data.tar.gz: c3c2beeb581971dbe6226b47b6fd53e72ebfd902
+  metadata.gz: 7dc286ebde4e9b6e9bf1a3f7efc08514e4f78610
+  data.tar.gz: a6be75bd1d025aabad6325fd0201778268e578fb
 SHA512:
-  metadata.gz: dca5d4b8cd060781da95aec175e1a7cb084d223261b1cabe6a9db47012451f495e606ba8a74921ef6d9e1c9c0640c9e27ece001564ee99bf95d4907afa5451de
-  data.tar.gz: c829a7fbef75369bbb3b1db6314539f1c13d303b98d6afdabd2f6476ebdcc0a50992986bb7d88c4844f132ea3fcc60bc61b00c9e65666be40aad284b96466e94
+  metadata.gz: 35474cafc2e08ab2429623f923bf0c8df44261a597be93e205221d1630907f3d585da87ff198aa32766b9448636d50c67a12ba8cb127cac659b069aa2d479d83
+  data.tar.gz: 12ff60007d7e23858a7b9c8447b59a997adf4bbc95e60cdd9392181a08d27548f3be4324e69237ded06ad41b4efad54ba6e73cf97d1e22e6bff5d1f4c5065368

data/app/controllers/openstax/api/v1/api_controller.rb

@@ -12,8 +12,14 @@ module OpenStax
 
         respond_to :json
 
+        # after_filters are in place to make sure certain things are set how we
+        # want even if something else goes on during the request.  These filters
+        # are also paired with before_filters in case an exception prevents
+        # normal action completion.
+
         # Always force JSON requests and send the Date header in the response
         before_filter :force_json_content_type
+        before_filter :set_date_header
         after_filter :set_date_header
 
         # Doorkeeper is used only if a token is present
@@ -24,6 +30,7 @@ module OpenStax
         skip_before_filter :verify_authenticity_token, unless: :session_user?
         skip_before_filter :verify_authenticity_token, only: :options
         before_filter :set_cors_preflight_headers, only: :options
+        before_filter :set_cors_headers
         after_filter :set_cors_headers
 
         # Keep old current_user method so we can use it

data/lib/openstax/api/version.rb

@@ -1,5 +1,5 @@
 module OpenStax
   module Api
-    VERSION = "6.1.0"
+    VERSION = "6.1.1"
   end
 end

data/spec/controllers/openstax/api/v1/api_controller_spec.rb

@@ -22,7 +22,7 @@ module OpenStax
             controller.doorkeeper_token = nil
             controller.present_user = nil
           end
-          
+
           it 'has no human_user and no application' do
             expect(controller.send :session_user?).to eq false
             expect(controller.current_application).to be_nil
@@ -36,7 +36,7 @@ module OpenStax
             controller.doorkeeper_token = nil
             controller.present_user = user
           end
-          
+
           it 'has a human_user but no application' do
             expect(controller.send :session_user?).to eq true
             expect(controller.current_application).to be_nil
@@ -50,7 +50,7 @@ module OpenStax
             controller.doorkeeper_token = doorkeeper_token
             controller.present_user = nil
           end
-          
+
           it 'has a human_user from token and an application' do
             allow(doorkeeper_token).to receive(:application).and_return(application)
             allow(doorkeeper_token).to receive(:resource_owner_id).and_return(user.id)
@@ -67,7 +67,7 @@ module OpenStax
             controller.doorkeeper_token = doorkeeper_token
             controller.present_user = nil
           end
-          
+
           it 'has an application but no human_user' do
             allow(doorkeeper_token).to receive(:application).and_return(application)
             allow(doorkeeper_token).to receive(:resource_owner_id).and_return(nil)
@@ -144,11 +144,21 @@ module OpenStax
           end
           after(:each) { OpenStax::Api.configuration.validate_cors_origin = nil }
 
-          it 'when configured proc is true, it sets the origin to whatever was reqeusted' do
-            @valid_origin = 'http://good-host'
-            @request.headers['HTTP_ORIGIN'] = @valid_origin
-            get 'dummy'
-            expect(response.headers['Access-Control-Allow-Origin']).to eq @valid_origin
+          context 'when configured proc is true' do
+            before(:each) do
+              @valid_origin = 'http://good-host'
+              @request.headers['HTTP_ORIGIN'] = @valid_origin
+            end
+
+            it 'sets the origin to whatever was reqeusted' do
+              get 'dummy'
+              expect(response.headers['Access-Control-Allow-Origin']).to eq @valid_origin
+            end
+
+            it 'sets the origin to whatever was requested even if there was an exception raised' do
+              get 'explode'
+              expect(response.headers['Access-Control-Allow-Origin']).to eq @valid_origin
+            end
           end
 
           it 'clears the headers if the configured proc is falsy' do
@@ -158,6 +168,7 @@ module OpenStax
             expect(response.headers['Access-Control-Allow-Origin']).to eq ''
           end
 
+
         end
 
       end

data/spec/dummy/app/controllers/api/v1/dummy_controller.rb

@@ -1,12 +1,22 @@
 module Api
   module V1
 
+    class DummyControllerError < StandardError; end
+
     class DummyController < OpenStax::Api::V1::ApiController
 
+      rescue_from DummyControllerError do |e|
+        render nothing: true, status: 500
+      end
+
       def dummy
         head(:ok)
       end
 
+      def explode
+        raise DummyControllerError, "kaboom"
+      end
+
     end
 
   end

data/spec/dummy/config/routes.rb

@@ -1,5 +1,6 @@
 Rails.application.routes.draw do
   api :v1, :default => true do
     get 'dummy', controller: 'dummy'
+    get 'explode', controller: 'dummy'
   end
 end