RubyApp 0.6.38 → 0.6.39

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

@@ -1,6 +1,6 @@
-
 = RubyApp::Elements::Mobile::Default::Features::DefaultPage.render(:css)
 = RubyApp::Elements::Mobile::Navigation::PageButton.render(:css)
 = RubyApp::Elements::Mobile::Navigation::NavigationButton.render(:css)
 = RubyApp::Elements::Mobile::Pages::InformationPage.render(:css)
+= RubyApp::Elements::Mobile::Pages::ScriptsPage.render(:css)
 = yield

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

@@ -10,3 +10,5 @@
         - element.content_for(:html, :link, 'Features')
       = @information_link.render(:html) do |element|
         - element.content_for(:html, :link, 'Information')
+      = @scripts_link.render(:html) do |element|
+        - element.content_for(:html, :link, 'Scripts')

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

@@ -2,4 +2,5 @@
 = RubyApp::Elements::Mobile::Navigation::PageButton.render(:js)
 = RubyApp::Elements::Mobile::Navigation::NavigationButton.render(:js)
 = RubyApp::Elements::Mobile::Pages::InformationPage.render(:js)
+= RubyApp::Elements::Mobile::Pages::ScriptsPage.render(:js)
 = yield

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

@@ -10,6 +10,7 @@ module RubyApp
         require 'ruby_app/elements/mobile/navigation/page_button'
         require 'ruby_app/elements/mobile/page'
         require 'ruby_app/elements/mobile/pages/information_page'
+        require 'ruby_app/elements/mobile/pages/scripts_page'
 
         class DefaultPage < RubyApp::Elements::Mobile::Page
 
@@ -26,6 +27,9 @@ module RubyApp
               RubyApp::Elements::Mobile::Pages::InformationPage.new(event.now).show(event, element.options)
             end
 
+            @scripts_link = RubyApp::Elements::Mobile::Navigation::PageButton.new
+            @scripts_link.page = RubyApp::Elements::Mobile::Pages::ScriptsPage
+
           end
 
         end

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

@@ -38,15 +38,15 @@ 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}")
-                    self.process_access_token(access_token)
+                    self.process_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)
+              def process_token(token)
+                RubyApp::Session.identity = self.create_identity_from_token(token)
               end
 
             end

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

@@ -26,8 +26,8 @@ module RubyApp
                 super(access_key, secret_key, _scopes, _options)
               end
 
-              def create_identity_from_access_token(access_token)
-                user = JSON.parse(access_token.get('/user').body)
+              def create_identity_from_token(token)
+                user = JSON.parse(token.get('/user').body)
                 RubyApp::Log.debug("GITHUB    user=#{user.inspect}")
                 return self.create_identity_from_email(user['email'])
               end

data/lib/ruby_app/elements/mobile/pages/information_page.css.haml

@@ -4,5 +4,4 @@
 = RubyApp::Elements::Mobile::Pages::Information::EnvironmentPage.render(:css)
 = RubyApp::Elements::Mobile::Pages::Information::InformationList.render(:css)
 = RubyApp::Elements::Mobile::Pages::Information::SessionsPage.render(:css)
-= RubyApp::Elements::Mobile::Pages::Information::ScriptsPage.render(:css)
 = yield

data/lib/ruby_app/elements/mobile/pages/information_page.html.haml

@@ -56,13 +56,6 @@
             %span.ui-li-count
               %code
                 = ENV['RUBY_APP_CONFIGURATION'] || 'default'
-      %li
-        = @scripts_link.render(:html) do |element|
-          - element.content_for(:html, :link) do
-            %span
-              Scripts
-            %span.ui-li-count
-              = RubyApp::Session.get_scripts.length
       %li
         = @sessions_link.render(:html) do |element|
           - element.content_for(:html, :link) do

data/lib/ruby_app/elements/mobile/pages/information_page.js.haml

@@ -4,5 +4,4 @@
 = RubyApp::Elements::Mobile::Pages::Information::EnvironmentPage.render(:js)
 = RubyApp::Elements::Mobile::Pages::Information::InformationList.render(:js)
 = RubyApp::Elements::Mobile::Pages::Information::SessionsPage.render(:js)
-= RubyApp::Elements::Mobile::Pages::Information::ScriptsPage.render(:js)
 = yield

data/lib/ruby_app/elements/mobile/pages/information_page.rb

@@ -12,7 +12,6 @@ module RubyApp
         require 'ruby_app/elements/mobile/pages/information/cookies_page'
         require 'ruby_app/elements/mobile/pages/information/environment_page'
         require 'ruby_app/elements/mobile/pages/information/sessions_page'
-        require 'ruby_app/elements/mobile/pages/information/scripts_page'
 
         class InformationPage < RubyApp::Elements::Mobile::Page
 
@@ -40,11 +39,6 @@ module RubyApp
               RubyApp::Elements::Mobile::Pages::Information::ConfigurationPage.new.show(event, element.options)
             end
 
-            @scripts_link = RubyApp::Elements::Mobile::Navigation::NavigationLink.new
-            @scripts_link.clicked do |element, event|
-              RubyApp::Elements::Mobile::Pages::Information::ScriptsPage.new.show(event, element.options)
-            end
-
             @sessions_link = RubyApp::Elements::Mobile::Navigation::NavigationLink.new
             @sessions_link.clicked do |element, event|
               RubyApp::Elements::Mobile::Pages::Information::SessionsPage.new.show(event, element.options)

data/lib/ruby_app/elements/mobile/pages/{information/scripts_list.css.haml → scripts_list.css.haml}

@@ -5,5 +5,5 @@
       div.script
         div.url
           font-size: 85%
-= RubyApp::Elements::Mobile::Pages::Information::ScriptsList::ScriptsListItem.render(:css)
+= RubyApp::Elements::Mobile::Pages::ScriptsList::ScriptsListItem.render(:css)
 = yield

data/lib/ruby_app/elements/mobile/pages/scripts_list.rb

@@ -0,0 +1,39 @@
+module RubyApp
+
+  module Elements
+
+    module Mobile
+
+      module Pages
+        require 'ruby_app/elements/mobile/navigation/navigation_list'
+
+        class ScriptsList < RubyApp::Elements::Mobile::Navigation::NavigationList
+
+          class ScriptsListItem < RubyApp::Elements::Mobile::Navigation::NavigationList::NavigationListItem
+
+            template_path(:all, File.dirname(__FILE__))
+
+            alias :script :item
+
+            def initialize(script)
+              super(script)
+            end
+
+          end
+
+          template_path(:all, File.dirname(__FILE__))
+
+          def initialize
+            super
+            self.items = RubyApp::Session.get_scripts.collect { |script| RubyApp::Elements::Mobile::Pages::ScriptsList::ScriptsListItem.new(script) }
+          end
+
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/lib/ruby_app/elements/mobile/pages/{information/scripts_page.css.haml → scripts_page.css.haml}

@@ -1,4 +1,4 @@
 = RubyApp::Elements::Mobile::Dialogs::AcknowledgementDialog.render(:css)
 = RubyApp::Elements::Mobile::Navigation::BackButton.render(:css)
-= RubyApp::Elements::Mobile::Pages::Information::ScriptsList.render(:css)
+= RubyApp::Elements::Mobile::Pages::ScriptsList.render(:css)
 = yield

data/lib/ruby_app/elements/mobile/pages/{information/scripts_page.js.haml → scripts_page.js.haml}

@@ -1,4 +1,4 @@
 = RubyApp::Elements::Mobile::Dialogs::AcknowledgementDialog.render(:js)
 = RubyApp::Elements::Mobile::Navigation::BackButton.render(:js)
-= RubyApp::Elements::Mobile::Pages::Information::ScriptsList.render(:js)
+= RubyApp::Elements::Mobile::Pages::ScriptsList.render(:js)
 = yield

data/lib/ruby_app/elements/mobile/pages/scripts_page.rb

@@ -0,0 +1,36 @@
+module RubyApp
+
+  module Elements
+
+    module Mobile
+
+      module Pages
+        require 'ruby_app/elements/mobile/navigation/back_button'
+        require 'ruby_app/elements/mobile/pages/scripts_list'
+        require 'ruby_app/elements/mobile/page'
+
+        class ScriptsPage < RubyApp::Elements::Mobile::Page
+
+          template_path(:all, File.dirname(__FILE__))
+
+          def initialize
+            super
+
+            @back_button = RubyApp::Elements::Mobile::Navigation::BackButton.new
+
+            @scripts_list = RubyApp::Elements::Mobile::Pages::ScriptsList.new
+            @scripts_list.item_clicked do |element, event|
+              event.go(event.item.script.url)
+            end
+
+          end
+
+        end
+
+      end
+
+    end
+
+  end
+
+end

data/lib/ruby_app/version.rb

@@ -1,4 +1,4 @@
 module RubyApp
-  VERSION = "0.6.38"
+  VERSION = "0.6.39"
   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: 75
+  hash: 73
   prerelease: 
   segments: 
   - 0
   - 6
-  - 38
-  version: 0.6.38
+  - 39
+  version: 0.6.39
 platform: ruby
 authors: 
 - Frank G. Ficnar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-10-18 00:00:00 Z
+date: 2012-10-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -501,13 +501,6 @@ files:
 - lib/ruby_app/elements/mobile/pages/information/pages_page.html.haml
 - lib/ruby_app/elements/mobile/pages/information/pages_page.js.haml
 - lib/ruby_app/elements/mobile/pages/information/pages_page.rb
-- lib/ruby_app/elements/mobile/pages/information/scripts_list.css.haml
-- lib/ruby_app/elements/mobile/pages/information/scripts_list.rb
-- lib/ruby_app/elements/mobile/pages/information/scripts_list_item.html.haml
-- lib/ruby_app/elements/mobile/pages/information/scripts_page.css.haml
-- lib/ruby_app/elements/mobile/pages/information/scripts_page.html.haml
-- lib/ruby_app/elements/mobile/pages/information/scripts_page.js.haml
-- lib/ruby_app/elements/mobile/pages/information/scripts_page.rb
 - lib/ruby_app/elements/mobile/pages/information/session_page.css.haml
 - lib/ruby_app/elements/mobile/pages/information/session_page.html.haml
 - lib/ruby_app/elements/mobile/pages/information/session_page.js.haml
@@ -522,6 +515,13 @@ files:
 - lib/ruby_app/elements/mobile/pages/information_page.html.haml
 - lib/ruby_app/elements/mobile/pages/information_page.js.haml
 - lib/ruby_app/elements/mobile/pages/information_page.rb
+- lib/ruby_app/elements/mobile/pages/scripts_list.css.haml
+- lib/ruby_app/elements/mobile/pages/scripts_list.rb
+- lib/ruby_app/elements/mobile/pages/scripts_list_item.html.haml
+- lib/ruby_app/elements/mobile/pages/scripts_page.css.haml
+- lib/ruby_app/elements/mobile/pages/scripts_page.html.haml
+- lib/ruby_app/elements/mobile/pages/scripts_page.js.haml
+- lib/ruby_app/elements/mobile/pages/scripts_page.rb
 - lib/ruby_app/elements/mobile/platforms/ios/document.rb
 - lib/ruby_app/exception.rb
 - lib/ruby_app/exceptions.rb

data/lib/ruby_app/elements/mobile/pages/information/scripts_list.rb

@@ -1,43 +0,0 @@
-module RubyApp
-
-  module Elements
-
-    module Mobile
-
-      module Pages
-
-        module Information
-          require 'ruby_app/elements/mobile/pages/information/information_list'
-
-          class ScriptsList < RubyApp::Elements::Mobile::Pages::Information::InformationList
-
-            class ScriptsListItem < RubyApp::Elements::Mobile::Pages::Information::InformationList::InformationListItem
-
-              template_path(:all, File.dirname(__FILE__))
-
-              alias :script :item
-
-              def initialize(script)
-                super(script)
-              end
-
-            end
-
-            template_path(:all, File.dirname(__FILE__))
-
-            def initialize
-              super
-              self.items = RubyApp::Session.get_scripts.collect { |script| RubyApp::Elements::Mobile::Pages::Information::ScriptsList::ScriptsListItem.new(script) }
-            end
-
-          end
-
-        end
-
-      end
-
-    end
-
-  end
-
-end

data/lib/ruby_app/elements/mobile/pages/information/scripts_page.rb

@@ -1,45 +0,0 @@
-module RubyApp
-
-  module Elements
-
-    module Mobile
-
-      module Pages
-
-        module Information
-          require 'ruby_app/elements/mobile/dialogs/acknowledgement_dialog'
-          require 'ruby_app/elements/mobile/navigation/back_button'
-          require 'ruby_app/elements/mobile/pages/information/scripts_list'
-          require 'ruby_app/elements/mobile/page'
-
-          class ScriptsPage < RubyApp::Elements::Mobile::Page
-
-            template_path(:all, File.dirname(__FILE__))
-
-            def initialize
-              super
-
-              @back_button = RubyApp::Elements::Mobile::Navigation::BackButton.new
-
-              @scripts_list = RubyApp::Elements::Mobile::Pages::Information::ScriptsList.new
-              @scripts_list.item_clicked do |element, event|
-                if RubyApp::Session.configuration.scripts.enabled
-                  event.go(event.item.script.url)
-                else
-                  RubyApp::Elements::Mobile::Dialog.show(event, RubyApp::Elements::Mobile::Dialogs::AcknowledgementDialog.new('Scripts', 'Scripts are currently disabled.'))
-                end
-              end
-
-            end
-
-          end
-
-        end
-
-      end
-
-    end
-
-  end
-
-end