nexmo 1.2.0 → 1.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ae52a9612e17e4e82d62b525f27b1d02523f6d34
+  data.tar.gz: e0fb13b7e0989a6f591102ff5583120006df6270
+SHA512:
+  metadata.gz: a9bbfbdf2791eff805283d71bad2812a0900b8e6afee3104e6387136112fe5d303f0557f2a35e09165e57a9e1ab7b693ccea95b7b07c8c79bafaed070be50fc1
+  data.tar.gz: dc9656dd961d47e4a908077f0fb1b80f1b7fac12f4d410c75b7495f3a10b3ce1f7ee215e1f02c971f80dd6bf5ba529e7ca2fa4e40fc4f4e84ef443144c0cf645

data/README.md

@@ -111,7 +111,7 @@ Troubleshooting
 
 Remember that phone numbers should be specified in international format.
 
-The Nexmo documentation contains a [list of error codes](http://nexmo.com/documentation/index.html#response_code)
+The Nexmo documentation contains a [list of error codes](https://docs.nexmo.com/index.php/sms-api/send-message#response_code)
 which may be useful if you have problems sending a message.
 
 Please report all bugs/issues via the GitHub issue tracker.

data/lib/nexmo.rb

@@ -16,7 +16,9 @@ module Nexmo
         @json = JSON
       end
 
-      @http = Net::HTTP.new('rest.nexmo.com', Net::HTTP.https_default_port)
+      @host = options.fetch(:host) { 'rest.nexmo.com' }
+
+      @http = Net::HTTP.new(@host, Net::HTTP.https_default_port)
 
       @http.use_ssl = true
     end
@@ -65,6 +67,18 @@ module Nexmo
       get('/number/search', {:country => country_code}.merge(params))
     end
 
+    def buy_number(params)
+      post('/number/buy', params)
+    end
+
+    def cancel_number(params)
+      post('/number/cancel', params)
+    end
+
+    def update_number(params)
+      post('/number/update', params)
+    end
+
     def get_message(id)
       get('/search/message', {:id => id})
     end

data/nexmo.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'nexmo'
-  s.version = '1.2.0'
+  s.version = '1.3.0'
   s.platform = Gem::Platform::RUBY
   s.authors = ['Tim Craft']
   s.email = ['mail@timcraft.com']
@@ -12,10 +12,11 @@ Gem::Specification.new do |s|
   s.add_development_dependency('mocha', '~> 0.13.2')
   s.add_development_dependency('oauth', '~> 0.4.7')
   s.add_development_dependency('faux', '~> 1.1.0')
+  s.add_development_dependency('webmock', '~> 1.17.0')
   s.require_path = 'lib'
 
   if RUBY_VERSION == '1.8.7'
-    s.add_development_dependency('minitest', '>= 4.2.0')
-    s.add_development_dependency('json', '>= 1.6.5')
+    s.add_development_dependency('minitest', '~> 4.2.0')
+    s.add_development_dependency('json', '~> 1.8.0')
   end
 end

data/spec/nexmo_spec.rb

@@ -1,4 +1,5 @@
 require 'minitest/autorun'
+require 'webmock/minitest'
 require 'mocha/setup'
 require 'faux'
 require 'nexmo'
@@ -7,19 +8,17 @@ require 'json'
 
 describe 'Nexmo::Client' do
   before do
-    @json_encoded_body = regexp_matches(/\{".+?":".+?"(,".+?":".+?")+\}/)
+    @base_url = 'https://rest.nexmo.com'
 
-    @http_header_hash = has_entry('Content-Type', 'application/json')
+    @json_object = {:body => /\{".+?":".+?"(,".+?":".+?")+\}/, :headers => {'Content-Type' => 'application/json'}}
+
+    @oauth_header = {'Authorization' => /\AOAuth .+\z/}
 
     @example_message_hash = {:from => 'ruby', :to => 'number', :text => 'Hey!'}
 
     @client = Nexmo::Client.new('key', 'secret')
   end
 
-  def expects_http_get(request_uri)
-    @client.http.expects(:get).with(has_equivalent_query_string(request_uri)).returns(stub)
-  end
-
   describe 'http method' do
     it 'returns a net http object that uses ssl' do
       @client.http.must_be_instance_of(Net::HTTP)
@@ -30,7 +29,7 @@ describe 'Nexmo::Client' do
 
   describe 'send_message method' do
     it 'posts to the sms json resource and returns a response object' do
-      @client.http.expects(:post).with('/sms/json', @json_encoded_body, @http_header_hash).returns(stub)
+      stub_request(:post, "#@base_url/sms/json").with(@json_object)
 
       @client.send_message(@example_message_hash).must_be_instance_of(Nexmo::Response)
     end
@@ -42,25 +41,25 @@ describe 'Nexmo::Client' do
     end
 
     it 'posts to the sms json resource and returns the message id' do
-      @http_response.stubs(:body).returns('{"messages":[{"status":0,"message-id":"id"}]}')
-
-      @client.http.expects(:post).with('/sms/json', @json_encoded_body, @http_header_hash).returns(@http_response)
+      stub_request(:post, "#@base_url/sms/json").with(@json_object).to_return({
+        :headers => {'Content-Type' => 'application/json'},
+        :body => '{"messages":[{"status":0,"message-id":"id"}]}'
+      })
 
       @client.send_message!(@example_message_hash).must_equal('id')
     end
 
     it 'raises an exception if the response code is not expected' do
-      @http_response.stubs(:code).returns('500')
-
-      @client.http.stubs(:post).returns(@http_response)
+      stub_request(:post, "#@base_url/sms/json").with(@json_object).to_return(:status => 500)
 
       proc { @client.send_message!(@example_message_hash) }.must_raise(Nexmo::Error)
     end
 
     it 'raises an exception if the response body contains an error' do
-      @http_response.stubs(:body).returns('{"messages":[{"status":2,"error-text":"Missing from param"}]}')
-
-      @client.http.stubs(:post).returns(@http_response)
+      stub_request(:post, "#@base_url/sms/json").with(@json_object).to_return({
+        :headers => {'Content-Type' => 'application/json'},
+        :body => '{"messages":[{"status":2,"error-text":"Missing from param"}]}'
+      })
 
       proc { @client.send_message!(@example_message_hash) }.must_raise(Nexmo::Error)
     end
@@ -68,7 +67,7 @@ describe 'Nexmo::Client' do
 
   describe 'get_balance method' do
     it 'fetches the account balance resource and returns a response object' do
-      expects_http_get '/account/get-balance?api_key=key&api_secret=secret'
+      stub_request(:get, "#@base_url/account/get-balance?api_key=key&api_secret=secret")
 
       @client.get_balance.must_be_instance_of(Nexmo::Response)
     end
@@ -76,7 +75,7 @@ describe 'Nexmo::Client' do
 
   describe 'get_country_pricing method' do
     it 'fetches the outbound pricing resource for the given country and returns a response object' do
-      expects_http_get '/account/get-pricing/outbound?api_key=key&api_secret=secret&country=CA'
+      stub_request(:get, "#@base_url/account/get-pricing/outbound?api_key=key&api_secret=secret&country=CA")
 
       @client.get_country_pricing(:CA).must_be_instance_of(Nexmo::Response)
     end
@@ -84,7 +83,7 @@ describe 'Nexmo::Client' do
 
   describe 'get_prefix_pricing method' do
     it 'fetches the outbound pricing resource for the given prefix and returns a response object' do
-      expects_http_get '/account/get-prefix-pricing/outbound?api_key=key&api_secret=secret&prefix=44'
+      stub_request(:get, "#@base_url/account/get-prefix-pricing/outbound?api_key=key&api_secret=secret&prefix=44")
 
       @client.get_prefix_pricing(44).must_be_instance_of(Nexmo::Response)
     end
@@ -92,7 +91,7 @@ describe 'Nexmo::Client' do
 
   describe 'get_account_numbers method' do
     it 'fetches the account numbers resource with the given parameters and returns a response object' do
-      expects_http_get '/account/numbers?api_key=key&api_secret=secret&size=25&pattern=33'
+      stub_request(:get, "#@base_url/account/numbers?api_key=key&api_secret=secret&size=25&pattern=33")
 
       @client.get_account_numbers(:size => 25, :pattern => 33).must_be_instance_of(Nexmo::Response)
     end
@@ -100,15 +99,39 @@ describe 'Nexmo::Client' do
 
   describe 'number_search method' do
     it 'fetches the number search resource for the given country with the given parameters and returns a response object' do
-      expects_http_get '/number/search?api_key=key&api_secret=secret&country=CA&size=25'
+      stub_request(:get, "#@base_url/number/search?api_key=key&api_secret=secret&country=CA&size=25")
 
       @client.number_search(:CA, :size => 25).must_be_instance_of(Nexmo::Response)
     end
   end
 
+  describe 'buy_number method' do
+    it 'purchases the number requested with the given parameters and returns a response object' do
+      stub_request(:post, "#@base_url/number/buy").with(@json_object)
+
+      @client.buy_number(:country => 'US', :msisdn => 'number').must_be_instance_of(Nexmo::Response)
+    end
+  end
+
+  describe 'cancel_number method' do
+    it 'cancels the number requested with the given parameters and returns a response object' do
+      stub_request(:post, "#@base_url/number/cancel").with(@json_object)
+
+      @client.cancel_number(:country => 'US', :msisdn => 'number').must_be_instance_of(Nexmo::Response)
+    end
+  end
+
+  describe 'update_number method' do
+    it 'updates the number requested with the given parameters and returns a response object' do
+      stub_request(:post, "#@base_url/number/update").with(@json_object)
+
+      @client.update_number(:country => 'US', :msisdn => 'number', :moHttpUrl => 'callback').must_be_instance_of(Nexmo::Response)
+    end
+  end
+
   describe 'get_message method' do
     it 'fetches the message search resource for the given message id and returns a response object' do
-      expects_http_get '/search/message?api_key=key&api_secret=secret&id=00A0B0C0'
+      stub_request(:get, "#@base_url/search/message?api_key=key&api_secret=secret&id=00A0B0C0")
 
       @client.get_message('00A0B0C0').must_be_instance_of(Nexmo::Response)
     end
@@ -116,7 +139,7 @@ describe 'Nexmo::Client' do
 
   describe 'get_message_rejections method' do
     it 'fetches the message rejections resource with the given parameters and returns a response object' do
-      expects_http_get '/search/rejections?api_key=key&api_secret=secret&date=YYYY-MM-DD'
+      stub_request(:get, "#@base_url/search/rejections?api_key=key&api_secret=secret&date=YYYY-MM-DD")
 
       @client.get_message_rejections(:date => 'YYYY-MM-DD').must_be_instance_of(Nexmo::Response)
     end
@@ -124,13 +147,13 @@ describe 'Nexmo::Client' do
 
   describe 'search_messages method' do
     it 'fetches the search messages resource with the given parameters and returns a response object' do
-      expects_http_get '/search/messages?api_key=key&api_secret=secret&date=YYYY-MM-DD&to=1234567890'
+      stub_request(:get, "#@base_url/search/messages?api_key=key&api_secret=secret&date=YYYY-MM-DD&to=1234567890")
 
       @client.search_messages(:date => 'YYYY-MM-DD', :to => 1234567890).must_be_instance_of(Nexmo::Response)
     end
 
     it 'should encode a non hash argument as a list of ids' do
-      expects_http_get '/search/messages?api_key=key&api_secret=secret&ids=id1&ids=id2'
+      stub_request(:get, "#@base_url/search/messages?api_key=key&api_secret=secret&ids=id1&ids=id2")
 
       @client.search_messages(%w(id1 id2))
     end
@@ -145,18 +168,18 @@ describe 'Nexmo::Client' do
       @client = Nexmo::Client.new
 
       @client.oauth_access_token = @oauth_access_token
-
-      @client.http = mock()
     end
 
     it 'makes get requests through the access token and returns a response object' do
-      @oauth_access_token.expects(:get).with('/account/get-pricing/outbound?country=CA').returns(stub)
+      stub_request(:get, "#@base_url/account/get-pricing/outbound?country=CA").with(:headers => @oauth_header)
 
       @client.get_country_pricing(:CA).must_be_instance_of(Nexmo::Response)
     end
 
     it 'makes post requests through the access token and returns a response object' do
-      @oauth_access_token.expects(:post).with('/sms/json', @json_encoded_body, @http_header_hash).returns(stub)
+      @json_object[:headers].merge!(@oauth_header)
+
+      stub_request(:post, "#@base_url/sms/json").with(@json_object)
 
       @client.send_message(@example_message_hash).must_be_instance_of(Nexmo::Response)
     end
@@ -199,6 +222,12 @@ describe 'Nexmo::Client' do
       @client.get_balance.must_equal(:return_value)
     end
   end
+
+  it 'provides an option for specifying a different hostname to connect to' do
+    @client = Nexmo::Client.new('key', 'secret', host: 'rest-sandbox.nexmo.com')
+
+    @client.http.address.must_equal('rest-sandbox.nexmo.com')
+  end
 end
 
 describe 'Nexmo::Response' do

metadata

@@ -1,80 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: nexmo
 version: !ruby/object:Gem::Version
-  version: 1.2.0
-  prerelease: 
+  version: 1.3.0
 platform: ruby
 authors:
 - Tim Craft
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-02 00:00:00.000000000 Z
+date: 2014-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.3
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.13.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.13.2
 - !ruby/object:Gem::Dependency
   name: oauth
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.7
 - !ruby/object:Gem::Dependency
   name: faux
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.17.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.17.0
 description: A Ruby wrapper for the Nexmo API
 email:
 - mail@timcraft.com
@@ -82,33 +87,31 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/nexmo.rb
-- spec/nexmo_spec.rb
 - README.md
+- lib/nexmo.rb
 - nexmo.gemspec
+- spec/nexmo_spec.rb
 homepage: http://github.com/timcraft/nexmo
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: See description
 test_files: []
-has_rdoc: