openstax_api 9.0.0 → 9.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f8d716f67fca1c587540e13f7db606522238ec2b77638f8278049d1812926c2
-  data.tar.gz: 062e0e434cb74bb13021f4211c5c919108a14d771321534ac0bf6a92b59ce556
+  metadata.gz: f83c98026dbc9d84ffd602fc06cf65de6b88ee89fe05c72ec01e974d82bf7cef
+  data.tar.gz: 7fa22ec461b66dfd46bf5e73348b33154bf272e68ff38c365cc7c37b26bd657d
 SHA512:
-  metadata.gz: 9f97f203f831a97d8bc4ffce4a348dff922c5b4f1b7795715daf6f2ef615231f18b0921dd226b36be3e08b494843dc91fba391b991418caa229b557dfa631298
-  data.tar.gz: 23d07578255d6cd7c84d08265ed866e02d1d20dfaa4efdcbaea260bc2064368382dab602b62fd1580c26b2a3b0f06ba7272e1d4665b21d371e8c855804dfde2f
+  metadata.gz: 34b6a34c6c049c3e52a86bd91adb9f9b2275eae3409730af74090ca7bdef314bfafcc58923cd61dcd4f56ecb8ea8b5ec9a543205988acb9706b187a50af05b21
+  data.tar.gz: c967f69e3c85fe37c387ad145156dcc6317545606981fd019c882e22fa0ae231fdc14f2a99bf51a279b172f486b57229c05b3b289980506351b52af1480fef70

data/lib/openstax/api/roar.rb

@@ -13,7 +13,7 @@ module OpenStax
         model_klass = relation.base_class
         OSU::AccessPolicy.require_action_allowed!(:index, current_api_user, model_klass)
 
-        represent_with_options = { user_options: options }.merge(represent_with: represent_with)
+        represent_with_options = { user_options: options, represent_with: represent_with }
 
         relation.each do |item|
           # Must be able to read each record
@@ -24,11 +24,10 @@ 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)
 
-        represent_with_options = { user_options: options }.merge(represent_with: represent_with)
+        represent_with_options = { user_options: options, represent_with: represent_with }
 
         result = routine.call(params, options)
         return render_api_errors(result.errors) if result.errors.any?
@@ -38,12 +37,11 @@ module OpenStax
           OSU::AccessPolicy.require_action_allowed!(:read, user, item)
         end
 
-        respond_with outputs, search_options.merge(represent_with_options)
+        respond_with outputs, { status: :ok, location: nil }.merge(represent_with_options)
       end
 
       def standard_create(model, represent_with=nil, options={})
-        create_options = { status: :created, location: nil }
-        represent_with_options = { user_options: options }.merge(represent_with: represent_with)
+        represent_with_options = { user_options: options, represent_with: represent_with }
 
         model.class.transaction do
           consume!(model, represent_with_options.dup)
@@ -51,7 +49,7 @@ module OpenStax
           OSU::AccessPolicy.require_action_allowed!(:create, current_api_user, model)
 
           if model.save
-            respond_with model, create_options.merge(represent_with_options)
+            respond_with model, { status: :created, location: nil }.merge(represent_with_options)
           else
             render_api_errors(model.errors)
           end
@@ -71,9 +69,7 @@ module OpenStax
       def standard_read(model, represent_with=nil, use_timestamp_for_cache=false, options={})
         OSU::AccessPolicy.require_action_allowed!(:read, current_api_user, model)
 
-        represent_with_options = { user_options: options }.merge(represent_with: represent_with)
-
-        respond_with model, represent_with_options \
+        respond_with(model, { user_options: options, represent_with: represent_with }) \
           if !use_timestamp_for_cache || stale?(model, template: false)
       end
 
@@ -82,7 +78,7 @@ module OpenStax
         OSU::AccessPolicy.require_action_allowed!(:update, current_api_user, model)
 
         responder_options = { responder: ResponderWithPutPatchDeleteContent }
-        represent_with_options = { user_options: options }.merge(represent_with: represent_with)
+        represent_with_options = { user_options: options, represent_with: represent_with }
 
         model.with_lock do
           consume!(model, represent_with_options.dup)
@@ -106,7 +102,7 @@ module OpenStax
           if model.respond_to?(:deleted?) && model.deleted?
 
         responder_options = { responder: ResponderWithPutPatchDeleteContent }
-        represent_with_options = { user_options: options }.merge(represent_with: represent_with)
+        represent_with_options = { user_options: options, represent_with: represent_with }
 
         model.with_lock do
           if model.destroy
@@ -128,8 +124,9 @@ module OpenStax
         recursive = options.has_key?(:recursive) ? options[:recursive] : true
 
         responder_options = { responder: ResponderWithPutPatchDeleteContent }
-        represent_with_options = { user_options: options.except(:recursive) }
-                                     .merge(represent_with: represent_with)
+        represent_with_options = {
+          user_options: options.except(:recursive), represent_with: represent_with
+        }
 
         model.with_lock do
           if model.restore(recursive: recursive)

data/lib/openstax/api/rspec_helpers.rb

@@ -71,9 +71,10 @@ module OpenStax
         # be a URL fragment string -- in such a case, prepend "/api"
         # to the front of the URL as a convenience to callers
 
-        if action.is_a? String
-          action = "/#{action}" if !action.starts_with?("/")
-          action = "/api#{action}" if !action.starts_with?("/api/")
+        action = action.to_s unless is_a_controller_spec?
+        if action.is_a?(String) && !action.include?('://')
+          action = "/#{action}" if !action.starts_with?('/')
+          action = "/api#{action}" if !action.starts_with?('/api/')
         end
 
         send type, action, args

data/lib/openstax/api/version.rb

@@ -1,5 +1,5 @@
 module OpenStax
   module Api
-    VERSION = '9.0.0'
+    VERSION = '9.0.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstax_api
 version: !ruby/object:Gem::Version
-  version: 9.0.0
+  version: 9.0.1
 platform: ruby
 authors:
 - Dante Soares
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-23 00:00:00.000000000 Z
+date: 2019-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -274,7 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: API utilities for OpenStax products and tools.