nuntium_api 0.6 → 0.7

data/lib/nuntium.rb

@@ -21,7 +21,8 @@ class Nuntium
   # Gets a country given its iso2 or iso3 code, or nil if a country with that iso does not exist.
   def country(iso)
     c = self.class.get "#{@url}/api/countries/#{iso}.json"
-    c.class <= String ? nil : c
+    return nil if c.class <= String
+    c
   end
   
   # Gets the list of carriers known to Nuntium that belong to a country, given its
@@ -37,34 +38,43 @@ class Nuntium
   # Gets a carrier given its guid, or nil if a carrier with that guid does not exist.
   def carrier(guid)
     c = self.class.get "#{@url}/api/carriers/#{guid}.json"
-    c.class <= String ? nil : c
+    return nil if c.class <= String
+    c
   end
   
   # Returns the list of channels belonging to the application or that don't
   # belong to any application.
   def channels
-    self.class.get "#{@url}/api/channels.json", :basic_auth => @auth
+    chans = self.class.get "#{@url}/api/channels.json", :basic_auth => @auth
+    return nil if chans.class <= String
+    chans.each do |channel|
+      read_configuration channel
+    end
   end
   
   # Returns a chnanel given its name, or nil if the channel doesn't exist
   def channel(name)
-    c = self.class.get "#{@url}/api/channels/#{name}.json", :basic_auth => @auth
-    c.class <= String ? nil : c
+    channel = self.class.get "#{@url}/api/channels/#{name}.json", :basic_auth => @auth
+    return nil if channel.class <= String
+    read_configuration channel
+    channel
   end
   
   # Creates a channel.
   # Example:
   #   create_channel :name => 'foo', :kind => 'qst_server', :protocol => 'sms',
-  #     :configuration => [{:name => 'password', :value => 'bar'}]
+  #     :configuration => {:password => 'bar'}
   def create_channel(channel)
+    write_configuration channel
     self.class.post "#{@url}/api/channels.json", :basic_auth => @auth, :body => channel
   end
   
   # Creates a channel.
   # Example:
   #   update_channel :name => 'foo', :kind => 'qst_server', :protocol => 'sms',
-  #     :configuration => [{:name => 'password', :value => 'bar'}]
+  #     :configuration => {:password => 'bar'}
   def update_channel(channel)
+    write_configuration channel
     self.class.put "#{@url}/api/channels/#{channel['name']}.json", :basic_auth => @auth, :body => channel
   end
   
@@ -79,7 +89,11 @@ class Nuntium
   #   candidate_channels_for_ao :from => 'sms://1', :to => 'sms://2', 
   #     :subject => 'hello', :body => 'hi!'
   def candidate_channels_for_ao(message)
-    self.class.get "#{@url}/api/candidate/channels.json", :basic_auth => @auth, :body => message
+    chans = self.class.get "#{@url}/api/candidate/channels.json", :basic_auth => @auth, :body => message
+    return nil if chans.class <= String
+    chans.each do |channel|
+      read_configuration channel
+    end
   end
   
   # Sends an AO message.
@@ -89,4 +103,22 @@ class Nuntium
     self.class.post "#{@url}/#{@account}/#{@application}/send_ao", :basic_auth => @auth, :body => message
   end
   
+  private 
+  
+  def write_configuration(channel)
+    configuration = []
+    channel[:configuration].each do |name, value|
+      configuration << {:name => name, :value => value} 
+    end
+    channel[:configuration] = configuration
+  end 
+  
+  def read_configuration(channel)
+    configuration = {}
+    channel['configuration'].each do |hash|
+      configuration[hash['name']] = hash['value'] 
+    end
+    channel['configuration'] = configuration
+  end
+  
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: nuntium_api
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
-  - 6
-  version: "0.6"
+  - 7
+  version: "0.7"
 platform: ruby
 authors: 
 - InsTEDD