touch_action 1.2.1 → 1.3.0

data/.ruby-version

@@ -0,0 +1 @@
+1.9.3-p547

data/CHANGELOG.md

@@ -1,7 +1,10 @@
-## v1.2.0
+## v1.3.0
 
-* added execution block until YUI is loaded and gesture is performed
-* added readyState checking in order to wait for pages to load when using tap on links for example
+* stable version
+
+## v1.2.1
+
+* unusable version
 
 ## v1.1.0
 

data/lib/touch_action/capybara_rspec_helper.rb

@@ -6,20 +6,8 @@ module TouchAction
     module RspecHelper
 
       def touch_action locator, *args
-        page.driver.browser.manage.timeouts.script_timeout = 30
-        page.driver.browser.execute_async_script( TouchAction::ScriptGenerator.yui_loader )
         final_script = TouchAction::ScriptGenerator.generate_javascript(*args)
-        page.driver.browser.execute_async_script( final_script, locator )
-        wait_for_page_ready_state
-      end
-
-    private
-      def wait_for_page_ready_state
-        sleep(0.5) # mobile browsers wait around 300ms when tapping to check if it isn's a double tap before triggering the link
-        end_time = Time.now + 30
-        while (page.driver.browser.execute_script('return document.readyState' != 'complete') || Time.now > end_time)
-          sleep(0.1)
-        end
+        page.driver.browser.execute_script( final_script, locator )
       end
 
     end

data/lib/touch_action/javascripts/touch_action.js.erb

@@ -1,15 +1,38 @@
 (function( touch_action, $, undefined ) {
 
-  touch_action.perform_gesture = function(selenium_finalized_callback) {
-
+  // private property
+  var execute_gesture = function() {
     YUI().use('node-event-simulate', function(Y) {
       
       var node = Y.one(touch_action.element);
       node.simulateGesture(touch_action.gesture, touch_action.options);
         
-    });    
+    });
+  };
+
+  // private method
+  function loadYui() { 
+
+    var head = document.getElementsByTagName('head')[0];
+    var script = document.createElement('script');
+    script.type = 'text/javascript';
+    script.src = "//yui.yahooapis.com/3.18.1/build/yui/yui-min.js";
+
+    script.onreadystatechange = execute_gesture;
+    script.onload = execute_gesture;
+
+    head.appendChild(script);
+ 
+  };
+  // public method
+  touch_action.perform = function() {
+    
+    if (typeof YUI == 'undefined') {
+      loadYui();
+    } else {
+      execute_gesture();
+    };
 
-    selenium_finalized_callback();
   };
 
 
@@ -21,4 +44,4 @@ touch_action.gesture = "<%=gesture%>";
 
 touch_action.options =  <%=options.to_json%>;
 
-touch_action.perform_gesture(arguments[arguments.length - 1]);
+touch_action.perform();

data/lib/touch_action/script_generator.rb

@@ -13,10 +13,6 @@ module TouchAction
       rotate: {rotation: -75}
     }
 
-    def self.yui_loader
-      yui_loader_script = File.read(File.expand_path("../javascripts/yui_loader.js", __FILE__))
-    end
-
     def self.generate_javascript action, options = {}
       action = :flick if action == :swipe
       raise ArgumentError, "The touch action #{action} doesn't exist" unless ACTIONS_WITH_DEFAULT_OPTIONS[action]

data/lib/touch_action/selenium-webdriver.rb

@@ -5,21 +5,8 @@ module TouchAction
   module SeleniumWebdriver
 
     def touch_action *args
-      Selenium::WebDriver::Timeouts.new(bridge).script_timeout= 30
-      bridge.executeAsyncScript( TouchAction::ScriptGenerator.yui_loader )
       final_script = TouchAction::ScriptGenerator.generate_javascript(*args)
-      bridge.executeAsyncScript( final_script, self )
-      wait_for_page_ready_state      
-    end
-
-  private
-
-    def wait_for_page_ready_state
-      sleep(0.5) # mobile browsers wait around 300ms when tapping to check if it isn's a double tap before triggering the link
-      end_time = Time.now + 30
-      while (bridge.executeScript('return document.readyState' != 'complete') || Time.now > end_time)
-        sleep(0.1)
-      end
+      bridge.executeScript( final_script, self )
     end
 
   end

data/lib/touch_action/version.rb

@@ -1,3 +1,3 @@
 module TouchAction
-  VERSION = "1.2.1"
+  VERSION = "1.3.0"
 end

data/lib/touch_action/watir-webdriver.rb

@@ -3,21 +3,9 @@ require "touch_action/script_generator"
 
 module TouchAction
   module WatirWebdriver
-
     def touch_action *args
-      browser.driver.manage.timeouts.script_timeout = 30
-      browser.driver.execute_async_script( TouchAction::ScriptGenerator.yui_loader )
       final_script = TouchAction::ScriptGenerator.generate_javascript(*args)
-      browser.driver.execute_async_script( final_script, self.wd  )
-      wait_for_page_ready_state
-    end
-
-
-  private
-
-    def wait_for_page_ready_state
-      sleep(0.5) # mobile browsers wait around 300ms when tapping to check if it isn's a double tap before triggering the link
-      browser.wait(60)
+      browser.execute_script( final_script, self )
     end
   end
 

data/spec/features/tap_spec.rb

@@ -6,27 +6,23 @@ RSpec.describe TouchAction do
       @browser.goto('http://localhost:9292/tap')
       element = @browser.div(id: 'myElement')
       element.touch_action :tap
+      sleep(5)
       expect(element.text).to include('tap')
     end
 
     it 'should tap link bound by FastClick' do
       @browser.goto('http://localhost:9292/tap')
       @browser.a(id: 'fastclick').touch_action :tap
+      sleep(5)
       expect(@browser.p(id: 'fast-click-test').text).to include('1 times')
     end
 
     it "should tap using webdriver capybara", js: true, use_webdriver: :capybara do
       visit('http://localhost:9292/tap')
       touch_action '#myElement', :tap
+      sleep(5)
       expect(find("#myElement").text).to include('tap')
     end
 
-    it "should tap using selenium", js: true, use_webdriver: :selenium do
-      @browser.navigate.to('http://localhost:9292/tap')
-      element = @browser.find_element(:id, 'myElement')
-      element.touch_action :tap
-      expect(element.text).to include('tap')
-    end
-
   end
 end

data/spec/spec_helper.rb

@@ -19,7 +19,7 @@ when 'ios'
   capabilities = {
     :deviceName => 'iPhone 5s',
     :browserName => 'Safari',
-    :platformVersion => '8.1',
+    :platformVersion => '8.2',
     :platformName => 'iOS',
     :app => 'safari',
     :newCommandTimeout => 9999

metadata

@@ -1,125 +1,142 @@
 --- !ruby/object:Gem::Specification
 name: touch_action
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
+  prerelease: 
 platform: ruby
 authors:
 - Ricardo Nacif
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2015-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Adds touch gestures simulation to Watir, Selenium and Capybara using
@@ -130,8 +147,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .ruby-version
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -141,7 +159,6 @@ files:
 - lib/touch_action.rb
 - lib/touch_action/capybara_rspec_helper.rb
 - lib/touch_action/javascripts/touch_action.js.erb
-- lib/touch_action/javascripts/yui_loader.js
 - lib/touch_action/script_generator.rb
 - lib/touch_action/selenium-webdriver.rb
 - lib/touch_action/version.rb
@@ -173,26 +190,27 @@ files:
 homepage: https://github.com/Ricardonacif/touch_action
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Adds touch gestures simulation to Watir-WebDriver, Selenium-WebDriver and
   Capybara using YUI JS.
 test_files:

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: bfa947340d9b1adb9be7ed82fd79ecd464c860b5
-  data.tar.gz: 8cbef3fbadc44447983247c002980644a58d12b6
-SHA512:
-  metadata.gz: 95c7a7bd87ef4983362ee27d2d27cdd16f3973772dc0f6a72d3aceb595eb0948b28ee53450c6e1a83c125955c392c0676a37061f72b5911f79e22f8783412950
-  data.tar.gz: 85d7accb204826af76f47dcba3429629e9593130ca3e9bd3ed5f4b5f01faef22473664a0e888953b7c43aa08eaf408d8f479742e7961b97b69178c3f34f8739b

data/lib/touch_action/javascripts/yui_loader.js

@@ -1,22 +0,0 @@
-(function(callback) {
-    if (typeof YUI == 'undefined') {
-        var script = document.createElement('script');
-        var head = document.getElementsByTagName('head')[0];
-        var done = false;
-        script.onload = script.onreadystatechange = (function() {
-            if (!done && (!this.readyState || this.readyState == 'loaded' 
-                    || this.readyState == 'complete')) {
-                done = true;
-                script.onload = script.onreadystatechange = null;
-                head.removeChild(script);
-                callback();
-            }
-        });
-        script.type = 'text/javascript';
-        script.src = "//yui.yahooapis.com/3.18.1/build/yui/yui-min.js";
-        head.appendChild(script);
-    }
-    else {
-        callback();
-    }
-})(arguments[arguments.length - 1]);