openstax_api 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc198021304774cc8ee9bc78991e4ba2fac6c694
-  data.tar.gz: 500c6ec0bce472a2198bb52962355c7b576f6dda
+  metadata.gz: 0f1429c6653d5491a5d6b1e9ed52f9a3f60545f3
+  data.tar.gz: 3132f7b1b24f55834b4d1675a1daef215b82ace3
 SHA512:
-  metadata.gz: 49cb492d1097f502f30de1784fde0d626328d0b6c30a90dcdb65c01e5aa463957947d159ff9a8d17f6f95c92c81ac80448ab8460f7fe0134a7840c07102a3fd4
-  data.tar.gz: 228e09327466df108e5ed2775b2203588f8ace1d5c30fc7f2f6a11ca845fe4d79ce0d5a6fceba130d0ab5e6d4b510c3ef77ec29e367d2fcfd95e5eae9bbf58ae
+  metadata.gz: 02f3f16a5b88f6071b20472fc8f4a73d77e1ca7314d3a7c1d80512f674135f33c679468239316cde65c56d856e4798667e06ddfb5f2b6e61aa844822997b1b33
+  data.tar.gz: c2d09d5c8a36c38d11074424d9df2153baaab847fa7930fc802ec7e3883dbbb34beaa384260fb02ee246a872a68661a970e10e0fe924ece44f8d47d78261eb55

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

@@ -20,15 +20,15 @@ module OpenStax
         skip_protect_beta if respond_to? :skip_protect_beta
 
         skip_before_filter :authenticate_user!
-        doorkeeper_for :all, :unless => :application_user_without_token?
+        doorkeeper_for :all, :unless => :user_without_token?
         skip_before_filter :verify_authenticity_token,
-                           :unless => :application_user_without_token?
+                           :unless => :user_without_token?
 
         respond_to :json
         rescue_from Exception, :with => :rescue_from_exception
 
         # Keep old current_user method so we can use it
-        alias_method :current_application_user,
+        alias_method :current_human_user,
                      OpenStax::Api.configuration.current_user_method
 
         # TODO: doorkeeper users (or rather users who have doorkeeper
@@ -43,13 +43,13 @@ module OpenStax
         # Always return an ApiUser
         def current_user
           @current_api_user ||= ApiUser.new(doorkeeper_token,
-                                            lambda { current_application_user })
+                                            lambda { current_human_user })
         end
 
       protected
 
-        def application_user_without_token?
-          current_application_user && doorkeeper_token.blank?
+        def user_without_token?
+          current_human_user && doorkeeper_token.blank?
         end
 
         def rescue_from_exception(exception)
@@ -81,8 +81,6 @@ module OpenStax
           
           head error
         end
-        
-
 
       end
 

data/lib/openstax/api/version.rb

@@ -1,5 +1,5 @@
 module OpenStax
   module Api
-    VERSION = "1.0.3"
+    VERSION = "1.0.4"
   end
 end

data/spec/dummy/log/development.log

@@ -484,3 +484,20 @@ Connecting to database specified by database.yml
 Connecting to database specified by database.yml
 Connecting to database specified by database.yml
 Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+   (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+   (0.2ms)  select sqlite_version(*)
+   (0.9ms)  DROP TABLE "dummy_users"
+   (0.9ms)  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)  DROP TABLE "oauth_access_grants"
+   (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.8ms)  CREATE UNIQUE INDEX "index_oauth_access_grants_on_token" ON "oauth_access_grants" ("token")
+   (0.8ms)  DROP TABLE "oauth_access_tokens"
+   (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.8ms)  CREATE INDEX "index_oauth_access_tokens_on_resource_owner_id" ON "oauth_access_tokens" ("resource_owner_id")
+   (0.7ms)  CREATE UNIQUE INDEX "index_oauth_access_tokens_on_token" ON "oauth_access_tokens" ("token")
+   (0.8ms)  DROP TABLE "oauth_applications"
+   (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.1ms)  SELECT version FROM "schema_migrations"

data/spec/dummy/log/test.log

@@ -685,3 +685,40 @@ Connecting to database specified by database.yml
    (0.0ms)  rollback transaction
    (0.0ms)  begin transaction
    (0.0ms)  rollback transaction
+Connecting to database specified by database.yml
+   (0.4ms)  begin transaction
+  DummyUser Load (0.1ms)  SELECT "dummy_users".* FROM "dummy_users" WHERE "dummy_users"."id" IS NULL LIMIT 1
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (3.1ms)  INSERT INTO "dummy_users" ("created_at", "password_hash", "updated_at", "username") VALUES (?, ?, ?, ?)  [["created_at", Thu, 01 May 2014 21:01:30 UTC +00:00], ["password_hash", nil], ["updated_at", Thu, 01 May 2014 21:01:30 UTC +00:00], ["username", nil]]
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+  DummyUser Load (0.1ms)  SELECT "dummy_users".* FROM "dummy_users" WHERE "dummy_users"."id" = 1 LIMIT 1
+   (0.2ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  SAVEPOINT active_record_1
+  SQL (0.2ms)  INSERT INTO "dummy_users" ("created_at", "password_hash", "updated_at", "username") VALUES (?, ?, ?, ?)  [["created_at", Thu, 01 May 2014 21:01:30 UTC +00:00], ["password_hash", nil], ["updated_at", Thu, 01 May 2014 21:01:30 UTC +00:00], ["username", nil]]
+   (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: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Dante Soares