tropo_rest 0.0.3 → 0.0.4

data/lib/tropo_rest/client/session.rb

@@ -11,8 +11,9 @@ module TropoRest
       # @return [Hashie::Mash] The session object.
       # @see https://www.tropo.com/docs/rest/starting_session.htm
       def create_session(token, params={})
-        params.merge! 'action' => 'create', 'token' => token
-        get(PLURAL_PATH, params)
+        params.merge!('token' => token)
+        params.merge!(params) { |k,v| v.to_s } # custom parameters must be strings
+        post(PLURAL_PATH, params)
       end
 
     end

data/lib/tropo_rest/connection.rb

@@ -8,18 +8,17 @@ module TropoRest
   module Connection
     private
 
-    def connection(url, format, resource)
+    def connection(url, resource)
       options = {
-        :headers => {'Accept' => "application/#{format}", 'User-Agent' => user_agent},
+        :headers => {'Accept' => "application/json", 'User-Agent' => user_agent},
         :url => url
       }
 
       Faraday::Connection.new(options) do |connection|
-        connection.use Faraday::Request::SerializeJson if format.to_sym == :json
+        connection.use Faraday::Request::SerializeJson
         connection.adapter(adapter)
         connection.basic_auth(username, password)
-        connection.use Faraday::Response::ParseJson if format.to_sym == :json
-        connection.use Faraday::Response::ParseXml if format.to_sym == :xml
+        connection.use Faraday::Response::ParseJson
         connection.use Faraday::Response::Resource, resource
         connection.use Faraday::Response::RaiseHttpErrors
       end

data/lib/tropo_rest/request.rb

@@ -47,11 +47,9 @@ module TropoRest
       path, resource, options = extract_request_args!(*args)
 
       # Do we need the session endpoint?
-      url     = path =~ /^\/?sessions/ ? session_endpoint : endpoint
-      # Need to parse XML for creating a session, but JSON for signals and everything else
-      format  = path =~ /^\/?sessions$/ ? :xml : :json
+      url = path =~ /^\/?sessions/ ? session_endpoint : endpoint
 
-      response = connection(url, format, resource).send(method) do |request|
+      response = connection(url, resource).send(method) do |request|
         case method
         when :get, :delete
           request.url(path, options)

data/lib/tropo_rest/version.rb

@@ -1,3 +1,3 @@
 module TropoRest
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/spec_helper.rb

@@ -39,18 +39,10 @@ def stub_put(path)
   stub_request(:put, tropo_url_for(path))
 end
 
-def a_session_get(path)
-  a_request(:get, tropo_session_url_for(path))
-end
-
 def a_session_post(path)
   a_request(:post, tropo_session_url_for(path))
 end
 
-def stub_session_get(path)
-  stub_request(:get, tropo_session_url_for(path))
-end
-
 def stub_session_post(path)
   stub_request(:post, tropo_session_url_for(path))
 end

data/spec/tropo_rest/client/session_spec.rb

@@ -9,37 +9,48 @@ describe TropoRest::Client do
   describe "#create_session" do
 
     before do
-      @params = {'token' => 'TOKEN', 'action' => 'create'}
-      stub_session_get("sessions").
-        with(:query => @params).
-        to_return(:body => <<-XML
-        <session>
-            <success>true</success>
-            <token>TOKEN</token>
-        </session>
-        XML
+      @params = {'token' => 'TOKEN'}
+      stub_session_post("sessions").
+        with(:body => @params).
+        to_return(:body => <<-JSON
+          {
+            "success": true,
+            "token": "TOKEN",
+            "id": "ID"
+          }
+          JSON
       )
     end
 
     it "should make the request" do
       @client.create_session("TOKEN")
-      a_session_get("sessions").
-        with(:query => @params).should have_been_made
+      a_session_post("sessions").
+        with(:body => @params).should have_been_made
     end
 
     it "should make the request with parameters" do
-      params  = {'phone_number' => '+19995551234', 'name' => 'Billy Gnosis'}
-      query   = params.merge('action' => 'create', 'token' => 'TOKEN')
-      stub_session_get("sessions").
-        with(:query => query)
-      @client.create_session("TOKEN", params)
-      a_session_get("sessions").
-        with(:query => query).should have_been_made
+      args   = {'phone_number' => '+19995551234', 'name' => 'Billy Gnosis'}
+      params = args.merge('token' => 'TOKEN')
+      stub_session_post("sessions").
+        with(:body => params)
+      @client.create_session("TOKEN", args)
+      a_session_post("sessions").
+        with(:body => params).should have_been_made
+    end
+
+    it "should convert all parameters to strings" do
+      args   = {'dollars' => 123.45, 'count' => 1}
+      params = {'dollars' => '123.45', 'count' => '1', 'token' => 'TOKEN'}
+      stub_session_post("sessions").
+        with(:body => params)
+      @client.create_session("TOKEN", args)
+      a_session_post("sessions").
+        with(:body => params).should have_been_made
     end
 
     it "should return the session object" do
       res = @client.create_session("TOKEN")
-      res.session.should == {'success' => 'true', 'token' => 'TOKEN'}
+      res.should == {'success' => true, 'token' => 'TOKEN', 'id' => 'ID'}
     end
 
   end

data/spec/tropo_rest/client_spec.rb

@@ -121,11 +121,11 @@ describe TropoRest::Client do
         a_request(:get, "https://api.tropo.com/1.0/sessions").should have_been_made
       end
 
-      it "should send XML Accept header for session requests" do
-        params = {'action' => 'create', 'token' => 'TOKEN'}
-        stub_session_get("sessions").with(:query => params)
-        @client.get("sessions", params)
-        a_session_get("sessions").with(:query => params, :headers => {"Accept" => "application/xml"}).should have_been_made
+      it "should send JSON Accept header for session requests" do
+        params = {'token' => 'TOKEN'}
+        stub_session_post("sessions").with(:body => params)
+        @client.post("sessions", params)
+        a_session_post("sessions").with(:body => params, :headers => {"Accept" => "application/json"}).should have_been_made
       end
 
       context "signals" do

data/tropo_rest.gemspec

@@ -41,7 +41,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "faraday", "~> 0.5.3"
   s.add_runtime_dependency "faraday_middleware", "~> 0.3.1"
   s.add_runtime_dependency "multi_json", "~> 0.0.5"
-  s.add_runtime_dependency "multi_xml", "~> 0.2.0"
   s.add_runtime_dependency "hashie", "~> 0.4.0"
 
   s.files        = `git ls-files`.split("\n")

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Christopher Durtschi
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-09 00:00:00 -07:00
+date: 2011-02-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -224,24 +224,9 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: *id014
-- !ruby/object:Gem::Dependency 
-  name: multi_xml
-  requirement: &id015 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 2
-        - 0
-        version: 0.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: hashie
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -253,7 +238,7 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *id016
+  version_requirements: *id015
 description: A simple wrapper for the Tropo REST API to manipulate applications, addresses, exchanges, sessions.
 email: 
 - christopher.durtschi@gmail.com
@@ -318,7 +303,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2424205396918740897
+      hash: 1625226992280391260
       segments: 
       - 0
       version: "0"