Merge pull request #28 from open-ndc/dev

Dev

lib/ndc_ex.ex

@@ -1,7 +1,6 @@
 defmodule NDCEx do
   require HTTPotion
   require Logger
-  import SweetXml
   @acceptable_ndc_methods [ AirShopping: ["AirShoppingRQ", "AirShoppingRS"],
                             FlightPrice: ["FlightPriceRQ", "FlightPriceRS"],
                             SeatAvailability: ["SeatAvailabilityRQ", "SeatAvailabilityRS"],
@@ -15,39 +14,35 @@ defmodule NDCEx do
                           ]
 
   def request(method, params) do
-    try do
     [request_name, response_name] = @acceptable_ndc_methods[method]
 
     :ndc
     |> get_mix_config
     |> NDCEx.Message.Base.build_document(request_name, params)
     |> rest_call_with_message(get_mix_config(:rest))
-    rescue
-      e -> {:error, error_message(e.message)}
-    end
   end
 
   def rest_call_with_message(xml, rest_config) do
     Logger.debug xml
-    try do
-      case HTTPotion.post rest_config[:url], [body: xml, headers: rest_config[:headers]] do
-        %HTTPotion.Response{body: body, headers: _headers, status_code: 200 } ->
-          {:ok, Exmerl.parse(body)}
-        %HTTPotion.Response{body: body, headers: _headers, status_code: _status_code } ->
-          {:error, Exmerl.parse(body)}
-          apply(NDCEx.Response.Error, :convert, [body])
-        %HTTPotion.Response{status_code: 404} ->
-          {:error, error_message("Request does not exist")}
-        _ ->
-          {:error, error_message("Unknown Error")}
-      end
-    rescue
-      e -> {:error, error_message(e.message)}
+    case HTTPotion.post rest_config[:url], [body: xml, headers: rest_config[:headers]] do
+      %HTTPotion.Response{body: body, headers: _headers, status_code: 200 } ->
+        {:ok, scan body}
+      %HTTPotion.Response{body: body, headers: _headers, status_code: _status_code } ->
+        {:error, scan body}
+      %HTTPotion.Response{status_code: 404} ->
+        {:error, error_message("Request does not exist")}
+      _ ->
+        {:error, error_message("Unknown Error")}
     end
   end
 
+  def scan(doc) do
+    { response, _ } = doc |> String.to_char_list |> :xmerl_scan.string
+    response
+  end
+
   defp error_message(message) do
-    Exmerl.parse "<error><message>#{message}</message></error>"
+    scan "<error><message>#{message}</message></error>"
   end
 
   def get_mix_config(key) when is_atom(key) do

mix.exs

@@ -39,11 +39,9 @@ defmodule NDCExSdk.Mixfile do
   defp deps do
     [
       {:xml_builder, "0.0.8"},
-      {:exmerl, "~> 0.1.1"},
       {:pipe, "~> 0.0.2"},
       {:ibrowse, github: "cmullaparthi/ibrowse", tag: "v4.1.2"},
       {:httpotion, "~> 2.1.0"},
-      {:sweet_xml, "~> 0.5.0"},
       {:credo, "~> 0.2", only: [:dev, :test]}
     ]
   end

test/seat_availability_test.exs

@@ -1,7 +1,6 @@
 defmodule SeatAvailabilityTest do
   require Logger
   use ExUnit.Case
-  require HTTPotion
   doctest NDCEx
 
 	@seat_params  [

test/service_list_test.exs

@@ -1,9 +1,10 @@
 defmodule ServiceListTest do
   require Logger
+  require Record
   use ExUnit.Case
-  require HTTPotion
   doctest NDCEx
-	import SweetXml
+  Record.defrecord :xmlElement, Record.extract(:xmlElement, from_lib: "xmerl/include/xmerl.hrl")
+  Record.defrecord :xmlText, Record.extract(:xmlText, from_lib: "xmerl/include/xmerl.hrl")
 
   @valid_core_query_params [
                   CoreQuery: [
@@ -23,15 +24,16 @@ defmodule ServiceListTest do
 
   test "Call ServiceList request" do
     {_, xml} = NDCEx.request(:AirShopping, @valid_core_query_params)
-		response_id = xml |> xpath(~x"//AirShoppingRS/ShoppingResponseIDs/ResponseID/text()")
+    [element] = :xmerl_xpath.string('/AirShoppingRS/ShoppingResponseIDs/ResponseID', xml)
+    [text] = xmlElement(element, :content)
+    response_id = xmlText(text, :value)
 		params = [
 			ShoppingResponseIDs: [
-					ResponseID: response_id
+					ResponseID: to_string(response_id)
 				]
 			]
 
 		{status, body} = NDCEx.request(:ServiceList, params)
-    IO.inspect params
     IO.inspect body
     assert status == :ok
   end