<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>app/controllers/oauth_clients_controller.rb</filename>
    </added>
    <added>
      <filename>app/controllers/oauth_controller.rb</filename>
    </added>
    <added>
      <filename>app/helpers/oauth_clients_helper.rb</filename>
    </added>
    <added>
      <filename>app/helpers/oauth_helper.rb</filename>
    </added>
    <added>
      <filename>app/models/access_token.rb</filename>
    </added>
    <added>
      <filename>app/models/client_application.rb</filename>
    </added>
    <added>
      <filename>app/models/oauth_nonce.rb</filename>
    </added>
    <added>
      <filename>app/models/oauth_token.rb</filename>
    </added>
    <added>
      <filename>app/models/request_token.rb</filename>
    </added>
    <added>
      <filename>app/models/tog/oauth.rb</filename>
    </added>
    <added>
      <filename>app/views/oauth/authorize.html.erb</filename>
    </added>
    <added>
      <filename>app/views/oauth/authorize_failure.html.erb</filename>
    </added>
    <added>
      <filename>app/views/oauth/authorize_success.html.erb</filename>
    </added>
    <added>
      <filename>app/views/oauth_clients/_form.html.erb</filename>
    </added>
    <added>
      <filename>app/views/oauth_clients/index.html.erb</filename>
    </added>
    <added>
      <filename>app/views/oauth_clients/new.html.erb</filename>
    </added>
    <added>
      <filename>app/views/oauth_clients/show.html.erb</filename>
    </added>
    <added>
      <filename>db/migrate/004_create_oauth_tables.rb</filename>
    </added>
    <added>
      <filename>lib/tog_oauth_controller_methods.rb</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -15,6 +15,11 @@ class User &lt; ActiveRecord::Base
   has_many :moderated_groups, :through =&gt; :moderator_memberships,
                     :conditions =&gt; &quot;memberships.state='active' and groups.state='active'&quot;, :source =&gt; :group
 
+  # =&gt; oauth support
+  has_many :client_applications
+  has_many :tokens, :class_name=&gt;&quot;OauthToken&quot;, :order=&gt;&quot;authorized_at desc&quot;, :include=&gt;[:client_application]
+  # =&gt; oauth support
+
   protected
 
     def create_profile</diff>
      <filename>app/models/user.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,4 +1,4 @@
-# Add your custom routes here.  If in config/routes.rb you would 
+# Add your custom routes here.  If in config/routes.rb you would
 # add &lt;tt&gt;map.resources&lt;/tt&gt;, here you would add just &lt;tt&gt;resources&lt;/tt&gt;
 
 resources :profiles
@@ -27,4 +27,14 @@ end
 
 namespace(:admin) do |admin|
   admin.resources :groups, :member =&gt; { :activate =&gt; :post}
-end
\ No newline at end of file
+end
+
+# =&gt; oauth support
+resources :oauth_clients
+authorize '/oauth/authorize',:controller=&gt;'oauth',:action=&gt;'authorize'
+request_token '/oauth/request_token',:controller=&gt;'oauth',:action=&gt;'request_token'
+access_token '/oauth/access_token',:controller=&gt;'oauth',:action=&gt;'access_token'
+test_request '/oauth/test_request',:controller=&gt;'oauth',:action=&gt;'test_request'
+x1 '/oauth_test', :controller=&gt;'oauth_test',:action=&gt;'test'
+x2 '/oauth_callback', :controller=&gt;'oauth_test',:action=&gt;'callback'
+# =&gt; oauth support
\ No newline at end of file</diff>
      <filename>config/routes.rb</filename>
    </modified>
    <modified>
      <diff>@@ -19,6 +19,13 @@ Tog::Plugins.settings :tog_social, &quot;profile.image.default&quot;         =&gt; &quot;default_p
                                    &quot;profile.image.versions.tiny&quot;   =&gt; &quot;25x25#&quot;,
                                    &quot;profile.list.page.size&quot;        =&gt; &quot;10&quot;
 
+# oauth beta support
+gem 'oauth', '&gt;=0.2.1'
+require 'oauth/signature/hmac/sha1'
+require 'oauth/request_proxy/action_controller_request'
+require 'oauth/server'
+require 'tog_oauth_controller_methods'
+
 Tog::Plugins.helpers ProfilesHelper, GroupsHelper
 
 Tog::Interface.sections(:site).add &quot;Profiles&quot;, &quot;/profiles&quot;</diff>
      <filename>init.rb</filename>
    </modified>
    <modified>
      <diff>@@ -2,14 +2,17 @@ ENV[&quot;RAILS_ENV&quot;] = &quot;test&quot;
 require File.expand_path(File.dirname(__FILE__) + &quot;/../../../../config/environment&quot;)
 require 'test_help'
 require 'test/unit'
+require 'mocha'
+require 'shoulda'
 
 require 'factory_girl'
 require File.expand_path(File.dirname(__FILE__) + '/factories')
 
+begin require 'redgreen'; rescue LoadError; end
+
 class Test::Unit::TestCase
   self.use_transactional_fixtures = true
   self.use_instantiated_fixtures  = false
-  fixtures :all
   
   def assert_difference(object, method = nil, difference = 1)
     initial_value = object.send(method)</diff>
      <filename>test/test_helper.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>7ca39535fa8490bca5157a08b2f7e4792748d702</id>
    </parent>
  </parents>
  <author>
    <name>Aitor Garc&#237;a</name>
    <email>aitor.garcia@gmail.com</email>
  </author>
  <url>http://github.com/tog/tog_social/commit/42e166e18681fc3af020c600edae7c1863091ce1</url>
  <id>42e166e18681fc3af020c600edae7c1863091ce1</id>
  <committed-date>2008-12-11T03:46:49-08:00</committed-date>
  <authored-date>2008-12-11T03:46:49-08:00</authored-date>
  <message>Beta oauth support added to the runk</message>
  <tree>ea707457dca076d218129c26ec8e2988d0015e4c</tree>
  <committer>
    <name>Aitor Garc&#237;a</name>
    <email>aitor.garcia@gmail.com</email>
  </committer>
</commit>
