qst_client 0.2 → 0.3

data/lib/qst_client.rb

@@ -11,8 +11,7 @@
 #
 #   client = QstClient.new 'service_url', 'username', 'psasword'
 #   last_id = client.put_messages [{'id' => '2', 'from' => 'sms://1234', 'to' => 'sms://5678', 'text' => 'Hello!', 'properties' => {'foo' => 'bar'}}]
-#   messages = client.get_messages
-#   messages = client.get_messages 'from_id'
+#   messages = client.get_messages :from_id => 'some_id', :max => 5
 require 'rubygems'
 require 'httparty'
 require 'builder'
@@ -39,10 +38,16 @@ class QstClient
     response['etag']
   end
   
-  # Get messages from the server, optionally saying from which id to start.
+  # Get messages from the server.
   # Returns an array of hashes similar to the one you would use to put_messages.
-  def get_messages(from_id = nil)
-    response = self.class.get "#{@url}/outgoing", :basic_auth => @auth
+  # Options:
+  #  - :from_id: the id from which to return messages, exclusive
+  #  - :max: the maximum amount of messages to get
+  def get_messages(options = {:max => 10})
+    params = {:basic_auth => @auth}
+    params[:headers] = {'if-none-match' => options[:from_id]} if options[:from_id] 
+  
+    response = self.class.get "#{@url}/outgoing?max=#{options[:max]}", params 
     raise QstClient::Exception.new response unless (200 ... 400).include? response.code
     
     messages = []
@@ -110,7 +115,6 @@ class QstClient
   
     response = self.class.post "#{@url}/incoming", :basic_auth => @auth, :body => xml.target!, :headers => {'Content-Type' => 'application/xml'}
     raise QstClient::Exception.new response unless (200 ... 400).include? response.code
-    response['etag']
   end
 
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: qst_client
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
-  - 2
-  version: "0.2"
+  - 3
+  version: "0.3"
 platform: ruby
 authors: 
 - InsTEDD