verboice 0.1.1 → 0.2.0

data/lib/verboice.rb

@@ -8,28 +8,115 @@
 #
 #   api = Verboice.new 'service_url', 'account_name', 'account_password', 'channel'
 require 'rubygems'
-require 'httparty'
+require 'net/http'
 require 'json'
+require 'rest_client'
+require 'cgi'
+require File.expand_path('../verboice/exception', __FILE__)
 
 # Provides access to the Verboice Public API.
 class Verboice
-  include HTTParty
-
-  # Creates an application-authenticated Verboice api access.
+  # Creates an account-authenticated Verboice api access.
   def initialize(url, account, password, default_channel = nil)
     @url = url
     @account = account
     @password = password
     @default_channel = default_channel
-    @auth = {:username => account, :password => password}
+    @options = {
+      :user => account,
+      :password => password,
+      :headers => {:content_type => 'application/json'},
+    }
   end
-  
+
   def call address, channel = @default_channel
-    self.class.get "#{@url}/api/call", :query => {:channel => channel, :address => address}, :basic_auth => @auth
+    get_json "/api/call?#{self.class.to_query :channel => channel, :address => address}"
   end
-  
+
   def call_state id
-    self.class.get "#{@url}/api/call/#{id}/state", :basic_auth => @auth
+    get_json "/api/call/#{id}/state"
+  end
+
+  def create_channel(channel)
+    post "/api/channels.json", channel.to_json do |response, error|
+      handle_channel_error error if error
+
+      channel = JSON.parse response.body
+      with_indifferent_access channel
+    end
+  end
+
+  # Deletes a chnanel given its name.
+  #
+  # Raises Verboice::Exception if something goes wrong.
+  def delete_channel(name)
+    delete "/api/channels/#{name}" do |response, error|
+      raise Verboice::Exception.new error.message if error
+
+      response
+    end
+  end
+
+  private
+
+  def get(path)
+    resource = RestClient::Resource.new @url, @options
+    resource = resource[path].get
+    yield resource, nil
+  rescue => ex
+    yield nil, ex
   end
 
+  def get_json(path)
+    get(path) do |response, error|
+      raise Verboice::Exception.new error.message if error
+
+      elem = JSON.parse response.body
+      elem.map! { |x| with_indifferent_access x } if elem.is_a? Array
+      elem
+    end
+  end
+
+  def post(path, data)
+    resource = RestClient::Resource.new @url, @options
+    resource = resource[path].post(data)
+    yield resource, nil
+  rescue => ex
+    yield nil, ex
+  end
+
+  def delete(path)
+    resource = RestClient::Resource.new @url, @options
+    resource = resource[path].delete
+    yield resource, nil
+  rescue => ex
+    yield nil, ex
+  end
+
+  def self.to_query(hash)
+    query = ''
+    first = true
+    hash.each do |key, value|
+      query << '&' unless first
+      query << key.to_s
+      query << '='
+      query << CGI.escape(value.to_s)
+      first = false
+    end
+    query
+  end
+
+  def handle_channel_error(error)
+    if error.is_a? RestClient::BadRequest
+      response = JSON.parse error.response.body
+      raise Verboice::Exception.new response['summary'], Hash[response['properties'].map {|e| [e.keys[0], e.values[0]]}]
+    else
+      raise Verboice::Exception.new error.message
+    end
+  end
+
+  def with_indifferent_access(hash)
+    hash = hash.with_indifferent_access if hash.respond_to? :with_indifferent_access
+    hash
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: verboice
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - InSTEDD
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-10 00:00:00 Z
+date: 2011-11-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: httparty
@@ -84,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: Access the Verboice API in ruby