openstax_api 8.2.0 → 8.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a3da970c8b505007a77d4c22af9f93f02598a7ac
-  data.tar.gz: 5550c22216fd6b3792b04b182995f4b97a23edfd
+SHA256:
+  metadata.gz: 0cf2c153cb674f3b1d932b5f9857f83ac91e89864305317fb67f3ff613c0d9d0
+  data.tar.gz: 110217b57b4eeb9c98ad6fa710eb02f978c3f48c54751fbe567ec0dc46cc0835
 SHA512:
-  metadata.gz: 3beef5dc60cc89ca7eef3af6056973ca999a24c998ac017595d4d2c6141bce3a5e7c88fa78ec368caf994dbec04a63245b915e7ab5f6942208ff59c1139221df
-  data.tar.gz: a9887c1adbdbc5bc1b66ebb244c8b1069864613bf7ed34d1e7f024fe23383fc85f43deceda938eefa1885c77abc3f31c7cdee66b7fa22cc5fa1454153aab4845
+  metadata.gz: e21ea298b52b5b2290066c80cbb1b78df35cb1d15cf8615b7b17127a85653a337f395ac3b49678adc44fa765c8e0baf37318448e9cc383de41062e5ee5273811
+  data.tar.gz: e2abcc359acaa35c0e63fc8c638a7c49e2186f8cae495768c6044e9b1dccf7143aac0fc18a29129b745a98fea128c5f2d3c2060d1e965fa43293976156f2f15c

data/lib/openstax/api/engine.rb

@@ -15,7 +15,7 @@ module OpenStax
 
       config.generators do |g|
         g.test_framework      :rspec,        fixture: false
-        g.fixture_replacement :factory_girl, dir: 'spec/factories'
+        g.fixture_replacement :factory_bot, dir: 'spec/factories'
         g.assets false
         g.helper false
       end

data/lib/openstax/api/roar.rb

@@ -24,6 +24,7 @@ module OpenStax
       end
 
       def standard_search(klass, routine, represent_with, options={})
+        search_options = { location: nil }
         user = current_api_user
         OSU::AccessPolicy.require_action_allowed!(:search, user, klass)
 
@@ -33,11 +34,11 @@ module OpenStax
         return render_api_errors(result.errors) if result.errors.any?
 
         outputs = result.outputs
-        outputs[:items].each do |item|
+        outputs.items.each do |item|
           OSU::AccessPolicy.require_action_allowed!(:read, user, item)
         end
 
-        respond_with outputs, represent_with_options
+        respond_with outputs, search_options.merge(represent_with_options)
       end
 
       def standard_create(model, represent_with=nil, options={})

data/lib/openstax/api/version.rb

@@ -1,5 +1,5 @@
 module OpenStax
   module Api
-    VERSION = "8.2.0"
+    VERSION = "8.3.0"
   end
 end

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

@@ -5,8 +5,8 @@ module OpenStax
     module V1
       describe ApiController do
 
-        let!(:user)                     { FactoryGirl.create :user }
-        let!(:user_2)                   { FactoryGirl.create :user }
+        let!(:user)                     { FactoryBot.create :user }
+        let!(:user_2)                   { FactoryBot.create :user }
         let!(:application)              { double('Doorkeeper::Application') }
         let!(:doorkeeper_token)         { double('Doorkeeper::AccessToken') }
         let!(:non_doorkeeper_user_proc) { lambda { user } }