openstax_api 7.1.1 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db318429c83e8c7a988ce5afc23006eb0447038a
-  data.tar.gz: 8a81f95ff5f4a951ac6ae6154d47bf3ac48ea37a
+  metadata.gz: a051bb3544455eda8634de89e45c437b6ffb3beb
+  data.tar.gz: 611263fd2da96e7c7a4b033e5211e357fd4b170a
 SHA512:
-  metadata.gz: 6a3280616e32f8e51d258153440cb3891b4228c0c1b060e203389d132c7fdaf77118099ab9fba4f387354818d643845de146e3953e5749908a9e2f2295a681a8
-  data.tar.gz: 9cea5a91e3b4f1973d8eeb3dfc9f61c307e2a218b80974b3aa668097c01ce384b83f10dc21e82ce2af42e2a8773835db84e121bbdecd779e3596253061a43413
+  metadata.gz: 8915fce828023bff8606cafbc82ace6933c0d452ecf3979d29bffedbc69cc3a66ddd1fd95af400a9c16fa65d29bce3dedb19030cf498c18e684c92358b214457
+  data.tar.gz: 58680b01d268abb5a04c0c33336b334b39418452b9bc2412d3140471ce6f868ff601deac127a3b9fb6a6406b7c6c4ea8837e3b6fc9ca3ce54ae80a35c83909a0

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 = options.merge(represent_with: represent_with)
+        represent_with_options = { user_options: options }.merge(represent_with: represent_with)
 
         relation.each do |item|
           # Must be able to read each record
@@ -23,11 +23,11 @@ module OpenStax
         respond_with(Lev::Outputs.new(items: relation), represent_with_options)
       end
 
-      def standard_search(model, routine, represent_with, options={})
+      def standard_search(klass, routine, represent_with, options={})
         user = current_api_user
-        OSU::AccessPolicy.require_action_allowed!(:search, user, model)
+        OSU::AccessPolicy.require_action_allowed!(:search, user, klass)
 
-        represent_with_options = options.merge(represent_with: represent_with)
+        represent_with_options = { user_options: options }.merge(represent_with: represent_with)
 
         result = routine.call(params, options)
         return render_api_errors(result.errors) if result.errors.any?
@@ -42,7 +42,7 @@ module OpenStax
 
       def standard_create(model, represent_with=nil, options={})
         create_options = { status: :created, location: nil }
-        represent_with_options = options.merge(represent_with: represent_with)
+        represent_with_options = { user_options: options }.merge(represent_with: represent_with)
 
         model.class.transaction do
           consume!(model, represent_with_options.dup)
@@ -70,7 +70,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 = options.merge(represent_with: represent_with)
+        represent_with_options = { user_options: options }.merge(represent_with: represent_with)
 
         respond_with model, represent_with_options \
           if !use_timestamp_for_cache || stale?(model, template: false)
@@ -81,7 +81,7 @@ module OpenStax
         OSU::AccessPolicy.require_action_allowed!(:update, current_api_user, model)
 
         responder_options = { responder: ResponderWithPutPatchDeleteContent }
-        represent_with_options = options.merge(represent_with: represent_with)
+        represent_with_options = { user_options: options }.merge(represent_with: represent_with)
 
         model.with_lock do
           consume!(model, represent_with_options.dup)
@@ -105,7 +105,7 @@ module OpenStax
           if model.respond_to?(:deleted?) && model.deleted?
 
         responder_options = { responder: ResponderWithPutPatchDeleteContent }
-        represent_with_options = options.merge(represent_with: represent_with)
+        represent_with_options = { user_options: options }.merge(represent_with: represent_with)
 
         model.with_lock do
           if model.destroy
@@ -127,7 +127,8 @@ module OpenStax
         recursive = options.has_key?(:recursive) ? options[:recursive] : true
 
         responder_options = { responder: ResponderWithPutPatchDeleteContent }
-        represent_with_options = options.except(:recursive).merge(represent_with: represent_with)
+        represent_with_options = { user_options: options.except(:recursive) }
+                                     .merge(represent_with: represent_with)
 
         model.with_lock do
           if model.restore(recursive: recursive)

data/lib/openstax/api/version.rb

@@ -1,5 +1,5 @@
 module OpenStax
   module Api
-    VERSION = "7.1.1"
+    VERSION = "8.0.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstax_api
 version: !ruby/object:Gem::Version
-  version: 7.1.1
+  version: 8.0.0
 platform: ruby
 authors:
 - Dante Soares
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-17 00:00:00.000000000 Z
+date: 2016-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -18,6 +18,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -25,13 +28,16 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: representable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.4'
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
@@ -41,7 +47,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.4'
     - - "<"
       - !ruby/object:Gem::Version
         version: '4.0'
@@ -332,7 +338,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: API utilities for OpenStax products and tools.