openstax_api 5.0.1 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6f67ec575e9990383aa7c21478d981e5e70bb9a
-  data.tar.gz: 5430de9cbcebbca7ceae0fd2778f810058a4097c
+  metadata.gz: 3c1cb250aa64fa4c52fabc8df85b84382dbfa073
+  data.tar.gz: 9965f611b7b19b5374b164be159f44623ae419a5
 SHA512:
-  metadata.gz: 63333b1fc1570bb53c0635aa78be1d2f323201c49c01d7d8d445c64542c6416792b58d2aced1cb44bffb716379352868f7d046d601e1f90dd69e2d31c0b69bd1
-  data.tar.gz: 7aa5032b8569f8b567e5de1d081e3de56e2773bf2957fe6b8626f50d279a656e0f868e6bb5d649878da3ca30965fb19ec300fb15ae14c34add1875b1ceb8f123
+  metadata.gz: 3e137dd7072ffa37e0e1bf64573e707189e6bb52a66f9d4286e4efcd5ea58aa40e3c6b1adc32f7b1f9873f62c7d9c63ea00c3b7b9a3dfa45f13fde0fbcd13cec
+  data.tar.gz: 50131d6aa0fbf79facab24015f420fa912cbd9b395989fa9865240cccf1382b65f35da8571d117f206905c3b0098f2e1557f1cdbea46a581c2455e699f0a3ea2

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

@@ -8,7 +8,7 @@ module OpenStax
         include OpenStax::Api::Roar
         include OpenStax::Api::Apipie
 
-        doorkeeper_for :all, :unless => :session_user?
+        before_action :doorkeeper_authorize!, :unless => :session_user?
         skip_before_filter :verify_authenticity_token, :unless => :session_user?
 
         respond_to :json
@@ -34,6 +34,12 @@ module OpenStax
           current_api_user.human_user
         end
 
+        def consume!(model, options = {})
+          # Don't error out if no CONTENT_TYPE header
+          request.env['CONTENT_TYPE'] ||= 'application/json'
+          super
+        end
+
         protected
 
         def session_user?

data/app/representers/openstax/api/v1/abstract_search_representer.rb

@@ -10,7 +10,7 @@ module OpenStax
     module V1
       class AbstractSearchRepresenter < ::Roar::Decorator
 
-        include ::Roar::Representer::JSON
+        include ::Roar::JSON
 
         property :total_count,
                  type: Integer,

data/lib/openstax/api/roar.rb

@@ -31,7 +31,8 @@ module OpenStax
 
           if model.save
             respond_with model, represent_with: represent_with,
-                                status: :created
+                                status: :created,
+                                location: [:api, model]
           else
             render_api_errors(model.errors)
           end
@@ -72,7 +73,7 @@ module OpenStax
         OSU::AccessPolicy.require_action_allowed!(:destroy,
                                                   current_api_user,
                                                   model)
-        
+
         if model.destroy
           head :no_content
         else

data/lib/openstax/api/rspec_helpers.rb

@@ -44,7 +44,8 @@ module OpenStax
         header = is_a_controller_spec? ? request.env : {}
 
         # Add the doorkeeper token info
-        header['HTTP_AUTHORIZATION'] = "Bearer #{doorkeeper_token.token}" if doorkeeper_token
+        header['HTTP_AUTHORIZATION'] = "Bearer #{doorkeeper_token.token}" \
+          if doorkeeper_token
 
         # Select the version of the API based on the spec metadata and populate the accept header
         version_string = self.class.metadata[:version].try(:to_s)

data/lib/openstax/api/version.rb

@@ -1,5 +1,5 @@
 module OpenStax
   module Api
-    VERSION = "5.0.1"
+    VERSION = "5.1.0"
   end
 end

data/spec/dummy/app/representers/user_representer.rb

@@ -1,8 +1,8 @@
 require 'representable/json'
 
-class UserRepresenter < ::Roar::Decorator
+class UserRepresenter < Roar::Decorator
 
-  include Roar::Representer::JSON
+  include Roar::JSON
   
   property :username, readable: false, writeable: false,
                       schema_info: { required: true }