openstax_api 0.2.1 → 1.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjRkYzdkNzdhYzM2MmJmZjIyNWY4NjY0NzhiYTY5MzIzZTRhYjRiMQ==
+    MGIwMjBlNDc2YWY3YzVkZjdiYjg0NWNhYTU3ZDY2NTYwZmZhMTFiMw==
   data.tar.gz: !binary |-
-    MjkzYTBiZDVkYTU1ZDc5ZGYwYmFmYTgzYWVhYTQxMmIxMGUzNzM5Zg==
+    ZmQ0MGZmMWFkMmNiMjM0MGRlZWQyMDE0YThmODgwYmVlMGNhNDJhNQ==
 SHA512:
   metadata.gz: !binary |-
-    NWRlYTljNWI5YmQ5MjZiMDEzNzBlOGZkNDJkNGExNmRiODkwMzcwM2ZkNGEw
-    NmE3NGFhY2MxYjQ2YmQzNmVjOTMxOGEyOTM3NjMwMWVmNWE5M2RlMWYwZDYw
-    NmVhOWE0NmNjYjdjODBlNjBjMDNhYjdlN2I2M2I5NjRmNDFkMzc=
+    NGUwM2NkODE3Njk2MzlhNmY1OGNjZTY0NjkwMDVhYzg0YmI1MmIwNGRiMWMy
+    ZDVhNDY1ODIwY2I0OGMyYzNiNzBlODRkMmU4ZjQ2ODMzMWQ1NGZiYWE3ZTUx
+    NWY5YjM2ZjQwM2Q0ZWFmYzQzMzhjMmJlNzQyZDIxMTNiZjI2Yzc=
   data.tar.gz: !binary |-
-    YjQ0ZTcyM2E5ZTQ2MDg2YzVkMDk1YmNkNjFlMWNmZGQ3NjNiNGQ2YzI4YmZj
-    ZTFlMzUwYjJlZmU4ZmNmNjM5Mzk3YTUzMWJiMzc1MTZkMWEyYThlYzk3Yjll
-    M2U5ZWI2OWIwNTI4MmE2YzkwZjkyNjhhMmJjNGEzOWI4ZWRhZmM=
+    MzM5MjJmMjgxNTA2ODIwMjEwNmFjMjhlMTA0OTcwMzZlNjIzNDJiYzYwOWUw
+    YzlhNGZkMzQ1ZjY4MzhhMTJmOWU0MGIyYjQ1NmUxNmU0MzJkMjg4OGIwMmYy
+    YjY2YWQ5OGJjNzczNWYwOGVjMjg2ZWE2YTYxYTEwZjI2NTI0NmE=

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

@@ -20,26 +20,38 @@ module OpenStax
         skip_protect_beta if respond_to? :skip_protect_beta
 
         skip_before_filter :authenticate_user!
+        doorkeeper_for :all, :unless => :application_user_without_token?
+        skip_before_filter :verify_authenticity_token,
+                           :unless => :application_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,
+                     OpenStax::Api.configuration.current_user_method
+
         # TODO: doorkeeper users (or rather users who have doorkeeper
         # applications) need to agree to API terms of use (need to have agreed
         # to it at one time, can't require them to agree when terms change since
         # their apps are doing the talking) -- this needs more thought
 
+        # TODO: maybe freak out if current_user is anonymous (require we know
+        # who person/app is so we can do things like throttling, API terms
+        # agreement, etc)
+
+        # Always return an ApiUser
         def current_user
-          @current_user ||= doorkeeper_token ? 
-                            User.find(doorkeeper_token.resource_owner_id) : 
-                            super
-          # TODO: maybe freak out if current user is anonymous (require we know
-          # who person/app is so we can do things like throttling, API terms
-          # agreement, etc)
+          @current_api_user ||= ApiUser.new(doorkeeper_token,
+                                            lambda { current_application_user })
         end
 
       protected
 
+        def application_user_without_token?
+          current_application_user && doorkeeper_token.blank?
+        end
+
         def rescue_from_exception(exception)
           # See https://github.com/rack/rack/blob/master/lib/rack/utils.rb#L453 for error names/symbols
           error = :internal_server_error

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

@@ -27,7 +27,7 @@ module OpenStax
         # procs that can get it for us.  This could save us some queries.
 
         if doorkeeper_token
-          user_class = OpenStax::Api.configuration.user_class_name.classify.constantize
+          user_class = OpenStax::Api.configuration.user_class_name.constantize
           @application_proc = lambda { doorkeeper_token.application }
           @user_proc = lambda {
             doorkeeper_token.resource_owner_id ? 

data/lib/openstax/api/route_extensions.rb

@@ -3,9 +3,10 @@ require 'openstax/api/constraints'
 module OpenStax
   module Api
     module RouteExtensions
-      def api(version = :v1, default = false)
-        constraints = Constraints.new(version: version, default: default)
-        namespace :api, defaults: {format: 'json'} do
+      def api(version, options = {})
+        constraints = Constraints.new(version: version,
+                                      default: options.delete(:default))
+        namespace :api, defaults: {format: 'json'}.merge(options) do
           scope(module: version,
                 constraints: constraints) { yield }
         end

data/lib/openstax/api/version.rb

@@ -1,5 +1,5 @@
 module OpenStax
   module Api
-    VERSION = "0.2.1"
+    VERSION = "1.0.0"
   end
 end

data/lib/openstax_api.rb

@@ -13,11 +13,30 @@ module OpenStax
         @configuration ||= Configuration.new
       end
 
+      ###########################################################################
+      #
+      # Configuration machinery.
+      #
+      # To configure OpenStax Api, put the following code in your applications
+      # initialization logic (eg. in the config/initializers in a Rails app)
+      #
+      #   OpenStax::Api.configure do |config|
+      #     config.<parameter name> = <parameter value>
+      #     ...
+      #   end
+      #
+      # user_class_name is a String containing the name of your User model class.
+      #
+      # current_user_method is a String containing the name of your controller
+      # method that returns the current user.
+      #
       class Configuration
         attr_accessor :user_class_name
+        attr_accessor :current_user_method
         
         def initialize      
           @user_class_name = 'User'
+          @current_user_method = 'current_user'
         end
       end
 

data/spec/dummy/app/controllers/application_controller.rb

@@ -1,3 +1,7 @@
 class ApplicationController < ActionController::Base
   protect_from_forgery
+
+  def present_user
+    @user ||= DummyUser.create
+  end
 end

data/spec/dummy/config/initializers/openstax_api.rb

@@ -1,3 +1,4 @@
 OpenStax::Api.configure do |config|
   config.user_class_name = 'DummyUser'
+  config.current_user_method = 'present_user'
 end

data/spec/dummy/log/development.log

@@ -199,3 +199,140 @@ Connecting to database specified by database.yml
    (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.7ms)  CREATE UNIQUE INDEX "index_oauth_applications_on_uid" ON "oauth_applications" ("uid")
    (0.1ms)  SELECT version FROM "schema_migrations"
+Connecting to database specified by database.yml
+   (1.6ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+   (0.3ms)  select sqlite_version(*)
+   (0.9ms)  DROP TABLE "dummy_users"
+   (0.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)  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")
+   (1.0ms)  DROP TABLE "oauth_access_tokens"
+   (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.8ms)  CREATE INDEX "index_oauth_access_tokens_on_resource_owner_id" ON "oauth_access_tokens" ("resource_owner_id")
+   (0.8ms)  CREATE UNIQUE INDEX "index_oauth_access_tokens_on_token" ON "oauth_access_tokens" ("token")
+   (1.9ms)  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"
+Connecting to database specified by database.yml
+   (1.5ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+   (0.2ms)  select sqlite_version(*)
+   (1.8ms)  DROP TABLE "dummy_users"
+   (1.0ms)  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.9ms)  DROP TABLE "oauth_access_grants"
+   (0.9ms)  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.9ms)  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.8ms)  CREATE UNIQUE INDEX "index_oauth_access_tokens_on_token" ON "oauth_access_tokens" ("token")
+   (0.8ms)  DROP TABLE "oauth_applications"
+   (0.8ms)  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"
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+   (1.5ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+   (0.2ms)  select sqlite_version(*)
+   (1.6ms)  DROP TABLE "dummy_users"
+   (1.0ms)  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.9ms)  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.8ms)  CREATE UNIQUE INDEX "index_oauth_access_tokens_on_token" ON "oauth_access_tokens" ("token")
+   (0.8ms)  DROP TABLE "oauth_applications"
+   (0.8ms)  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"
+Connecting to database specified by database.yml
+   (1.5ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+   (0.2ms)  select sqlite_version(*)
+   (1.8ms)  DROP TABLE "dummy_users"
+   (1.1ms)  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.9ms)  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.9ms)  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.8ms)  CREATE UNIQUE INDEX "index_oauth_access_tokens_on_token" ON "oauth_access_tokens" ("token")
+   (0.9ms)  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.7ms)  CREATE UNIQUE INDEX "index_oauth_applications_on_uid" ON "oauth_applications" ("uid")
+   (0.1ms)  SELECT version FROM "schema_migrations"
+Connecting to database specified by database.yml
+   (1.5ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+   (0.2ms)  select sqlite_version(*)
+   (1.5ms)  DROP TABLE "dummy_users"
+   (0.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.6ms)  DROP TABLE "oauth_access_grants"
+   (0.7ms)  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.7ms)  CREATE UNIQUE INDEX "index_oauth_access_grants_on_token" ON "oauth_access_grants" ("token")
+   (1.0ms)  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.8ms)  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"
+Connecting to database specified by database.yml
+   (1.5ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+   (0.2ms)  select sqlite_version(*)
+   (1.8ms)  DROP TABLE "dummy_users"
+   (1.1ms)  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.9ms)  DROP TABLE "oauth_access_grants"
+   (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.8ms)  CREATE UNIQUE INDEX "index_oauth_access_grants_on_token" ON "oauth_access_grants" ("token")
+   (1.0ms)  DROP TABLE "oauth_access_tokens"
+   (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.8ms)  CREATE INDEX "index_oauth_access_tokens_on_resource_owner_id" ON "oauth_access_tokens" ("resource_owner_id")
+   (1.0ms)  CREATE UNIQUE INDEX "index_oauth_access_tokens_on_token" ON "oauth_access_tokens" ("token")
+   (0.8ms)  DROP TABLE "oauth_applications"
+   (0.8ms)  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"
+Connecting to database specified by database.yml
+   (1.5ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+   (0.2ms)  select sqlite_version(*)
+   (1.8ms)  DROP TABLE "dummy_users"
+   (1.0ms)  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.9ms)  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.7ms)  CREATE UNIQUE INDEX "index_oauth_access_grants_on_token" ON "oauth_access_grants" ("token")
+   (0.9ms)  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.8ms)  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"
+Connecting to database specified by database.yml
+   (1.5ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+   (0.2ms)  select sqlite_version(*)
+   (1.9ms)  DROP TABLE "dummy_users"
+   (1.1ms)  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.9ms)  DROP TABLE "oauth_access_grants"
+   (0.9ms)  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")
+   (1.0ms)  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.8ms)  CREATE UNIQUE INDEX "index_oauth_access_tokens_on_token" ON "oauth_access_tokens" ("token")
+   (0.8ms)  DROP TABLE "oauth_applications"
+   (0.8ms)  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

@@ -315,3 +315,81 @@ Connecting to database specified by database.yml
    (4.9ms)  rollback transaction
    (0.1ms)  begin transaction
    (0.1ms)  rollback transaction
+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
+Connecting to database specified by database.yml
+Connecting to database specified by database.yml
+   (0.5ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (38.6ms)  INSERT INTO "dummy_users" ("created_at", "password_hash", "updated_at", "username") VALUES (?, ?, ?, ?)  [["created_at", Tue, 15 Apr 2014 00:10:12 UTC +00:00], ["password_hash", nil], ["updated_at", Tue, 15 Apr 2014 00:10:12 UTC +00:00], ["username", nil]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.5ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.5ms)  INSERT INTO "dummy_users" ("created_at", "password_hash", "updated_at", "username") VALUES (?, ?, ?, ?)  [["created_at", Tue, 15 Apr 2014 00:10:12 UTC +00:00], ["password_hash", nil], ["updated_at", Tue, 15 Apr 2014 00:10:12 UTC +00:00], ["username", nil]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+  DummyUser Load (0.2ms)  SELECT "dummy_users".* FROM "dummy_users" WHERE "dummy_users"."id" = ? LIMIT 1  [["id", 1]]
+   (0.3ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  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
+Connecting to database specified by database.yml
+   (0.5ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  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)  SAVEPOINT active_record_1
+  SQL (33.5ms)  INSERT INTO "dummy_users" ("created_at", "password_hash", "updated_at", "username") VALUES (?, ?, ?, ?)  [["created_at", Tue, 15 Apr 2014 00:20:53 UTC +00:00], ["password_hash", nil], ["updated_at", Tue, 15 Apr 2014 00:20:53 UTC +00:00], ["username", nil]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+  DummyUser Load (0.1ms)  SELECT "dummy_users".* FROM "dummy_users" WHERE "dummy_users"."id" = ? LIMIT 1  [["id", 1]]
+   (1.1ms)  rollback transaction
+   (0.7ms)  begin transaction
+   (0.1ms)  SAVEPOINT active_record_1
+  SQL (0.5ms)  INSERT INTO "dummy_users" ("created_at", "password_hash", "updated_at", "username") VALUES (?, ?, ?, ?)  [["created_at", Tue, 15 Apr 2014 00:20:53 UTC +00:00], ["password_hash", nil], ["updated_at", Tue, 15 Apr 2014 00:20:53 UTC +00:00], ["username", nil]]
+   (0.1ms)  RELEASE SAVEPOINT active_record_1
+   (0.3ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.1ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstax_api
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Dante Soares
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -136,7 +136,6 @@ files:
 - README.md
 - Rakefile
 - app/controllers/openstax/api/v1/api_controller.rb
-- app/controllers/openstax/api/v1/oauth_based_api_controller.rb
 - app/models/openstax/api/api_user.rb
 - lib/openstax/api/apipie.rb
 - lib/openstax/api/constraints.rb
@@ -147,10 +146,7 @@ files:
 - lib/openstax/api/route_extensions.rb
 - lib/openstax/api/version.rb
 - lib/openstax_api.rb
-- spec/app/controllers/openstax/api/v1/api_controller_spec.rb
-- spec/app/controllers/openstax/api/v1/oauth_based_api_controller_spec.rb
-- spec/app/models/openstax/api/api_user_spec.rb
-- spec/app/representers/openstax/api/v1/representable_schema_printer_spec.rb
+- spec/controllers/openstax/api/v1/api_controller_spec.rb
 - spec/dummy/README.md
 - spec/dummy/Rakefile
 - spec/dummy/app/assets/javascripts/application.js
@@ -194,6 +190,8 @@ files:
 - spec/lib/openstax/api/doorkeeper_extensions_spec.rb
 - spec/lib/openstax/api/roar.rb
 - spec/lib/openstax/api/route_extensions_spec.rb
+- spec/models/openstax/api/api_user_spec.rb
+- spec/representers/openstax/api/v1/representable_schema_printer_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/openstax/openstax_api
 licenses:
@@ -220,10 +218,7 @@ signing_key:
 specification_version: 4
 summary: API utilities for OpenStax products and tools.
 test_files:
-- spec/app/controllers/openstax/api/v1/api_controller_spec.rb
-- spec/app/controllers/openstax/api/v1/oauth_based_api_controller_spec.rb
-- spec/app/models/openstax/api/api_user_spec.rb
-- spec/app/representers/openstax/api/v1/representable_schema_printer_spec.rb
+- spec/controllers/openstax/api/v1/api_controller_spec.rb
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
@@ -267,4 +262,6 @@ test_files:
 - spec/lib/openstax/api/doorkeeper_extensions_spec.rb
 - spec/lib/openstax/api/roar.rb
 - spec/lib/openstax/api/route_extensions_spec.rb
+- spec/models/openstax/api/api_user_spec.rb
+- spec/representers/openstax/api/v1/representable_schema_printer_spec.rb
 - spec/spec_helper.rb

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

@@ -1,15 +0,0 @@
-module OpenStax
-  module Api
-    module V1
-
-      class OauthBasedApiController < ApiController
-
-        def current_user
-          @current_api_user ||= ApiUser.new(doorkeeper_token, lambda { super })
-        end
-           
-      end
-
-    end
-  end
-end

data/spec/app/controllers/openstax/api/v1/oauth_based_api_controller_spec.rb

@@ -1,11 +0,0 @@
-require 'spec_helper'
-
-module OpenStax
-  module Api
-    module V1
-      describe OauthBasedApiController do
-        # Nothing to test yet
-      end
-    end
-  end
-end