openstax_api 5.3.0 → 5.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab8a6785ca018f79bbd476d360b2a52956a6b56a
-  data.tar.gz: 4d77c522856c7f424a86e9c8e06646e2292af525
+  metadata.gz: bd1e28d0e4f377076268137319caa8627e4946f1
+  data.tar.gz: 9594e636215544dc1a2f1d39e88cebb983434c0c
 SHA512:
-  metadata.gz: 27abc5a1882d7fa01c531d32d5e4e82192469d156ea843d3d6185df40e55474751834ef5a3135e2f51cdbf491275254b24ea025f7c59dd341b92279c629d4f5e
-  data.tar.gz: 460eb820b127aa0805dfb0c636ac810ca6bbc2533855c901e7330a147b66781aca5cfbc22b1b9abe44b2a0ea55d09c99abf5d3b5ee50fc7f61d000a29cbbfb82
+  metadata.gz: fe53719d70cdc83b38bae3987ad2d112341ef147a8a2a527cc295c0ddbcdf0bedbef72e50d675fd1f899804f902335d1513e9c29724658d98835542670ee4953
+  data.tar.gz: 340faad4b368f2a7af64c7a0c29bde1ed6266434b0fe369489182f7e901ed1e492eb09f8477dcb7af6903fbbfa6751cebe006414dcc5645891f562876775fc93

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

@@ -13,6 +13,7 @@ module OpenStax
 
         respond_to :json
 
+        before_filter :force_json_content_type
         after_filter :set_date_header
 
         # Keep old current_user method so we can use it
@@ -36,12 +37,6 @@ 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?
@@ -52,6 +47,12 @@ module OpenStax
           response.date = Time.now unless response.date?
         end
 
+        def force_json_content_type
+          # Force JSON content_type
+          request.env['CONTENT_TYPE'] = 'application/json'
+          request.env['action_dispatch.request.content_type'] = 'application/json'
+        end
+
       end
 
     end

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

@@ -25,18 +25,31 @@ module OpenStax
         collection :items,
                    readable: true,
                    writeable: false,
+                   exec_context: :decorator,
                    schema_info: {
                      required: true,
                      description: "The items matching the query or a subset thereof when paginating"
                    }
 
+        def items
+          return represented.items if represented.respond_to?(:items)
+          return represented[:items] if represented.respond_to?(:has_key?) && \
+                                        represented.has_key?(:items)
+          represented
+        end
+
         def total_count
-          return represented[:total_count] if represented[:total_count]
-          case represented[:items]
-          when ActiveRecord::Relation
-            represented[:items].limit(nil).offset(nil).count
-          when Array
-            represented[:items].count
+          return represented.total_count if represented.respond_to?(:total_count)
+          return represented[:total_count] if represented.respond_to?(:has_key?) && \
+                                              represented.has_key?(:total_count)
+
+          @items = items
+          if @items.respond_to?(:length)
+            if @items.respond_to?(:limit) && @items.respond_to?(:offset)
+              @items.limit(nil).offset(nil).length
+            else
+              @items.length
+            end
           else
             1
           end

data/lib/openstax/api/routing_mapper_includes.rb

@@ -14,8 +14,7 @@ module OpenStax
           scope(except: [:new, :edit],
                 module: version,
                 constraints: constraints) do
-            get '/', to: '/apipie/apipies#index', defaults: {format: 'html',
-                                                             version: version.to_s}
+            get '/', to: '/apipie/apipies#index', defaults: {format: 'html', version: version.to_s}
 
             yield
 

data/lib/openstax/api/rspec_helpers.rb

@@ -90,8 +90,12 @@ module OpenStax
   end
 end
 
-if defined?(RSpec)
+# Add the helpers to RSpec but don't error out if the rspec gem is not present
+begin
+  require 'rspec/core'
+
   RSpec.configure do |c|
     c.include OpenStax::Api::RSpecHelpers
   end
+rescue LoadError
 end

data/lib/openstax/api/version.rb

@@ -1,5 +1,5 @@
 module OpenStax
   module Api
-    VERSION = "5.3.0"
+    VERSION = "5.4.0"
   end
 end