RubyApp 0.6.32 → 0.6.33

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

@@ -50,10 +50,6 @@ module RubyApp
 
               end
 
-              def create_identity_from_me(me)
-                RubyApp::Session::Identity.new(me['email'])
-              end
-
             end
 
           end

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

@@ -39,9 +39,7 @@ 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}")
-                    user = JSON.parse(access_token.get('/user').body)
-                    RubyApp::Log.debug("OAUTH     user=#{user.inspect}")
-                    RubyApp::Session.identity = self.create_identity_from_user(user)
+                    RubyApp::Session.identity = self.create_identity_from_access_token(access_token)
                     RubyApp::Session.documents.pop
                     event.go('/')
                   end
@@ -49,10 +47,6 @@ module RubyApp
 
               end
 
-              def create_identity_from_user(user)
-                RubyApp::Session::Identity.new(user['email'])
-              end
-
             end
 
           end

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

@@ -26,6 +26,12 @@ module RubyApp
                 super(access_key, secret_key, _scope, _options)
               end
 
+              def create_identity_from_access_token(access_token)
+                user = JSON.parse(access_token.get('/user').body)
+                RubyApp::Log.debug("GITHUB    user=#{user.inspect}")
+                RubyApp::Session.identity = RubyApp::Session::Identity.new(user['email'])
+              end
+
             end
 
           end

data/lib/ruby_app/scripts/all_once.rb

@@ -1,4 +1,5 @@
 load_script! 'default'
+load_script! 'elements/authentications/facebook'
 load_script! 'elements/authentications/o_auth/git_hub'
 load_script! 'elements/buttons'
 load_script! 'elements/calendars/month'

data/lib/ruby_app/scripts/elements/authentications/facebook.rb

@@ -0,0 +1,8 @@
+load_script! 'common/features/authentications'
+
+add_step! (RubyApp::Element::Event)                       { |event| event.assert_exists_link('Facebook') }
+#add_step! (RubyApp::Element::AssertedEvent)               { |event| event.click_link('Facebook') }
+#add_step! (RubyApp::Elements::Mobile::Page::LoadedEvent)  { |event| event.assert_exists_text('You are logged in as') }
+add_step! (RubyApp::Element::AssertedEvent)               { |event| event.click_link('Back') }
+add_step! (RubyApp::Elements::Mobile::Page::ShownEvent)   { |event| event.click_link('Back') }
+add_step! (RubyApp::Elements::Mobile::Page::ShownEvent)   { |event| event.execute {} }

data/lib/ruby_app/version.rb

@@ -1,4 +1,4 @@
 module RubyApp
-  VERSION = "0.6.32"
+  VERSION = "0.6.33"
   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: 71
+  hash: 69
   prerelease: 
   segments: 
   - 0
   - 6
-  - 32
-  version: 0.6.32
+  - 33
+  version: 0.6.33
 platform: ruby
 authors: 
 - Frank G. Ficnar
@@ -585,6 +585,7 @@ files:
 - lib/ruby_app/scripts/common/features/authentications.rb
 - lib/ruby_app/scripts/common/reset.rb
 - lib/ruby_app/scripts/default.rb
+- lib/ruby_app/scripts/elements/authentications/facebook.rb
 - lib/ruby_app/scripts/elements/authentications/o_auth/git_hub.rb
 - lib/ruby_app/scripts/elements/buttons.rb
 - lib/ruby_app/scripts/elements/calendars/month.rb