oauned 0.0.1 → 1.0.0

data/README.md

@@ -1,23 +1,25 @@
 # Oauned
 
 Rails Engine that lets you become an OAuth Provider.
+[![Travis](https://secure.travis-ci.org/evome/oauned.png)](http://travis-ci.org/evome/oauned)
 
 ## Installation
 
-You can use the latest gem which is on rubygems.
+Add this to your Gemfile :
 
-    gem install oauned
+    gem 'oauned'
+    gem 'devise'
 
-Don't forget to add it to your Gemfile !
-
-Then, you must create the local models.
+Then, you must execute the generators :
 
+    rails g devise:install
+    rails g devise user
     rails g oauned:install
 
-This will create three models in your application : `Application`, `Authorization`, `Connection`  
-You'll need a fourth one, which is not created : `User`. The authentication management gem you're using should be creating it, not us.
+This will create three models in your application : `Application`, `Authorization`, `Connection`.  
+Devise will also create a fourth one : `User`.
 
-You can easily rename those models. Just change their name and the relations names between them.
+You can't currently rename those models and hope for oauned to keep working. This is something we intend to do though.
 
 A route is also created.
 
@@ -64,11 +66,11 @@ We're open to any contribution. It has to be tested properly though.
 * [Fork](http://help.github.com/forking/) the project
 * Do your changes and commit them to your repository
 * Test your changes. We won't accept any untested contributions (except if they're not testable).
-* Create an [issue](https://github.com/dmathieu/oauned/issues) with a link to your commits.
+* Create an [issue](https://github.com/evome/oauned/issues) with a link to your commits.
 
 ## Maintainers
 
-* Damien MATHIEU (http://github.com/dmathieu)
+* Damien MATHIEU ([github/dmathieu](http://github.com/dmathieu), [dmathieu.com](http://dmathieu.com))
 
 ## License
-MIT License. Copyright 2010 Damien MATHIEU. http://dmathieu.com
+MIT License. Copyright 2010 Evome. http://evome.fr

data/lib/generators/oauned/helpers.rb

@@ -1,14 +1,19 @@
 module Oauned
   module Generators
     module Helpers
-      
+
+      private
       def model_exists?(model)
         File.exists?(File.join(destination_root, model_path(model)))
       end
-      
+
       def model_path(model)
         File.join("app", "models", "#{model}.rb")
       end
+
+      def migration_exists?(model_name)
+        Dir.glob("#{File.join(destination_root, migration_path)}/[0-9]*_*.rb").grep(/\d+_add_oauned_to_#{model_name}.rb$/).first
+      end
     end
   end
-end
+end

data/lib/generators/oauned/install_generator.rb

@@ -3,47 +3,97 @@ require 'generators/oauned/helpers'
 
 module Oauned
   module Generators
-    class InstallGenerator < Rails::Generators::Base
-      source_root File.expand_path("../templates", __FILE__)
+    class InstallGenerator < ActiveRecord::Generators::Base
       include Oauned::Generators::Helpers
+      source_root File.expand_path("../templates", __FILE__)
+
+      argument :authorization,
+        :type => :string,
+        :default => "authorization"
+      argument :connection,
+        :type => :string,
+        :default => "connection"
 
       desc "Creates the oauned routes and models"
       def add_oauned_routes
         route "scope '/scoped' { oauned_routing }"
       end
-      
+
+      def copy_migration
+        [:application, :authorization, :connection].each do |model_sym|
+          model_name = send(model_sym)
+          @table_name = model_name.pluralize
+          if (behavior == :invoke && model_exists?(model_name)) || (behavior == :revoke && migration_exists?(model_name))
+            migration_template "migration_existing.rb",
+              "db/migrate/add_oauned_to_#{model_name}"
+          else
+            migration_template "migration.rb",
+              "db/migrate/oauned_create_#{model_name}"
+          end
+        end
+      end
+
       def create_models
-        [:application, :authorization, :connection].each do |model|
-          invoke "active_record:model", [model], :migration => false unless model_exists?(model) && behavior == :invoke
+        [:application, :authorization, :connection].each do |model_sym|
+          model_name = send(model_sym)
+          if !model_exists?(model_name) && behavior == :invoke
+            Rails::Generators.invoke "active_record:model",
+              [model_name],
+              :migration => false,
+              :destination_root => destination_root
+            require File.join(destination_root, model_path(model_name))
+          end
         end
       end
-      
+
       def inject_application_content
-        inject_into_class model_path(:application), Application, <<EOS if model_exists?(:authorization)
+        if model_exists?(application)
+          inject_into_class model_path(application),
+            application.capitalize.constantize,
+<<EOS
   include Oauned::Models::Application
-  
+
   has_many   :authorizations
   has_many   :connections
 EOS
+        end
       end
-      
+
       def inject_authorization_content
-        inject_into_class model_path(:authorization), Application, <<EOS if model_exists?(:authorization)
+        if model_exists?(authorization)
+          inject_into_class model_path(authorization),
+            authorization.capitalize.constantize,
+<<EOS
   include Oauned::Models::Authorization
-  
+
   belongs_to       :user
   belongs_to       :application
 EOS
+        end
       end
-      
+
       def inject_connection_content
-        inject_into_class model_path(:connection), Application, <<EOS if model_exists?(:authorization)
+        if model_exists?(connection)
+          inject_into_class model_path(connection),
+            connection.capitalize.constantize,
+ <<EOS
   include Oauned::Models::Connection
-  
+
   belongs_to       :user
   belongs_to       :application
 EOS
+        end
+      end
+
+      private
+      #
+      # We can't use an argument, but must rely on the name attribute
+      # Because ActiveRecord::Generators::Base extends from NamedBase
+      #
+      def application
+        @application ||= name || "application"
       end
+
     end
   end
-end
+end

data/lib/generators/oauned/templates/migration.rb

@@ -0,0 +1,12 @@
+class OaunedCreate<%= table_name.camelize %> < ActiveRecord::Migration
+  def self.up
+    create_table(:<%= table_name %>) do |t|
+
+      t.timestamps
+    end
+  end
+
+  def self.down
+    drop_table :<%= table_name %>
+  end
+end

data/lib/generators/oauned/templates/migration_existing.rb

@@ -0,0 +1,14 @@
+class AddDOaunedTo<%= table_name.camelize %> < ActiveRecord::Migration
+  def self.up
+    change_table(:<%= table_name %>) do |t|
+      # Uncomment below if timestamps were not included in your original model.
+      # t.timestamps
+    end
+  end
+
+  def self.down
+    # By default, we don't want to make any assumption about how to roll back a migration when your
+    # model already existed. Please edit below which fields you would like to remove in this migration.
+    raise ActiveRecord::IrreversibleMigration
+  end
+end

data/lib/oauned.rb

@@ -1,7 +1,8 @@
 module Oauned
   autoload :ControllerMethods, 'oauned/controller_methods'
   autoload :Models, 'oauned/models'
-  
+  autoload :Version, 'oauned/version'
+
 end
 
-require 'oauned/rails'
+require 'oauned/rails'

data/lib/oauned/controller_methods.rb

@@ -28,7 +28,7 @@ module Oauned
         
         private
         def user_from_oauth
-          token = Connection.where(:access_token => params[:access_token]).first
+          token = Connection.where(['access_token LIKE ?', params[:access_token]]).first
           token.user if (token && !token.expired?)
         end
         

data/lib/oauned/models.rb

@@ -2,4 +2,14 @@ module Oauned::Models
   autoload :Application, 'oauned/models/application'
   autoload :Authorization, 'oauned/models/authorization'
   autoload :Connection, 'oauned/models/connection'
-end
+
+
+  @@models = {}
+  def self.[](key)
+    @@models[key]
+  end
+
+  def self.[]=(key, value)
+    @@models[key] = value
+  end
+end

data/lib/oauned/models/application.rb

@@ -1,5 +1,7 @@
 module Oauned::Models::Application
   def self.included(klass)
+    Oauned::Models['application'] = klass
+
     klass.class_eval do
       before_create    :set_default
 
@@ -13,4 +15,4 @@ module Oauned::Models::Application
       end
     end
   end
-end
+end

data/lib/oauned/models/authorization.rb

@@ -1,5 +1,7 @@
 module Oauned::Models::Authorization
   def self.included(klass)
+    Oauned::Models['authorization'] = klass
+
     klass.class_eval do
       before_create    :set_default
 
@@ -12,7 +14,7 @@ module Oauned::Models::Authorization
 
       def tokenize!
         self.destroy
-        Connection.create!(:user_id => user.id, :application_id => application.id)
+        Connection.create!(:user_id => user_id, :application_id => application_id)
       end
 
       private
@@ -22,4 +24,4 @@ module Oauned::Models::Authorization
       end
     end
   end
-end
+end

data/lib/oauned/models/connection.rb

@@ -1,5 +1,7 @@
 module Oauned::Models::Connection
   def self.included(klass)
+    Oauned::Models['connection'] = klass
+
     klass.class_eval do
       before_create    :set_default
 
@@ -18,8 +20,9 @@ module Oauned::Models::Connection
       private
       def set_default
         self.access_token = SecureRandom.hex(20)
+        self.refresh_token = SecureRandom.hex(20)
         self.expires_at = 1.hour.from_now
       end
     end
   end
-end
+end

data/lib/oauned/rails/routing.rb

@@ -1,10 +1,10 @@
 module ActionDispatch::Routing
   class Mapper
-    
+
     def oauned_routing
       get '/' => 'oauned/oauth#index', :as => 'oauth'
       post '/' => 'oauned/oauth#authorize'
       post '/token' => 'oauned/oauth#token'
     end
   end
-end
+end

data/lib/oauned/version.rb

@@ -0,0 +1,3 @@
+module Oauned
+  VERSION = "1.0.0"
+end

metadata

@@ -1,34 +1,27 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: oauned
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 1
-  version: 0.0.1
+version: !ruby/object:Gem::Version
+  version: 1.0.0
+  prerelease: 
 platform: ruby
-authors: []
-
+authors:
+- Damien MATHIEU
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-01-21 00:00:00 +01:00
+date: 2011-09-13 00:00:00.000000000 +02:00
 default_executable: 
 dependencies: []
-
 description: Rails Engine to be an Oauth Provider
 email: 
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/generators/oauned/helpers.rb
 - lib/generators/oauned/install_generator.rb
+- lib/generators/oauned/templates/migration.rb
+- lib/generators/oauned/templates/migration_existing.rb
 - lib/oauned/controller_methods.rb
 - lib/oauned/models/application.rb
 - lib/oauned/models/authorization.rb
@@ -36,6 +29,7 @@ files:
 - lib/oauned/models.rb
 - lib/oauned/rails/routing.rb
 - lib/oauned/rails.rb
+- lib/oauned/version.rb
 - lib/oauned.rb
 - MIT-LICENSE
 - Rakefile
@@ -43,34 +37,26 @@ files:
 has_rdoc: true
 homepage: 
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Oauth Provider
 test_files: []
-