RubyApp 0.6.36 → 0.6.38

data/lib/ruby_app/elements/mobile/default/features/authentications/default_page.rb

@@ -30,32 +30,27 @@ module RubyApp
 
                 @github_authentication_link = RubyApp::Elements::Mobile::Button.new
                 @github_authentication_link.clicked do |element, event|
-                  RubyApp::Session.documents.push(RubyApp::Elements::Mobile::Documents::Authentication::OAuth::GitHubAuthenticationDocument.new)
-                  event.refresh_browser
+                  RubyApp::Elements::Mobile::Documents::Authentication::OAuth::GitHubAuthenticationDocument.new.show(event)
                 end
 
                 @facebook_authentication_link = RubyApp::Elements::Mobile::Button.new
                 @facebook_authentication_link.clicked do |element, event|
-                  RubyApp::Session.documents.push(RubyApp::Elements::Mobile::Documents::Authentication::Facebook::EmailAuthenticationDocument.new)
-                  event.refresh_browser
+                  RubyApp::Elements::Mobile::Documents::Authentication::Facebook::EmailAuthenticationDocument.new.show(event)
                 end
 
                 @google_authentication_link = RubyApp::Elements::Mobile::Button.new
                 @google_authentication_link.clicked do |element, event|
-                  RubyApp::Session.documents.push(RubyApp::Elements::Mobile::Documents::Authentication::OpenId::GoogleAuthenticationDocument.new)
-                  event.refresh_browser
+                  RubyApp::Elements::Mobile::Documents::Authentication::OpenId::GoogleAuthenticationDocument.new.show(event)
                 end
 
                 @my_open_id_authentication_link = RubyApp::Elements::Mobile::Button.new
                 @my_open_id_authentication_link.clicked do |element, event|
-                  RubyApp::Session.documents.push(RubyApp::Elements::Mobile::Documents::Authentication::OpenId::MyOpenIdAuthenticationDocument.new)
-                  event.refresh_browser
+                  RubyApp::Elements::Mobile::Documents::Authentication::OpenId::MyOpenIdAuthenticationDocument.new.show(event)
                 end
 
                 @yahoo_authentication_link = RubyApp::Elements::Mobile::Button.new
                 @yahoo_authentication_link.clicked do |element, event|
-                  RubyApp::Session.documents.push(RubyApp::Elements::Mobile::Documents::Authentication::OpenId::YahooAuthenticationDocument.new)
-                  event.refresh_browser
+                  RubyApp::Elements::Mobile::Documents::Authentication::OpenId::YahooAuthenticationDocument.new.show(event)
                 end
 
               end

data/lib/ruby_app/elements/mobile/document.rb

@@ -57,6 +57,16 @@ module RubyApp
           return @pages.last
         end
 
+        def show(event, url = '/')
+          RubyApp::Session.documents.push(self)
+          event.go(url)
+        end
+
+        def hide(event, url = '/')
+          RubyApp::Session.documents.pop
+          event.go(url)
+        end
+
         protected
 
           def on_event(event)

data/lib/ruby_app/elements/mobile/documents/authentication/facebook/authentication_document.rb

@@ -25,7 +25,6 @@ module RubyApp
                 super()
 
                 self.loaded do |element, event|
-
                   unless @authentication
                     RubyApp::Log.debug("FACEBOOK  permissions=#{permissions.inspect}")
                     @authentication = ::Koala::Facebook::OAuth.new(ENV['FACEBOOK_ACCESS_KEY'] || RubyApp::Elements::Mobile::Documents::Authentication::Facebook::AuthenticationDocument.configuration.access_key,
@@ -40,17 +39,20 @@ module RubyApp
                     code = RubyApp::Request.query['code']
                     token = @authentication.get_access_token(code)
                     RubyApp::Log.debug("FACEBOOK  token=#{token.inspect}")
-                    graph = ::Koala::Facebook::API.new(token)
-                    me = graph.get_object('me')
-                    RubyApp::Log.debug("FACEBOOK  me=#{me.inspect}")
-                    RubyApp::Session.identity = self.create_identity_from_me(me)
-                    RubyApp::Session.documents.pop
-                    event.go('/')
+                    self.process_token(token)
+                    self.hide(event)
                   end
                 end
 
               end
 
+              def process_token(token)
+                graph = ::Koala::Facebook::API.new(token)
+                me = graph.get_object('me')
+                RubyApp::Log.debug("FACEBOOK  me=#{me.inspect}")
+                RubyApp::Session.identity = self.create_identity_from_me(me)
+              end
+
             end
 
           end

data/lib/ruby_app/elements/mobile/documents/authentication/o_auth/authentication_document.rb

@@ -25,7 +25,6 @@ module RubyApp
                 super()
 
                 self.loaded do |element, event|
-
                   unless @client
                     RubyApp::Log.debug("OAUTH     scopes=#{scopes.inspect}")
                     RubyApp::Log.debug("OAUTH     options=#{options.inspect}")
@@ -39,14 +38,17 @@ module RubyApp
                     code = RubyApp::Request.query['code']
                     access_token = @client.auth_code.get_token(code, :redirect_uri => RubyApp::Request.url)
                     RubyApp::Log.debug("OAUTH     token=#{access_token.token.inspect}")
-                    RubyApp::Session.identity = self.create_identity_from_access_token(access_token)
-                    RubyApp::Session.documents.pop
-                    event.go('/')
+                    self.process_access_token(access_token)
+                    self.hide(event)
                   end
                 end
 
               end
 
+              def process_access_token(access_token)
+                RubyApp::Session.identity = self.create_identity_from_access_token(access_token)
+              end
+
             end
 
           end

data/lib/ruby_app/elements/mobile/documents/authentication/open_id/authentication_document.rb

@@ -25,7 +25,6 @@ module RubyApp
                 super()
 
                 self.loaded do |element, event|
-
                   unless @consumer
                     @consumer = ::OpenID::Consumer.new(RubyApp::Session.data, nil)
                     request = @consumer.begin(identifier)
@@ -38,14 +37,13 @@ module RubyApp
                     response = @consumer.complete(RubyApp::Request.query, RubyApp::Request.url)
                     case response.status
                       when ::OpenID::Consumer::SUCCESS
-                        RubyApp::Session.identity = self.create_identity_from_response(response)
+                        self.process_response(response)
                         RubyApp::Log.info("SESSION   RubyApp::Session.identity.url=#{RubyApp::Session.identity.url.inspect}")
                       when ::OpenID::Consumer::FAILURE
                         RubyApp::Log.error("OPENID    #{response.class}")
                         RubyApp::Log.error("OPENID    #{response.message.inspect}")
                     end
-                    RubyApp::Session.documents.pop
-                    event.go('/')
+                    self.hide(event)
                   end
                 end
 
@@ -54,6 +52,10 @@ module RubyApp
               def process_request(request)
               end
 
+              def process_response(response)
+                RubyApp::Session.identity = self.create_identity_from_response(response)
+              end
+
               def create_identity_from_response(response)
                 return RubyApp::Session::Identity.new(response.identity_url)
               end

data/lib/ruby_app/version.rb

@@ -1,4 +1,4 @@
 module RubyApp
-  VERSION = "0.6.36"
+  VERSION = "0.6.38"
   ROOT    = File.expand_path(File.dirname(__FILE__))
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: RubyApp
 version: !ruby/object:Gem::Version 
-  hash: 79
+  hash: 75
   prerelease: 
   segments: 
   - 0
   - 6
-  - 36
-  version: 0.6.36
+  - 38
+  version: 0.6.38
 platform: ruby
 authors: 
 - Frank G. Ficnar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-17 00:00:00 Z
+date: 2012-10-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement