calabash-android 0.2.12 → 0.2.13

data/CHANGES.txt

@@ -1,3 +1,6 @@
+0.2.13:
+      Now using application/json content type for communication with test server.
+
 0.2.12:
       Various small improvements and bug fixes.
 

data/lib/calabash-android/operations.rb

@@ -182,9 +182,7 @@ module Operations
       retries = 0
       begin
         http = Net::HTTP.new "127.0.0.1", @server_port
-        cmd = "command=#{data.to_json}"
-        cmd = cmd.gsub("+", "%2B")
-        resp = http.post(path, cmd, {})
+        resp = http.post(path, "#{data.to_json}", {"Content-Type" => "application/json;charset=utf-8"})
         resp.body
       rescue Exception => e
         raise e if retries > 20

data/lib/calabash-android/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Android
-    VERSION = "0.2.12"
-    FRAMEWORK_VERSION = "0.2.12"
+    VERSION = "0.2.13"
+    FRAMEWORK_VERSION = "0.2.13"
   end
 end

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

@@ -93,7 +93,12 @@ public class HttpServer extends NanoHTTPD {
             return new NanoHTTPD.Response( HTTP_OK, "image/png", new ByteArrayInputStream(out.toByteArray()));
         }
 		
-		String commandString = params.getProperty("command");
+        System.out.println("header: "+ header);
+        System.out.println("params: "+ params);
+        System.out.println("files: "+ files);
+
+
+        String commandString = params.getProperty("json");
 		System.out.println("command: "+ commandString);
 		String result = toJson(runCommand(commandString));
 		System.out.println("result:" + result);

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

@@ -352,7 +352,7 @@ public class NanoHTTPD
 
 				// Create a BufferedReader for easily reading it as string.
 				ByteArrayInputStream bin = new ByteArrayInputStream(fbuf);
-				BufferedReader in = new BufferedReader( new InputStreamReader(bin));
+				BufferedReader in = new BufferedReader( new InputStreamReader(bin, "UTF-8"));
 
 				// If the method is POST, there may be parameters
 				// in data section, too, read it:
@@ -379,6 +379,16 @@ public class NanoHTTPD
 
 						decodeMultipartData(boundary, fbuf, in, parms, files);
 					}
+					else if (contentType.toLowerCase().startsWith("application/json")) 
+					{
+						StringBuffer sb = new StringBuffer();
+						String line = null;
+						while ((line = in.readLine()) != null) 
+						{
+							sb.append(line + "\n");
+						}
+						parms.put("json", sb.toString());
+					}
 					else
 					{
 						// Handle application/x-www-form-urlencoded

metadata

@@ -1,88 +1,89 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: calabash-android
-version: !ruby/object:Gem::Version
-  version: 0.2.12
+version: !ruby/object:Gem::Version 
+  hash: 13
   prerelease: 
+  segments: 
+  - 0
+  - 2
+  - 13
+  version: 0.2.13
 platform: ruby
-authors:
+authors: 
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-27 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-08-31 00:00:00 +02:00
+default_executable: 
+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
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: json
   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
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: slowhandcuke
   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
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: retriable
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: ! 'calabash-android drives tests for native  and hybrid Android apps. '
-email:
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
+description: "calabash-android drives tests for native  and hybrid Android apps. "
+email: 
 - jonas@lesspainful.com
-executables:
+executables: 
 - calabash-android
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .calabash_settings
 - CHANGES.txt
 - Gemfile
@@ -654,28 +655,39 @@ files:
 - test-server/instrumentation-backend/src/sh/calaba/org/codehaus/jackson/util/package-info.java
 - test-server/calabash-js/src/calabash.js
 - test-server/calabash-js/src/set_text.js
+has_rdoc: true
 homepage: http://github.com/calabash
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Client for calabash-android for automated functional testing on Android
 test_files: []
+