RubyApp 0.6.61 → 0.6.62

data/Rakefile

@@ -56,7 +56,7 @@ namespace :ruby_app do
 
     desc 'Run the test script on the local environment'
     task :local do |task|
-      Rake::Task['ruby_app:test:url'].invoke('http://localhost:8000/root')
+      Rake::Task['ruby_app:test:url'].invoke("http://localhost:8000/ruby_app")
     end
 
   end

data/lib/ruby_app/configuration.ru

@@ -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.nil_if('/')}/ruby_app/resources" do
+map "#{RubyApp.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.nil_if('/')}/favicon.ico" do
+map "#{RubyApp.root_or_nil}/favicon.ico" do
   run Rack::File.new(File.join(RubyApp::ROOT, %w[resources favicon.ico]))
 end
 
-map "#{RubyApp.root.nil_if('/')}/" do
+map "#{RubyApp.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,10 +15,10 @@
       %link{'rel'     => 'stylesheet',
             'href'    => stylesheet}
     %link{'rel'       => 'stylesheet',
-          'href'      => "#{RubyApp.root.nil_if('/')}/#{RubyApp::Language.locale.code}/document.css"}
+          'href'      => "#{RubyApp.root_or_nil}/#{RubyApp::Language.locale.code}/document.css"}
     - self.scripts.each do |script|
       %script{'src'   => script}
-    %script{'src'     => "#{RubyApp.root.nil_if('/')}/#{RubyApp::Language.locale.code}/document.js"}
+    %script{'src'     => "#{RubyApp.root_or_nil}/#{RubyApp::Language.locale.code}/document.js"}
 
     %meta{'name'      => 'root',
           'content'   => RubyApp.root}

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.nil_if('/')}/ruby_app/resources/elements/mobile/document/jquery.mobile-1.1.0/jquery.mobile-1.1.0.min.css")
-
-          @scripts.push("#{RubyApp.root.nil_if('/')}/ruby_app/resources/elements/mobile/document/jquery-1.8.3.min.js")
-          @scripts.push("#{RubyApp.root.nil_if('/')}/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.nil_if('/')}/ruby_app/resources/elements/mobile/document/jquery.ui.touch-punch-0.2.2.min.js")
-          @scripts.push("#{RubyApp.root.nil_if('/')}/ruby_app/resources/elements/mobile/document/fastclick-0.5.6.js")
-          @scripts.push("#{RubyApp.root.nil_if('/')}/ruby_app/resources/elements/mobile/document/document.js")
-          @scripts.push("#{RubyApp.root.nil_if('/')}/ruby_app/resources/elements/mobile/document/jquery.mobile-1.1.0/jquery.mobile-1.1.0.min.js")
+          @stylesheets.push("#{RubyApp.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")
 
         end
 

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.nil_if('/')}/ruby_app/resources/elements/mobile/platforms/ios/document/apple-touch-icon.png",
-                                'apple-touch-startup-image' => "#{RubyApp.root.nil_if('/')}/ruby_app/resources/elements/mobile/platforms/ios/document/apple-touch-startup-image.png")
+              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")
 
             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.nil_if('/')}/,'')}")
-        RubyApp::Rack::Route.do_route(RubyApp::Request.request_method, RubyApp::Request.path.gsub(/^#{RubyApp.root.nil_if('/')}/,''))
+        # 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}/,''))
       end
 
       route(RubyApp::Mixins::RouteMixin::GET, /\/quit/) do |method, path|

data/lib/ruby_app/request.rb

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

data/lib/ruby_app/scripts/phantom.js

@@ -5,14 +5,17 @@ console.log('MESSAGE Running test script on ' + arguments[1] + ' ...');
 var page = require('webpage').create();
 page.open(arguments[1] + '?script=phantom');
 
+page.onNavigationRequested = function(url, type, willNavigate, mainFrame) {
+  console.log('NAVIGATE ' + url);
+};
 page.onConsoleMessage = function(message) {
-  console.log('CONSOLE ' + message);
+  console.log('CONSOLE  ' + message);
 };
 page.onConfirm = function(message) {
-  console.log('FAIL    ' + message);
+  console.log('FAIL     ' + message);
   phantom.exit();
 };
 page.onClosing = function(page) {
-  console.log('SUCCESS ' + page.url);
+  console.log('SUCCESS  ' + page.url);
   phantom.exit();
 };

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.nil_if('/')}/quit?go=#{CGI.escape("#{RubyApp.root}?script=#{name}")}"})
+                          :url  => "#{RubyApp.root_or_nil}/quit?go=#{CGI.escape("#{RubyApp.root}?script=#{name}")}"})
           end
         end
       end

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

@@ -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.nil_if('/')}/ruby_app/resources' do
+map '#{RubyApp.root_or_nil}/ruby_app/resources' do
   run Rack::File.new(File.join(RubyApp::ROOT, %w[resources]))
 end
 
-map '#{RubyApp.root.nil_if('/')}/_APPLICATION_DOWNCODE_/resources' do
+map '#{RubyApp.root_or_nil}/_APPLICATION_DOWNCODE_/resources' do
   run Rack::File.new(File.join(_APPLICATION_UPCODE_::ROOT, %w[resources]))
 end
 
-map '#{RubyApp.root.nil_if('/')}/favicon.ico' do
+map '#{RubyApp.root_or_nil}/favicon.ico' do
   run Rack::File.new(File.join(RubyApp::ROOT, %w[resources favicon.ico]))
 end
 
-map '#{RubyApp.root.nil_if('/')}/' do
+map '#{RubyApp.root_or_nil}/' do
   use RubyApp::Rack::Request
   use RubyApp::Rack::Response
   use RubyApp::Rack::Language

data/lib/ruby_app/version.rb

@@ -1,5 +1,5 @@
 module RubyApp
-  VERSION = "0.6.61"
+  VERSION = "0.6.62"
   ROOT    = File.expand_path(File.dirname(__FILE__))
 
   def self.root
@@ -10,4 +10,8 @@ module RubyApp
     @@_root = value
   end
 
+  def self.root_or_nil
+    return @@_root.nil_if('/')
+  end
+
 end

data/ruby_app.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'chronic_duration'
   s.add_dependency 'facets'
   s.add_dependency 'fileutils'
-  s.add_dependency 'haml'
+  s.add_dependency 'haml',              '3.1.8'
   s.add_dependency 'json'
   s.add_dependency 'koala'
   s.add_dependency 'mime-types'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: RubyApp
 version: !ruby/object:Gem::Version 
-  hash: 125
+  hash: 123
   prerelease: 
   segments: 
   - 0
   - 6
-  - 61
-  version: 0.6.61
+  - 62
+  version: 0.6.62
 platform: ruby
 authors: 
 - Frank G. Ficnar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-14 00:00:00 Z
+date: 2013-02-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -91,12 +91,14 @@ dependencies:
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 19
         segments: 
-        - 0
-        version: "0"
+        - 3
+        - 1
+        - 8
+        version: 3.1.8
   prerelease: false
   type: :runtime
   name: haml