opro 0.0.1.pre1.0.1 → 0.0.1.pre1.0.2

data/VERSION

@@ -1 +1 @@
-0.0.1.pre1.0.1
+0.0.1.pre1.0.2

data/app/controllers/oauth/client_application_controller.rb

@@ -6,7 +6,13 @@ class Oauth::ClientApplicationController < ApplicationController
   end
 
   def create
-    @client_app = Oauth::ClientApplication.create_with_user_and_name(current_user, params[:oauth_client_application][:name])
+    @client_app = Oauth::ClientApplication.find_by_user_id_and_name(current_user.id, params[:oauth_client_application][:name])
+    @client_app ||= Oauth::ClientApplication.create_with_user_and_name(current_user, params[:oauth_client_application][:name])
+    if @client_app.save
+      # do nothing
+    else
+      render :new
+    end
   end
 
   def index

data/app/controllers/oauth/docs_controller.rb

@@ -1,4 +1,6 @@
 require 'erb'
+require 'bluecloth'
+
 OPRO_MD_ROOT=File.join(File.dirname(__FILE__), '../../views/oauth/docs/markdown/')
 
 

data/app/models/oauth/access_grant.rb

@@ -10,6 +10,8 @@ class Oauth::AccessGrant < ActiveRecord::Base
 
   before_create :generate_tokens
 
+  alias_attribute :token, :access_token
+
   def self.prune!
     # UPDATEME
     # delete_all(["created_at < ?", 3.days.ago])

data/app/views/oauth/client_application/create.html.erb

@@ -1,11 +1,15 @@
-<h2>Success! Here is your App</h2>
+<h2>Success! Here is your OAuth Client's Credentials</h2>
+<p>Copy these credentials down for use in your application</p>
 <table>
   <tr><td>Name:  </td><td><%= @client_app.name       %></td></tr>
   <tr><td>Client Id:    </td><td><%= @client_app.app_id     %></td></tr>
   <tr><td>Secret:</td><td><%= @client_app.app_secret %></td></tr>
 </table>
 
-<div>
-  <%= link_to 'Register an New App', new_oauth_client_application_path %>
-</div>
+<hr />
+<p>
+  Read the
+  <%= link_to 'Quick Start Documentation', oauth_doc_path(:quick_start) %> or
+    <%= link_to 'Register Another Oauth Client App', new_oauth_client_application_path %>
+</p>
 

data/app/views/oauth/client_application/new.html.erb

@@ -1,9 +1,10 @@
-<h2>Create An App</h2>
+<h2>Create An OAuth Client App</h2>
 <div>
   <%= form_for @client_app do |f| %>
-    <%= f.label :name %>:
+    <%= f.label :name %>
     <%= f.text_field :name, :placeholder => 'App Name' %>
     <%= f.submit 'Create OAuth Client', :id => 'submitApp' %>
+    <p>(you can change this name later)</p>
   <%- end -%>
 </div>
 

data/app/views/oauth/docs/markdown/curl.md.erb

@@ -1,6 +1,42 @@
-This document explains what curl is and how to use it. 
+# Curl
+
+[Curl](http://curl.haxx.se/) is a command line tool for transfering data with a url syntax. Most systems should have curl installed. Open up terminal on OS X or command prompt on windows and type in `curl`. There are parts of the OAuth process that were not intended for direct human interaction such as exchanging the code from the Provider for an access_token. Because of this, it can be easier to use `curl` to talk to a server directly instead of using a web browser.
+
+## What is it good for?
+
+With curl we're able to arbitrarily add parameters to our requests and to send using arbitrary HTTP status codes (GET/POST/DELETE) that are difficult to simulate in the browser. If you need to `POST` data to a url doing so with curl is much easier than constructing a form for testing.
+
+## How do I use it?
+
+On the command line you should be able to get get help by typing `man curl` if your system supports man pages. Below are some simple and common use cases
+
+### Get Webpage
+
+You can get the entire contents of a web document by simply issuing curl to that url
+
+    $ curl https://www.google.com
+
+
+### Get Headers
+
+
+You can ask for the headers of a request by adding the `-I` flag to a curl command
+
+    $ curl https://www.google.com -I
+    HTTP/1.1 200 OK
+    Expires: -1
+    Cache-Control: private, max-age=0
+    Content-Type: text/html; charset=ISO-8859-1
+    Server: gws
+    X-XSS-Protection: 1; mode=block
+    X-Frame-Options: SAMEORIGIN
+    Transfer-Encoding: chunked
+
+
+
+# Hurl
+
+[Hurl](http://hurl.it/) is an open sourced browser based `curl` implementation. If you're going to do quite a few curl requests, using it can be easier than the command line.
 
-TODO
 
 
-In the future I would love to include Hurl in this project. If that interests you, submit a pull request ;)

data/app/views/oauth/docs/markdown/oauth.md.erb

@@ -1,3 +1,28 @@
-Oauth is ... TODO
+## Opro Oauth
+
+OAuth comes in a few different flavors, the implementation of OAuth comes from <%= link_to "Facebook's Server Side OAuth Authentication", 'http://developers.facebook.com/docs/authentication/server-side/'%>.
+
+
+## What is It?
+
+OAuth is a secure way to grant authorization without having to transfer passwords to third parties. If you've used an iPhone or Android app to access Twitter or Facebook you've likely used OAuth.
+
+The flow is simple, it is started when a user clicks on an authorization button, they are then directed to the OAuth provider's website, such as Facebook. They are then prompted to confirm with the OAuth provider that they are who they say they are by logging in. The user is then given the opportunity to grant authorization to the OAuth client (where the request was initiated, such as the iPhone). After returning to the client, a code is sent that can be exchanged for a secure token. This secure token can be used to authenticate as the user. This way an iPhone client can ask for personalized content to show to the user, such as a friend list, or messages. This is the mechanism that drives most of the web.
+
+## Not just Mobile
+
+Client and server side web applications can use this type of authorization to add features to their service such as posting things to a timeline, or adding personalization.
+
+
+## Alternatives
+
+OAuth is simple in concept, but can be tricky to implement right. Many services also support basic auth. With basic auth you send a user's username and password along with every request. While this is fairly simple it means that the client application has access to your password, which is not very secure. There are other standards such as xAuth, and likely more to come in the future
+
+
+## Clients
+
+This website is an OAuth Provider, and you can create an OAuth client to access this website as a logged in user for select url's.
+
+To get started getting your first OAuth token follow the <%= view_context.link_to 'quick start guide', oauth_doc_path(:quick_start) %>. 
+
 
-<%= link_to "Facebook's Server Side OAuth Authentication", 'http://developers.facebook.com/docs/authentication/server-side/'%>

data/app/views/oauth/docs/markdown/quick_start.md.erb

@@ -1,6 +1,6 @@
 ## Quick Start Guide
 
-This site is providing OAuth through [Opro](http://github.com/schneems/opro). If this is your first time using Oauth, please visit [What is Oauth]() or follow along with this guide.
+This site is providing OAuth through [Opro](http://github.com/schneems/opro). If this is your first time using Oauth, please visit [What is Oauth](<%= oauth_doc_path(:oauth) %>) or follow along with this guide.
 
 
 ## Step 1: Register your Application
@@ -28,14 +28,14 @@ Once you grant your application permission, you will be redirected back to the u
 
 Once redirected to the home page, take a look in the address bar, we should see a `code` parameter. Copy this for use later:
 
-    <%= "#{request.base_url}?" %>?code=4857goldfish827423
+    <%= "#{request.base_url}" %>?code=4857goldfish827423
 
 In the url above the `code` would be `4857goldfish827423`. This code can be used to obtain an access token for the user. Once you have a user's access token, you can perform actions for the user as if they were logged in. If you accidentally close this page, don't worry just visit first url and we'll show you the code again.
 
 
 ## Step 3: Get AccessToken for User with Curl
 
-We'll be using [Curl]() to go through the process of getting an access for our first user, you'll likely use http client libraries in your actual applications, but most systems come with curl and it is a fairly easy way to get started. If you've never used it before read our [curl documentation]()
+We'll be using [Curl](<%= oauth_doc_path(:curl) %>) to go through the process of getting an access for our first user, you'll likely use http client libraries in your actual applications, but most systems come with curl and it is a fairly easy way to get started. If you've never used it before read our [curl documentation](<%= oauth_doc_path(:curl) %>)
 
 (Note in all code examples the $ character indicates we are on the command line, it does not need to be coppied)
 
@@ -68,4 +68,3 @@ You should see a successful result ( again don't forget to replace the example a
 Don't share your client application's secret or any user's access_token with unknown or untrusted parties. Always use https when available and don't write any of these values to your application's logs.
 
 
-<%= view_context.link_to ' ← back',  oauth_docs_path %>

data/app/views/oauth/docs/show.html.erb

@@ -1 +1,3 @@
-<%= render_doc(@doc) %>
+<%= render_doc(@doc) %>
+
+<%= link_to ' ← back',  oauth_docs_path %>

data/app/views/oauth/tests/index.html.erb

@@ -7,11 +7,7 @@
 <p>
   If you send a valid OAuth request to any oauth_test url such as <%= link_to oauth_test_path(:show_me_the_money), oauth_test_path(:show_me_the_money) %> you should see a response like this
 </p>
-  <pre>
-    <code>
-      <%= {:status => 200, :message => 'Oauth Worked!! ', :params => {:id => 'show_me_the_money', :access_token => '3948fuAlo10gnsu'} }.to_json %>
-    </code>
-  </pre>
+  <pre><code><%= {:status => 200, :message => 'Oauth Worked!! ', :params => {:id => 'show_me_the_money', :access_token => '3948fuAlo10gnsu'} }.to_json %></code></pre>
 <p>
   If the request is not valid you will receive a message detailing the errors.
 </p>
@@ -20,11 +16,7 @@
 <p>
   If you send a valid OAuth request using the 'DELETE' HTTP method to <%=  oauth_test_path(:show_me_the_money) %> you should see a response like below.</p>
   <%= button_to oauth_test_path(:show_me_the_money), oauth_test_path(:show_me_the_money), :method => :delete %>
-  <pre>
-    <code>
-      <%= {:status => 401, :message => 'Oauth is Disabled on this Action, this is the correct result!', :params => {:id => 'show_me_the_money', :access_token => '3948fuAlo10gnsu'}}.to_json %>
-    </code>
-  </pre>
+  <pre><code><%= {:status => 401, :message => 'Oauth is Disabled on this Action, this is the correct result!', :params => {:id => 'show_me_the_money', :access_token => '3948fuAlo10gnsu'}}.to_json %></code></pre>
 
 <p>
   If you get a 200 result, then there is something configured incorrectly on the server, please contact the administrator.

data/opro.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "opro"
-  s.version = "0.0.1.pre1.0.1"
+  s.version = "0.0.1.pre1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["schneems"]
-  s.date = "2012-04-10"
+  s.date = "2012-04-13"
   s.description = " Enable OAuth clients (iphone, android, web sites, etc.) to access and use your Rails application, what you do with it is up to you"
   s.email = "richard.schneeman@gmail.com"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opro
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre1.0.1
+  version: 0.0.1.pre1.0.2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-10 00:00:00.000000000Z
+date: 2012-04-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70203502493160 !ruby/object:Gem::Requirement
+  requirement: &70160889026080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *70203502493160
+  version_requirements: *70160889026080
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70203502491540 !ruby/object:Gem::Requirement
+  requirement: &70160889025500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *70203502491540
+  version_requirements: *70160889025500
 - !ruby/object:Gem::Dependency
   name: bluecloth
-  requirement: &70203502490520 !ruby/object:Gem::Requirement
+  requirement: &70160889024900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70203502490520
+  version_requirements: *70160889024900
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70203502489320 !ruby/object:Gem::Requirement
+  requirement: &70160889024280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70203502489320
+  version_requirements: *70160889024280
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70203502488240 !ruby/object:Gem::Requirement
+  requirement: &70160889023620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 1.1.3
   type: :development
   prerelease: false
-  version_requirements: *70203502488240
+  version_requirements: *70160889023620
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70203502486620 !ruby/object:Gem::Requirement
+  requirement: &70160889023000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *70203502486620
+  version_requirements: *70160889023000
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70203502485440 !ruby/object:Gem::Requirement
+  requirement: &70160889003480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70203502485440
+  version_requirements: *70160889003480
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70203502466260 !ruby/object:Gem::Requirement
+  requirement: &70160889002560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70203502466260
+  version_requirements: *70160889002560
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70203502464720 !ruby/object:Gem::Requirement
+  requirement: &70160889001680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70203502464720
+  version_requirements: *70160889001680
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70203502462100 !ruby/object:Gem::Requirement
+  requirement: &70160889000620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70203502462100
+  version_requirements: *70160889000620
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70203502460760 !ruby/object:Gem::Requirement
+  requirement: &70160888999860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70203502460760
+  version_requirements: *70160888999860
 description: ! ' Enable OAuth clients (iphone, android, web sites, etc.) to access
   and use your Rails application, what you do with it is up to you'
 email: richard.schneeman@gmail.com
@@ -237,7 +237,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -607479715438649741
+      hash: -3455292628874218809
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: