doorkeeper 0.1.1 → 0.2.0

data/app/views/doorkeeper/authorizations/new.html.erb

@@ -2,12 +2,27 @@
   <h2>Authorize <%= @authorization.client.name %> to use your account?</h2>
 </div>
 
+
+
 <div class="span16">
+  <% if @authorization.scopes %>
+  <p>
+    This application will be able to:
+  </p>
+  <ul>
+    <% @authorization.scopes.each do |scope| %>
+      <li><%= scope.description %></li>
+    <% end %>
+  </ul>
+  <% end %>
+
   <div class="inline_block">
     <%= form_tag authorization_path do %>
       <%= hidden_field_tag :client_id, @authorization.client_id %>
       <%= hidden_field_tag :redirect_uri, @authorization.redirect_uri %>
+      <%= hidden_field_tag :state, @authorization.state %>
       <%= hidden_field_tag :response_type, @authorization.response_type %>
+      <%= hidden_field_tag :scope, @authorization.scope %>
       <%= submit_tag "Authorize", :class => "btn success" %> or
     <% end %>
   </div>
@@ -15,7 +30,9 @@
     <%= form_tag authorization_path, :method => :delete do %>
       <%= hidden_field_tag :client_id, @authorization.client_id %>
       <%= hidden_field_tag :redirect_uri, @authorization.redirect_uri %>
+      <%= hidden_field_tag :state, @authorization.state %>
       <%= hidden_field_tag :response_type, @authorization.response_type %>
+      <%= hidden_field_tag :scope, @authorization.scope %>
       <%= button_tag "Deny", :class => "btn" %>
     <% end %>
   </div>

data/app/views/doorkeeper/authorized_applications/index.html.erb

@@ -0,0 +1,26 @@
+<div class="span16">
+  <header class="page-header">
+    <h2>Your authorized applications</h2>
+  </header>
+
+  <table class="zebra-striped">
+    <thead>
+      <tr>
+        <th>Application</th>
+        <th>Authorized at</th>
+        <th></th>
+        <th></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @applications.each do |application| %>
+        <tr>
+          <td><%= link_to application.name, application %></td>
+          <td><%= application.created_at %></td>
+          <td><%= link_to 'Revoke', authorized_application_path(application), :confirm => 'Are you sure?', :method => :delete, :class => 'btn danger' %></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+
+</div>

data/config/routes.rb

@@ -5,4 +5,5 @@ Doorkeeper::Engine.routes.draw do
   post   'token',     :to => "tokens#create",          :as => :token
 
   resources :applications
+  resources :authorized_applications, :only => [:index, :destroy]
 end

data/config/routes.rbc

@@ -60,7 +60,7 @@ x
 9
 __block__
 i
-148
+176
 5
 7
 0
@@ -208,9 +208,37 @@ i
 49
 17
 1
+15
+5
+7
+18
+44
+43
+1
+79
+49
+2
+1
+13
+7
+19
+7
+20
+7
+21
+35
+2
+49
+5
+2
+15
+47
+49
+17
+2
 11
 I
-7
+8
 I
 0
 I
@@ -220,7 +248,7 @@ I
 I
 -2
 p
-18
+22
 s
 9
 authorize
@@ -275,8 +303,20 @@ applications
 x
 9
 resources
+x
+23
+authorized_applications
+x
+4
+only
+x
+5
+index
+x
+7
+destroy
 p
-11
+13
 I
 0
 I
@@ -299,6 +339,10 @@ I
 7
 I
 94
+I
+8
+I
+b0
 x
 56
 /Users/felipeelias/Applicake/doorkeeper/config/routes.rb

data/lib/doorkeeper/config.rb

@@ -1,42 +1,102 @@
+require 'doorkeeper/config/scopes'
+require 'doorkeeper/config/scope'
+require 'doorkeeper/config/scopes_builder'
+
 module Doorkeeper
   def self.configure(&block)
-    @@config = Config.new(&block)
+    @config = Config::Builder.new(&block).build
+  end
+
+  def self.configuration
+    @config
   end
 
   class Config
-    module ConfigOptions
-      def register_config_option(name, attribute, receives_block = true)
-        define_method name do |*args, &block|
-          if receives_block
-            self.instance_variable_set(:"@#{attribute}", block)
-          else
-            self.instance_variable_set(:"@#{attribute}", args[0])
+    def default_scope_string
+      @scopes.try(:default_scope_string) || ""
+    end
+
+    class Builder
+      def initialize(&block)
+        @config = Config.new
+        instance_eval(&block)
+      end
+
+      def build
+        @config
+      end
+
+      def use_refresh_token
+        @config.instance_variable_set("@refresh_token_enabled", true)
+      end
+    end
+
+    module Option
+
+      # Defines configuration option
+      #
+      # When you call option, it defines two methods. One method will take place
+      # in the +Config+ class and the other method will take place in the
+      # +Builder+ class.
+      #
+      # The +name+ parameter will set both builder method and config attribute.
+      # If the +:as+ option is defined, the builder method will be the specified
+      # option while the config attribute will be the +name+ parameter.
+      #
+      # If you want to introduce another level of config DSL you can
+      # define +builder_class+ parameter.
+      # Builder should take a block as the initializer parameter and respond to function +build+
+      # that returns the value of the config attribute.
+      #
+      # ==== Options
+      #
+      # * [:+as+] Set the builder method that goes inside +configure+ block
+      # * [+:default+] The default value in case no option was set
+      #
+      # ==== Examples
+      #
+      #    option :name
+      #    option :name, :as => :set_name
+      #    option :name, :default => "My Name"
+      #    option :scopes :builder_class => ScopesBuilder
+      #
+      def option(name, options = {})
+        attribute = options[:as] || name
+        attribute_builder = options[:builder_class]
+
+        Builder.instance_eval do
+          define_method name do |*args, &block|
+            value = unless attribute_builder
+              block ? block : args.first
+            else
+              attribute_builder.new(&block).build
+            end
+
+            @config.instance_variable_set(:"@#{attribute}", value)
           end
         end
 
-        attr_reader attribute
-        public attribute
+        define_method attribute do |*args|
+          instance_variable_get(:"@#{attribute}") || options[:default]
+        end
 
-        Doorkeeper.class_eval "
-            def self.#{attribute}
-              @@config.#{attribute}
-            end
-          "
+        public attribute
       end
 
       def extended(base)
-        base.send(:private, :register_method)
+        base.send(:private, :option)
       end
     end
 
-    extend ConfigOptions
+    extend Option
 
-    register_config_option :resource_owner_authenticator, :authenticate_resource_owner
-    register_config_option :admin_authenticator, :authenticate_admin
+    option :resource_owner_authenticator, :as      => :authenticate_resource_owner
+    option :admin_authenticator,          :as      => :authenticate_admin
+    option :access_token_expires_in,      :default => 7200
+    option :authorization_scopes,         :as      => :scopes, :builder_class => ScopesBuilder, :default => Scopes.new
 
-    def initialize(&block)
-      instance_eval &block
+    def refresh_token_enabled?
+      !!@refresh_token_enabled
     end
   end
 end
-

data/lib/doorkeeper/config.rbc

@@ -66,7 +66,7 @@ x
 10
 Doorkeeper
 i
-40
+51
 5
 66
 99
@@ -83,19 +83,30 @@ i
 99
 7
 3
-1
+7
+4
 65
+5
 49
+2
 4
+15
+99
+7
+5
+1
+65
+49
+6
 3
 13
 99
 12
 7
-5
+7
 12
 7
-6
+8
 12
 65
 12
@@ -104,7 +115,7 @@ i
 4
 15
 49
-5
+7
 0
 11
 I
@@ -117,7 +128,7 @@ I
 0
 n
 p
-7
+9
 x
 9
 configure
@@ -129,23 +140,22 @@ x
 9
 configure
 i
-30
+31
 95
 19
 0
 15
-65
-7
-0
 45
+0
 1
+43
 2
 20
 0
 13
 70
 10
-23
+22
 44
 43
 3
@@ -158,10 +168,12 @@ i
 0
 49
 6
-2
+0
+38
+7
 11
 I
-6
+4
 I
 1
 I
@@ -170,15 +182,15 @@ I
 0
 n
 p
-7
-x
 8
-@@config
 x
 6
 Config
 n
 x
+7
+Builder
+x
 4
 Proc
 x
@@ -188,8 +200,11 @@ x
 3
 new
 x
-18
-class_variable_set
+5
+build
+x
+7
+@config
 p
 5
 I
@@ -201,7 +216,7 @@ I
 I
 3
 I
-1e
+1f
 x
 64
 /Users/felipeelias/Applicake/doorkeeper/lib/doorkeeper/config.rb
@@ -214,6 +229,52 @@ x
 13
 attach_method
 x
+13
+configuration
+M
+1
+n
+n
+x
+13
+configuration
+i
+3
+39
+0
+11
+I
+1
+I
+0
+I
+0
+I
+0
+n
+p
+1
+x
+7
+@config
+p
+5
+I
+-1
+I
+6
+I
+0
+I
+7
+I
+3
+x
+64
+/Users/felipeelias/Applicake/doorkeeper/lib/doorkeeper/config.rb
+p
+0
+x
 6
 Config
 x
@@ -230,16 +291,17 @@ x
 6
 Config
 i
-71
+136
 5
 66
 99
 7
 0
+1
 65
 49
 1
-2
+3
 13
 99
 12
@@ -259,48 +321,112 @@ i
 2
 0
 15
+99
+7
 5
-45
+65
+49
+6
+2
+13
+99
+12
+7
+7
+12
+7
+8
+12
+65
+12
+49
+4
+4
+15
+49
+7
 0
+15
 5
+45
+5
+9
 47
 49
-6
+10
 1
 15
 5
 7
+11
+44
+43
+12
+79
+49
+13
+1
+13
 7
+14
 7
-8
+15
+49
+16
+2
+15
 47
 49
-9
+17
 2
 15
 5
 7
-10
+18
+44
+43
+12
+79
+49
+13
+1
+13
 7
-11
+14
+7
+19
+49
+16
+2
+15
 47
 49
-9
+17
 2
 15
-99
+5
 7
+20
+44
+43
 12
-7
-13
-65
-67
+79
 49
-14
-0
+13
+1
+13
+7
+21
+7
+22
 49
+16
+2
 15
-4
+47
+49
+17
+2
 11
 I
 6
@@ -312,23 +438,23 @@ I
 0
 n
 p
-16
+23
 x
-13
-ConfigOptions
+7
+Builder
 x
-11
-open_module
+10
+open_class
 x
-15
-__module_init__
+14
+__class_init__
 M
 1
 n
 n
 x
-13
-ConfigOptions
+7
+Builder
 i
 30
 5
@@ -373,87 +499,354 @@ n
 p
 6
 x
-22
-register_config_option
+10
+initialize
 M
 1
 n
 n
 x
-22
-register_config_option
-i
-59
-23
-2
 10
-8
-2
+initialize
+i
+50
+95
 19
-2
+0
 15
-5
-20
+45
 0
-56
+1
+13
+71
+2
+47
+9
+25
+47
+49
+3
 0
+13
 47
-50
-1
-1
+49
+4
+0
 15
-5
-20
-1
-47
+8
+28
 49
 2
-1
+0
+38
+5
 15
 5
 20
-1
-47
+0
+13
+70
+10
+45
+44
+43
+6
+12
 49
-3
+7
 1
-15
-45
+47
+50
+8
+0
+11
+I
 4
+I
+1
+I
+0
+I
+0
+n
+p
+9
+x
+6
+Config
+n
+x
+3
+new
+x
+8
+allocate
+x
+10
+initialize
+x
+7
+@config
+x
+4
+Proc
+x
+14
+__from_block__
+x
+13
+instance_eval
+p
+7
+I
+-1
+I
+c
+I
+4
+I
+d
+I
+1f
+I
+e
+I
+32
+x
+64
+/Users/felipeelias/Applicake/doorkeeper/lib/doorkeeper/config.rb
+p
+1
+x
+5
+block
+x
+17
+method_visibility
+x
+15
+add_defn_method
+x
 5
+build
+M
+1
+n
+n
+x
+5
+build
+i
+3
+39
+0
+11
+I
+1
+I
+0
+I
+0
+I
+0
+n
+p
+1
+x
 7
+@config
+p
+5
+I
+-1
+I
+11
+I
+0
+I
+12
+I
+3
+x
+64
+/Users/felipeelias/Applicake/doorkeeper/lib/doorkeeper/config.rb
+p
+0
+p
+5
+I
+2
+I
+c
+I
+10
+I
+11
+I
+1e
+x
+64
+/Users/felipeelias/Applicake/doorkeeper/lib/doorkeeper/config.rb
+p
+0
+x
+13
+attach_method
+x
 6
-20
+Option
+x
+11
+open_module
+x
+15
+__module_init__
+M
 1
-47
-101
+n
+n
+x
+6
+Option
+i
+30
+5
+66
+99
+7
+0
 7
+1
+65
+67
+49
+2
+0
+49
+3
+4
+15
+99
 7
-8
+4
+7
+5
+65
+67
+49
+2
+0
+49
+3
+4
+11
+I
+5
+I
+0
+I
+0
+I
+0
+n
+p
+6
+x
+6
+option
+M
+1
+n
+n
+x
+6
+option
+i
+57
+23
+1
+10
+14
+44
+43
+0
+78
+49
+1
+1
+19
+1
+15
 20
 1
-47
-101
 7
+2
+49
+3
+1
+13
+10
+27
+15
+20
+0
+19
+2
+15
+45
+4
+5
+56
+6
+50
 7
+0
+15
+5
+20
+2
+56
+8
+47
+50
 9
-63
+1
+15
 5
+20
+2
+47
 49
 10
 1
 11
 I
-9
+6
 I
 3
 I
-2
+1
 I
-3
+2
 n
 p
 11
+x
+4
+Hash
+x
+16
+new_from_literal
+x
+2
+as
+x
+2
+[]
+x
+7
+Builder
+n
 M
 1
 p
@@ -464,10 +857,47 @@ for_block
 t
 n
 x
-22
-register_config_option
+6
+option
 i
-71
+11
+5
+21
+1
+0
+56
+0
+47
+50
+1
+1
+11
+I
+4
+I
+0
+I
+0
+I
+0
+I
+-2
+p
+2
+M
+1
+p
+2
+x
+9
+for_block
+t
+n
+x
+6
+option
+i
+57
 59
 36
 19
@@ -487,62 +917,188 @@ i
 1
 19
 1
+20
+1
+9
+27
+20
+1
+8
+32
+20
+0
+49
+2
+0
+19
+2
+15
+39
+3
+7
+4
 21
+2
+2
+47
+101
+5
+63
+2
+47
+49
+6
+0
+20
+2
+49
+7
+2
+11
+I
+8
+I
+3
+I
+0
+I
+0
+I
+0
+p
+8
+x
+4
+Proc
+x
+14
+__from_block__
+x
+5
+first
+x
+7
+@config
+s
 1
+@
+x
+4
+to_s
+x
+6
+to_sym
+x
+21
+instance_variable_set
+p
+9
+I
+0
+I
+31
+I
+13
+I
+32
+I
+20
+I
+32
+I
+23
+I
+33
+I
+39
+x
+64
+/Users/felipeelias/Applicake/doorkeeper/lib/doorkeeper/config.rb
+p
+3
+x
+4
+args
+x
+5
+block
+x
+5
+value
+x
+13
+define_method
+p
+3
+I
+0
+I
+31
+I
+b
+x
+64
+/Users/felipeelias/Applicake/doorkeeper/lib/doorkeeper/config.rb
+p
+0
+x
+13
+instance_eval
+M
+1
+p
 2
+x
 9
-46
+for_block
+t
+n
+x
+6
+option
+i
+37
+59
+36
+19
+0
+15
 5
 7
-2
+0
 21
 1
-1
+2
 47
 101
-3
+1
 63
 2
 47
 49
-4
+2
 0
-20
-1
+47
 49
-5
-2
-8
-70
-5
-7
-2
+3
+1
+13
+10
+36
+15
 21
 1
 1
-47
-101
-3
-63
-2
-47
-49
+7
 4
-0
-20
-0
-78
-49
-6
-1
 49
 5
-2
+1
 11
 I
-8
+5
 I
-2
+1
 I
 0
 I
@@ -550,13 +1106,7 @@ I
 I
 0
 p
-7
-x
-4
-Proc
-x
-14
-__from_block__
+6
 s
 1
 @
@@ -568,113 +1118,63 @@ x
 to_sym
 x
 21
-instance_variable_set
+instance_variable_get
+x
+7
+default
 x
 2
 []
 p
-11
+5
 I
 0
 I
-9
-I
-13
-I
-a
-I
-18
-I
-b
-I
-2e
-I
-d
+37
 I
-46
+5
 I
-0
+38
 I
-47
+25
 x
 64
 /Users/felipeelias/Applicake/doorkeeper/lib/doorkeeper/config.rb
 p
-2
+1
 x
 4
 args
 x
-5
-block
-x
 13
 define_method
 x
-11
-attr_reader
-x
 6
 public
-x
-10
-Doorkeeper
-n
-s
-22
-
-            def self.
-x
-4
-to_s
-s
-24
-
-              @@config.
-s
-27
-
-            end
-          
-x
-10
-class_eval
 p
-17
+11
 I
 -1
 I
-8
-I
-8
-I
-9
-I
-12
-I
-11
+2d
 I
-1a
+e
 I
-12
+2e
 I
-22
+1e
 I
-14
+30
 I
 27
 I
-15
-I
-2e
-I
-16
-I
 37
 I
-14
+31
 I
 3b
+I
+39
 x
 64
 /Users/felipeelias/Applicake/doorkeeper/lib/doorkeeper/config.rb
@@ -684,12 +1184,12 @@ x
 4
 name
 x
+7
+options
+x
 9
 attribute
 x
-14
-receives_block
-x
 17
 method_visibility
 x
@@ -732,8 +1232,8 @@ x
 7
 private
 x
-15
-register_method
+6
+option
 x
 4
 send
@@ -742,11 +1242,11 @@ p
 I
 -1
 I
-1b
+3e
 I
 0
 I
-1c
+3f
 I
 a
 x
@@ -762,11 +1262,11 @@ p
 I
 2
 I
-8
+2d
 I
 10
 I
-1b
+3e
 I
 1e
 x
@@ -774,9 +1274,6 @@ x
 /Users/felipeelias/Applicake/doorkeeper/lib/doorkeeper/config.rb
 p
 0
-x
-13
-attach_method
 n
 x
 6
@@ -785,11 +1282,23 @@ x
 28
 resource_owner_authenticator
 x
+4
+Hash
+x
+16
+new_from_literal
+x
+2
+as
+x
 27
 authenticate_resource_owner
 x
-22
-register_config_option
+3
+[]=
+x
+6
+option
 x
 19
 admin_authenticator
@@ -797,117 +1306,48 @@ x
 18
 authenticate_admin
 x
-10
-initialize
-M
-1
-n
-n
-x
-10
-initialize
-i
 23
-95
-19
-0
-15
-5
-20
-0
-13
-70
-10
-18
-44
-43
-0
-12
-49
-1
-1
-47
-50
-2
-0
-11
-I
-4
-I
-1
-I
-0
-I
-0
-n
-p
-3
-x
-4
-Proc
-x
-14
-__from_block__
+access_token_expires_in
 x
-13
-instance_eval
-p
-5
-I
--1
-I
-25
-I
-4
-I
-26
+7
+default
 I
-17
-x
-64
-/Users/felipeelias/Applicake/doorkeeper/lib/doorkeeper/config.rb
-p
-1
-x
-5
-block
-x
-17
-method_visibility
-x
-15
-add_defn_method
+1c20
 p
-11
+13
 I
 2
 I
-7
+b
 I
-1c
+1d
 I
-20
+16
 I
-25
+37
 I
-22
+43
 I
-2f
+40
 I
-23
+45
 I
-39
+58
 I
-25
+46
+I
+70
 I
 47
+I
+88
 x
 64
 /Users/felipeelias/Applicake/doorkeeper/lib/doorkeeper/config.rb
 p
 0
 p
-5
+7
 I
 2
 I
@@ -917,7 +1357,11 @@ d
 I
 6
 I
-28
+18
+I
+a
+I
+33
 x
 64
 /Users/felipeelias/Applicake/doorkeeper/lib/doorkeeper/config.rb