openstax_api 5.2.2 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ae4df95ab9e38f20ee96bfe5d5cd310c10d5c7c7
-  data.tar.gz: ed8ea2e60ff45728be9d4803a5e9db0a478e6256
+  metadata.gz: ab8a6785ca018f79bbd476d360b2a52956a6b56a
+  data.tar.gz: 4d77c522856c7f424a86e9c8e06646e2292af525
 SHA512:
-  metadata.gz: cc6efaa3c7504398f7ccf5d67c318b5985d4884819edd0e385ac903aab6ff7b74d590e6ef480f4d8b607eed31d155859de30964c8d41a2b42c8533be45c53237
-  data.tar.gz: b03775f4e8dbb68ad768ef7d1f93333174be78dd90362194de40fb2004fa3112298d0d2789ef68450bf37418c0394ac456fff06ce5638db138fa0e5dc695b824
+  metadata.gz: 27abc5a1882d7fa01c531d32d5e4e82192469d156ea843d3d6185df40e55474751834ef5a3135e2f51cdbf491275254b24ea025f7c59dd341b92279c629d4f5e
+  data.tar.gz: 460eb820b127aa0805dfb0c636ac810ca6bbc2533855c901e7330a147b66781aca5cfbc22b1b9abe44b2a0ea55d09c99abf5d3b5ee50fc7f61d000a29cbbfb82

data/lib/openstax/api/roar.rb

@@ -25,9 +25,7 @@ module OpenStax
         model.class.transaction do
           consume!(model, represent_with: represent_with)
           yield model if block_given?
-          OSU::AccessPolicy.require_action_allowed!(:create,
-                                                    current_api_user,
-                                                    model)
+          OSU::AccessPolicy.require_action_allowed!(:create, current_api_user, model)
 
           if model.save
             respond_with model, represent_with: represent_with,
@@ -38,30 +36,24 @@ module OpenStax
         end
       end
 
-      def standard_read(model, represent_with=nil)
-        OSU::AccessPolicy.require_action_allowed!(:read,
-                                                  current_api_user,
-                                                  model)
-        respond_with model, represent_with: represent_with
+      def standard_read(model, represent_with=nil, use_timestamp_for_cache=false)
+        OSU::AccessPolicy.require_action_allowed!(:read, current_api_user, model)
+        respond_with model, represent_with: represent_with \
+          if !use_timestamp_for_cache || stale?(model)
       end
 
       def standard_update(model, represent_with=nil)
         # Must be able to update the record before and after the update itself
-        OSU::AccessPolicy.require_action_allowed!(:update,
-                                                  current_api_user,
-                                                  model)
+        OSU::AccessPolicy.require_action_allowed!(:update, current_api_user, model)
 
         model.class.transaction do
           consume!(model, represent_with: represent_with)
           yield model if block_given?
-          OSU::AccessPolicy.require_action_allowed!(:update,
-                                                    current_api_user,
-                                                    model)
+          OSU::AccessPolicy.require_action_allowed!(:update, current_api_user, model)
         
           if model.save
             # http://stackoverflow.com/a/27413178
-            respond_with model, represent_with: represent_with,
-                                responder: ResponderWithPutContent
+            respond_with model, represent_with: represent_with, responder: ResponderWithPutContent
           else
             render_api_errors(model.errors)
           end
@@ -69,9 +61,7 @@ module OpenStax
       end
 
       def standard_destroy(model)
-        OSU::AccessPolicy.require_action_allowed!(:destroy,
-                                                  current_api_user,
-                                                  model)
+        OSU::AccessPolicy.require_action_allowed!(:destroy, current_api_user, model)
 
         if model.destroy
           head :no_content
@@ -82,44 +72,34 @@ module OpenStax
 
       def standard_index(relation, represent_with)
         model_klass = relation.base_class
-        OSU::AccessPolicy.require_action_allowed!(:index,
-                                                  current_api_user,
-                                                  model_klass)
+        OSU::AccessPolicy.require_action_allowed!(:index, current_api_user, model_klass)
         relation.each do |item|
           # Must be able to read each record
-          OSU::AccessPolicy.require_action_allowed!(:read,
-                                                    current_api_user,
-                                                    item)
+          OSU::AccessPolicy.require_action_allowed!(:read, current_api_user, item)
         end
-        respond_with(Lev::Outputs.new(items: relation),
-                     represent_with: represent_with)
+        respond_with(Lev::Outputs.new(items: relation), represent_with: represent_with)
       end
 
       def standard_sort(*args)
         raise NotYetImplemented
       end
 
-      def standard_nested_create(model, container_association,
-                                 container, represent_with=nil)
+      def standard_nested_create(model, container_association, container, represent_with=nil)
         # Must be able to update the container
-        OSU::AccessPolicy.require_action_allowed!(:update,
-                                                  current_api_user,
-                                                  container)
+        OSU::AccessPolicy.require_action_allowed!(:update, current_api_user, container)
         model.send("#{container_association.to_s}=", container)
 
         standard_create(model, represent_with)
       end
 
       def render_api_errors(errors, status = :unprocessable_entity)
-        hash = {status: Rack::Utils.status_code(status)}
+        hash = { status: Rack::Utils.status_code(status) }
         case errors
         when ActiveModel::Errors, Lev::BetterActiveModelErrors
           hash[:errors] = []
           errors.each do |attribute, message|
             hash[:errors] << {
-              code: "#{attribute.to_s}_#{
-                      message.to_s.gsub(/[\s-]/, '_').gsub(/[^\w]/, '')
-                    }",
+              code: "#{attribute.to_s}_#{message.to_s.gsub(/[\s-]/, '_').gsub(/[^\w]/, '')}",
               message: errors.full_message(attribute, message)
             }
           end

data/lib/openstax/api/version.rb

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