openstax_api 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f3b5b34e393b1abf7b65bb886dea5f96b017392
-  data.tar.gz: b48a445efa09281e030109a557b6527149c36263
+  metadata.gz: c5fd4bfe8e6a6248275865264dfd4a2213f4f7c2
+  data.tar.gz: ab61b919e2b8e47fd59bee384c475c347c593111
 SHA512:
-  metadata.gz: 6e78e2b4e5a735163cb9ae671df7502ccfc50945d8700c1bea4fa7c42073d1515d3463e34522c0a6c3f84b13a23143decce54b37c6235362b94ecf5e3cf9bda2
-  data.tar.gz: d719cc8713015baf7ee5559782e3dd833b0e9819eaae4f6fe8ec58171c8933a7d0fda2ce74a4ab622b7639bd90b6880309b23c90044631e1ed700aef12c89703
+  metadata.gz: ca6879019824fab19edc1d212904742bfda992f2a00d5ee0024a2c7b0f0a3e0a58eb3ae8e7489b559db500f0fbeb76cb4c0ada6eaf64fab458183e5177251730
+  data.tar.gz: 0927f2ab635170b7ab83ce88a427cc4b839a437b04b82702a79c81e226ea3ddc2a15942e45c80949fc14fc622ee954cad891efd79f491889795faea40954bc20

data/README.md

@@ -1,6 +1,8 @@
 # openstax_api
 
+[![Gem Version](https://badge.fury.io/rb/openstax_api.svg)](http://badge.fury.io/rb/openstax_api)
 [![Build Status](https://travis-ci.org/openstax/openstax_api.svg?branch=master)](https://travis-ci.org/openstax/openstax_api)
+[![Code Climate](https://codeclimate.com/github/openstax/openstax_api/badges/gpa.svg)](https://codeclimate.com/github/openstax/openstax_api)
 
 API utilities for OpenStax products and tools.
 

data/Rakefile

@@ -1,5 +1,5 @@
 #!/usr/bin/env rake
-# http://viget.com/extend/rails-engine-testing-with-rspec-capybara-and-factorygirl
+
 begin
   require 'bundler/setup'
 rescue LoadError
@@ -11,12 +11,12 @@ load 'rails/tasks/engine.rake'
 
 Bundler::GemHelper.install_tasks
 
-Dir[File.join(File.dirname(__FILE__), 'tasks/**/*.rake')].each {|f| load f }
-
-require 'rspec/core'
-require 'rspec/core/rake_task'
+require 'rake/testtask'
 
-desc 'Run all specs in spec directory (excluding plugin specs)'
-RSpec::Core::RakeTask.new(:spec => 'app:db:test:prepare')
+Rake::TestTask.new(:spec => 'app:db:test:prepare') do |t|
+  t.libs << 'spec'
+  t.pattern = 'spec/**/*_spec.rb'
+  t.verbose = false
+end
 
 task :default => :spec

data/app/models/openstax/api/api_user.rb

@@ -11,8 +11,6 @@
 # This API class gives us a way to abstract out these cases and also
 # gives us accessors to get the Application and User objects, if available.
 
-require 'openstax_utilities'
-
 module OpenStax
   module Api
     class ApiUser
@@ -41,26 +39,6 @@ module OpenStax
                     @non_doorkeeper_user_proc.call
       end
 
-      ##########################
-      # Access Control Helpers #
-      ##########################
-
-      def can_do?(action, resource)
-        OSU::AccessPolicy.action_allowed?(action, self, resource)
-      end
-
-      def method_missing(method_name, *arguments, &block)
-        if method_name.to_s =~ /\Acan_(\w+)\?\z/
-          can_do?($1.to_sym, arguments.first)
-        else
-          super
-        end
-      end
-
-      def respond_to_missing?(method_name, include_private = false)
-        method_name.to_s =~ /\Acan_(\w+)\?\z/ || super
-      end
-
     end
   end
 end

data/lib/openstax/api/representable_schema_printer.rb

@@ -82,9 +82,11 @@ module OpenStax
                 attr_info.delete(:type)
                 attr_info[:$ref] = dname
               end
-
-              definitions[rname] ||= json_object(decorator,
+              if definitions[rname].nil?
+                definitions[rname] = {}
+                definitions[rname] = json_object(decorator,
                                                  definitions, options)
+              end
             else
               attr_info.merge!(json_object(decorator, definitions, options))
             end

data/lib/openstax/api/roar.rb

@@ -1,6 +1,8 @@
 # Copyright 2011-2014 Rice University. Licensed under the Affero General Public 
 # License version 3 or later.  See the COPYRIGHT file for details.
 
+require 'openstax_utilities'
+
 module OpenStax
   module Api
 
@@ -17,13 +19,13 @@ module OpenStax
 
       def standard_read(model_klass, id, represent_with=nil)
         @model = model_klass.find(id)
-        raise SecurityTransgression unless current_api_user.can_read?(@model)
+        OSU::AccessPolicy.require_action_allowed!(:read, current_api_user, @model)
         respond_with @model, represent_with: get_representer(represent_with, @model)
       end
 
       def standard_update(model_klass, id, represent_with=nil)
         @model = model_klass.find(id)
-        raise SecurityTransgression unless current_api_user.can_update?(@model)
+        OSU::AccessPolicy.require_action_allowed!(:update, current_api_user, @model)
         consume!(@model, represent_with: get_representer(represent_with, @model))
         
         if @model.save
@@ -51,10 +53,10 @@ module OpenStax
         # what we're dealing with, but if user doesn't have permission we don't
         # want to have changed the DB.  Wrap in a transaction to protect ourselves.
 
-        model_klass.transaction do 
+        model_klass.transaction do
           consume!(@model, represent_with: get_representer(represent_with, @model))
           yield @model if block_given?
-          raise SecurityTransgression unless current_api_user.can_create?(@model)
+          OSU::AccessPolicy.require_action_allowed!(:create, current_api_user, @model)
         end
 
         if @model.save
@@ -66,7 +68,7 @@ module OpenStax
 
       def standard_destroy(model_klass, id)
         @model = model_klass.find(id)
-        raise SecurityTransgression unless current_api_user.can_destroy?(@model)
+        OSU::AccessPolicy.require_action_allowed!(:destroy, current_api_user, @model)
         
         if @model.destroy
           head :no_content
@@ -98,7 +100,7 @@ module OpenStax
         originalOrdered.each do |item|
           raise SecurityTransgression unless item.send(:container_column) == originalOrdered[0].send(:container_column) \
             if item.respond_to?(:container_column)
-          raise SecurityTransgression unless current_api_user.can_sort?(item)
+          OSU::AccessPolicy.require_action_allowed!(:sort, current_api_user, item)
         end
 
         originalOrderedIds = originalOrdered.collect{|sc| sc.id}

data/lib/openstax/api/version.rb

@@ -1,5 +1,5 @@
 module OpenStax
   module Api
-    VERSION = "2.2.3"
+    VERSION = "2.2.4"
   end
 end