RubyApp 0.0.58 → 0.0.59

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    RubyApp (0.0.58)
+    RubyApp (0.0.59)
       BlueCloth
       chronic
       chronic_duration
@@ -31,7 +31,7 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    childprocess (0.2.6)
+    childprocess (0.2.8)
       ffi (~> 1.0.6)
     chronic (0.6.6)
     chronic_duration (0.9.6)

data/features/elements/input.feature

@@ -5,10 +5,10 @@ Feature: Input elements
     When I click "InputTestPage"
     Then I should see "Input"
     And I fill in the "Input" field with "value" and I change focus
-    Then I should see "You input 'value'."
+    Then I should see "You input 'value'"
     When I click "Close"
     And I fill in the "Input" field with "" and I change focus
-    Then I should see "You input '(nil)'."
+    Then I should see "You input '(nil)'"
     Then I click "Close"
     Then I quit
 
@@ -17,7 +17,7 @@ Feature: Input elements
     When I click "InputTestPage"
     Then I should see "DurationInput"
     When I fill in the "DurationInput" field with "2h 3m" and I change focus
-    Then I should see "You input '7,380'."
+    Then I should see "You input '7,380'"
     When I click "Close"
     Then the "DurationInput" field should contain "2 hrs 3 mins"
     Then I quit
@@ -27,10 +27,10 @@ Feature: Input elements
     When I click "InputTestPage"
     Then I should see "MultilineInput"
     And I fill in the "MultilineInput" field with "value" and I change focus
-    Then I should see "You input 'value'."
+    Then I should see "You input 'value'"
     When I click "Close"
     And I fill in the "MultilineInput" field with "" and I change focus
-    Then I should see "You input '(nil)'."
+    Then I should see "You input '(nil)'"
     Then I click "Close"
     Then I quit
 
@@ -39,9 +39,20 @@ Feature: Input elements
     When I click "InputTestPage"
     Then I should see "EmailInput"
     And I fill in the "EmailInput" field with "value" and I change focus
-    Then I should see "You input 'value'."
+    Then I should see "You input 'value'"
     When I click "Close"
     And I fill in the "EmailInput" field with "" and I change focus
-    Then I should see "You input '(nil)'."
+    Then I should see "You input '(nil)'"
     Then I click "Close"
     Then I quit
+
+  Scenario: Render a toggle input element and process its event
+    Given I go to the test pages
+    When I click "InputTestPage"
+    Then I should see "ToggleInput"
+    And the "ToggleInput" field should be unchecked
+    When I check the "ToggleInput" field
+    Then I should see "You input 'true'"
+    When I click "Close"
+    And I uncheck the "ToggleInput" field
+    Then I should see "You input 'false'"

data/features/step_definitions/default_steps.rb

@@ -29,6 +29,22 @@ Then /^the "([^\"]*)" field should contain "([^\"]*)"$/ do |field, value|
   field_labeled(field).value.should =~ /#{value}/
 end
 
+When /^I (un)?check the "([^"]*)" field?$/ do |uncheck, field|
+  unless uncheck
+    check(field)
+  else
+    uncheck(field)
+  end
+end
+
+Then /^the "([^\"]*)" field should be (un)?checked$/ do |field, unchecked|
+  unless unchecked
+    page.should have_checked_field(field)
+  else
+    page.should_not have_checked_field(field)
+  end
+end
+
 Then /^show me the page$/ do
   save_and_open_page
 end

data/lib/ruby_app/application.rb

@@ -43,11 +43,11 @@ module RubyApp
       _options.translations_paths = [File.join(RubyApp::ROOT, %w[translations])] + ( _options.translations_paths.is_a?(Array) ? _options.translations_paths : [_options.translations_paths] )
       @@_application = _options.application_class.new(_options)
       @@_application.start!
-      RubyApp::Log.debug("#{self}##{__method__} options=#{_options.inspect}")
+      RubyApp::Log.debug("#{self}.#{__method__} options=#{_options.inspect}")
     end
 
     def self.destroy!
-      RubyApp::Log.debug("#{self}##{__method__}")
+      RubyApp::Log.debug("#{self}.#{__method__}")
       @@_application.stop!
       @@_application = nil
     end

data/lib/ruby_app/configuration.rb

@@ -17,11 +17,11 @@ module RubyApp
 
     def self.load!
       @@_configuration = RubyApp::Configuration.new(RubyApp::Application.options.configuration_paths)
-      RubyApp::Log.debug("#{self}##{__method__} paths=#{RubyApp::Application.options.configuration_paths.inspect}")
+      RubyApp::Log.debug("#{self}.#{__method__} paths=#{RubyApp::Application.options.configuration_paths.inspect}")
     end
 
     def self.unload!
-      RubyApp::Log.debug("#{self}##{__method__}")
+      RubyApp::Log.debug("#{self}.#{__method__}")
       @@_configuration = nil
     end
 

data/lib/ruby_app/elements/input.js.haml

@@ -2,7 +2,7 @@
   :plain
     // #{__FILE__}
     $(document).ready(function() {
-      $('input').live('change', function(event) {
+      $('input[type="text"]').live('change', function(event) {
         event.preventDefault();
         RubyApp.queueEvent({_class:'RubyApp::Elements::Input::ChangedEvent', source_id:$(this).attr('id'), value:$(this).val()}, true);
       });

data/lib/ruby_app/elements/inputs/email_input.js.haml

@@ -0,0 +1,10 @@
+- self.rendered?(__FILE__) do
+  :plain
+    // #{__FILE__}
+    $(document).ready(function() {
+      $('input[type="email"]').live('change', function(event) {
+        event.preventDefault();
+        RubyApp.queueEvent({_class:'RubyApp::Elements::Inputs::EmailInput::ChangedEvent', source_id:$(this).attr('id'), value:$(this).val()}, true);
+      });
+    });
+= yield

data/lib/ruby_app/elements/inputs/email_input.rb

@@ -9,7 +9,7 @@ module RubyApp
 
         template_path(:all, File.dirname(__FILE__))
 
-        exclude_parent_template(:html)
+        exclude_parent_template(:html, :js)
 
         def initialize
           super

data/lib/ruby_app/elements/inputs/toggle_input.html.haml

@@ -0,0 +1,3 @@
+/
+  #{__FILE__}
+%input{attributes.merge(:type => :checkbox, :checked => self.value)}

data/lib/ruby_app/elements/inputs/toggle_input.js.haml

@@ -0,0 +1,10 @@
+- self.rendered?(__FILE__) do
+  :plain
+    // #{__FILE__}
+    $(document).ready(function() {
+      $('input[type="checkbox"]').live('change', function(event) {
+        event.preventDefault();
+        RubyApp.queueEvent({_class:'RubyApp::Elements::Inputs::ToggleInput::ChangedEvent', source_id:$(this).attr('id'), value:this.checked}, true);
+      });
+    });
+= yield

data/lib/ruby_app/elements/inputs/toggle_input.rb

@@ -0,0 +1,31 @@
+module RubyApp
+
+  module Elements
+
+    module Inputs
+      require 'ruby_app/elements/input'
+
+      class ToggleInput < RubyApp::Elements::Input
+
+        template_path(:all, File.dirname(__FILE__))
+
+        exclude_parent_template(:html, :js)
+
+        def initialize
+          super
+        end
+
+        protected
+
+          def on_changed(event)
+            @value = event.value =~ /(true|t|yes|y|on)/ ? true : false
+            changed(event)
+          end
+
+      end
+
+    end
+
+  end
+
+end

data/lib/ruby_app/elements/pages/test_pages/input_test_page.css.haml

@@ -1,6 +1,8 @@
 = RubyApp::Elements::Dialogs::MessageDialog.render(:css)
 = RubyApp::Elements::Input.render(:css)
 = RubyApp::Elements::Inputs::DurationInput.render(:css)
+= RubyApp::Elements::Inputs::EmailInput.render(:css)
 = RubyApp::Elements::Inputs::MultilineInput.render(:css)
+= RubyApp::Elements::Inputs::ToggleInput.render(:css)
 = RubyApp::Elements::Markdown.render(:css)
 = yield

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

@@ -18,3 +18,7 @@
   %label{:for => @email_input.element_id}
     = self.translate.label.email_input
   = @email_input.render(:html)
+  %br
+  %label{:for => @toggle_input.element_id}
+    = self.translate.label.toggle_input
+  = @toggle_input.render(:html)

data/lib/ruby_app/elements/pages/test_pages/input_test_page.js.haml

@@ -1,6 +1,8 @@
 = RubyApp::Elements::Dialogs::MessageDialog.render(:js)
 = RubyApp::Elements::Input.render(:js)
 = RubyApp::Elements::Inputs::DurationInput.render(:js)
+= RubyApp::Elements::Inputs::EmailInput.render(:js)
 = RubyApp::Elements::Inputs::MultilineInput.render(:js)
+= RubyApp::Elements::Inputs::ToggleInput.render(:js)
 = RubyApp::Elements::Markdown.render(:js)
 = yield

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

@@ -11,6 +11,7 @@ module RubyApp
         require 'ruby_app/elements/inputs/duration_input'
         require 'ruby_app/elements/inputs/email_input'
         require 'ruby_app/elements/inputs/multiline_input'
+        require 'ruby_app/elements/inputs/toggle_input'
         require 'ruby_app/elements/pages/blank_page'
         require 'ruby_app/session'
 
@@ -26,25 +27,31 @@ module RubyApp
             @input = RubyApp::Elements::Input.new
             @input.changed do |element, event|
               RubyApp::Session.show_dialog(event, RubyApp::Elements::Dialogs::MessageDialog.new(self.translate.message_dialog.message.title,
-                                                                                                self.translate.message_dialog.message.message(@input.value || '(nil)')))
+                                                                                                self.translate.message_dialog.message.message(@input.value || '(nil)', @input.value.class)))
             end
 
             @duration_input = RubyApp::Elements::Inputs::DurationInput.new
             @duration_input.changed do |element, event|
               RubyApp::Session.show_dialog(event, RubyApp::Elements::Dialogs::MessageDialog.new(self.translate.message_dialog.message.title,
-                                                                                                self.translate.message_dialog.message.message(@duration_input.duration || '(nil)')))
+                                                                                                self.translate.message_dialog.message.message(@duration_input.duration || '(nil)', @duration_input.value.class)))
             end
 
             @multiline_input = RubyApp::Elements::Inputs::MultilineInput.new
             @multiline_input.changed do |element, event|
               RubyApp::Session.show_dialog(event, RubyApp::Elements::Dialogs::MessageDialog.new(self.translate.message_dialog.message.title,
-                                                                                                self.translate.message_dialog.message.message(@multiline_input.value || '(nil)')))
+                                                                                                self.translate.message_dialog.message.message(@multiline_input.value || '(nil)', @multiline_input.value.class)))
             end
 
             @email_input = RubyApp::Elements::Inputs::EmailInput.new
             @email_input.changed do |element, event|
               RubyApp::Session.show_dialog(event, RubyApp::Elements::Dialogs::MessageDialog.new(self.translate.message_dialog.message.title,
-                                                                                                self.translate.message_dialog.message.message(@email_input.value || '(nil)')))
+                                                                                                self.translate.message_dialog.message.message(@email_input.value || '(nil)', @email_input.value.class)))
+            end
+
+            @toggle_input = RubyApp::Elements::Inputs::ToggleInput.new
+            @toggle_input.changed do |element, event|
+              RubyApp::Session.show_dialog(event, RubyApp::Elements::Dialogs::MessageDialog.new(self.translate.message_dialog.message.title,
+                                                                                                self.translate.message_dialog.message.message(@toggle_input.value, @toggle_input.value.class)))
             end
 
           end

data/lib/ruby_app/log.rb

@@ -33,11 +33,11 @@ module RubyApp
       directory = File.dirname(path)
       Dir.mkdir(directory) unless File.exists?(directory)
       @@_log = RubyApp::Log.new(path)
-      @@_log.debug("#{self}##{__method__} path=#{path.inspect}")
+      @@_log.debug("#{self}.#{__method__} path=#{path.inspect}")
     end
 
     def self.close!
-      @@_log.debug("#{self}##{__method__}")
+      @@_log.debug("#{self}.#{__method__}")
       @@_log.close if @@_log
       @@_log = nil
     end

data/lib/ruby_app/rack/route.rb

@@ -62,7 +62,7 @@ module RubyApp
             200,
             { 'content-type' => RubyApp::Rack::Route.get_content_type(format) },
             [
-              RubyApp::Log.duration("#{self}##{__method__} method=#{method.inspect} path=#{path.inspect} format=#{format.to_sym.inspect}") do
+              RubyApp::Log.duration("#{self}.#{__method__} method=#{method.inspect} path=#{path.inspect} format=#{format.to_sym.inspect}") do
                 RubyApp::Session.pages.last.render(format.to_sym)
               end
             ]

data/lib/ruby_app/translations/en.yml

@@ -124,10 +124,11 @@ ruby_app:
             duration_input: DurationInput
             email_input: EmailInput
             multiline_input: MultilineInput
+            toggle_input: ToggleInput
           message_dialog:
             message:
               title: Input Test
-              message: You input '%1'.
+              message: You input '%1' of type %2.
         link_test_page:
           title: Link Test Page
           content:

data/lib/ruby_app/version.rb

@@ -1,4 +1,4 @@
 module RubyApp
-  VERSION = "0.0.58"
+  VERSION = "0.0.59"
   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: 107
+  hash: 105
   prerelease: 
   segments: 
   - 0
   - 0
-  - 58
-  version: 0.0.58
+  - 59
+  version: 0.0.59
 platform: ruby
 authors: 
 - Frank G. Ficnar
@@ -15,11 +15,9 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-09 00:00:00 Z
+date: 2012-01-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
-  name: BlueCloth
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -29,11 +27,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
   requirement: *id001
-- !ruby/object:Gem::Dependency 
+  type: :runtime
   prerelease: false
-  name: chronic
+  name: BlueCloth
+- !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -43,11 +41,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
   requirement: *id002
-- !ruby/object:Gem::Dependency 
+  type: :runtime
   prerelease: false
-  name: chronic_duration
+  name: chronic
+- !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -57,11 +55,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
   requirement: *id003
-- !ruby/object:Gem::Dependency 
+  type: :runtime
   prerelease: false
-  name: facets
+  name: chronic_duration
+- !ruby/object:Gem::Dependency 
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -71,11 +69,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
   requirement: *id004
-- !ruby/object:Gem::Dependency 
+  type: :runtime
   prerelease: false
-  name: fileutils
+  name: facets
+- !ruby/object:Gem::Dependency 
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -85,11 +83,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
   requirement: *id005
-- !ruby/object:Gem::Dependency 
+  type: :runtime
   prerelease: false
-  name: haml
+  name: fileutils
+- !ruby/object:Gem::Dependency 
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -99,11 +97,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
   requirement: *id006
-- !ruby/object:Gem::Dependency 
+  type: :runtime
   prerelease: false
-  name: json
+  name: haml
+- !ruby/object:Gem::Dependency 
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -113,11 +111,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
   requirement: *id007
-- !ruby/object:Gem::Dependency 
+  type: :runtime
   prerelease: false
-  name: mime-types
+  name: json
+- !ruby/object:Gem::Dependency 
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -127,11 +125,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
   requirement: *id008
-- !ruby/object:Gem::Dependency 
+  type: :runtime
   prerelease: false
-  name: r18n-core
+  name: mime-types
+- !ruby/object:Gem::Dependency 
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -141,11 +139,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
   requirement: *id009
-- !ruby/object:Gem::Dependency 
+  type: :runtime
   prerelease: false
-  name: rack
+  name: r18n-core
+- !ruby/object:Gem::Dependency 
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -155,11 +153,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
   requirement: *id010
-- !ruby/object:Gem::Dependency 
+  type: :runtime
   prerelease: false
-  name: ruby-event
+  name: rack
+- !ruby/object:Gem::Dependency 
   version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -169,11 +167,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
   requirement: *id011
-- !ruby/object:Gem::Dependency 
+  type: :runtime
   prerelease: false
-  name: ruby-openid
+  name: ruby-event
+- !ruby/object:Gem::Dependency 
   version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -183,11 +181,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
   requirement: *id012
-- !ruby/object:Gem::Dependency 
+  type: :runtime
   prerelease: false
-  name: sass
+  name: ruby-openid
+- !ruby/object:Gem::Dependency 
   version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -197,11 +195,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
   requirement: *id013
-- !ruby/object:Gem::Dependency 
+  type: :runtime
   prerelease: false
-  name: term-ansicolor
+  name: sass
+- !ruby/object:Gem::Dependency 
   version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -211,11 +209,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
   requirement: *id014
-- !ruby/object:Gem::Dependency 
+  type: :runtime
   prerelease: false
-  name: yajl-ruby
+  name: term-ansicolor
+- !ruby/object:Gem::Dependency 
   version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -225,11 +223,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
   requirement: *id015
-- !ruby/object:Gem::Dependency 
+  type: :runtime
   prerelease: false
-  name: capybara
+  name: yajl-ruby
+- !ruby/object:Gem::Dependency 
   version_requirements: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -239,11 +237,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   requirement: *id016
-- !ruby/object:Gem::Dependency 
+  type: :development
   prerelease: false
-  name: cucumber
+  name: capybara
+- !ruby/object:Gem::Dependency 
   version_requirements: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -253,11 +251,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   requirement: *id017
-- !ruby/object:Gem::Dependency 
+  type: :development
   prerelease: false
-  name: launchy
+  name: cucumber
+- !ruby/object:Gem::Dependency 
   version_requirements: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -267,11 +265,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   requirement: *id018
-- !ruby/object:Gem::Dependency 
+  type: :development
   prerelease: false
-  name: rake
+  name: launchy
+- !ruby/object:Gem::Dependency 
   version_requirements: &id019 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -281,11 +279,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   requirement: *id019
-- !ruby/object:Gem::Dependency 
+  type: :development
   prerelease: false
-  name: rspec
+  name: rake
+- !ruby/object:Gem::Dependency 
   version_requirements: &id020 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -295,11 +293,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   requirement: *id020
-- !ruby/object:Gem::Dependency 
+  type: :development
   prerelease: false
-  name: rspec-mocks
+  name: rspec
+- !ruby/object:Gem::Dependency 
   version_requirements: &id021 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -309,11 +307,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   requirement: *id021
-- !ruby/object:Gem::Dependency 
+  type: :development
   prerelease: false
-  name: ya2yaml
+  name: rspec-mocks
+- !ruby/object:Gem::Dependency 
   version_requirements: &id022 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -323,8 +321,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
   requirement: *id022
+  type: :development
+  prerelease: false
+  name: ya2yaml
 description: A web application framework in Ruby
 email: 
 - frank.ficnar@gmail.com
@@ -407,10 +407,14 @@ files:
 - lib/ruby_app/elements/input.rb
 - lib/ruby_app/elements/inputs/duration_input.rb
 - lib/ruby_app/elements/inputs/email_input.html.haml
+- lib/ruby_app/elements/inputs/email_input.js.haml
 - lib/ruby_app/elements/inputs/email_input.rb
 - lib/ruby_app/elements/inputs/multiline_input.html.haml
 - lib/ruby_app/elements/inputs/multiline_input.js.haml
 - lib/ruby_app/elements/inputs/multiline_input.rb
+- lib/ruby_app/elements/inputs/toggle_input.html.haml
+- lib/ruby_app/elements/inputs/toggle_input.js.haml
+- lib/ruby_app/elements/inputs/toggle_input.rb
 - lib/ruby_app/elements/link.html.haml
 - lib/ruby_app/elements/link.rb
 - lib/ruby_app/elements/list.html.haml
@@ -613,7 +617,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.13
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A web application framework in Ruby