RubyApp 0.0.23 → 0.0.24

data/.rvmrc

@@ -1,55 +1 @@
-#!/usr/bin/env bash
-
-# This is an RVM Project .rvmrc file, used to automatically load the ruby
-# development environment upon cd'ing into the directory
-
-# First we specify our desired <ruby>[@<gemset>], the @gemset name is optional.
-environment_id="ruby-1.8.7-p352@RubyApp"
-
-#
-# Uncomment following line if you want options to be set only for given project.
-#
-# PROJECT_JRUBY_OPTS=( --1.9 )
-
-#
-# First we attempt to load the desired environment directly from the environment
-# file. This is very fast and efficient compared to running through the entire
-# CLI and selector. If you want feedback on which environment was used then
-# insert the word 'use' after --create as this triggers verbose mode.
-#
-if [[ -d "${rvm_path:-$HOME/.rvm}/environments" \
-  && -s "${rvm_path:-$HOME/.rvm}/environments/$environment_id" ]]
-then
-  \. "${rvm_path:-$HOME/.rvm}/environments/$environment_id"
-
-  if [[ -s "${rvm_path:-$HOME/.rvm}/hooks/after_use" ]]
-  then
-    . "${rvm_path:-$HOME/.rvm}/hooks/after_use"
-  fi
-else
-  # If the environment file has not yet been created, use the RVM CLI to select.
-  if ! rvm --create use  "$environment_id"
-  then
-    echo "Failed to create RVM environment '${environment_id}'."
-    exit 1
-  fi
-fi
-
-#
-# If you use an RVM gemset file to install a list of gems (*.gems), you can have
-# it be automatically loaded. Uncomment the following and adjust the filename if
-# necessary.
-#
-# filename=".gems"
-# if [[ -s "$filename" ]]
-# then
-#   rvm gemset import "$filename" | grep -v already | grep -v listed | grep -v complete | sed '/^$/d'
-# fi
-
-# If you use bundler, this might be useful to you:
-# if command -v bundle && [[ -s Gemfile ]]
-# then
-#   bundle install
-# fi
-
-
+rvm ruby-1.8.7-p352@RubyApp

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    RubyApp (0.0.23)
+    RubyApp (0.0.24)
       BlueCloth
       chronic
       chronic_duration

data/features/elements/pages/quit_page.feature

@@ -0,0 +1,8 @@
+Feature: Quit page
+
+  Scenario: View the quit page
+    Given I go to the test pages
+    When I click "Settings"
+    Then I should see "Quit the session"
+    When I am viewing "/quit"
+    Then I should see "Click here to go to the test pages"

data/lib/ruby_app/element.rb

@@ -65,6 +65,14 @@ module RubyApp
         execute("RubyApp.updateElement('#{element.element_id}');")
       end
 
+      def add_class(selector, _class)
+        execute("RubyApp.add_class(#{selector.to_json}, #{_class.to_json});")
+      end
+
+      def remove_class(selector, _class)
+        execute("RubyApp.remove_class(#{selector.to_json}, #{_class.to_json});")
+      end
+
       def update_text(selector, value)
         execute("RubyApp.updateText(#{selector.to_json}, #{value.to_json});")
       end

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

@@ -75,6 +75,12 @@
             $('#'+id).replaceWith(content);
           } );
       },
+      this.addClass = function(selector, _class) {
+        $(selector).addClass(_class);
+      },
+      this.removeClass = function(selector, _class) {
+        $(selector).removeClass(_class);
+      },
       this.updateText = function(selector, value) {
         $(selector).text(value);
       },

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

@@ -1,5 +1,10 @@
-- self.content_for(:body) do
-  /
-    #{__FILE__}
-  :javascript
-     location.assign('/');
+/
+  #{__FILE__}
+!!! 5
+%html{attributes}
+  %head
+    %title
+      = yield(:title) || self.translate.title
+  %body
+    :javascript
+       location.assign('/');

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

@@ -9,6 +9,7 @@ module RubyApp
       class QuitPage < RubyApp::Elements::Page
 
         template_path(:all, File.dirname(__FILE__))
+        exclude_parent_template(:all)
 
         def initialize
           super

data/lib/ruby_app/elements/pages/test_pages/default_test_page.rb

@@ -14,7 +14,6 @@ module RubyApp
         require 'ruby_app/elements/pages/blank_page'
         require 'ruby_app/elements/pages/test_pages/button_test_page'
         require 'ruby_app/elements/pages/test_pages/dialog_test_page'
-        require 'ruby_app/elements/pages/test_pages/exception_test_page'
         require 'ruby_app/elements/pages/test_pages/input_test_page'
         require 'ruby_app/elements/pages/test_pages/link_test_page'
         require 'ruby_app/elements/pages/test_pages/list_test_page'

data/lib/ruby_app/rack/route.rb

@@ -9,7 +9,6 @@ module RubyApp
   module Rack
     require 'ruby_app/element'
     require 'ruby_app/elements/exception_element'
-    require 'ruby_app/elements/pages/exception_page'
     require 'ruby_app/elements/pages/quit_page'
     require 'ruby_app/exceptions/session_invalid_exception'
     require 'ruby_app/log'
@@ -34,11 +33,7 @@ module RubyApp
           ]
         rescue Exception => exception
           RubyApp::Log.exception(exception)
-          [
-            200,
-            { 'content-type' => 'text/html' },
-            [ RubyApp::Elements::Pages::ExceptionPage.new(exception).render(:html) ]
-          ]
+          raise exception
         end
       end
 
@@ -70,11 +65,7 @@ module RubyApp
           ]
         rescue Exception => exception
           RubyApp::Log.exception(exception)
-          [
-            200,
-            { 'content-type' => RubyApp::Rack::Route.get_content_type(format) },
-            [ RubyApp::Elements::Pages::ExceptionPage.new(exception).render(format.to_sym) ]
-          ]
+          raise exception
         end
       end
 

data/lib/ruby_app/session.rb

@@ -67,7 +67,7 @@ module RubyApp
     end
 
     def quit
-      RubyApp::Request.env['rack.session.options'][:drop] = true
+      RubyApp::Request.env['rack.session.options'][:drop] = true if RubyApp::Request.env['rack.session.options']
     end
 
     def self.get

data/lib/ruby_app/templates/application/lib/_APPLICATION_DOWNCODE_/session.rb

@@ -7,9 +7,9 @@ module _APPLICATION_UPCODE_
 
   class Session < RubyApp::Session
 
-    def initialize(page = nil)
+    def initialize(session_id, page = nil)
       require '_APPLICATION_DOWNCODE_/elements/pages/default_page'
-      super(page || _APPLICATION_UPCODE_::Elements::Pages::DefaultPage.new)
+      super(session_id, page || _APPLICATION_UPCODE_::Elements::Pages::DefaultPage.new)
     end
 
   end

data/lib/ruby_app/translations/en.yml

@@ -39,8 +39,6 @@ ruby_app:
 
               [`DialogTestPage`](RubyApp::Elements::Pages::TestPages::DialogTestPage) ... A page with links to show a variety of dialogs (e.g. busy dialog, exception dialog, message dialog, month dialog, etc.)
 
-              [`ExceptionTestPage`](RubyApp::Elements::Pages::TestPages::ExceptionTestPage) ... A page that raises an exception when rendered
-
               [`InputTestPage`](RubyApp::Elements::Pages::TestPages::InputTestPage) ... A page with a variety of input controls (e.g. simple input, duration input, etc.)
 
               [`LinkTestPage`](RubyApp::Elements::Pages::TestPages::LinkTestPage) ... A page with a single, clickable link
@@ -181,6 +179,8 @@ ruby_app:
             title: myOpenID Authentication
           yahoo_authentication_page:
             title: Yahoo! Authentication
+      quit_page:
+        title: Quit
       settings_page:
         title: Settings
         content:

data/lib/ruby_app/version.rb

@@ -1,4 +1,4 @@
 module RubyApp
-  VERSION = "0.0.23"
+  VERSION = "0.0.24"
   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: 49
+  hash: 47
   prerelease: 
   segments: 
   - 0
   - 0
-  - 23
-  version: 0.0.23
+  - 24
+  version: 0.0.24
 platform: ruby
 authors: 
 - Frank G. Ficnar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-11 00:00:00 Z
+date: 2011-12-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -351,7 +351,7 @@ files:
 - features/elements/list.feature
 - features/elements/markdown.feature
 - features/elements/page.feature
-- features/elements/pages/exception_page.feature
+- features/elements/pages/quit_page.feature
 - features/step_definitions/default_macros.rb
 - features/step_definitions/default_steps.rb
 - features/support/env.rb
@@ -451,8 +451,6 @@ files:
 - lib/ruby_app/elements/pages/default_page.html.haml
 - lib/ruby_app/elements/pages/default_page.js.haml
 - lib/ruby_app/elements/pages/default_page.rb
-- lib/ruby_app/elements/pages/exception_page.html.haml
-- lib/ruby_app/elements/pages/exception_page.rb
 - lib/ruby_app/elements/pages/quit_page.html.haml
 - lib/ruby_app/elements/pages/quit_page.rb
 - lib/ruby_app/elements/pages/settings_page.css.haml
@@ -471,8 +469,6 @@ files:
 - lib/ruby_app/elements/pages/test_pages/dialog_test_page.html.haml
 - lib/ruby_app/elements/pages/test_pages/dialog_test_page.js.haml
 - lib/ruby_app/elements/pages/test_pages/dialog_test_page.rb
-- lib/ruby_app/elements/pages/test_pages/exception_test_page.html.haml
-- lib/ruby_app/elements/pages/test_pages/exception_test_page.rb
 - lib/ruby_app/elements/pages/test_pages/input_test_page.css.haml
 - lib/ruby_app/elements/pages/test_pages/input_test_page.html.haml
 - lib/ruby_app/elements/pages/test_pages/input_test_page.js.haml
@@ -632,7 +628,7 @@ test_files:
 - features/elements/list.feature
 - features/elements/markdown.feature
 - features/elements/page.feature
-- features/elements/pages/exception_page.feature
+- features/elements/pages/quit_page.feature
 - features/step_definitions/default_macros.rb
 - features/step_definitions/default_steps.rb
 - features/support/env.rb

data/features/elements/pages/exception_page.feature

@@ -1,10 +0,0 @@
-Feature: Exception page
-
-  Scenario: View the exception page
-    Given I go to the test pages
-    When I click "ExceptionTestPage"
-    Then I should see "RuntimeError"
-    And I should see "Exception page"
-    Given I am viewing "/quit"
-    Then I should see "Click here to go to the test pages"
-

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

@@ -1,6 +0,0 @@
-- self.content_for(:title) do
-  = @exception.class
-- self.content_for(:body) do
-  /
-    #{__FILE__}
-  = @exception.message

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

@@ -1,23 +0,0 @@
-module RubyApp
-
-  module Elements
-
-    module Pages
-      require 'ruby_app/elements/page'
-
-      class ExceptionPage < RubyApp::Elements::Page
-
-        template_path(:all, File.dirname(__FILE__))
-
-        def initialize(exception)
-          super()
-          @exception = exception
-        end
-
-      end
-
-    end
-
-  end
-
-end

data/lib/ruby_app/elements/pages/test_pages/exception_test_page.html.haml

@@ -1,5 +0,0 @@
-- self.content_for(:content) do
-  /
-    #{__FILE__}
-  = @markdown.render(:html) do |element|
-    - element.content_for(:body, self.translate.content.body)

data/lib/ruby_app/elements/pages/test_pages/exception_test_page.rb

@@ -1,33 +0,0 @@
-module RubyApp
-
-  module Elements
-
-    module Pages
-
-      module TestPages
-        require 'ruby_app/elements/markdown'
-        require 'ruby_app/elements/pages/blank_page'
-
-        class ExceptionTestPage < RubyApp::Elements::Pages::BlankPage
-
-          template_path(:all, File.dirname(__FILE__))
-
-          def initialize
-            super
-            @markdown = RubyApp::Elements::Markdown.new
-          end
-
-          def render(format)
-            raise self.translate.exception if format == :html
-            super(format)
-          end
-
-        end
-
-      end
-
-    end
-
-  end
-
-end