nexmos 0.2 → 0.3

data/spec/nexmos/number_spec.rb

@@ -2,63 +2,65 @@ require 'spec_helper'
 describe ::Nexmos::Number do
   let(:webmock_default_headers) do
     {
-        :headers => {
-            'Accept' => 'application/json',
-            'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
-            'User-Agent' => ::Nexmos.user_agent
-        }
+      :headers => {
+        'Accept'          => 'application/json',
+        'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
+        'User-Agent'      => ::Nexmos.user_agent
+      }
     }
   end
 
   let(:finland_numbers_search) do
-    {"numbers" => [
-      {"type" => "mobile-lvn",
-       "msisdn" => "3584573950816",
-       "country" => "FI",
-       "cost" => "3.00"},
-      {"type" => "mobile-lvn",
-       "msisdn" => "3584573950815",
-       "country" => "FI",
-       "cost" => "3.00"},
-      {"type" => "mobile-lvn",
-       "msisdn" => "3584573950814",
-       "country" => "FI",
-       "cost" => "3.00"},
-      {"type" => "mobile-lvn",
-       "msisdn" => "3584573950813",
-       "country" => "FI",
-       "cost" => "3.00"},
-      {"type" => "mobile-lvn",
-       "msisdn" => "3584573950812",
-       "country" => "FI",
-       "cost" => "3.00"},
-      {"type" => "mobile-lvn",
-       "msisdn" => "3584573950806",
-       "country" => "FI",
-       "cost" => "3.00"},
-      {"type" => "mobile-lvn",
-       "msisdn" => "3584573950805",
-       "country" => "FI",
-       "cost" => "3.00"},
-      {"type" => "mobile-lvn",
-       "msisdn" => "3584573950804",
-       "country" => "FI",
-       "cost" => "3.00"},
-      {"type" => "mobile-lvn",
-       "msisdn" => "3584573950798",
-       "country" => "FI",
-       "cost" => "3.00"},
-      {"type" => "mobile-lvn",
-       "msisdn" => "3584573950796",
-       "country" => "FI",
-       "cost" => "3.00"}],
-     "count" => 22}
+    {
+      "numbers" => [
+        { "type"    => "mobile-lvn",
+          "msisdn"  => "3584573950816",
+          "country" => "FI",
+          "cost"    => "3.00" },
+        { "type"    => "mobile-lvn",
+          "msisdn"  => "3584573950815",
+          "country" => "FI",
+          "cost"    => "3.00" },
+        { "type"    => "mobile-lvn",
+          "msisdn"  => "3584573950814",
+          "country" => "FI",
+          "cost"    => "3.00" },
+        { "type"    => "mobile-lvn",
+          "msisdn"  => "3584573950813",
+          "country" => "FI",
+          "cost"    => "3.00" },
+        { "type"    => "mobile-lvn",
+          "msisdn"  => "3584573950812",
+          "country" => "FI",
+          "cost"    => "3.00" },
+        { "type"    => "mobile-lvn",
+          "msisdn"  => "3584573950806",
+          "country" => "FI",
+          "cost"    => "3.00" },
+        { "type"    => "mobile-lvn",
+          "msisdn"  => "3584573950805",
+          "country" => "FI",
+          "cost"    => "3.00" },
+        { "type"    => "mobile-lvn",
+          "msisdn"  => "3584573950804",
+          "country" => "FI",
+          "cost"    => "3.00" },
+        { "type"    => "mobile-lvn",
+          "msisdn"  => "3584573950798",
+          "country" => "FI",
+          "cost"    => "3.00" },
+        { "type"    => "mobile-lvn",
+          "msisdn"  => "3584573950796",
+          "country" => "FI",
+          "cost"    => "3.00" }
+      ],
+      "count"   => 22 }.to_json
   end
 
   before(:each) do
     ::Nexmos.reset!
     ::Nexmos.setup do |c|
-      c.api_key = 'default_key'
+      c.api_key    = 'default_key'
       c.api_secret = 'default_secret'
     end
   end
@@ -72,15 +74,15 @@ describe ::Nexmos::Number do
 
     it 'should return list of numbers' do
       request = stub_request(:get, "https://rest.nexmo.com/number/search?api_key=default_key&api_secret=default_secret&country=FI").
-          with(webmock_default_headers).to_return(:status => 200, :body => finland_numbers_search, :headers => {})
-      res = subject.search(:country => 'FI')
-      res.should be_kind_of(::Hash)
-      res.success?.should be_true
-      res['count'].should == 22
-      res['numbers'].should be_kind_of(::Array)
-      res['numbers'].size.should == 10
-      res['numbers'].first.keys.sort.should == ["cost", "country", "msisdn", "type"]
-      request.should have_been_made.once
+        with(webmock_default_headers).to_return(:status => 200, :body => finland_numbers_search, :headers => {'Content-Type' => 'application/json'})
+      res     = subject.search(:country => 'FI')
+      expect(res).to be_kind_of(::Hash)
+      expect(res.success?).to be_truthy
+      expect(res['count']).to eq(22)
+      expect(res['numbers']).to be_kind_of(::Array)
+      expect(res['numbers'].size).to eq(10)
+      expect(res['numbers'].first.keys.sort).to eq(["cost", "country", "msisdn", "type"])
+      expect(request).to have_been_made.once
     end
   end
 
@@ -95,13 +97,13 @@ describe ::Nexmos::Number do
     it 'should buy number' do
       request = stub_request(:post, "https://rest.nexmo.com/number/buy").
         with(
-          :headers => {'Accept'=>'application/json', 'Content-Type'=>'application/x-www-form-urlencoded', 'User-Agent'=> ::Nexmos.user_agent},
-          :body => {"api_key"=>"default_key", "api_secret"=>"default_secret", "country"=>"FI", "msisdn"=>"3584573950816"}
-        ).to_return(:status => 200, :body => "", :headers => {})
-      res = subject.buy(:country => 'FI', :msisdn => '3584573950816' )
-      res.should be_kind_of(::Hash)
-      res.success?.should be_true
-      request.should have_been_made.once
+          :headers => { 'Accept' => 'application/json', 'Content-Type' => 'application/x-www-form-urlencoded', 'User-Agent' => ::Nexmos.user_agent },
+          :body    => { "api_key" => "default_key", "api_secret" => "default_secret", "country" => "FI", "msisdn" => "3584573950816" }
+        ).to_return(:status => 200, :body => "", :headers => {'Content-Type' => 'application/json'})
+      res     = subject.buy(:country => 'FI', :msisdn => '3584573950816')
+      expect(res).to be_kind_of(::Hash)
+      expect(res.success?).to be_truthy
+      expect(request).to have_been_made.once
     end
 
   end

data/spec/nexmos_spec.rb

@@ -3,14 +3,29 @@ describe ::Nexmos do
   subject{ ::Nexmos }
 
   before(:each) do
-    subject.reset!
+    described_class.reset!
   end
 
   context '#reset!' do
-    its(:user_agent) { should == "Nexmos v#{::Nexmos::VERSION}" }
-    its(:api_key) { should be_nil }
-    its(:api_secret) { should be_nil }
-    its(:logger) { should be_kind_of(::Logger) }
+    describe '#user_agent' do
+      subject { super().user_agent }
+      it { is_expected.to eq("Nexmos v#{::Nexmos::VERSION}") }
+    end
+
+    describe '#api_key' do
+      subject { super().api_key }
+      it { is_expected.to be_nil }
+    end
+
+    describe '#api_secret' do
+      subject { super().api_secret }
+      it { is_expected.to be_nil }
+    end
+
+    describe '#logger' do
+      subject { super().logger }
+      it { is_expected.to be_kind_of(::Logger) }
+    end
   end
 
   context '#setup' do
@@ -20,7 +35,7 @@ describe ::Nexmos do
         subject.setup do |c|
           c.user_agent = 'Test1245'
         end
-        subject.user_agent.should == 'Test1245'
+        expect(subject.user_agent).to eq('Test1245')
       end
 
       it 'should set logger' do
@@ -28,21 +43,21 @@ describe ::Nexmos do
         subject.setup do |c|
           c.logger = newlogger
         end
-        subject.logger.should == newlogger
+        expect(subject.logger).to eq(newlogger)
       end
 
       it 'should set api_key' do
         subject.setup do |c|
           c.api_key = 'test-api-key'
         end
-        subject.api_key.should == 'test-api-key'
+        expect(subject.api_key).to eq('test-api-key')
       end
 
       it 'should set api_secret' do
         subject.setup do |c|
           c.api_secret = 'test-api-secret'
         end
-        subject.api_secret.should == 'test-api-secret'
+        expect(subject.api_secret).to eq('test-api-secret')
       end
 
     end
@@ -55,9 +70,9 @@ describe ::Nexmos do
         subject.setup do |c|
           c.api_key = 'test-api-key2'
         end
-        subject.api_key.should == 'test-api-key'
+        expect(subject.api_key).to eq('test-api-key')
       end
     end
   end
 
-end
+end

data/spec/spec_helper.rb

@@ -1,23 +1,18 @@
-# This file was generated by the `rspec --init` command. Conventionally, all
-# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# Require this file using `require "spec_helper"` to ensure that it is only
-# loaded once.
-#
-# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+require 'simplecov'
 require 'coveralls'
-Coveralls.wear!
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+SimpleCov.start do
+  add_filter 'spec'
+  minimum_coverage(76)
+end
 require 'webmock'
 require 'webmock/rspec'
 require 'nexmos'
+require 'json'
 
 RSpec.configure do |config|
-  config.treat_symbols_as_metadata_keys_with_true_values = true
-  config.run_all_when_everything_filtered = true
-  config.filter_run :focus
-
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  config.order = 'random'
 end

metadata

@@ -1,97 +1,103 @@
 --- !ruby/object:Gem::Specification
 name: nexmos
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Alexander Simonov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-20 00:00:00.000000000 Z
+date: 2014-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rash
+  name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - "<="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Nexmo API client
@@ -101,16 +107,24 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .ruby-gemset
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".rubocop.yml"
+- ".travis.yml"
+- Appraisals
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- defaults.reek
+- gemfiles/activesupport_3.2.gemfile
+- gemfiles/activesupport_4.0.gemfile
+- gemfiles/activesupport_4.1.gemfile
+- gemfiles/activesupport_4.2.gemfile
 - lib/api.yml
+- lib/faraday_middleware/response/mashrashify.rb
+- lib/hashie/mash/rash.rb
 - lib/nexmos.rb
 - lib/nexmos/account.rb
 - lib/nexmos/base.rb
@@ -135,17 +149,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Nexmo API client

data/.ruby-gemset

@@ -1 +0,0 @@
-nexmos