RubyApp 0.5.16 → 0.5.17

data/Gemfile.lock

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

data/lib/ruby_app/element.rb

@@ -122,6 +122,14 @@ module RubyApp
         self.tap_selector("a:contains('#{text}')")
       end
 
+      def tap_list_item(text)
+        self.tap_selector("a.item:contains('#{text}')")
+      end
+
+      def tap_list_link(text)
+        self.tap_selector("a.link[title*='#{text}']")
+      end
+
       def tap_selector(selector)
         _selector = ".ui-page-active #{selector}"
         self.execute("RubyApp.tap(#{_selector.to_json});")

data/lib/ruby_app/elements/mobile/default/features/lists_page.rb

@@ -24,24 +24,32 @@ module RubyApp
 
               @list = RubyApp::Elements::Mobile::List.new
               @list.attributes.merge!('data-inset' => true)
+              @list.is_split = true
               @list.items += [  'Item 01',
                                 'Item 02',
                                 'Item 03',
                                 'Item 04',
                                 'Item 05' ]
-              @list.clicked do |element, event|
-                RubyApp::Elements::Mobile::Dialog.show(event, RubyApp::Elements::Mobile::Dialogs::AcknowledgementDialog.new('List', "You clicked #{event.item}."), :transition => 'pop')
+              @list.item_clicked do |element, event|
+                RubyApp::Elements::Mobile::Dialog.show(event, RubyApp::Elements::Mobile::Dialogs::AcknowledgementDialog.new('List', "You clicked the item #{event.item}."), :transition => 'pop')
+              end
+              @list.link_clicked do |element, event|
+                RubyApp::Elements::Mobile::Dialog.show(event, RubyApp::Elements::Mobile::Dialogs::AcknowledgementDialog.new('List', "You clicked the link #{event.item}."), :transition => 'pop')
               end
 
               @select = RubyApp::Elements::Mobile::Lists::Select.new
               @select.attributes.merge!('data-inset' => true)
+              @select.is_split = true
               @select.items += [  'Item 11',
                                   'Item 12',
                                   'Item 13',
                                   'Item 14',
                                   'Item 15' ]
-              @select.clicked do |element, event|
-                RubyApp::Elements::Mobile::Dialog.show(event, RubyApp::Elements::Mobile::Dialogs::AcknowledgementDialog.new('List', "You clicked #{event.item}."), :transition => 'pop')
+              @select.item_clicked do |element, event|
+                RubyApp::Elements::Mobile::Dialog.show(event, RubyApp::Elements::Mobile::Dialogs::AcknowledgementDialog.new('List', "You clicked the item #{event.item}."), :transition => 'pop')
+              end
+              @select.link_clicked do |element, event|
+                RubyApp::Elements::Mobile::Dialog.show(event, RubyApp::Elements::Mobile::Dialogs::AcknowledgementDialog.new('List', "You clicked the link #{event.item}."), :transition => 'pop')
               end
 
             end

data/lib/ruby_app/elements/mobile/list.html.haml

@@ -3,5 +3,8 @@
 %ul.list{attributes}
   - self.items.each_with_index do |item, index|
     %li.item{'data-icon' => 'false'}
-      %a.item{:href => '#', :index => index}
+      %a.item{:href => '#', 'data-index' => index}
         = yield(:item, item, index) || item
+      - if self.split?
+        %a.link{:href => '#', 'data-index' => index}
+          = yield(:link, item, index) || item

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

@@ -3,7 +3,11 @@
   $(document).ready( function() {
     $(document).on('tap', 'ul.list > li.item a.item', function(event) {
       event.preventDefault();
-      RubyApp.queueEvent({_class:'RubyApp::Elements::Mobile::List::ClickedEvent', source:$(this).parents('ul.list').attr('id'), index:$(this).attr('index')});
+      RubyApp.queueEvent({_class:'RubyApp::Elements::Mobile::List::ItemClickedEvent', source:$(this).parents('ul.list').attr('id'), index:$(this).attr('data-index')});
+    });
+    $(document).on('tap', 'ul.list > li.item a.link', function(event) {
+      event.preventDefault();
+      RubyApp.queueEvent({_class:'RubyApp::Elements::Mobile::List::LinkClickedEvent', source:$(this).parents('ul.list').attr('id'), index:$(this).attr('data-index')});
     });
   });
 = yield

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

@@ -28,29 +28,57 @@ module RubyApp
 
         end
 
+        class ItemClickedEvent < RubyApp::Elements::Mobile::List::ClickedEvent
+
+          def initialize(data)
+            super(data)
+          end
+
+        end
+
+        class LinkClickedEvent < RubyApp::Elements::Mobile::List::ClickedEvent
+
+          def initialize(data)
+            super(data)
+          end
+
+        end
+
         template_path(:all, File.dirname(__FILE__))
 
         attr_accessor :items
+        attr_accessor :is_split
 
-        event :clicked
+        event :item_clicked
+        event :link_clicked
 
         def initialize
           super
           self.attributes.merge!('data-role' => 'listview')
 
           @items = []
+          @is_split = false
 
         end
 
+        def split?
+          return self.is_split
+        end
+
         protected
 
           def on_event(event)
-            on_clicked(event) if event.is_a?(RubyApp::Elements::Mobile::List::ClickedEvent)
+            on_item_clicked(event) if event.is_a?(RubyApp::Elements::Mobile::List::ItemClickedEvent)
+            on_link_clicked(event) if event.is_a?(RubyApp::Elements::Mobile::List::LinkClickedEvent)
             super(event)
           end
 
-          def on_clicked(event)
-            clicked(event)
+          def on_item_clicked(event)
+            item_clicked(event)
+          end
+
+          def on_link_clicked(event)
+            link_clicked(event)
           end
 
       end

data/lib/ruby_app/elements/mobile/lists/select.html.haml

@@ -3,5 +3,8 @@
 %ul.list{attributes}
   - self.items.each_with_index do |item, index|
     %li.item{'data-icon' => 'false', 'data-theme' => self.selected_item == item ? self.attributes['data-selected-theme'] : nil}
-      %a.item{:href => '#', :index => index}
+      %a.item{:href => '#', 'data-index' => index}
         = yield(:item, item, index) || item
+      - if self.split?
+        %a.link{:href => '#', 'data-index' => index}
+          = yield(:link, item, index) || item

data/lib/ruby_app/elements/mobile/lists/select.rb

@@ -26,7 +26,7 @@ module RubyApp
 
           protected
 
-            def on_clicked(event)
+            def on_item_clicked(event)
               @selected_item = event.item
               event.update_element(self)
               super(event)

data/lib/ruby_app/elements/mobile/pages/information/documents_page.rb

@@ -24,7 +24,7 @@ module RubyApp
               @back_button = RubyApp::Elements::Mobile::Navigation::BackButton.new
 
               @documents_list = RubyApp::Elements::Mobile::Pages::Information::DocumentsList.new(@session)
-              @documents_list.clicked do |element, event|
+              @documents_list.item_clicked do |element, event|
                 RubyApp::Elements::Mobile::Pages::Information::DocumentPage.new(event.item).show(event, element.options)
               end
 

data/lib/ruby_app/elements/mobile/pages/information/pages_page.rb

@@ -24,7 +24,7 @@ module RubyApp
               @back_button = RubyApp::Elements::Mobile::Navigation::BackButton.new
 
               @pages_list = RubyApp::Elements::Mobile::Pages::Information::PagesList.new(@document)
-              @pages_list.clicked do |element, event|
+              @pages_list.item_clicked do |element, event|
                 RubyApp::Elements::Mobile::Pages::Information::PagePage.new(event.item).show(event, element.options)
               end
 

data/lib/ruby_app/elements/mobile/pages/information/scripts_page.rb

@@ -22,7 +22,7 @@ module RubyApp
               @back_button = RubyApp::Elements::Mobile::Navigation::BackButton.new
 
               @scripts_list = RubyApp::Elements::Mobile::Pages::Information::ScriptsList.new
-              @scripts_list.clicked do |element, event|
+              @scripts_list.item_clicked do |element, event|
                 if RubyApp::Session.configuration.scripts.enabled
                   event.go(event.item.url)
                 else

data/lib/ruby_app/elements/mobile/pages/information/sessions_page.rb

@@ -22,7 +22,7 @@ module RubyApp
               @back_button = RubyApp::Elements::Mobile::Navigation::BackButton.new
 
               @sessions_list = RubyApp::Elements::Mobile::Pages::Information::SessionsList.new
-              @sessions_list.clicked do |element, event|
+              @sessions_list.item_clicked do |element, event|
                 RubyApp::Elements::Mobile::Pages::Information::SessionPage.new(event.item).show(event, element.options)
               end
 

data/lib/ruby_app/scripts/elements/lists.rb

@@ -7,22 +7,44 @@ end
 
 add_step! RubyApp::Elements::Mobile::Page::ShownEvent do |event|
   event.assert_exists_link('Item 01')
-  event.tap_link('Item 01')
+  event.tap_list_item('Item 01')
 end
 
 add_step! RubyApp::Elements::Mobile::Page::ShownEvent do |event|
-  event.assert_exists_text('You clicked Item 01.')
+  event.assert_exists_text('You clicked the item Item 01.')
+  event.assert_exists_link('OK')
+  event.tap_link('OK')
+end
+
+add_step! RubyApp::Elements::Mobile::Page::ShownEvent do |event|
+  event.assert_exists_link('Item 01')
+  event.tap_list_link('Item 01')
+end
+
+add_step! RubyApp::Elements::Mobile::Page::ShownEvent do |event|
+  event.assert_exists_text('You clicked the link Item 01.')
+  event.assert_exists_link('OK')
+  event.tap_link('OK')
+end
+
+add_step! RubyApp::Elements::Mobile::Page::ShownEvent do |event|
+  event.assert_exists_link('Item 11')
+  event.tap_list_item('Item 11')
+end
+
+add_step! RubyApp::Elements::Mobile::Page::ShownEvent do |event|
+  event.assert_exists_text('You clicked the item Item 11.')
   event.assert_exists_link('OK')
   event.tap_link('OK')
 end
 
 add_step! RubyApp::Elements::Mobile::Page::ShownEvent do |event|
   event.assert_exists_link('Item 11')
-  event.tap_link('Item 11')
+  event.tap_list_link('Item 11')
 end
 
 add_step! RubyApp::Elements::Mobile::Page::ShownEvent do |event|
-  event.assert_exists_text('You clicked Item 11.')
+  event.assert_exists_text('You clicked the link Item 11.')
   event.assert_exists_link('OK')
   event.tap_link('OK')
 end

data/lib/ruby_app/version.rb

@@ -1,4 +1,4 @@
 module RubyApp
-  VERSION = "0.5.16"
+  VERSION = "0.5.17"
   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: 43
+  hash: 41
   prerelease: 
   segments: 
   - 0
   - 5
-  - 16
-  version: 0.5.16
+  - 17
+  version: 0.5.17
 platform: ruby
 authors: 
 - Frank G. Ficnar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-16 00:00:00 Z
+date: 2012-04-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false