RubyApp 0.0.26 → 0.0.27

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    RubyApp (0.0.26)
+    RubyApp (0.0.27)
       BlueCloth
       chronic
       chronic_duration
@@ -36,10 +36,10 @@ GEM
     chronic (0.6.6)
     chronic_duration (0.9.6)
       numerizer (~> 0.1.1)
-    cucumber (1.1.3)
+    cucumber (1.1.4)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (~> 2.6.7)
+      gherkin (~> 2.7.1)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.6)
     diff-lcs (1.1.3)
@@ -47,7 +47,7 @@ GEM
     ffi (1.0.11)
     fileutils (0.7)
       rmagick (>= 2.13.1)
-    gherkin (2.6.9)
+    gherkin (2.7.1)
       json (>= 1.4.6)
     haml (3.1.4)
     json (1.6.3)
@@ -57,7 +57,7 @@ GEM
     multi_json (1.0.4)
     nokogiri (1.5.0)
     numerizer (0.1.1)
-    r18n-core (0.4.12)
+    r18n-core (0.4.13)
     rack (1.3.5)
     rack-test (0.6.1)
       rack (>= 1.0)

data/bin/ruby_app

@@ -3,6 +3,7 @@ require 'rubygems'
 require 'bundler/setup'
 
 require 'fileutils'
+require 'logrotate'
 require 'rack'
 require 'term/ansicolor'
 

data/features/elements/page.feature

@@ -21,3 +21,12 @@ Feature: A page
     And I click "TestPage"
     Then I should see "The cookie value is 'value'."
     Then I quit
+
+  Scenario Outline: Loading the home page
+    Given I am viewing "/"
+    And I should see "Loaded"
+
+    Scenarios: Count
+      | count |
+      | X     |
+      | X     |

data/lib/ruby_app/elements/base/base_page.js.haml

@@ -16,7 +16,10 @@
             } );
           } )
           .error( function(request, message, exception) {
-            alert(#{RubyApp::Elements::Base::BasePage.translate.error.to_json});
+            if (confirm(#{RubyApp::Elements::Base::BasePage.translate.error.to_json}))
+            {
+              RubyApp.refresh();
+            }
           } )
       },
       this.alert = function(message) {

data/lib/ruby_app/elements/pages/default_page.html.haml

@@ -3,3 +3,4 @@
     #{__FILE__}
   = @markdown.render(:html) do |element|
     - element.content_for(:body, self.translate.content.body)
+  %div#loaded

data/lib/ruby_app/elements/pages/default_page.rb

@@ -14,6 +14,10 @@ module RubyApp
         def initialize
           super
 
+          self.loaded do |element, event|
+            event.update_text('div#loaded', self.translate.loaded(event.now))
+          end
+
           @markdown = RubyApp::Elements::Markdown.new
           @markdown.clicked do |element, event|
             case event.name

data/lib/ruby_app/rack/route.rb

@@ -75,8 +75,7 @@ module RubyApp
       end
 
       route(RubyApp::Mixins::RouteMixin::POST, /.*/) do |method, path|
-        RubyApp::Log.debug("#{self}.post(...) method=#{method.inspect} path=#{path.inspect} POST=#{RubyApp::Request.POST.inspect}")
-        RubyApp::Log.debug("#{self}.post(...) RubyApp::Session.session_id=#{RubyApp::Session.session_id}")
+        RubyApp::Log.debug("#{self}.route method=#{method.inspect} path=#{path.inspect} POST=#{RubyApp::Request.POST.inspect}")
         begin
           if RubyApp::Session.session_id == RubyApp::Request.POST['session_id']
             event = RubyApp::Element::Event.from_hash(RubyApp::Request.POST)
@@ -89,7 +88,6 @@ module RubyApp
           else
             raise RubyApp::Exceptions::SessionInvalidException.new(RubyApp::Request.POST['session_id'])
           end
-
         rescue Exception => exception
           RubyApp::Log.exception(exception)
           [

data/lib/ruby_app/translations/en.yml

@@ -2,7 +2,7 @@ ruby_app:
   elements:
     base:
       base_page:
-        error:  An error occurred sending the event.  Refresh the page and try again.,
+        error:  An error occurred sending the event.  Do you want to refresh the page and try again?
     dialogs:
       base:
         base_close_dialog:
@@ -168,7 +168,9 @@ ruby_app:
         content:
           body: |
             Click [here](go_test) to go to the test pages.
-      authentication:
+        loaded:
+           Loaded at %1
+        authentication:
         open_id:
           base:
             base_authentication_page:

data/lib/ruby_app/version.rb

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

data/rakefile

@@ -6,19 +6,30 @@ require 'rake'
 
 namespace :ruby_app do
 
-  desc 'Monitor RubyApp'
+  desc 'Monitor log'
   task :monitor do |task|
-    system("cd ./lib/ruby_app; > ./log/application.log; clear; tail -f ./log/application.log")
+    system("cd ./lib/ruby_app && > ./log/application.log && clear && tail -f ./log/application.log")
   end
 
-  desc 'Create RubyApp console'
+  desc 'Create console'
   task :console do |task|
-    system("cd ./lib/ruby_app; clear; bundle exec ../../bin/ruby_app console")
+    system("cd ./lib/ruby_app && clear && bundle exec ../../bin/ruby_app console")
   end
 
-  desc 'Run RubyApp'
+  desc 'Run'
   task :run do |task|
-    system("cd ./lib/ruby_app; clear; bundle exec ../../bin/ruby_app run")
+    system("cd ./lib/ruby_app && clear && bundle exec ../../bin/ruby_app run")
+  end
+
+  desc 'Get version'
+  task :version do |task|
+    puts RubyApp::VERSION
+  end
+
+  desc 'Update version, commit, push to master, release'
+  task :release, :version do |task, arguments|
+    version_file = File.join(RubyApp::ROOT, %w[version.rb])
+    system "sed 's|[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*|#{arguments.version}|g' < '#{version_file}' > '#{version_file}.out' && rm '#{version_file}' && mv '#{version_file}.out' '#{version_file}' && git commit --all --message='Incrementing version' && git push origin master; rake release"
   end
 
   namespace :test do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: RubyApp
 version: !ruby/object:Gem::Version 
-  hash: 43
+  hash: 41
   prerelease: 
   segments: 
   - 0
   - 0
-  - 26
-  version: 0.0.26
+  - 27
+  version: 0.0.27
 platform: ruby
 authors: 
 - Frank G. Ficnar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-12 00:00:00 Z
+date: 2011-12-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement