RubyApp 0.5.13 → 0.5.14

data/Gemfile.lock

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

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

@@ -143,7 +143,7 @@
   };
 
   $(window).load(function() {
-    RubyApp.queueEvent({_class:'RubyApp::Elements::Mobile::Document::LoadedEvent', source:$('html').attr('id')});
+    RubyApp.queueEvent({_class:'RubyApp::Elements::Mobile::Page::LoadedEvent', source:$('div[data-role="page"]').filter(':first').attr('id')});
   });
 
 = yield

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

@@ -12,14 +12,6 @@ module RubyApp
 
       class Document < RubyApp::Element
 
-        class LoadedEvent < RubyApp::Element::Event
-
-          def initialize(data)
-            super(data)
-          end
-
-        end
-
         template_path(:all, File.dirname(__FILE__))
 
         attr_reader :metadata
@@ -29,8 +21,6 @@ module RubyApp
 
         attr_reader :pages
 
-        event :loaded
-
         def initialize
           super
 
@@ -58,15 +48,6 @@ module RubyApp
 
         protected
 
-          def on_event(event)
-            on_loaded(event) if event.is_a?(RubyApp::Elements::Mobile::Document::LoadedEvent)
-            super(event)
-          end
-
-          def on_loaded(event)
-            loaded(event)
-          end
-
       end
 
     end

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

@@ -12,6 +12,14 @@ module RubyApp
 
       class Page < RubyApp::Element
 
+        class LoadedEvent < RubyApp::Element::Event
+
+          def initialize(data)
+            super(data)
+          end
+
+        end
+
         class ShownEvent < RubyApp::Element::Event
 
           def initialize(data)
@@ -38,6 +46,7 @@ module RubyApp
 
         template_path(:all, File.dirname(__FILE__))
 
+        event :loaded
         event :shown
         event :before_hidden
         event :hidden
@@ -60,12 +69,17 @@ module RubyApp
         protected
 
           def on_event(event)
+            on_loaded(event) if event.is_a?(RubyApp::Elements::Mobile::Page::LoadedEvent)
             on_shown(event) if event.is_a?(RubyApp::Elements::Mobile::Page::ShownEvent)
             on_before_hidden(event) if event.is_a?(RubyApp::Elements::Mobile::Page::BeforeHiddenEvent)
             on_hidden(event) if event.is_a?(RubyApp::Elements::Mobile::Page::HiddenEvent)
             super(event)
           end
 
+          def on_loaded(event)
+            loaded(event)
+          end
+
           def on_shown(event)
             shown(event)
           end

data/lib/ruby_app/scripts/common/features.rb

@@ -1,2 +1,2 @@
-add_step! (RubyApp::Elements::Mobile::Document::LoadedEvent)  { |event| event.assert_exists_link('Features') }
-add_step! (RubyApp::Element::AssertedEvent)                   { |event| event.tap_link('Features') }
+add_step! (RubyApp::Elements::Mobile::Page::LoadedEvent)  { |event| event.assert_exists_link('Features') }
+add_step! (RubyApp::Element::AssertedEvent)               { |event| event.tap_link('Features') }

data/lib/ruby_app/scripts/common/reset.rb

@@ -1,4 +1,4 @@
-add_step! RubyApp::Elements::Mobile::Document::LoadedEvent do |event|
+add_step! RubyApp::Elements::Mobile::Page::LoadedEvent do |event|
   self.reset_script!
   event.refresh_browser
 end

data/lib/ruby_app/scripts/default.rb

@@ -1,3 +1,3 @@
-add_step! (RubyApp::Elements::Mobile::Document::LoadedEvent)  { |event| event.assert_exists_link('Features') }
-add_step! (RubyApp::Element::AssertedEvent)                   { |event| event.assert_exists_link('Information') }
-add_step! (RubyApp::Element::AssertedEvent)                   { |event| event.refresh_browser }
+add_step! (RubyApp::Elements::Mobile::Page::LoadedEvent)  { |event| event.assert_exists_link('Features') }
+add_step! (RubyApp::Element::AssertedEvent)               { |event| event.assert_exists_link('Information') }
+add_step! (RubyApp::Element::AssertedEvent)               { |event| event.refresh_browser }

data/lib/ruby_app/templates/application/scripts/default.rb

@@ -1 +1 @@
-add_step! (RubyApp::Elements::Mobile::Document::LoadedEvent)  { |event| event.assert_exists_link('Welcome!') }
+add_step! (RubyApp::Elements::Mobile::Page::LoadedEvent)  { |event| event.assert_exists_link('Welcome!') }

data/lib/ruby_app/version.rb

@@ -1,4 +1,4 @@
 module RubyApp
-  VERSION = "0.5.13"
+  VERSION = "0.5.14"
   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: 17
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 5
-  - 13
-  version: 0.5.13
+  - 14
+  version: 0.5.14
 platform: ruby
 authors: 
 - Frank G. Ficnar
@@ -15,9 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-12 00:00:00 Z
+date: 2012-04-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: BlueCloth
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -27,11 +29,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id001
   type: :runtime
-  prerelease: false
-  name: BlueCloth
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: chronic
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -41,11 +43,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id002
   type: :runtime
-  prerelease: false
-  name: chronic
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: chronic_duration
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -55,11 +57,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id003
   type: :runtime
-  prerelease: false
-  name: chronic_duration
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: facets
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -69,11 +71,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id004
   type: :runtime
-  prerelease: false
-  name: facets
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: fileutils
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -83,11 +85,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
   type: :runtime
-  prerelease: false
-  name: fileutils
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: haml
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -97,11 +99,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id006
   type: :runtime
-  prerelease: false
-  name: haml
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: json
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -111,11 +113,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id007
   type: :runtime
-  prerelease: false
-  name: json
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: mime-types
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -125,11 +127,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id008
   type: :runtime
-  prerelease: false
-  name: mime-types
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: r18n-core
   version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -139,11 +141,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id009
   type: :runtime
-  prerelease: false
-  name: r18n-core
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: rack
   version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -153,11 +155,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id010
   type: :runtime
-  prerelease: false
-  name: rack
+  requirement: *id010
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: ruby-event
   version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -167,11 +169,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id011
   type: :runtime
-  prerelease: false
-  name: ruby-event
+  requirement: *id011
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: ruby-openid
   version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -181,11 +183,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id012
   type: :runtime
-  prerelease: false
-  name: ruby-openid
+  requirement: *id012
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: sass
   version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -195,11 +197,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id013
   type: :runtime
-  prerelease: false
-  name: sass
+  requirement: *id013
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: term-ansicolor
   version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -209,11 +211,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id014
   type: :runtime
-  prerelease: false
-  name: term-ansicolor
+  requirement: *id014
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: terminal-table
   version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -223,11 +225,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id015
   type: :runtime
-  prerelease: false
-  name: terminal-table
+  requirement: *id015
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: yajl-ruby
   version_requirements: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -237,11 +239,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id016
   type: :runtime
-  prerelease: false
-  name: yajl-ruby
+  requirement: *id016
 - !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: rake
   version_requirements: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -251,10 +253,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id017
   type: :development
-  prerelease: false
-  name: rake
+  requirement: *id017
 description: A mobile web application framework in Ruby
 email: 
 - frank.ficnar@gmail.com
@@ -518,7 +518,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.13
 signing_key: 
 specification_version: 3
 summary: A mobile web application framework in Ruby