calabash-android 0.4.6 → 0.4.7.pre1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 64cf7a26d360f3483fdc88f29c24f82d995e4f59
+  data.tar.gz: b52dacd37f6444b16af0fa62c8453ea5b9e13fc9
+SHA512:
+  metadata.gz: 07241d9e4d9b291bd9ccdd277badfbde8fc7ad774cc7491a8d960762d72e19b41985950b1d3554d693debca272373b7a0783d118461067711dc70b40fb91da33
+  data.tar.gz: 5988a802d01af1d3144c7ff391480dc28c34957b23081f0686a80789f9532dab480a258f0d7a74df9cbf7fc9beb5e86b80773c048dc41c5abd4879e5afb683a4

data/calabash-android.gemspec

@@ -21,5 +21,6 @@ Gem::Specification.new do |s|
   s.add_dependency( "slowhandcuke" )
   s.add_dependency( "rubyzip" )
   s.add_dependency( "awesome_print" )
+  s.add_dependency( 'httpclient', '~> 2.3.2')
 
 end

data/doc/calabash-android-help.txt

@@ -5,6 +5,7 @@ Usage: calabash-android <command-name> [parameters] [options]
     setup
     build
     run [parameters]
+    console
     version
 
   Commands:
@@ -15,11 +16,14 @@ Usage: calabash-android <command-name> [parameters] [options]
     setup sets up a non-default keystore to use with this test project.
 
     build builds the test server that will be used when testing the app.
-      
+
     run runs Cucumber in the current folder with the enviroment needed.
 
+    console opens an interactive irb shell. Here you can send commands
+      to the app and query for UI elements.
+
     version prints the gem version
 
 
     Options:
-    -v, --verbose  Turns on verbose logging
+    -v, --verbose  Turns on verbose logging

data/lib/calabash-android/operations.rb

@@ -1,3 +1,4 @@
+require 'httpclient'
 require 'json'
 require 'net/http'
 require 'open-uri'
@@ -254,15 +255,86 @@ module Operations
 
     def http(path, data = {}, options = {})
       begin
-        http = Net::HTTP.new "127.0.0.1", @server_port
-        http.open_timeout = options[:open_timeout] if options[:open_timeout]
-        http.read_timeout = options[:read_timeout] if options[:read_timeout]
-        resp = http.post(path, "#{data.to_json}", {"Content-Type" => "application/json;charset=utf-8"})
-        resp.body
-      rescue EOFError => e
-          log "It looks like your app is no longer running. \nIt could be because of a crash or because your test script shut it down."
-          raise e
+
+        configure_http(@http, options)
+        make_http_request(
+            :method => :post,
+            :body => data.to_json,
+            :uri => url_for(path),
+            :header => {"Content-Type" => "application/json;charset=utf-8"})
+
+      rescue HTTPClient::TimeoutError,
+             HTTPClient::KeepAliveDisconnected,
+             Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::ECONNABORTED,
+             Errno::ETIMEDOUT => e
+        log "It looks like your app is no longer running. \nIt could be because of a crash or because your test script shut it down."
+        raise e
+      end
+    end
+
+    def set_http(http)
+      @http = http
+    end
+
+    def url_for(method)
+      url = URI.parse(ENV['DEVICE_ENDPOINT']|| "http://127.0.0.1:#{@server_port}")
+      path = url.path
+      if path.end_with? "/"
+        path = "#{path}#{method}"
+      else
+        path = "#{path}/#{method}"
       end
+      url.path = path
+      url
+    end
+
+
+
+    def make_http_request(options)
+      body = nil
+      begin
+        unless @http
+          @http = init_request(options)
+        end
+        header = options[:header] || {}
+        header["Content-Type"] = "application/json;charset=utf-8"
+        options[:header] = header
+
+        if options[:method] == :post
+          body = @http.post(options[:uri], options).body
+        else
+          body = @http.get(options[:uri], options).body
+        end
+      rescue Exception => e
+        if @http
+          @http.reset_all
+          @http=nil
+        end
+        raise e
+      end
+      body
+    end
+
+    def init_request(options)
+      http = HTTPClient.new
+      configure_http(http, options)
+    end
+
+    def configure_http(http, options)
+      return unless http
+      http.connect_timeout = options[:open_timeout] || 15
+      http.send_timeout = options[:send_timeout] || 15
+      http.receive_timeout = options[:read_timeout] || 15
+      if options.has_key?(:debug) && options[:debug]
+        http.debug_dev= $stdout
+      else
+        if ENV['DEBUG_HTTP'] and (ENV['DEBUG_HTTP'] != '0')
+          http.debug_dev = $stdout
+        else
+          http.debug_dev= nil
+        end
+      end
+      http
     end
 
     def screenshot(options={:prefix => nil, :name => nil})
@@ -493,8 +565,8 @@ module Operations
     performAction("touch_coordinate", center_x, center_y)
   end
 
-  def http(options, data=nil)
-    default_device.http(options, data)
+  def http(path, data = {}, options = {})
+    default_device.http(path, data, options)
   end
 
   def html(q)
@@ -620,12 +692,12 @@ module Operations
     res['results']
   end
 
-  def url_for( verb )
-    ni
+  def url_for( method )
+    default_device.url_for(method)
   end
 
-  def make_http_request( url, req )
-    ni
+  def make_http_request(options)
+    default_device.make_http_request(options)
   end
 
 end

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.4.6"
+    VERSION = "0.4.7.pre1"
   end
 end

data/test-server/instrumentation-backend/.classpath

@@ -6,5 +6,6 @@
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="lib" path="libs/robotium-solo-3.6.jar"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

data/test-server/instrumentation-backend/project.properties

@@ -8,4 +8,4 @@
 # project structure.
 
 # Project target.
-target=Google Inc.:Google APIs:16
+target=Google Inc.:Google APIs:17

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/FranklyResult.java

@@ -1,14 +1,13 @@
 package sh.calaba.instrumentationbackend;
 
 import java.io.CharArrayWriter;
-import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import sh.calaba.org.codehaus.jackson.map.ObjectMapper;
+import sh.calaba.instrumentationbackend.json.JSONUtils;
 
 /**
  * Represents a response in the Frankly protocol.
@@ -52,13 +51,7 @@ public class FranklyResult {
     }
     
     public String asJson() {
-        ObjectMapper mapper = new ObjectMapper();
-
-        try {        	
-            return mapper.writeValueAsString(asMap());
-        } catch (IOException e) {
-            throw new RuntimeException("Could not convert result to json", e);
-        }
+        return JSONUtils.asJson(asMap());
     }
 
 	public Map<String,Object> asMap() 

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/HttpServer.java

@@ -3,7 +3,6 @@ package sh.calaba.instrumentationbackend.actions;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
-import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.List;
@@ -17,8 +16,8 @@ import sh.calaba.instrumentationbackend.Command;
 import sh.calaba.instrumentationbackend.FranklyResult;
 import sh.calaba.instrumentationbackend.InstrumentationBackend;
 import sh.calaba.instrumentationbackend.Result;
+import sh.calaba.instrumentationbackend.json.JSONUtils;
 import sh.calaba.instrumentationbackend.query.Query;
-import sh.calaba.instrumentationbackend.query.QueryResult;
 import sh.calaba.org.codehaus.jackson.map.DeserializationConfig.Feature;
 import sh.calaba.org.codehaus.jackson.map.ObjectMapper;
 import android.graphics.Bitmap;
@@ -61,14 +60,50 @@ public class HttpServer extends NanoHTTPD {
 		super(testServerPort, new File("/"));
 	}
 
-	@SuppressWarnings("rawtypes")
+	@SuppressWarnings({ "rawtypes", "unchecked" })
 	public Response serve(String uri, String method, Properties header,
 			Properties params, Properties files) {
 		System.out.println("URI: " + uri);
 		if (uri.endsWith("/ping")) {
 			return new NanoHTTPD.Response(HTTP_OK, MIME_HTML, "pong");
 
-		} else if (uri.endsWith("/map")) {
+		}
+		else if (uri.endsWith("/dump")) {
+			FranklyResult errorResult = null;
+			try {
+				
+				
+				String json = params.getProperty("json");
+				
+				
+				if (json == null)
+				{					
+					Map<?,?> dumpTree = new ViewDump().dumpWithoutElements();
+					return new NanoHTTPD.Response(HTTP_OK, "application/json;charset=utf-8", JSONUtils.asJson(dumpTree));
+				}
+				else 
+				{
+					ObjectMapper mapper = new ObjectMapper();
+					Map dumpSpec = mapper.readValue(json, Map.class);
+														
+					List<Integer> path = (List<Integer>) dumpSpec.get("path");
+					if (path == null)
+					{
+						Map<?,?> dumpTree = new ViewDump().dumpWithoutElements();
+						return new NanoHTTPD.Response(HTTP_OK, "application/json;charset=utf-8", JSONUtils.asJson(dumpTree));					
+					}
+					Map<?,?> dumpTree = new ViewDump().dumpPathWithoutElements(path);
+					return new NanoHTTPD.Response(HTTP_OK, "application/json;charset=utf-8", JSONUtils.asJson(dumpTree));
+				}
+
+				
+			} catch (Exception e ) {
+				e.printStackTrace();
+                errorResult = FranklyResult.fromThrowable(e);
+            }
+            return new NanoHTTPD.Response(HTTP_INTERNALERROR, "application/json;charset=utf-8", errorResult.asJson());
+		} 
+		else if (uri.endsWith("/map")) {
 			FranklyResult errorResult = null;
 			try {
 				String commandString = params.getProperty("json");
@@ -77,12 +112,11 @@ public class HttpServer extends NanoHTTPD {
 				
 				String uiQuery = (String) command.get("query");
 				Map op = (Map) command.get("operation");
+				@SuppressWarnings("unused") //TODO: support other methods, e.g., flash
 				String methodName = (String) op.get("method_name");
 				List arguments = (List) op.get("arguments");
 				
-				//For now we only support query and query_all
-				//query_all includes also invisible views, while query filters them
-				boolean includeInVisible = "query_all".equals(methodName);
+				//For now we only support query
 				
 				
 				List queryResult = new Query(uiQuery,arguments).executeQuery();

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/ViewDump.java

@@ -0,0 +1,50 @@
+package sh.calaba.instrumentationbackend.actions;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.Callable;
+import java.util.concurrent.atomic.AtomicReference;
+
+import sh.calaba.instrumentationbackend.query.ast.UIQueryUtils;
+
+@SuppressWarnings({ "rawtypes", "unchecked" })
+public class ViewDump {
+
+	public Map<?,?> dumpWithoutElements() {
+		Map<?, ?> dumpTree = (Map) UIQueryUtils.evaluateSyncInMainThread(new Callable() {
+			public Object call() throws Exception {
+				return UIQueryUtils.dump();
+			}
+		});
+		
+		return sameTreeWithoutElements(dumpTree);
+		
+	}
+
+
+	public Map<?,?> dumpPathWithoutElements(final List<Integer> path) {
+		final AtomicReference<List<Integer>> ref = new AtomicReference<List<Integer>>(path);
+		Map<?, ?> dumpTree = (Map) UIQueryUtils.evaluateSyncInMainThread(new Callable() {
+			public Object call() throws Exception {
+				return UIQueryUtils.dumpByPath(ref.get());
+			}
+		});
+		
+		return UIQueryUtils.mapWithElAsNull(dumpTree);						
+	}
+
+	
+	private Map<?, ?> sameTreeWithoutElements(Map<?, ?> dump) {
+		Map node = UIQueryUtils.mapWithElAsNull(dump);
+		List<Map> nodeChildren = (List<Map>) node.get("children");
+		List<Map> childrenNoEl = new ArrayList<Map>(nodeChildren.size());
+		for (Map child : nodeChildren) {
+			childrenNoEl.add(sameTreeWithoutElements(child));
+		}
+		node.put("children",childrenNoEl);
+		return node;
+	}
+
+	
+}

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/json/JSONUtils.java

@@ -0,0 +1,18 @@
+package sh.calaba.instrumentationbackend.json;
+
+import java.io.IOException;
+import java.util.Map;
+
+import sh.calaba.org.codehaus.jackson.map.ObjectMapper;
+
+public class JSONUtils {
+
+	public static String asJson(Map<?,?> map) {
+		ObjectMapper mapper = new ObjectMapper();
+		try {
+			return mapper.writeValueAsString(map);
+		} catch (IOException e) {
+			throw new RuntimeException("Could not convert result to json: "+map, e);
+		}
+	}
+}

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/Query.java

@@ -164,8 +164,7 @@ public class Query {
         Set<View> parents = new HashSet<View>();
         for (View v : viewFetcher.getAllViews(false))
         {
-            View parent = viewFetcher.getTopParent(v);
-            System.out.println(parent);
+            View parent = viewFetcher.getTopParent(v);            
             parents.add(parent);
         }
         List<View> results = new ArrayList<View>();

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/ViewMapper.java

@@ -18,33 +18,14 @@ public class ViewMapper {
 	public static Object extractDataFromView(View v) {		
 		
 		Map data = new HashMap();
-		data.put("class", v.getClass().getName());		
+		data.put("class", getClassNameForView(v));		
 		data.put("description", v.toString());
-		CharSequence description = v.getContentDescription();
-		data.put("contentDescription", description != null ? description.toString() : null);
+		data.put("contentDescription", getContentDescriptionForView(v));
 		data.put("enabled", v.isEnabled());
-		String id = null;
-		try {
-			id = InstrumentationBackend.solo.getCurrentActivity()
-					.getResources().getResourceEntryName(v.getId());
-		} catch (Resources.NotFoundException e) {
-			System.out.println("Resource not found for " + v.getId()
-					+ ". Moving on.");
-		}
-		data.put("id", id);
-
-		Map rect = new HashMap();
-		int[] location = new int[2];
-		v.getLocationOnScreen(location);
-
-		rect.put("x", location[0]);
-		rect.put("y", location[1]);
 		
-		rect.put("center_x", location[0] + v.getWidth()/2.0);
-		rect.put("center_y", location[1] + v.getHeight()/2.0);
-		
-		rect.put("width", v.getWidth());
-		rect.put("height", v.getHeight());
+		data.put("id", getIdForView(v));
+
+		Map rect = getRectForView(v);
 
 		data.put("rect", rect);
 
@@ -64,6 +45,43 @@ public class ViewMapper {
 
 	}
 
+	public static Map getRectForView(View v) {
+		Map rect = new HashMap();
+		int[] location = new int[2];
+		v.getLocationOnScreen(location);
+
+		rect.put("x", location[0]);
+		rect.put("y", location[1]);
+		
+		rect.put("center_x", location[0] + v.getWidth()/2.0);
+		rect.put("center_y", location[1] + v.getHeight()/2.0);
+		
+		rect.put("width", v.getWidth());
+		rect.put("height", v.getHeight());
+		return rect;
+	}
+
+	public static String getContentDescriptionForView(View v) {
+		CharSequence description = v.getContentDescription();
+		return description != null ? description.toString() : null;
+	}
+
+	public static String getClassNameForView(View v) {
+		return v.getClass().getName();
+	}
+
+	public static String getIdForView(View v) {
+		String id = null;
+		try {
+			id = InstrumentationBackend.solo.getCurrentActivity()
+					.getResources().getResourceEntryName(v.getId());
+		} catch (Resources.NotFoundException e) {
+			System.out.println("Resource not found for " + v.getId()
+					+ ". Moving on.");
+		}
+		return id;
+	}
+
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public static Object mapView(Object o) {
 		if (o instanceof View) {

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/ast/PartialFutureList.java

@@ -86,8 +86,8 @@ public class PartialFutureList implements Future {
 		return result;
 	}
 	
-	private Future extractFuture(List evaluateWithViews) {
-		for (Object o : evaluateWithViews) {
+	private Future extractFuture(List list) {
+		for (Object o : list) {
 			if (o instanceof Future) {
 				return (Future) o;
 			}

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/ast/UIQueryUtils.java

@@ -19,12 +19,17 @@ import org.antlr.runtime.tree.CommonTree;
 import sh.calaba.instrumentationbackend.InstrumentationBackend;
 import sh.calaba.instrumentationbackend.actions.webview.QueryHelper;
 import sh.calaba.instrumentationbackend.query.CompletedFuture;
+import sh.calaba.instrumentationbackend.query.Query;
+import sh.calaba.instrumentationbackend.query.ViewMapper;
 import sh.calaba.instrumentationbackend.query.antlr.UIQueryParser;
 import sh.calaba.org.codehaus.jackson.map.ObjectMapper;
 import sh.calaba.org.codehaus.jackson.type.TypeReference;
-import android.content.res.Resources.NotFoundException;
+import android.text.InputType;
 import android.view.View;
 import android.webkit.WebView;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.TextView;
 
 public class UIQueryUtils {	
 	
@@ -150,7 +155,7 @@ public class UIQueryUtils {
 		if (!(v instanceof View)) { return true; }		
 		View view = (View) v;
 
-        if (view.getWidth() == 0 || view.getWidth() == 0) {
+        if (view.getHeight() == 0 || view.getWidth() == 0) {
             return false;
         }
 
@@ -158,13 +163,7 @@ public class UIQueryUtils {
 	}
 
 	public static String getId(View view) {
-		try {
-			return InstrumentationBackend.solo.getCurrentActivity()
-					.getResources().getResourceEntryName(view.getId());			
-	
-		}
-		catch (NotFoundException e) {}
-		return null;
+		return ViewMapper.getIdForView(view);
 	}
 
 	@SuppressWarnings("rawtypes")
@@ -274,4 +273,218 @@ public class UIQueryUtils {
 
 	}
 
+/*
+ * 
+{"rect"=>{"x"=>0, "y"=>0, "width"=>768, "height"=>1024},
+ "hit-point"=>{"x"=>384, "y"=>512},
+ "id"=>"",
+ "action"=>false,
+ "enabled"=>1,
+ "visible"=>1,
+ "value"=>nil,
+ "type"=>"[object UIAWindow]",
+ "name"=>nil,
+ "label"=>nil,
+ "children"=> [(samestructure)*]
+  
+ */
+	public static Map<?,?> dump() 
+	{
+		Query dummyQuery = new Query("not_used");	
+				
+		return dumpRecursively(emptyRootView(), dummyQuery.rootViews());
+	}
+	
+	@SuppressWarnings({ "unchecked", "rawtypes" })
+	public static Map<?,?> mapWithElAsNull(Map<?,?> dump) {
+		HashMap result = new HashMap(dump);
+		result.put("el",null);
+		return result;
+	}
+
+	
+		
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	protected static Map<?,?> dumpRecursively(Map parentView,List<View> children)
+	{
+		ArrayList childrenArray = new ArrayList(32);
+		for (int i=0;i<children.size();i++) {
+			View view = children.get(i);
+			Map serializedChild = serializeViewToDump(view);
+			List<Integer> childPath = new ArrayList<Integer>((List) parentView.get("path"));
+			childPath.add(i);
+			serializedChild.put("path", childPath);			
+			childrenArray.add(dumpRecursively(serializedChild, UIQueryUtils.subviews(view)));
+		}
+			
+		parentView.put("children", childrenArray);
+		
+		return parentView;
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public static Map<?,?> dumpByPath(List<Integer> path) {
+		Query dummyQuery = new Query("not_used");
+		
+		Map currentView = emptyRootView();
+		List<View> currentChildren = dummyQuery.rootViews(); 
+				
+		for (Integer i:path) {
+			View child = currentChildren.get(i);		
+			currentView = serializeViewToDump(child);
+			currentChildren = UIQueryUtils.subviews(child);						
+		}
+		
+		return currentView;
+	}
+	
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public static Map<?,?> serializeViewToDump(View view) {
+		if (view == null) {return null;}
+		
+		Map m = new HashMap();
+		
+		m.put("id",getId(view));
+		m.put("el",view);
+		
+		Map rect = ViewMapper.getRectForView(view);
+		Map hitPoint = extractHitPointFromRect(rect);
+		
+		m.put("rect",rect);
+		m.put("hit-point",hitPoint);
+		m.put("action",actionForView(view));
+		m.put("enabled",view.isEnabled());
+		m.put("visible",isVisible(view));
+		m.put("entry_types", elementEntryTypes(view));
+		m.put("value",extractValueFromView(view));
+		m.put("type",ViewMapper.getClassNameForView(view));
+		m.put("name",getNameForView(view));
+		m.put("label",ViewMapper.getContentDescriptionForView(view));									
+		return m;
+	}
+
+	public static List<String> elementEntryTypes(View view) {
+		if (view instanceof TextView)
+		{
+			TextView textView = (TextView) view;				
+			return mapTextViewInputTypes(textView.getInputType());	
+		}
+		return null;
+		
+	}
+
+	public static List<String> mapTextViewInputTypes(int inputType) {
+		List<String> inputTypes = new ArrayList<String>();
+		if (inputTypeHasTrait(inputType, InputType.TYPE_TEXT_VARIATION_PASSWORD) || inputTypeHasTrait(inputType, InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD)) {
+			inputTypes.add("password");
+		}
+		if (inputTypeHasTrait(inputType, InputType.TYPE_CLASS_NUMBER)) {
+			inputTypes.add("numeric");
+		}
+		inputTypes.add(String.valueOf(inputType));
+		
+		return inputTypes;	
+	}
+
+	private static boolean inputTypeHasTrait(int inputType,
+			int inputTypeTrait) {
+		return (inputType & inputTypeTrait) != 0;
+	}
+
+	private static Object getNameForView(View view) 
+	{
+		Object result = null;
+		Method hintMethod = hasProperty(view,"hint");
+		if (hintMethod!=null)
+		{
+			result = getProperty(view, hintMethod);			
+		}
+		if (result != null) {return result.toString();}
+		Method textMethod = hasProperty(view,"text");
+		if (textMethod!=null)
+		{
+			result = getProperty(view, textMethod);			
+		}
+		if (result != null) {return result.toString();}
+		
+		return null;
+	}
+
+	public static Object extractValueFromView(View view) {
+		if (view instanceof Button) {
+			Button b = (Button) view;
+			return b.getText().toString();
+		}
+		else if (view instanceof CheckBox) {
+			CheckBox c = (CheckBox) view;
+			return c.isChecked();
+		}
+		else if (view instanceof TextView) {
+			TextView t = (TextView) view;
+			return t.getText().toString();
+		}
+		return null;
+	}
+
+	/*
+	 * function action(el)
+    {
+        var normalized = normalize(el);
+        if (!normalized) {
+            return false;
+        }
+        if (normalized instanceof UIAButton) {
+            return {
+                "type":'touch',
+                "gesture":'tap'
+            };
+        }
+        //TODO MORE
+        return false;
+    }
+	 */
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public static Map<?,?> actionForView(View view) 
+	{
+		Map result = null;
+		if (view instanceof android.widget.Button || view instanceof android.widget.ImageButton) {
+			result = new HashMap();
+			result.put("type","touch");
+			result.put("gesture","tap");
+		}
+		
+		//TODO: obviously many more!
+		return result;
+		
+		
+	}
+
+	@SuppressWarnings({ "rawtypes", "unchecked" })
+	public static Map extractHitPointFromRect(Map rect) {
+		Map hitPoint = new HashMap();
+		hitPoint.put("x", rect.get("center_x"));
+		hitPoint.put("y", rect.get("center_y"));
+		return hitPoint;
+	}
+
+	@SuppressWarnings({"unchecked", "rawtypes", "serial"})
+	private static Map<?,?> emptyRootView() {		
+		return new HashMap() {{				
+			put("id",null);
+			put("el",null);			
+			put("rect",null);
+			put("hit-point",null);
+			put("action",false);
+			put("enabled",false);
+			put("visible",true);
+			put("value",null);
+			put("path",new ArrayList<Integer>());			
+			put("type","[object CalabashRootView]");
+			put("name",null);
+			put("label",null);									
+		}};
+	}
+
+	
+
 }

metadata

@@ -1,113 +1,114 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.4.6
-  prerelease: 
+  version: 0.4.7.pre1
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-27 00:00:00.000000000 Z
+date: 2013-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: retriable
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: slowhandcuke
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-description: ! 'calabash-android drives tests for native  and hybrid Android apps. '
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.3.2
+description: 'calabash-android drives tests for native  and hybrid Android apps. '
 email:
 - jonas@lesspainful.com
 executables:
@@ -296,6 +297,7 @@ files:
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/HttpServer.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/NanoHTTPD.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/NullAction.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/ViewDump.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/activity/FinishOpenedActivities.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/activity/GetOpenedActivities.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/activity/GoBackToActivity.java
@@ -398,6 +400,7 @@ files:
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/webview/ScrollTo.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/webview/SetPropertyByCssSelector.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/actions/webview/SetText.java
+- test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/json/JSONUtils.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/CompletedFuture.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/InvocationOperation.java
 - test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/query/Operation.java
@@ -836,26 +839,25 @@ files:
 - lib/calabash-android/lib/TestServer.apk
 homepage: http://github.com/calabash
 licenses: []
+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'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Client for calabash-android for automated functional testing on Android
 test_files: []