openstax_api 2.3.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5629468c30de716b91b391649758a2b175ea729
-  data.tar.gz: e54286b3183689bae4f7369b8bce896f3d6cf869
+  metadata.gz: 9b54c98562d6256845ee88aace52efde4b5c6e43
+  data.tar.gz: df03792d31e741ee88caaed9f7e2165a2debe7c4
 SHA512:
-  metadata.gz: 7e2cf10423d2d147b72eea5ebbdae967fcb46273da34656e98f18fbcb6641729ceca952b85aa421c8b95edfb5cf32e7d52ca392b382bd0fda600338c1e308e1e
-  data.tar.gz: 42f3deafb56ee2a911c3c0a011f782a5ea1f47707bc890a153b424d0f98594b824e08efc997004f1a5a9e2baba041088e009dc0f5d320bba3aec019c67c3c248
+  metadata.gz: 85871dbc9dd7de450049c4639e6dc31fc2e8c6bcfff3dc7af1ec4bb0d43031fde25b0ec00cdcae3e9303e9bb14aaaab8730000f799d17f03f96c96cad16d4a91
+  data.tar.gz: 2b8cc6ecd5a772b5e9650a61bf646384ef35b749c48678edbc58205076388b08a1bcf7381f61c7a344386217ccc8a1bc57cbe60c19583f240aa25aadcf65d880

data/README.md

@@ -24,19 +24,22 @@ $ bundle
 
 This gem includes the following classes, all under the OpenStax::Api namespace:
 
-### Controllers
+### Controller
 
-`ApiController`
+`OpenStax::Api::V1::ApiController`
 
-`OauthBasedApiController`
+Your API controllers should inherit from ApiController.
 
-Your API controllers should inherit from those classes.
+Your `current_user` method will not be available in ApiController.
+Instead, use the current_api_user, current_human_user and current_application methods.
 
-### Models
+### Model
 
-`ApiUser`
+`OpenStax::Api::V1::ApiUser`
 
-This is the class of someone using the API, which can either be a (signed in) user, a doorkeeper application, or a combination of both.
+Your users should NOT inherit from ApiUser. It is used only by ApiController.
+
+ApiUser represents either a signed in user, a doorkeeper application, or a combination of both.
 
 ## Doorkeeper Extensions
 

data/app/controllers/openstax/api/v1/api_controller.rb

@@ -8,15 +8,9 @@ module OpenStax
         include OpenStax::Api::Roar
         include OpenStax::Api::Apipie
 
-        skip_protect_beta if respond_to? :skip_protect_beta
-
-        skip_before_filter :authenticate_user!
         doorkeeper_for :all, :unless => :session_user?
         skip_before_filter :verify_authenticity_token, :unless => :session_user?
 
-        # This filter can wait until the user signs in again
-        skip_interception :expired_password if respond_to? :skip_interception
-
         respond_to :json
 
         # Keep old current_user method so we can use it
@@ -40,12 +34,6 @@ module OpenStax
           current_api_user.human_user
         end
 
-        # JSON can't really redirect
-        # Redirect from a filter effectively means "deny access"
-        def redirect_to(options = {}, response_status = {})
-          head :forbidden
-        end
-
         protected
 
         def session_user?

data/lib/openstax/api/version.rb

@@ -1,5 +1,5 @@
 module OpenStax
   module Api
-    VERSION = "2.3.1"
+    VERSION = "2.4.0"
   end
 end

data/spec/dummy/log/test.log

@@ -4075,3 +4075,228 @@ Connecting to database specified by database.yml
    (0.0ms)  rollback transaction
    (0.0ms)  begin transaction
    (0.0ms)  rollback transaction
+   (1.8ms)  CREATE TABLE "dummy_users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "username" varchar(255), "password_hash" varchar(255), "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (1.0ms)  CREATE TABLE "oauth_access_grants" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "resource_owner_id" integer NOT NULL, "application_id" integer NOT NULL, "token" varchar(255) NOT NULL, "expires_in" integer NOT NULL, "redirect_uri" text NOT NULL, "created_at" datetime NOT NULL, "revoked_at" datetime, "scopes" varchar(255)) 
+   (0.1ms)  select sqlite_version(*)
+   (1.0ms)  CREATE UNIQUE INDEX "index_oauth_access_grants_on_token" ON "oauth_access_grants" ("token")
+   (0.8ms)  CREATE TABLE "oauth_access_tokens" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "resource_owner_id" integer, "application_id" integer, "token" varchar(255) NOT NULL, "refresh_token" varchar(255), "expires_in" integer, "revoked_at" datetime, "created_at" datetime NOT NULL, "scopes" varchar(255)) 
+   (0.8ms)  CREATE UNIQUE INDEX "index_oauth_access_tokens_on_refresh_token" ON "oauth_access_tokens" ("refresh_token")
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_oauth_access_tokens_on_refresh_token' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_oauth_access_tokens_on_refresh_token' AND type='index'
+
+   (0.8ms)  CREATE  INDEX "index_oauth_access_tokens_on_resource_owner_id" ON "oauth_access_tokens" ("resource_owner_id")
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_oauth_access_tokens_on_resource_owner_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_oauth_access_tokens_on_resource_owner_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_oauth_access_tokens_on_refresh_token' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_oauth_access_tokens_on_refresh_token' AND type='index'
+
+   (0.8ms)  CREATE UNIQUE INDEX "index_oauth_access_tokens_on_token" ON "oauth_access_tokens" ("token")
+   (0.9ms)  CREATE TABLE "oauth_applications" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255) NOT NULL, "uid" varchar(255) NOT NULL, "secret" varchar(255) NOT NULL, "redirect_uri" text NOT NULL, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.8ms)  CREATE UNIQUE INDEX "index_oauth_applications_on_uid" ON "oauth_applications" ("uid")
+   (0.8ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.8ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (0.8ms)  INSERT INTO "schema_migrations" (version) VALUES ('1')
+   (0.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')
+   (0.4ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  INSERT INTO "dummy_users" ("created_at", "updated_at") VALUES (?, ?)  [["created_at", "2014-09-26 19:51:34.303942"], ["updated_at", "2014-09-26 19:51:34.303942"]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.9ms)  rollback transaction
+   (0.1ms)  begin transaction
+  DummyUser Load (0.1ms)  SELECT  "dummy_users".* FROM "dummy_users"  WHERE "dummy_users"."id" IS NULL  ORDER BY "dummy_users"."id" ASC LIMIT 1
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.2ms)  INSERT INTO "dummy_users" ("created_at", "updated_at") VALUES (?, ?)  [["created_at", "2014-09-26 19:51:34.312967"], ["updated_at", "2014-09-26 19:51:34.312967"]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+  DummyUser Load (0.1ms)  SELECT  "dummy_users".* FROM "dummy_users"  WHERE "dummy_users"."id" = 1  ORDER BY "dummy_users"."id" ASC LIMIT 1
+   (0.3ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (1.8ms)  CREATE TABLE "dummy_users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "username" varchar(255), "password_hash" varchar(255), "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.8ms)  CREATE TABLE "oauth_access_grants" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "resource_owner_id" integer NOT NULL, "application_id" integer NOT NULL, "token" varchar(255) NOT NULL, "expires_in" integer NOT NULL, "redirect_uri" text NOT NULL, "created_at" datetime NOT NULL, "revoked_at" datetime, "scopes" varchar(255)) 
+   (0.1ms)  select sqlite_version(*)
+   (1.6ms)  CREATE UNIQUE INDEX "index_oauth_access_grants_on_token" ON "oauth_access_grants" ("token")
+   (0.7ms)  CREATE TABLE "oauth_access_tokens" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "resource_owner_id" integer, "application_id" integer, "token" varchar(255) NOT NULL, "refresh_token" varchar(255), "expires_in" integer, "revoked_at" datetime, "created_at" datetime NOT NULL, "scopes" varchar(255)) 
+   (0.7ms)  CREATE UNIQUE INDEX "index_oauth_access_tokens_on_refresh_token" ON "oauth_access_tokens" ("refresh_token")
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_oauth_access_tokens_on_refresh_token' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_oauth_access_tokens_on_refresh_token' AND type='index'
+
+   (0.7ms)  CREATE  INDEX "index_oauth_access_tokens_on_resource_owner_id" ON "oauth_access_tokens" ("resource_owner_id")
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_oauth_access_tokens_on_resource_owner_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_oauth_access_tokens_on_resource_owner_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_oauth_access_tokens_on_refresh_token' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_oauth_access_tokens_on_refresh_token' AND type='index'
+
+   (0.8ms)  CREATE UNIQUE INDEX "index_oauth_access_tokens_on_token" ON "oauth_access_tokens" ("token")
+   (0.9ms)  CREATE TABLE "oauth_applications" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255) NOT NULL, "uid" varchar(255) NOT NULL, "secret" varchar(255) NOT NULL, "redirect_uri" text NOT NULL, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.8ms)  CREATE UNIQUE INDEX "index_oauth_applications_on_uid" ON "oauth_applications" ("uid")
+   (0.8ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.8ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (0.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('1')
+   (1.3ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')
+   (0.4ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  DummyUser Load (0.1ms)  SELECT  "dummy_users".* FROM "dummy_users"  WHERE "dummy_users"."id" IS NULL  ORDER BY "dummy_users"."id" ASC LIMIT 1
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  INSERT INTO "dummy_users" ("created_at", "updated_at") VALUES (?, ?)  [["created_at", "2014-09-26 23:18:58.756166"], ["updated_at", "2014-09-26 23:18:58.756166"]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+  DummyUser Load (0.1ms)  SELECT  "dummy_users".* FROM "dummy_users"  WHERE "dummy_users"."id" = 1  ORDER BY "dummy_users"."id" ASC LIMIT 1
+   (0.9ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.2ms)  INSERT INTO "dummy_users" ("created_at", "updated_at") VALUES (?, ?)  [["created_at", "2014-09-26 23:18:58.762926"], ["updated_at", "2014-09-26 23:18:58.762926"]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.4ms)  rollback transaction
+   (1.6ms)  CREATE TABLE "dummy_users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "username" varchar(255), "password_hash" varchar(255), "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.8ms)  CREATE TABLE "oauth_access_grants" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "resource_owner_id" integer NOT NULL, "application_id" integer NOT NULL, "token" varchar(255) NOT NULL, "expires_in" integer NOT NULL, "redirect_uri" text NOT NULL, "created_at" datetime NOT NULL, "revoked_at" datetime, "scopes" varchar(255)) 
+   (0.1ms)  select sqlite_version(*)
+   (0.8ms)  CREATE UNIQUE INDEX "index_oauth_access_grants_on_token" ON "oauth_access_grants" ("token")
+   (0.9ms)  CREATE TABLE "oauth_access_tokens" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "resource_owner_id" integer, "application_id" integer, "token" varchar(255) NOT NULL, "refresh_token" varchar(255), "expires_in" integer, "revoked_at" datetime, "created_at" datetime NOT NULL, "scopes" varchar(255)) 
+   (0.8ms)  CREATE UNIQUE INDEX "index_oauth_access_tokens_on_refresh_token" ON "oauth_access_tokens" ("refresh_token")
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_oauth_access_tokens_on_refresh_token' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_oauth_access_tokens_on_refresh_token' AND type='index'
+
+   (0.8ms)  CREATE  INDEX "index_oauth_access_tokens_on_resource_owner_id" ON "oauth_access_tokens" ("resource_owner_id")
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_oauth_access_tokens_on_resource_owner_id' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_oauth_access_tokens_on_resource_owner_id' AND type='index'
+
+   (0.1ms)              SELECT sql
+            FROM sqlite_master
+            WHERE name='index_oauth_access_tokens_on_refresh_token' AND type='index'
+            UNION ALL
+            SELECT sql
+            FROM sqlite_temp_master
+            WHERE name='index_oauth_access_tokens_on_refresh_token' AND type='index'
+
+   (0.8ms)  CREATE UNIQUE INDEX "index_oauth_access_tokens_on_token" ON "oauth_access_tokens" ("token")
+   (1.0ms)  CREATE TABLE "oauth_applications" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255) NOT NULL, "uid" varchar(255) NOT NULL, "secret" varchar(255) NOT NULL, "redirect_uri" text NOT NULL, "created_at" datetime NOT NULL, "updated_at" datetime NOT NULL) 
+   (0.8ms)  CREATE UNIQUE INDEX "index_oauth_applications_on_uid" ON "oauth_applications" ("uid")
+   (0.8ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
+   (0.7ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+   (0.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('1')
+   (0.7ms)  INSERT INTO "schema_migrations" (version) VALUES ('0')
+   (0.4ms)  begin transaction
+  DummyUser Load (0.1ms)  SELECT  "dummy_users".* FROM "dummy_users"  WHERE "dummy_users"."id" IS NULL  ORDER BY "dummy_users"."id" ASC LIMIT 1
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.3ms)  INSERT INTO "dummy_users" ("created_at", "updated_at") VALUES (?, ?)  [["created_at", "2014-09-26 23:38:10.372836"], ["updated_at", "2014-09-26 23:38:10.372836"]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+  DummyUser Load (0.1ms)  SELECT  "dummy_users".* FROM "dummy_users"  WHERE "dummy_users"."id" = 1  ORDER BY "dummy_users"."id" ASC LIMIT 1
+   (1.0ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.2ms)  INSERT INTO "dummy_users" ("created_at", "updated_at") VALUES (?, ?)  [["created_at", "2014-09-26 23:38:10.383475"], ["updated_at", "2014-09-26 23:38:10.383475"]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.3ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstax_api
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Dante Soares