updated gems

.gitignore

@@ -40,3 +40,5 @@ pkg
 #
 # For vim:
 #*.swp
+
+.idea

Gemfile

@@ -3,10 +3,10 @@ source "http://rubygems.org"
 gem "savon"
 
 group :development do
-  gem "rspec", "~> 2.3.0"
-  gem "yard", "~> 0.6.0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
+  gem "rspec", "~> 2.14.1"
+  gem "yard", "~> 0.8.7.2"
+  gem "bundler", "~> 1.3.5"
+  gem "jeweler", "~> 1.8.7"
   gem "rcov", ">= 0"
   gem "bluecloth"
 end

Gemfile.lock

@@ -1,47 +1,90 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    addressable (2.3.5)
+    akami (1.2.0)
+      gyoku (>= 0.4.0)
+      nokogiri (>= 1.4.0)
     bluecloth (2.1.0)
-    builder (2.1.2)
-    crack (0.1.8)
-    diff-lcs (1.1.2)
-    git (1.2.5)
-    gyoku (0.3.1)
+    builder (3.2.2)
+    diff-lcs (1.2.4)
+    faraday (0.8.8)
+      multipart-post (~> 1.2.0)
+    git (1.2.6)
+    github_api (0.10.1)
+      addressable
+      faraday (~> 0.8.1)
+      hashie (>= 1.2)
+      multi_json (~> 1.4)
+      nokogiri (~> 1.5.2)
+      oauth2
+    gyoku (1.1.0)
       builder (>= 2.1.2)
-    httpi (0.9.0)
-      ntlm-http (>= 0.1.1)
+    hashie (2.0.5)
+    highline (1.6.19)
+    httpauth (0.2.0)
+    httpi (2.1.0)
       rack
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
+      rubyntlm (~> 0.3.2)
+    jeweler (1.8.7)
+      builder
+      bundler (~> 1.0)
       git (>= 1.2.5)
+      github_api (= 0.10.1)
+      highline (>= 1.6.15)
+      nokogiri (= 1.5.10)
       rake
-    ntlm-http (0.1.1)
-    rack (1.2.1)
-    rake (0.8.7)
+      rdoc
+    json (1.8.0)
+    jwt (0.1.8)
+      multi_json (>= 1.5)
+    multi_json (1.8.1)
+    multi_xml (0.5.5)
+    multipart-post (1.2.0)
+    nokogiri (1.5.10)
+    nori (2.3.0)
+    oauth2 (0.9.2)
+      faraday (~> 0.8)
+      httpauth (~> 0.2)
+      jwt (~> 0.1.4)
+      multi_json (~> 1.0)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    rack (1.5.2)
+    rake (10.1.0)
     rcov (0.9.9)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
-    savon (0.8.6)
+    rdoc (4.0.1)
+      json (~> 1.4)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.5)
+    rspec-expectations (2.14.3)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.3)
+    rubyntlm (0.3.4)
+    savon (2.3.0)
+      akami (~> 1.2.0)
       builder (>= 2.1.2)
-      crack (~> 0.1.8)
-      gyoku (>= 0.3.0)
-      httpi (>= 0.7.8)
-    yard (0.6.4)
+      gyoku (~> 1.1.0)
+      httpi (~> 2.1.0)
+      nokogiri (>= 1.4.0, < 1.6)
+      nori (~> 2.3.0)
+      wasabi (~> 3.2.0)
+    wasabi (3.2.0)
+      httpi (~> 2.0)
+      nokogiri (>= 1.4.0, < 1.6)
+    yard (0.8.7.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bluecloth
-  bundler (~> 1.0.0)
-  jeweler (~> 1.5.2)
+  bundler (~> 1.3.5)
+  jeweler (~> 1.8.7)
   rcov
-  rspec (~> 2.3.0)
+  rspec (~> 2.14.1)
   savon
-  yard (~> 0.6.0)
+  yard (~> 0.8.7.2)

examples/example.rb

@@ -1,10 +1,11 @@
 require 'rubygems'
-require 'awesome_print'
-require 'lib/voxbone'
+require 'voxbone'
+require 'pp'
 
 voxbone = Voxbone.new(:username   => 'test', 
                       :password   => 'test',
-                      :base_uri   => 'http://sandbox.voxbone.com/VoxAPI/services/VoxAPI?wsdl',
+                      :wsdl   => 'http://sandbox.voxbone.com/VoxAPI/services/VoxAPI?WSDL',
+                      :endpoint => 'http://sandbox.voxbone.com/VoxAPI/services/VoxAPI',
                       :log_level  => :debug)
 
-ap voxbone.get_countries_list(:type => 'GEOGRAPHIC')
+pp voxbone.get_countries_list(:type => 'GEOGRAPHIC')

lib/voxbone/voxbone.rb

@@ -20,15 +20,9 @@ def initialize(params)
     raise ArgumentError, ":username required" if params[:username].nil?
     raise ArgumentError, ":password required" if params[:password].nil?
 
-    config_savon(params)
     @user_token = create_user_token(params)
-
-    @client = Savon::Client.new do
-      wsdl.document  = params[:base_uri] || 'http://www.voxbone.com/VoxAPI/services/VoxAPI?WSDL'
-      wsdl.namespace = 'http://www.voxbone.com/VoxAPI'
-    end
-
-    @methods = @client.wsdl.soap_actions
+    @client = savon_client(params)
+    @methods = @client.operations
   end
 
   ##
@@ -43,31 +37,32 @@ def initialize(params)
   def method_missing(method_name, *args)
     if @methods.include? method_name
       params = (args.first || {}).merge(@user_token)
-      response = @client.request :vox, method_name do
-        soap.body = capitalize_params(params)
-      end
+      message = { :message => capitalize_params(params) }
+      response = @client.call method_name, message
       response.to_hash
     else
       raise NoMethodError, "The method #{method_name.to_s} does not exist."
     end
   end
 
-  private 
-
+  private
   ##
-  # Configures Savon
+  # Returns configured Savon client
   #
-  # @param [required, Hash] params 
-  # @option params [optional, String] :log_level to set for Savon
-  def config_savon(params)
-    Savon.configure do |config|
-      if params[:log_level]
-        config.log = true
-        config.log_level = params[:log_level]
-      else
-        config.log = false
-      end
+  # @param [required, Hash] configuration params
+  def savon_client(params)
+    savon_params = {
+      :wsdl => params[:wsdl] || 'http://www.voxbone.com/VoxAPI/services/VoxAPI?WSDL',
+      :namespace => 'http://www.voxbone.com/VoxAPI',
+      :log => false
+    }
+
+    if params[:log_level]
+      savon_params[:log] = true
+      savon_params[:log_level] = params[:log_level]
     end
+
+    Savon.client(savon_params)
   end
 
   ##

voxbone.gemspec

@@ -46,33 +46,30 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<savon>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_runtime_dependency(%q<savon>, ["~> 2.3.0"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.14.1"])
+      s.add_development_dependency(%q<yard>, ["~> 0.8.7.2"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.3.5"])
+      s.add_development_dependency(%q<jeweler>, ["~> 1.8.7"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<bluecloth>, [">= 0"])
-      s.add_runtime_dependency(%q<savon>, [">= 0"])
     else
-      s.add_dependency(%q<savon>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-      s.add_dependency(%q<yard>, ["~> 0.6.0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+      s.add_dependency(%q<savon>, ["~> 2.3.0"])
+      s.add_dependency(%q<rspec>, ["~> 2.14.1"])
+      s.add_dependency(%q<yard>, ["~> 0.8.7.2"])
+      s.add_dependency(%q<bundler>, ["~> 1.3.5"])
+      s.add_dependency(%q<jeweler>, ["~> 1.8.7"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<bluecloth>, [">= 0"])
-      s.add_dependency(%q<savon>, [">= 0"])
     end
   else
-    s.add_dependency(%q<savon>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2.3.0"])
-    s.add_dependency(%q<yard>, ["~> 0.6.0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
+    s.add_dependency(%q<savon>, ["~> 2.3.0"])
+    s.add_dependency(%q<rspec>, ["~> 2.14.1"])
+    s.add_dependency(%q<yard>, ["~> 0.8.7.2"])
+    s.add_dependency(%q<bundler>, ["~> 1.3.5"])
+    s.add_dependency(%q<jeweler>, ["~> 1.8.7"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<bluecloth>, [">= 0"])
-    s.add_dependency(%q<savon>, [">= 0"])
   end
 end