appoxy_rails 0.0.16 → 0.0.17

data/lib/appoxy_sessions.rb

@@ -1,5 +1,7 @@
 require 'simple_record'
+require 'oauth'
 require_relative "sessions/user"
+require_relative "sessions/oauth_token"
 require_relative "sessions/application_controller"
 require_relative "sessions/sessions_controller"
 require_relative "sessions/users_controller"

data/lib/sessions/oauth_token.rb

@@ -0,0 +1,12 @@
+class OauthToken < SimpleRecord::Base
+
+    belongs_to :user
+
+    has_strings :type, # request or access
+                :site,
+                :token,
+                :secret
+
+#    has_clobs :access_token
+
+end

data/lib/sessions/sessions_controller.rb

@@ -33,7 +33,7 @@ module Appoxy
 
         logout_keeping_session!
 
-        @email        = params[:email]
+        @email = params[:email]
         if @email.blank?
           flash[:error] = "You must enter a valid email address."
           render :action=>"new"
@@ -62,17 +62,10 @@ module Appoxy
 #                    user = User.authenticate(@email, params[:password])
         if user && user.authenticate(params[:password])
           self.current_user = user
-          flash[:info]      = "Logged in successfully."
-          orig_url          = session[:return_to]
-          puts 'orig_url = ' + orig_url.to_s
-          session[:return_to] = nil
-          if !orig_url.nil?
-            redirect_to orig_url # if entered via a different url
-          else
-            after_create
-          end
-          user.last_login = Time.now
+          user.last_login   = Time.now
           user.save(:dirty=>true)
+          flash[:info] = "Logged in successfully."
+
         else
           flash[:error] = "Invalid email or password. Please try again."
           render :action => 'new'
@@ -85,7 +78,12 @@ module Appoxy
       end
 
       def after_create
-
+        orig_url = session[:return_to]
+        puts 'orig_url = ' + orig_url.to_s
+        session[:return_to] = nil
+        if !orig_url.nil?
+          redirect_to orig_url # if entered via a different url
+        end
       end
 
       def reset_password
@@ -187,12 +185,91 @@ module Appoxy
             #                @user.fake = false
             @user.save(:dirty=>true)
           end
-          session[:user_id] = @user.id
+
+          set_current_user @user
           @user
 
         end
       end
 
+      def twitter_auth
+        callback_url = "#{base_url}/sessions/create_twitter"
+        @request_token          = twitter_oauth_consumer(:signin=>true).get_request_token(:oauth_callback => callback_url)
+        session[:request_token] = @request_token
+        ru                      = @request_token.authorize_url(:oauth_callback => callback_url)
+        puts ru.inspect
+        redirect_to ru
+      end
+
+      # OAUTH VERSION
+      def create_twitter_oauth
+        puts 'params=' + params.inspect
+        @request_token = session[:request_token]
+        @access_token  = @request_token.get_access_token(:oauth_verifier => params[:oauth_verifier])
+        puts 'access_token = ' + @access_token.inspect
+
+        token = OauthToken.find_by_user_id_and_site_and_type(current_user.id, @access_token.consumer(:signin=>true).site, "access")
+        puts 'found token? ' + token.inspect
+        unless token
+          token = OauthToken.new(:type  =>"access",
+                                 :user  =>current_user,
+                                 :site  =>@access_token.consumer.site,
+                                 :token =>@access_token.token,
+                                 :secret=>@access_token.secret)
+          token.save!
+        else
+          token.token  = @access_token.token
+          token.secret = @access_token.secret
+          token.save(:dirty=>true)
+        end
+        @token          = token
+
+        flash[:success] = "Authorized with Twitter."
+
+      end
+
+      def create_twitter
+        before_create
+        puts 'params=' + params.inspect
+        @request_token = session[:request_token]
+        @access_token  = @request_token.get_access_token(:oauth_verifier => params[:oauth_verifier])
+        puts 'access_token = ' + @access_token.inspect
+        p @access_token.params
+
+        @user = User.find_by_twitter_id(@access_token.params[:user_id])
+        unless @user
+          @user = User.new(:username           =>@access_token.params[:screen_name],
+                           :twitter_screen_name=>@access_token.params[:screen_name],
+                           :twitter_id         =>@access_token.params[:user_id])
+          @user.save!
+          puts '@user=' + @user.inspect
+        else
+          @user.username = @access_token.params[:screen_name]
+          @user.save(:dirty=>true)
+
+        end
+
+        set_current_user @user
+
+        flash[:success] = "Authorized with Twitter."
+
+        after_create
+
+      end
+
+      private
+      def twitter_oauth_consumer(options={})
+        auth_path = options[:signin] ? "authenticate" : "authorize"
+        @consumer = OAuth::Consumer.new(Rails.application.config.twitter_consumer_key,
+                                        Rails.application.config.twitter_consumer_secret,
+                                        :site               => "https://api.twitter.com",
+                                        :oauth_callback     => "#{base_url}/sessions/#{(options[:signin] ? "create_twitter" : "create_twitter_oauth")}",
+                                        :request_token_path => "/oauth/request_token",
+                                        :authorize_path     => "/oauth/#{auth_path}",
+                                        :access_token_path  => "/oauth/access_token")
+        p @consumer
+      end
+
 
     end
   end

data/lib/sessions/user.rb

@@ -9,8 +9,10 @@ module Appoxy
       end
 
       has_strings :email,
+                  :username,
                   :open_id,
-                  :fb_id,  :fb_access_token,
+                  :twitter_id, :twitter_screen_name,
+                  :fb_id, :fb_access_token,
                   {:name => :password, :hashed=>true},
                   :first_name,
                   :last_name,
@@ -22,8 +24,8 @@ module Appoxy
                   :time_zone,
                   :lat, :lng
 
-                  has_dates :last_login,
-                            :remember_me_expires
+      has_dates :last_login,
+                :remember_me_expires
 
 
       def validate

data/lib/ui/binding_hack.rb

@@ -1,14 +1,14 @@
-module Appoxy
-  module UI
-    class BindingHack
-
-      def initialize(hash)
-        @options = hash
-      end
-
-      def get_binding
-        binding
-      end
-    end
-  end
+module Appoxy
+  module UI
+    class BindingHack
+
+      def initialize(hash)
+        @options = hash
+      end
+
+      def get_binding
+        binding
+      end
+    end
+  end
 end

data/lib/ui/test.rb

@@ -1,7 +1,7 @@
-require 'erb'
-require_relative 'binding_hack'
-
-options = Appoxy::UI::BindingHack.new(:x=>"hi")
-template = ERB.new(File.read(File.join(File.dirname(__FILE__), '_geo_location_finder.html.erb')))
-ret      = template.result(options.get_binding)
-p ret
+require 'erb'
+require_relative 'binding_hack'
+
+options = Appoxy::UI::BindingHack.new(:x=>"hi")
+template = ERB.new(File.read(File.join(File.dirname(__FILE__), '_geo_location_finder.html.erb')))
+ret      = template.result(options.get_binding)
+p ret

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 16
-  version: 0.0.16
+  - 17
+  version: 0.0.17
 platform: ruby
 authors: 
 - Travis Reeder
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-01 00:00:00 -08:00
+date: 2011-02-04 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -31,7 +31,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: ruby-openid
+  name: oauth
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -44,7 +44,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: appoxy_api
+  name: ruby-openid
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -57,7 +57,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: mini_fb
+  name: appoxy_api
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -70,7 +70,7 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: simple_record
+  name: mini_fb
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -82,6 +82,19 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: simple_record
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id006
 description: Appoxy API Helper gem description...
 email: travis@appoxy.com
 executables: []
@@ -101,6 +114,7 @@ files:
 - lib/appoxy_ui.rb
 - lib/railtie.rb
 - lib/sessions/application_controller.rb
+- lib/sessions/oauth_token.rb
 - lib/sessions/sessions_controller.rb
 - lib/sessions/shareable.rb
 - lib/sessions/user.rb