openstax_api 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bd63382869d88bfbb49b1fe5fb7c1a5522f2369
-  data.tar.gz: c80e6e53fa5a5f8c2942f723a5999e93198eccae
+  metadata.gz: 9a04be0fa091031552f0e4797e093a1751661e7d
+  data.tar.gz: 8e79ca4932124dcdf2948320db9d461ff94cd498
 SHA512:
-  metadata.gz: 95c74b7898781162457f4f6b1180735c0a21c5ce2d5368eb2e2baeb7fddd66d04fda8fff3fc17f401ddfad6d9dc561d2e6f8c1d36e165119038a769b142c8804
-  data.tar.gz: 86c0f23a3182e2bdb7051d48cef30106c2b5c2252f3563c723cd12ed685a06fec0f3be3ce903d6268588f63ca6625d61be08ad074564c7942642043540e1dad3
+  metadata.gz: d975020dd0e7bf4e5ba8eefb43fede87f83bf95de73a0f48ab915ddaa43f5131a965dcaf8e92a66671c664593d83eeeb45a9b5cb411298a14f8f0d65cd1e8c12
+  data.tar.gz: 86dc7e42cd01e76e895a48f19d5320ba1bcd48142de2471c3b3ac082d1ffccf656c6315f12c24ee88e83416cccd1b0179c075473d57367e23c9300a4c7b1cf5c

data/lib/openstax/api/rspec_helpers.rb

@@ -39,34 +39,26 @@ module OpenStax
       end
 
       def api_request(type, action, doorkeeper_token, args={})
-        request_method = is_a_controller_spec? ?
-                           :controller_spec_api_request : 
-                           :request_spec_api_request
-        self.send(request_method, type, action, doorkeeper_token, args)
-      end
-
-      private
-
-      def controller_spec_api_request(type, action, doorkeeper_token, args={})
         raise IllegalArgument if ![:get, :post, :put, :delete, :patch, :head].include?(type)
 
-        # Add the doorkeeper token info and the accept header
+        header = is_a_controller_spec? ? request.env : {}
 
-        request.env['HTTP_AUTHORIZATION'] = "Bearer #{doorkeeper_token.token}" \
-          if doorkeeper_token
+        # Add the doorkeeper token info
+        header['HTTP_AUTHORIZATION'] = "Bearer #{doorkeeper_token.token}" if doorkeeper_token
 
-        request.env['HTTP_ACCEPT'] = http_accept_string
+        # 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)
+        raise ArgumentError, "Top-level 'describe' metadata must include a value for ':version'" if version_string.nil?
+        header['HTTP_ACCEPT'] = "application/vnd.openstax.#{version_string}"
 
         # Set the raw post data in the request, converting to JSON if needed
-
         if args[:raw_post_data]
-          request.env['RAW_POST_DATA'] = args[:raw_post_data].is_a?(Hash) ? 
-                                         args[:raw_post_data].to_json : 
-                                         args[:raw_post_data]
+          header['RAW_POST_DATA'] = args[:raw_post_data].is_a?(Hash) ? 
+                                      args[:raw_post_data].to_json : 
+                                      args[:raw_post_data]
         end
 
         # Set the data format
-
         args[:parameters] ||= {}
         args[:parameters][:format] = 'json'
 
@@ -79,29 +71,19 @@ module OpenStax
           action = "/api#{action}" if !action.starts_with?("/api/")
         end
 
-        # Delegate the work to the normal HTTP request helpers
-        self.send(type, action, args[:parameters], args[:session], args[:flash])
+        if is_a_controller_spec?
+          self.send(type, action, args[:parameters], args[:session], args[:flash])
+        else
+          self.send(type, action, args[:parameters], header)
+        end
       end
 
-      def request_spec_api_request(type, route, doorkeeper_token=nil, args={})
-        http_header = {}
-        http_header['HTTP_AUTHORIZATION'] = "Bearer #{doorkeeper_token.token}" if doorkeeper_token.present?
-        http_header['HTTP_ACCEPT'] = http_accept_string
-
-        send(type, route, {format: :json}, http_header)
-      end
+      private
 
       def is_a_controller_spec?
         self.class.metadata[:type] == :controller
       end
 
-      def http_accept_string
-        # Select the version of the API based on the spec metadata and populate the vnd string
-        version_string = self.class.metadata[:version].try(:to_s)
-        raise ArgumentError, "Top-level 'describe' metadata must include a value for ':version'" if version_string.nil?
-        "application/vnd.openstax.#{version_string}"
-      end
-
     end
   end
 end

data/lib/openstax/api/version.rb

@@ -1,5 +1,5 @@
 module OpenStax
   module Api
-    VERSION = "4.0.0"
+    VERSION = "4.0.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstax_api
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Dante Soares