calabash-android 0.5.11 → 0.5.12.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94c6e2b470cedf9656247543c5dc1770aabcc1f4
-  data.tar.gz: 802fa73e9c59c81b9bce5a916caf8efea09120ae
+  metadata.gz: 687749f90a3d6925e20572e3c8c0f8a5f0da70c7
+  data.tar.gz: 7dc8452b1af1937e782c8efc79648adfe16712af
 SHA512:
-  metadata.gz: 48cf3da5067bafc7c92ced64f27ddec626bbe51e242a912778be62ccc75e7aa03851e50637d3ba9dd1abd1c1cdf4945bd04dacbbd490ea3a9f839814f518f836
-  data.tar.gz: 3d94971acca24214001a20581a8257583e157ea4ddd3d47b9604b52e3bc2675df4f030538b9a9a742e4ce0d238c922e6e55b4653487b80c91246eff475372892
+  metadata.gz: 701ad3949e4f2d1349c34f02feb8ee7214bc0dae885b73309dff1b8642c44317a2ac1bd699db62556baa9b170fa339a4fe5f10d31fd7b2bf9a1148ad95bead84
+  data.tar.gz: 16130bdfef459dc8a6e5e0b2bc3bbe9cf8782655a6db9f71588f7c04db9c712ee1d807c1c6995a2b3565099a5dd7aa0186ac895d949a3a6fe50cad0ea88037b8

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.5.11"
+    VERSION = "0.5.12.pre1"
   end
 end

data/test-server/calabash-js/src/calabash.js

@@ -24,9 +24,14 @@
         if (isHostMethod(object,'getBoundingClientRect'))
         {
            boundingBox = object.getBoundingClientRect();
-           res['rect'] = boundingBox;
-           res['rect'].center_x = boundingBox.left + Math.floor(boundingBox.width/2);
-           res['rect'].center_y = boundingBox.top + Math.floor(boundingBox.height/2);
+           var rect = {};
+           rect.width = boundingBox.width;
+           rect.height = boundingBox.height;
+           rect.left = boundingBox.left;
+           rect.top = boundingBox.top;
+           res.rect = rect;
+           res.rect.center_x = rect.left + Math.floor(rect.width/2);
+           res.rect.center_y = rect.top + Math.floor(rect.height/2);
         }
         res.nodeType = NODE_TYPES[object.nodeType] || res.nodeType + ' (Unexpected)';
         res.nodeName = object.nodeName;

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.5.11
+  version: 0.5.12.pre1
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-16 00:00:00.000000000 Z
+date: 2015-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -250,7 +250,6 @@ files:
 - test-server/AndroidManifest.xml
 - test-server/build.xml
 - test-server/calabash-js/src/calabash.js
-- test-server/calabash-js/src/set_text.js
 - lib/calabash-android/lib/TestServer.apk
 homepage: http://github.com/calabash
 licenses: []
@@ -266,9 +265,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.2

data/test-server/calabash-js/src/set_text.js

@@ -1,139 +0,0 @@
-(function () {
-        function simulateKeyEvent(elem, character) {
-            var ch = character.charCodeAt(0);
-
-            var evt;
-            evt = document.createEvent('KeyboardEvent');
-            evt.initKeyboardEvent('keydown', true, true, window, 0, 0, 0, 0, 0, ch);
-            elem.dispatchEvent(evt);
-
-            evt = document.createEvent('KeyboardEvent');
-            evt.initKeyboardEvent('keyup', true, true, window, 0, 0, 0, 0, 0, ch);
-            elem.dispatchEvent(evt);
-            evt = document.createEvent('KeyboardEvent');
-            evt.initKeyboardEvent('keypress', true, true, window, 0, 0, 0, 0, 0, ch);
-            elem.dispatchEvent(evt);
-        }
-
-
-        function enterTextIntoInputField(elem, text) {
-            elem.value = "";
-            for (var i = 0; i < text.length; i++) {
-                var ch = text.charAt(i);
-                elem.value += ch;
-                simulateKeyEvent(elem, ch);
-            }
-        }
-
-
-        function fireHTMLEvent(elem, eventName) {
-            var evt = document.createEvent("HTMLEvents");
-            evt.initEvent(eventName, true, true );
-            return !elem.dispatchEvent(evt);
-        }
-
-        function selectInputField(elem) {
-            elem.click();
-            elem.focus();
-        }
-
-
-        function deselectInputField(elem) {
-            fireHTMLEvent(elem, 'change');
-            fireHTMLEvent(elem, 'blur');
-        }
-
-
-    /** David Mark's isHostMethod function,
-      * http://peter.michaux.ca/articles/feature-detection-state-of-the-art-browser-scripting
-      * Modified to use strict equality
-      */
-    function isHostMethod (object, property)
-    {
-      var t = typeof object[property];
-      return t==='function' ||
-             (!!(t==='object' && object[property])) ||
-             t==='unknown';
-    }
-    //http://www.w3.org/TR/DOM-Level-2-Core/core.html
-    var NODE_TYPES = {
-        /*ELEMENT_NODE                   : */ 1 : 'ELEMENT_NODE',
-        /*ATTRIBUTE_NODE                 : */ 2: 'ATTRIBUTE_NODE',
-        /*TEXT_NODE                      : */ 3 : 'TEXT_NODE',
-        /*DOCUMENT_NODE                  : */ 9 : 'DOCUMENT_NODE'
-    };
-
-    function toJSON(object)
-    {
-        var res, i, N;
-        if (typeof object==='undefined')
-        {
-            throw {message:'Calling toJSON with undefined'};
-        }
-        else if (object instanceof Node)//TODO: support for frames!
-        {
-            res = {};
-            if (isHostMethod(object,'getBoundingClientRect'))
-            {
-                res['rect'] = object.getBoundingClientRect();
-            }
-            res.nodeType = NODE_TYPES[object.nodeType] || res.nodeType + ' (Unexpected)';
-            res.nodeName = object.nodeName;
-            res.id = object.id || '';
-            res['class'] = object.className || '';
-            if (object.hasOwnProperty('value')) {
-                res.value = object.value;
-            }
-            res.html = object.outerHTML || '';
-            res.nodeValue = object.nodeValue;
-        }
-        else if (object instanceof NodeList || //TODO: support for frames!
-                 (typeof object=='object' && object &&
-                  typeof object.length === 'number' &&
-                  object.length > 0 //array like
-                  && typeof object[0] !== 'undefined'))
-        {
-            res = [];
-            for (i=0,N=object.length;i<N;i++)
-            {
-                res[i] = toJSON(object[i]);
-            }
-        }
-        else
-        {
-            res = object;
-        }
-        return res;
-    }
-
-    ///TODO: no support for now frames
-    //idea would be map XPath across window.frames
-    //must take care of visibility questions
-
-    try
-    {
-        var exp = JSON.parse('%@')/* dynamic */,
-                el,
-                text = '%@',
-                i,N;
-
-        el=document.elementFromPoint(exp.rect.left + exp.rect.width / 2, exp.rect.top + exp.rect.height / 2);
-        if(exp.id){
-            el = document.getElementById(exp.id);
-        }
-        if (/input/i.test(el.tagName))
-        {
-                selectInputField(el);
-                enterTextIntoInputField(el, text);
-        }
-        else
-        {
-
-        }
-    }
-    catch (e)
-    {
-       return JSON.stringify({error:'Exception while running query: '+exp, details:e.toString()})
-    }
-    return JSON.stringify(toJSON(el));
-})();