RubyApp 0.6.66 → 0.6.67

data/Rakefile

@@ -47,16 +47,25 @@ namespace :ruby_app do
 
   end
 
-  namespace :test do
+  namespace :script do
 
-    desc 'Run the test script through PhantomJS on a given url'
-    task :url, :url do |task, arguments|
-      system("phantomjs lib/ruby_app/scripts/phantom.js #{arguments.url}")
+    desc 'Run a given script through PhantomJS on a given url'
+    task :run, :url, :script do |task, arguments|
+      system("phantomjs --ignore-ssl-errors=true lib/ruby_app/scripts/phantom/phantom.js #{arguments.url} #{arguments.script}")
     end
 
-    desc 'Run the test script on the local environment'
-    task :local do |task|
-      Rake::Task['ruby_app:test:url'].invoke("http://localhost:8000/ruby_app")
+    namespace :standard_no_logon do
+
+      desc 'Run the script through PhantomJS on a given url'
+      task :run, :url do |task, arguments|
+        Rake::Task['ruby_app:script:run'].invoke(arguments.url, 'phantom/standard_no_logon')
+      end
+
+      desc 'Run the script on the local environment'
+      task :local do |task|
+        Rake::Task['ruby_app:script:standard_no_logon:run'].invoke('http://localhost:8000')
+      end
+
     end
 
   end

data/lib/ruby_app/application.rb

@@ -16,7 +16,23 @@ module RubyApp
     attr_reader :options, :environment
 
     def initialize
+
       @environment = {}
+
+      RubyApp::Log.debug("LOG       RubyApp::Application.root = #{RubyApp::Application.root.inspect}")
+
+    end
+
+    def self.root
+      @@_root ||= '/'
+    end
+
+    def self.root=(value)
+      @@_root = value
+    end
+
+    def self.root_or_nil
+      return @@_root.nil_if('/')
     end
 
     def self.get

data/lib/ruby_app/configuration.ru

@@ -11,7 +11,7 @@ require 'ruby_app/rack'
 
 # Placeholder for template application require
 
-RubyApp.root = '/ruby_app'
+RubyApp::Application.root = '/'
 
 use Rack::ShowExceptions
 use Rack::Reloader
@@ -22,7 +22,7 @@ use Rack::Reloader
 use RubyApp::Rack::Application, :configuration_paths  => [File.join(RubyApp::ROOT, %w[configuration.yml])]
 # Placeholder for template application configuration path
 
-map "#{RubyApp.root_or_nil}/ruby_app/resources" do
+map "#{RubyApp::Application.root_or_nil}/ruby_app/resources" do
   run Rack::File.new(File.join(RubyApp::ROOT, %w[resources]))
 end
 
@@ -30,11 +30,11 @@ end
 
 
 
-map "#{RubyApp.root_or_nil}/favicon.ico" do
+map "#{RubyApp::Application.root_or_nil}/favicon.ico" do
   run Rack::File.new(File.join(RubyApp::ROOT, %w[resources favicon.ico]))
 end
 
-map "#{RubyApp.root_or_nil}/" do
+map "#{RubyApp::Application.root_or_nil}/" do
   use RubyApp::Rack::Request
   use RubyApp::Rack::Response
   use RubyApp::Rack::Language

data/lib/ruby_app/elements/mobile/document.html.haml

@@ -15,13 +15,13 @@
       %link{'rel'     => 'stylesheet',
             'href'    => stylesheet}
     %link{'rel'       => 'stylesheet',
-          'href'      => "#{RubyApp.root_or_nil}/#{RubyApp::Language.locale.code}/document.css"}
+          'href'      => "#{RubyApp::Application.root_or_nil}/#{RubyApp::Language.locale.code}/document.css"}
     - self.scripts.each do |script|
       %script{'src'   => script}
-    %script{'src'     => "#{RubyApp.root_or_nil}/#{RubyApp::Language.locale.code}/document.js"}
+    %script{'src'     => "#{RubyApp::Application.root_or_nil}/#{RubyApp::Language.locale.code}/document.js"}
 
     %meta{'name'      => 'root',
-          'content'   => RubyApp.root}
+          'content'   => RubyApp::Application.root}
     %meta{'name'      => 'session',        
           'content'   => RubyApp::Session.session_id}
     %meta{'name'      => 'locale',         

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

@@ -43,14 +43,14 @@ module RubyApp
 
           @metadata.merge!('viewport' => 'width=device-width, initial-scale=1')
 
-          @stylesheets.push("#{RubyApp.root_or_nil}/ruby_app/resources/elements/mobile/document/jquery.mobile-1.1.0/jquery.mobile-1.1.0.min.css")
+          @stylesheets.push("#{RubyApp::Application.root_or_nil}/ruby_app/resources/elements/mobile/document/jquery.mobile-1.1.0/jquery.mobile-1.1.0.min.css")
 
-          @scripts.push("#{RubyApp.root_or_nil}/ruby_app/resources/elements/mobile/document/jquery-1.8.3.min.js")
-          @scripts.push("#{RubyApp.root_or_nil}/ruby_app/resources/elements/mobile/document/jquery-ui-1.9.2.custom/js/jquery-ui-1.9.2.custom.min.js")
-          @scripts.push("#{RubyApp.root_or_nil}/ruby_app/resources/elements/mobile/document/jquery.ui.touch-punch-0.2.2.min.js")
-          @scripts.push("#{RubyApp.root_or_nil}/ruby_app/resources/elements/mobile/document/fastclick-0.5.6.js")
-          @scripts.push("#{RubyApp.root_or_nil}/ruby_app/resources/elements/mobile/document/document.js")
-          @scripts.push("#{RubyApp.root_or_nil}/ruby_app/resources/elements/mobile/document/jquery.mobile-1.1.0/jquery.mobile-1.1.0.min.js")
+          @scripts.push("#{RubyApp::Application.root_or_nil}/ruby_app/resources/elements/mobile/document/jquery-1.8.3.min.js")
+          @scripts.push("#{RubyApp::Application.root_or_nil}/ruby_app/resources/elements/mobile/document/jquery-ui-1.9.2.custom/js/jquery-ui-1.9.2.custom.min.js")
+          @scripts.push("#{RubyApp::Application.root_or_nil}/ruby_app/resources/elements/mobile/document/jquery.ui.touch-punch-0.2.2.min.js")
+          @scripts.push("#{RubyApp::Application.root_or_nil}/ruby_app/resources/elements/mobile/document/fastclick-0.5.6.js")
+          @scripts.push("#{RubyApp::Application.root_or_nil}/ruby_app/resources/elements/mobile/document/document.js")
+          @scripts.push("#{RubyApp::Application.root_or_nil}/ruby_app/resources/elements/mobile/document/jquery.mobile-1.1.0/jquery.mobile-1.1.0.min.js")
 
         end
 
@@ -58,12 +58,12 @@ module RubyApp
           return @pages.last
         end
 
-        def show(event, url = RubyApp.root)
+        def show(event, url = RubyApp::Application.root)
           RubyApp::Session.documents.push(self)
           event.go(url)
         end
 
-        def hide(event, url = RubyApp.root)
+        def hide(event, url = RubyApp::Application.root)
           RubyApp::Session.documents.pop
           event.go(url)
         end

data/lib/ruby_app/elements/mobile/documents/quit_document.html.haml

@@ -6,4 +6,4 @@
     %meta{'charset' => 'UTF-8'}
     %script
       :plain
-        location.replace('#{RubyApp.root}');
+        location.replace('#{RubyApp::Application.root}');

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

@@ -18,8 +18,8 @@ module RubyApp
 
               self.metadata.merge!('apple-mobile-web-app-capable'          => 'yes',
                                    'apple-mobile-web-app-status-bar-style' => 'black')
-              self.links.merge!('apple-touch-icon'          => "#{RubyApp.root_or_nil}/ruby_app/resources/elements/mobile/platforms/ios/document/apple-touch-icon.png",
-                                'apple-touch-startup-image' => "#{RubyApp.root_or_nil}/ruby_app/resources/elements/mobile/platforms/ios/document/apple-touch-startup-image.png")
+              self.links.merge!('apple-touch-icon'          => "#{RubyApp::Application.root_or_nil}/ruby_app/resources/elements/mobile/platforms/ios/document/apple-touch-icon.png",
+                                'apple-touch-startup-image' => "#{RubyApp::Application.root_or_nil}/ruby_app/resources/elements/mobile/platforms/ios/document/apple-touch-startup-image.png")
 
             end
 

data/lib/ruby_app/log.rb

@@ -14,6 +14,8 @@ module RubyApp
     extend RubyApp::Mixins::ConfigurationMixin
     extend RubyApp::Mixins::DelegateMixin
 
+    attr_reader :path
+
     class Formatter < ::Logger::Formatter
 
       def call(severity, time, application, message)
@@ -85,7 +87,11 @@ module RubyApp
 
       def initialize(path)
         super(path)
+
         self.formatter = RubyApp::Log::Formatter.new
+
+        @path = path
+
       end
 
   end

data/lib/ruby_app/rack/route.rb

@@ -14,8 +14,8 @@ module RubyApp
       extend RubyApp::Mixins::RouteMixin
 
       def call(environment)
-        # RubyApp::Log.debug("ROUTE     #{RubyApp::Request.request_method} #{RubyApp::Request.path.gsub(/^#{RubyApp.root_or_nil}/,'')}")
-        RubyApp::Rack::Route.do_route(RubyApp::Request.request_method, RubyApp::Request.path.gsub(/^#{RubyApp.root_or_nil}/,''))
+        # RubyApp::Log.debug("ROUTE     #{RubyApp::Request.request_method} #{RubyApp::Request.path.gsub(/^#{RubyApp::Application.root_or_nil}/,'')}")
+        RubyApp::Rack::Route.do_route(RubyApp::Request.request_method, RubyApp::Request.path.gsub(/^#{RubyApp::Application.root_or_nil}/,''))
       end
 
       route(RubyApp::Mixins::RouteMixin::GET, /\/quit/) do |method, path|

data/lib/ruby_app/rack/session.rb

@@ -17,7 +17,7 @@ module RubyApp
           #RubyApp::Log.debug("#{RubyApp::Log.prefix(self, __method__)}                    (now)=#{Time.now.inspect}")
           RubyApp::Response.set_cookie('_session', { :value    => RubyApp::Session.session_id,
                                                      :expires  => RubyApp::Session.expires,
-                                                     :path     => RubyApp.root})
+                                                     :path     => RubyApp::Application.root})
           return @application.call(environment)
         ensure
           RubyApp::Session.unload!

data/lib/ruby_app/request.rb

@@ -12,7 +12,7 @@ module RubyApp
     attr_reader :environment
 
     def language
-      self.path.gsub(/^#{RubyApp.root_or_nil}/,'') =~ /^\/([^\/\?]+)/
+      self.path.gsub(/^#{RubyApp::Application.root_or_nil}/,'') =~ /^\/([^\/\?]+)/
       return $1
     end
 

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

@@ -1,6 +1,6 @@
 load_script! 'common/features/authentications'
 
-add_step! (RubyApp::Element::Event)                       { |event| event.go(RubyApp.root) }
+add_step! (RubyApp::Element::Event)                       { |event| event.go(RubyApp::Application.root) }
 add_step! (RubyApp::Elements::Mobile::Page::LoadedEvent)  { |event| event.assert_exists_link('Facebook') }
 add_step! (RubyApp::Element::AssertedEvent)               { |event| event.click_link('Facebook') }
 add_step! (RubyApp::Elements::Mobile::Page::LoadedEvent)  

data/lib/ruby_app/scripts/elements/language.rb

@@ -2,11 +2,11 @@ load_script! 'common/features'
 
 add_step! (RubyApp::Element::Event)                       { |event| event.assert_exists_link('Language') }
 add_step! (RubyApp::Element::AssertedEvent)               { |event| event.click_link('Language') }
-add_step! (RubyApp::Elements::Mobile::Page::ShownEvent)   { |event| event.go("#{RubyApp.root}/en") }
+add_step! (RubyApp::Elements::Mobile::Page::ShownEvent)   { |event| event.go("#{RubyApp::Application.root_or_nil}/en") }
 add_step! (RubyApp::Elements::Mobile::Page::LoadedEvent)  { |event| event.assert_exists_link('Back') }
-add_step! (RubyApp::Element::AssertedEvent)               { |event| event.go("#{RubyApp.root}/fr") }
+add_step! (RubyApp::Element::AssertedEvent)               { |event| event.go("#{RubyApp::Application.root_or_nil}/fr") }
 add_step! (RubyApp::Elements::Mobile::Page::LoadedEvent)  { |event| event.assert_exists_link('Reculer') }
-add_step! (RubyApp::Element::AssertedEvent)               { |event| event.go(RubyApp.root) }
+add_step! (RubyApp::Element::AssertedEvent)               { |event| event.go(RubyApp::Application.root) }
 add_step! (RubyApp::Elements::Mobile::Page::LoadedEvent)  { |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/session.rb

@@ -215,7 +215,7 @@ module RubyApp
           elsif _path =~ /\.rb/
             name = _path.gsub(String.interpolate { RubyApp::Session.configuration.scripts.path }, '').gsub(/^\//, '').gsub(/\.rb/, '')
             scripts.push({:name => name,
-                          :url  => "#{RubyApp.root_or_nil}/quit?go=#{CGI.escape("#{RubyApp.root}?script=#{name}")}"})
+                          :url  => "#{RubyApp::Application.root_or_nil}/quit?go=#{CGI.escape("#{RubyApp::Application.root}?script=#{name}")}"})
           end
         end
       end

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

@@ -11,7 +11,7 @@ require 'ruby_app/rack'
 
 require '_APPLICATION_DOWNCODE_'
 
-RubyApp.root = '/'
+RubyApp::Application.root = '/'
 
 use Rack::ShowExceptions
 use Rack::Reloader
@@ -22,19 +22,19 @@ use Rack::Reloader
 use RubyApp::Rack::Application, :configuration_paths  => [ File.join(RubyApp::ROOT, %w[configuration.yml]),
                                                            File.join(_APPLICATION_UPCODE_::ROOT, %w[configuration.yml])]
 
-map '#{RubyApp.root_or_nil}/ruby_app/resources' do
+map '#{RubyApp::Application.root_or_nil}/ruby_app/resources' do
   run Rack::File.new(File.join(RubyApp::ROOT, %w[resources]))
 end
 
-map '#{RubyApp.root_or_nil}/_APPLICATION_DOWNCODE_/resources' do
+map '#{RubyApp::Application.root_or_nil}/_APPLICATION_DOWNCODE_/resources' do
   run Rack::File.new(File.join(_APPLICATION_UPCODE_::ROOT, %w[resources]))
 end
 
-map '#{RubyApp.root_or_nil}/favicon.ico' do
+map '#{RubyApp::Application.root_or_nil}/favicon.ico' do
   run Rack::File.new(File.join(RubyApp::ROOT, %w[resources favicon.ico]))
 end
 
-map '#{RubyApp.root_or_nil}/' do
+map '#{RubyApp::Application.root_or_nil}/' do
   use RubyApp::Rack::Request
   use RubyApp::Rack::Response
   use RubyApp::Rack::Language

data/lib/ruby_app/version.rb

@@ -1,17 +1,4 @@
 module RubyApp
-  VERSION = "0.6.66"
+  VERSION = "0.6.67"
   ROOT    = File.expand_path(File.dirname(__FILE__))
-
-  def self.root
-    @@_root ||= '/'
-  end
-
-  def self.root=(value)
-    @@_root = value
-  end
-
-  def self.root_or_nil
-    return @@_root.nil_if('/')
-  end
-
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: RubyApp
 version: !ruby/object:Gem::Version 
-  hash: 131
+  hash: 129
   prerelease: 
   segments: 
   - 0
   - 6
-  - 66
-  version: 0.6.66
+  - 67
+  version: 0.6.67
 platform: ruby
 authors: 
 - Frank G. Ficnar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-20 00:00:00 Z
+date: 2013-02-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -1465,8 +1465,6 @@ files:
 - lib/ruby_app/scripts/elements/swipe.rb
 - lib/ruby_app/scripts/elements/trigger.rb
 - lib/ruby_app/scripts/now.rb
-- lib/ruby_app/scripts/phantom.js
-- lib/ruby_app/scripts/phantom.rb
 - lib/ruby_app/scripts/standard_all.rb
 - lib/ruby_app/scripts/standard_continuous.rb
 - lib/ruby_app/scripts/standard_logon.rb

data/lib/ruby_app/scripts/phantom.js

@@ -1,26 +0,0 @@
-var system = require('system');
-
-var arguments = system.args;
-var url = arguments[1] + '?script=phantom';
-
-var page = require('webpage').create();
-
-page.onLoadStarted = function() {
-  console.log('MESSAGE  Loading ' + url);
-};
-page.onNavigationRequested = function(url, type, willNavigate, mainFrame) {
-  console.log('NAVIGATE ' + url);
-};
-page.onConsoleMessage = function(message) {
-  console.log('CONSOLE  ' + message);
-};
-page.onConfirm = function(message) {
-  console.log('FAIL     ' + message);
-  phantom.exit();
-};
-page.onClosing = function(page) {
-  console.log('SUCCESS  ' + page.url);
-  phantom.exit();
-};
-
-page.open(url);

data/lib/ruby_app/scripts/phantom.rb

@@ -1,3 +0,0 @@
-load_script! 'standard_no_logon'
-
-add_step! (RubyApp::Element::Event) { |event| event.execute('window.close();') }