RubyApp 0.5.86 → 0.5.87

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    RubyApp (0.5.86)
+    RubyApp (0.5.87)
       BlueCloth
       chronic
       chronic_duration
@@ -9,12 +9,14 @@ PATH
       fileutils
       haml
       json
+      koala
       mime-types
       r18n-core
       rack
       ruby-event
       ruby-openid
       sass
+      system_timer
       term-ansicolor
       terminal-table
       yajl-ruby
@@ -23,15 +25,22 @@ GEM
   remote: http://rubygems.org/
   specs:
     BlueCloth (1.0.1)
-    chronic (0.7.0)
+    chronic (0.8.0)
     chronic_duration (0.9.6)
       numerizer (~> 0.1.1)
     facets (2.9.3)
+    faraday (0.8.4)
+      multipart-post (~> 1.1)
     fileutils (0.7)
       rmagick (>= 2.13.1)
     haml (3.1.7)
     json (1.7.5)
+    koala (1.5.0)
+      faraday (~> 0.7)
+      multi_json (~> 1.3)
     mime-types (1.19)
+    multi_json (1.3.6)
+    multipart-post (1.1.5)
     numerizer (0.1.1)
     r18n-core (1.1.1)
     rack (1.4.1)
@@ -40,6 +49,7 @@ GEM
     ruby-event (1.0.0)
     ruby-openid (2.2.0)
     sass (3.2.1)
+    system_timer (1.2.4)
     term-ansicolor (1.0.7)
     terminal-table (1.4.5)
     yajl-ruby (1.1.0)

data/lib/ruby_app/configuration.ru

@@ -1,4 +1,4 @@
-#\ --port 8008 --pid ./rack.pid
+#\ --port 8000 --pid ./rack.pid
 require 'rubygems'
 require 'bundler/setup'
 
@@ -19,8 +19,8 @@ map '/ruby_app/resources' do
   run Rack::File.new(File.join(RubyApp::ROOT, %w[resources]))
 end
 
-map '/favicon.ico' do
-  run Rack::File.new(File.join(RubyApp::ROOT, %w[resources favicon.ico]))
+map '/google_button.ico' do
+  run Rack::File.new(File.join(RubyApp::ROOT, %w[resources google_button.ico]))
 end
 
 map '/' do

data/lib/ruby_app/configuration.yml

@@ -10,6 +10,10 @@ default:
       mobile:
         documents:
           authentication:
+            facebook:
+              authentication_document:
+                access_key: '123'
+                secret_key: 'abc'
             open_id:
               ax_authentication_document:
                 attributes:

data/lib/ruby_app/elements.rb

@@ -1,5 +1,9 @@
 require 'ruby_app/element'
 require 'ruby_app/elements/mobile/button'
+require 'ruby_app/elements/mobile/buttons/facebook_button'
+require 'ruby_app/elements/mobile/buttons/google_button'
+require 'ruby_app/elements/mobile/buttons/my_open_id_button'
+require 'ruby_app/elements/mobile/buttons/yahoo_button'
 require 'ruby_app/elements/mobile/calendars/month'
 require 'ruby_app/elements/mobile/click'
 require 'ruby_app/elements/mobile/dialog'
@@ -10,6 +14,7 @@ require 'ruby_app/elements/mobile/dialogs/exception_dialog'
 require 'ruby_app/elements/mobile/document'
 require 'ruby_app/elements/mobile/documents/mail_document'
 require 'ruby_app/elements/mobile/documents/quit_document'
+require 'ruby_app/elements/mobile/documents/authentication/facebook/email_authentication_document'
 require 'ruby_app/elements/mobile/documents/authentication/open_id/google_authentication_document'
 require 'ruby_app/elements/mobile/documents/authentication/open_id/my_open_id_authentication_document'
 require 'ruby_app/elements/mobile/documents/authentication/open_id/yahoo_authentication_document'

data/lib/ruby_app/elements/mobile/buttons/facebook_button.css.haml

@@ -0,0 +1,5 @@
+:sass
+  /* #{__FILE__}
+  .ui-icon-facebook
+    background-image: url('/ruby_app/resources/elements/mobile/buttons/facebook_button.png')
+= yield

data/lib/ruby_app/elements/mobile/buttons/facebook_button.rb

@@ -0,0 +1,27 @@
+module RubyApp
+
+  module Elements
+
+    module Mobile
+
+      module Buttons
+        require 'ruby_app/elements/mobile/button'
+
+        class FacebookButton < RubyApp::Elements::Mobile::Button
+
+          template_path(:all, File.dirname(__FILE__))
+
+          def initialize
+            super
+            self.attributes.merge!('data-icon' => 'facebook')
+          end
+
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/lib/ruby_app/elements/mobile/buttons/google_button.css.haml

@@ -0,0 +1,5 @@
+:sass
+  /* #{__FILE__}
+  .ui-icon-google
+    background-image: url('/ruby_app/resources/elements/mobile/buttons/google_button.png')
+= yield

data/lib/ruby_app/elements/mobile/buttons/google_button.rb

@@ -0,0 +1,27 @@
+module RubyApp
+
+  module Elements
+
+    module Mobile
+
+      module Buttons
+        require 'ruby_app/elements/mobile/button'
+
+        class GoogleButton < RubyApp::Elements::Mobile::Button
+
+          template_path(:all, File.dirname(__FILE__))
+
+          def initialize
+            super
+            self.attributes.merge!('data-icon' => 'google')
+          end
+
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/lib/ruby_app/elements/mobile/buttons/my_open_id_button.css.haml

@@ -0,0 +1,5 @@
+:sass
+  /* #{__FILE__}
+  .ui-icon-myopenid
+    background-image: url('/ruby_app/resources/elements/mobile/buttons/my_open_id_button.png')
+= yield

data/lib/ruby_app/elements/mobile/buttons/my_open_id_button.rb

@@ -0,0 +1,27 @@
+module RubyApp
+
+  module Elements
+
+    module Mobile
+
+      module Buttons
+        require 'ruby_app/elements/mobile/button'
+
+        class MyOpenIDButton < RubyApp::Elements::Mobile::Button
+
+          template_path(:all, File.dirname(__FILE__))
+
+          def initialize
+            super
+            self.attributes.merge!('data-icon' => 'myopenid')
+          end
+
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/lib/ruby_app/elements/mobile/buttons/yahoo_button.css.haml

@@ -0,0 +1,5 @@
+:sass
+  /* #{__FILE__}
+  .ui-icon-yahoo
+    background-image: url('/ruby_app/resources/elements/mobile/buttons/yahoo_button.png')
+= yield

data/lib/ruby_app/elements/mobile/buttons/yahoo_button.rb

@@ -0,0 +1,27 @@
+module RubyApp
+
+  module Elements
+
+    module Mobile
+
+      module Buttons
+        require 'ruby_app/elements/mobile/button'
+
+        class YahooButton < RubyApp::Elements::Mobile::Button
+
+          template_path(:all, File.dirname(__FILE__))
+
+          def initialize
+            super
+            self.attributes.merge!('data-icon' => 'yahoo')
+          end
+
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/lib/ruby_app/elements/mobile/default/features/authentications/default_page.css.haml

@@ -1,3 +1,6 @@
-= RubyApp::Elements::Mobile::Button.render(:css)
+= RubyApp::Elements::Mobile::Buttons::FacebookButton.render(:css)
+= RubyApp::Elements::Mobile::Buttons::GoogleButton.render(:css)
+= RubyApp::Elements::Mobile::Buttons::MyOpenIDButton.render(:css)
+= RubyApp::Elements::Mobile::Buttons::YahooButton.render(:css)
 = RubyApp::Elements::Mobile::Navigation::BackButton.render(:css)
 = yield

data/lib/ruby_app/elements/mobile/default/features/authentications/default_page.html.haml

@@ -12,6 +12,8 @@
       - else
         You are not logged in.
     %div{'data-role' => 'controlgroup'}
+      = @facebook_authentication_link.render(:html) do |element|
+        - element.content_for(:html, :link, 'Facebook')
       = @google_authentication_link.render(:html) do |element|
         - element.content_for(:html, :link, 'Google')
       = @my_open_id_authentication_link.render(:html) do |element|

data/lib/ruby_app/elements/mobile/default/features/authentications/default_page.js.haml

@@ -1,3 +1,6 @@
-= RubyApp::Elements::Mobile::Button.render(:js)
+= RubyApp::Elements::Mobile::Buttons::FacebookButton.render(:js)
+= RubyApp::Elements::Mobile::Buttons::GoogleButton.render(:js)
+= RubyApp::Elements::Mobile::Buttons::MyOpenIDButton.render(:js)
+= RubyApp::Elements::Mobile::Buttons::YahooButton.render(:js)
 = RubyApp::Elements::Mobile::Navigation::BackButton.render(:js)
 = yield

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

@@ -10,7 +10,11 @@ module RubyApp
 
           module Authentications
             require 'ruby_app'
-            require 'ruby_app/elements/mobile/button'
+            require 'ruby_app/elements/mobile/buttons/facebook_button'
+            require 'ruby_app/elements/mobile/buttons/google_button'
+            require 'ruby_app/elements/mobile/buttons/my_open_id_button'
+            require 'ruby_app/elements/mobile/buttons/yahoo_button'
+            require 'ruby_app/elements/mobile/documents/authentication/facebook/email_authentication_document'
             require 'ruby_app/elements/mobile/documents/authentication/open_id/google_authentication_document'
             require 'ruby_app/elements/mobile/documents/authentication/open_id/my_open_id_authentication_document'
             require 'ruby_app/elements/mobile/documents/authentication/open_id/yahoo_authentication_document'
@@ -26,19 +30,25 @@ module RubyApp
 
                 @back_button = RubyApp::Elements::Mobile::Navigation::BackButton.new
 
-                @google_authentication_link = RubyApp::Elements::Mobile::Button.new
+                @facebook_authentication_link = RubyApp::Elements::Mobile::Buttons::FacebookButton.new
+                @facebook_authentication_link.clicked do |element, event|
+                  RubyApp::Session.documents.push(RubyApp::Elements::Mobile::Documents::Authentication::Facebook::EmailAuthenticationDocument.new)
+                  event.refresh_browser
+                end
+
+                @google_authentication_link = RubyApp::Elements::Mobile::Buttons::GoogleButton.new
                 @google_authentication_link.clicked do |element, event|
                   RubyApp::Session.documents.push(RubyApp::Elements::Mobile::Documents::Authentication::OpenId::GoogleAuthenticationDocument.new)
                   event.refresh_browser
                 end
 
-                @my_open_id_authentication_link = RubyApp::Elements::Mobile::Button.new
+                @my_open_id_authentication_link = RubyApp::Elements::Mobile::Buttons::MyOpenIDButton.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
                 end
 
-                @yahoo_authentication_link = RubyApp::Elements::Mobile::Button.new
+                @yahoo_authentication_link = RubyApp::Elements::Mobile::Buttons::YahooButton.new
                 @yahoo_authentication_link.clicked do |element, event|
                   RubyApp::Session.documents.push(RubyApp::Elements::Mobile::Documents::Authentication::OpenId::YahooAuthenticationDocument.new)
                   event.refresh_browser

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

@@ -0,0 +1,69 @@
+require 'rubygems'
+require 'bundler/setup'
+
+require 'koala'
+
+module RubyApp
+
+  module Elements
+
+    module Mobile
+
+      module Documents
+
+        module Authentication
+
+          module Facebook
+            require 'ruby_app'
+            require 'ruby_app/elements/mobile/document'
+
+            class AuthenticationDocument < RubyApp::Elements::Mobile::Document
+
+              template_path(:all, File.dirname(__FILE__))
+
+              def initialize(permissions)
+                super()
+
+                self.loaded do |element, event|
+
+                  unless @authentication
+                    @authentication = ::Koala::Facebook::OAuth.new(ENV['FACEBOOK_ACCESS_KEY'] || RubyApp::Elements::Mobile::Documents::Authentication::Facebook::AuthenticationDocument.configuration.access_key,
+                                                                   ENV['FACEBOOK_SECRET_KEY'] || RubyApp::Elements::Mobile::Documents::Authentication::Facebook::AuthenticationDocument.configuration.secret_key,
+                                                                   RubyApp::Request.url)
+                    url = @authentication.url_for_oauth_code(:display => 'touch',
+                                                             :permissions => permissions)
+                    RubyApp::Log.debug("FACEBOOK  --> #{url.inspect}")
+                    event.go(url)
+                  else
+                    RubyApp::Log.debug("FACEBOOK  <-- #{RubyApp::Request.url.inspect}")
+                    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('/')
+                  end
+                end
+
+              end
+
+              def create_identity_from_me(me)
+                RubyApp::Session::Identity.new(me['email'])
+              end
+
+            end
+
+          end
+
+        end
+
+      end
+
+    end
+
+  end
+
+end

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

@@ -0,0 +1,39 @@
+module RubyApp
+
+  module Elements
+
+    module Mobile
+
+      module Documents
+
+        module Authentication
+
+          module Facebook
+            require 'ruby_app'
+            require 'ruby_app/elements/mobile/documents/authentication/facebook/authentication_document'
+
+            class EmailAuthenticationDocument < RubyApp::Elements::Mobile::Documents::Authentication::Facebook::AuthenticationDocument
+
+              template_path(:all, File.dirname(__FILE__))
+
+              def initialize
+                super('email')
+              end
+
+              def create_identity_from_me(me)
+                RubyApp::Session::Identity.new(me['email'])
+              end
+
+            end
+
+          end
+
+        end
+
+      end
+
+    end
+
+  end
+
+end

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

@@ -35,9 +35,6 @@ module RubyApp
                     event.go(url)
                   else
                     RubyApp::Log.debug("OPENID    <-- #{RubyApp::Request.url.inspect}")
-                    RubyApp::Request.query.each do |name, value|
-                      RubyApp::Log.debug("OPENID    #{name}=#{value}")
-                    end
                     response = @consumer.complete(RubyApp::Request.query, RubyApp::Request.url)
                     case response.status
                       when ::OpenID::Consumer::SUCCESS

data/lib/ruby_app/templates/application/configuration.ru

@@ -28,8 +28,8 @@ map '/_APPLICATION_DOWNCODE_/resources' do
   run Rack::File.new(File.join(_APPLICATION_UPCODE_::ROOT, %w[resources]))
 end
 
-map '/favicon.ico' do
-  run Rack::File.new(File.join(RubyApp::ROOT, %w[resources favicon.ico]))
+map '/google_button.ico' do
+  run Rack::File.new(File.join(RubyApp::ROOT, %w[resources google_button.ico]))
 end
 
 map '/' do

data/lib/ruby_app/version.rb

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

data/ruby_app.gemspec

@@ -23,12 +23,14 @@ Gem::Specification.new do |s|
   s.add_dependency 'fileutils'
   s.add_dependency 'haml'
   s.add_dependency 'json'
+  s.add_dependency 'koala'
   s.add_dependency 'mime-types'
   s.add_dependency 'r18n-core'
   s.add_dependency 'rack'
   s.add_dependency 'ruby-event'
   s.add_dependency 'ruby-openid'
   s.add_dependency 'sass'
+  s.add_dependency 'system_timer'
   s.add_dependency 'term-ansicolor'
   s.add_dependency 'terminal-table'
   s.add_dependency 'yajl-ruby'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: RubyApp
 version: !ruby/object:Gem::Version 
-  hash: 167
+  hash: 165
   prerelease: 
   segments: 
   - 0
   - 5
-  - 86
-  version: 0.5.86
+  - 87
+  version: 0.5.87
 platform: ruby
 authors: 
 - Frank G. Ficnar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-11 00:00:00 Z
+date: 2012-09-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -127,7 +127,7 @@ dependencies:
         version: "0"
   prerelease: false
   type: :runtime
-  name: mime-types
+  name: koala
   requirement: *id008
 - !ruby/object:Gem::Dependency 
   version_requirements: &id009 !ruby/object:Gem::Requirement 
@@ -141,7 +141,7 @@ dependencies:
         version: "0"
   prerelease: false
   type: :runtime
-  name: r18n-core
+  name: mime-types
   requirement: *id009
 - !ruby/object:Gem::Dependency 
   version_requirements: &id010 !ruby/object:Gem::Requirement 
@@ -155,7 +155,7 @@ dependencies:
         version: "0"
   prerelease: false
   type: :runtime
-  name: rack
+  name: r18n-core
   requirement: *id010
 - !ruby/object:Gem::Dependency 
   version_requirements: &id011 !ruby/object:Gem::Requirement 
@@ -169,7 +169,7 @@ dependencies:
         version: "0"
   prerelease: false
   type: :runtime
-  name: ruby-event
+  name: rack
   requirement: *id011
 - !ruby/object:Gem::Dependency 
   version_requirements: &id012 !ruby/object:Gem::Requirement 
@@ -183,7 +183,7 @@ dependencies:
         version: "0"
   prerelease: false
   type: :runtime
-  name: ruby-openid
+  name: ruby-event
   requirement: *id012
 - !ruby/object:Gem::Dependency 
   version_requirements: &id013 !ruby/object:Gem::Requirement 
@@ -197,7 +197,7 @@ dependencies:
         version: "0"
   prerelease: false
   type: :runtime
-  name: sass
+  name: ruby-openid
   requirement: *id013
 - !ruby/object:Gem::Dependency 
   version_requirements: &id014 !ruby/object:Gem::Requirement 
@@ -211,7 +211,7 @@ dependencies:
         version: "0"
   prerelease: false
   type: :runtime
-  name: term-ansicolor
+  name: sass
   requirement: *id014
 - !ruby/object:Gem::Dependency 
   version_requirements: &id015 !ruby/object:Gem::Requirement 
@@ -225,7 +225,7 @@ dependencies:
         version: "0"
   prerelease: false
   type: :runtime
-  name: terminal-table
+  name: system_timer
   requirement: *id015
 - !ruby/object:Gem::Dependency 
   version_requirements: &id016 !ruby/object:Gem::Requirement 
@@ -239,7 +239,7 @@ dependencies:
         version: "0"
   prerelease: false
   type: :runtime
-  name: yajl-ruby
+  name: term-ansicolor
   requirement: *id016
 - !ruby/object:Gem::Dependency 
   version_requirements: &id017 !ruby/object:Gem::Requirement 
@@ -252,9 +252,37 @@ dependencies:
         - 0
         version: "0"
   prerelease: false
+  type: :runtime
+  name: terminal-table
+  requirement: *id017
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id018 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
+  type: :runtime
+  name: yajl-ruby
+  requirement: *id018
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id019 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  prerelease: false
   type: :development
   name: rake
-  requirement: *id017
+  requirement: *id019
 description: A mobile web application framework in Ruby
 email: 
 - frank.ficnar@gmail.com
@@ -281,6 +309,14 @@ files:
 - lib/ruby_app/element.rb
 - lib/ruby_app/elements.rb
 - lib/ruby_app/elements/mobile/button.rb
+- lib/ruby_app/elements/mobile/buttons/facebook_button.css.haml
+- lib/ruby_app/elements/mobile/buttons/facebook_button.rb
+- lib/ruby_app/elements/mobile/buttons/google_button.css.haml
+- lib/ruby_app/elements/mobile/buttons/google_button.rb
+- lib/ruby_app/elements/mobile/buttons/my_open_id_button.css.haml
+- lib/ruby_app/elements/mobile/buttons/my_open_id_button.rb
+- lib/ruby_app/elements/mobile/buttons/yahoo_button.css.haml
+- lib/ruby_app/elements/mobile/buttons/yahoo_button.rb
 - lib/ruby_app/elements/mobile/calendars/month.css.haml
 - lib/ruby_app/elements/mobile/calendars/month.html.haml
 - lib/ruby_app/elements/mobile/calendars/month.js.haml
@@ -372,6 +408,8 @@ files:
 - lib/ruby_app/elements/mobile/document.html.haml
 - lib/ruby_app/elements/mobile/document.js.haml
 - lib/ruby_app/elements/mobile/document.rb
+- lib/ruby_app/elements/mobile/documents/authentication/facebook/authentication_document.rb
+- lib/ruby_app/elements/mobile/documents/authentication/facebook/email_authentication_document.rb
 - lib/ruby_app/elements/mobile/documents/authentication/open_id/authentication_document.rb
 - lib/ruby_app/elements/mobile/documents/authentication/open_id/ax_authentication_document.rb
 - lib/ruby_app/elements/mobile/documents/authentication/open_id/email_authentication_document.rb
@@ -500,6 +538,14 @@ files:
 - lib/ruby_app/rack/route.rb
 - lib/ruby_app/rack/session.rb
 - lib/ruby_app/request.rb
+- lib/ruby_app/resources/elements/mobile/buttons/facebook_button.ico
+- lib/ruby_app/resources/elements/mobile/buttons/facebook_button.png
+- lib/ruby_app/resources/elements/mobile/buttons/google_button.ico
+- lib/ruby_app/resources/elements/mobile/buttons/google_button.png
+- lib/ruby_app/resources/elements/mobile/buttons/my_open_id_button.ico
+- lib/ruby_app/resources/elements/mobile/buttons/my_open_id_button.png
+- lib/ruby_app/resources/elements/mobile/buttons/yahoo_button.ico
+- lib/ruby_app/resources/elements/mobile/buttons/yahoo_button.png
 - lib/ruby_app/resources/elements/mobile/document/document.js
 - lib/ruby_app/resources/elements/mobile/document/jquery.ui.touch-punch.min.js
 - lib/ruby_app/resources/elements/mobile/platforms/ios/document/apple-touch-icon.png