nexmos 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d338a3229ac17831cea6c50deae59d12fe198ab6
-  data.tar.gz: d8a6b6ce761fbc1a712a9d85a889a0543740ec4b
+  metadata.gz: f014945d28d7492c96c5f96e32116c3569e8092a
+  data.tar.gz: 0ad507ebe06159c30b19e588a1aff0192de44acb
 SHA512:
-  metadata.gz: c82e6e6b05be226022d5b42aa3c3cb75b8829259c89d8de909f862c7963c62d20b08ef2f72044ae04786ca22e1280f367c68f0f8781ae3a7e50333f8766f16c7
-  data.tar.gz: efb8d6f1da615b434dda0787e7a9501e002641ea50054a84098198ecb52e3ba6c4f237b3d2ebab03fe0dc1ca27bb381baae751177dfaa399f51648653490c1c6
+  metadata.gz: f29f1e3d43258f758ad848f12c6648e43b72cc1ae08ef32ae4c85d4f8702bea2bf3d1f29e20f3cedff09baca25fd3e0d7d4cadea8e2cce05d43ffe0935fa193d
+  data.tar.gz: 20f664251088b326b2b9306d74ba98deebdcc069960843ec12fa3af11ebc5fa759df2d1f1b50fb6ace7216db4a585d1b05be4d70596f3ab3f8dfe3ec63f143eb

data/.gitignore

@@ -4,6 +4,7 @@
 .config
 .yardoc
 Gemfile.lock
+gemfiles/*.lock
 InstalledFiles
 _yardoc
 coverage

data/.rubocop.yml

@@ -0,0 +1,17 @@
+AllCops:
+  Include:
+    - '**/Rakefile'
+  Exclude:
+    - 'spec/**/*'
+Metrics/LineLength:
+  Max: 99
+Style/FileName:
+  Enabled: false
+Style/ModuleFunction:
+  Enabled: false
+Style/Encoding:
+  Enabled: false
+Documentation:
+  Enabled: false
+Metrics/MethodLength:
+  Max: 15

data/.travis.yml

@@ -1,7 +1,16 @@
 language: ruby
 rvm:
-  - 1.9.3
   - 2.0.0
+  - 2.1
   - ruby-head
   - jruby-19mode # JRuby in 1.9 mode
-  - rbx-19mode
+  - rbx-2
+gemfile:
+  - gemfiles/activesupport_3.2.gemfile
+  - gemfiles/activesupport_4.0.gemfile
+  - gemfiles/activesupport_4.1.gemfile
+  - gemfiles/activesupport_4.2.gemfile
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+bundler_args: --without local_development

data/Appraisals

@@ -0,0 +1,15 @@
+appraise "activesupport-3.2" do
+  gem "activesupport", "~> 3.2.0"
+end
+
+appraise "activesupport-4.0" do
+  gem "activesupport", "~> 4.0.0"
+end
+
+appraise "activesupport-4.1" do
+  gem "activesupport", "~> 4.1.0"
+end
+
+appraise "activesupport-4.2" do
+  gem "activesupport", "~> 4.2.0.beta4"
+end

data/Gemfile

@@ -2,9 +2,20 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in nexmo-client.gemspec
 gemspec
-group :development, :test do
+
+
+group :test do
+  gem 'simplecov', '>= 0.9.0', :require => false
+  gem 'coveralls', :require => false
+end
+
+group :local_development do
+  gem 'terminal-notifier-guard', require: false if RUBY_PLATFORM.downcase.include?('darwin')
+  gem 'guard-rspec', '>= 4.3.1' ,require: false
+  gem 'guard-bundler', require: false
+  gem 'guard-preek', require: false
+  gem 'guard-rubocop', require: false
+  gem 'guard-reek', github: 'pericles/guard-reek', require: false
   gem 'pry'
-  gem 'rake'
-  gem 'webmock'
-  gem 'coveralls', require: false
+  gem 'appraisal'
 end

data/Guardfile

@@ -0,0 +1,20 @@
+guard 'rspec', cmd: 'rspec' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end
+
+guard 'bundler' do
+  watch('Gemfile')
+  watch('ar_json_serialize.gemspec')
+end
+
+guard :rubocop do
+  watch(%r{.+\.rb$})
+  watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
+end
+
+guard :preek, run_all_dir: 'lib' do
+	watch(/^lib\/(.*).rb/)
+end
+

data/Rakefile

@@ -1,6 +1,6 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/defaults.reek

@@ -0,0 +1,11 @@
+---
+NestedIterators:
+  max_allowed_nesting: 2
+UtilityFunction:
+  enabled: false
+IrresponsibleModule:
+  enabled: false
+DuplicateMethodCall:
+  max_calls: 5
+FeatureEnvy:
+  enabled: false

data/gemfiles/activesupport_3.2.gemfile

@@ -0,0 +1,23 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 3.2.0"
+
+group :test do
+  gem "simplecov", ">= 0.9.0", :require => false
+  gem "coveralls", :require => false
+end
+
+group :local_development do
+  gem "terminal-notifier-guard", :require => false
+  gem "guard-rspec", ">= 4.3.1", :require => false
+  gem "guard-bundler", :require => false
+  gem "guard-preek", :require => false
+  gem "guard-rubocop", :require => false
+  gem "guard-reek", :github => "pericles/guard-reek", :require => false
+  gem "pry"
+  gem "appraisal"
+end
+
+gemspec :path => "../"

data/gemfiles/activesupport_4.0.gemfile

@@ -0,0 +1,23 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 4.0.0"
+
+group :test do
+  gem "simplecov", ">= 0.9.0", :require => false
+  gem "coveralls", :require => false
+end
+
+group :local_development do
+  gem "terminal-notifier-guard", :require => false
+  gem "guard-rspec", ">= 4.3.1", :require => false
+  gem "guard-bundler", :require => false
+  gem "guard-preek", :require => false
+  gem "guard-rubocop", :require => false
+  gem "guard-reek", :github => "pericles/guard-reek", :require => false
+  gem "pry"
+  gem "appraisal"
+end
+
+gemspec :path => "../"

data/gemfiles/activesupport_4.1.gemfile

@@ -0,0 +1,23 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 4.1.0"
+
+group :test do
+  gem "simplecov", ">= 0.9.0", :require => false
+  gem "coveralls", :require => false
+end
+
+group :local_development do
+  gem "terminal-notifier-guard", :require => false
+  gem "guard-rspec", ">= 4.3.1", :require => false
+  gem "guard-bundler", :require => false
+  gem "guard-preek", :require => false
+  gem "guard-rubocop", :require => false
+  gem "guard-reek", :github => "pericles/guard-reek", :require => false
+  gem "pry"
+  gem "appraisal"
+end
+
+gemspec :path => "../"

data/gemfiles/activesupport_4.2.gemfile

@@ -0,0 +1,23 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activesupport", "~> 4.2.0.beta4"
+
+group :test do
+  gem "simplecov", ">= 0.9.0", :require => false
+  gem "coveralls", :require => false
+end
+
+group :local_development do
+  gem "terminal-notifier-guard", :require => false
+  gem "guard-rspec", ">= 4.3.1", :require => false
+  gem "guard-bundler", :require => false
+  gem "guard-preek", :require => false
+  gem "guard-rubocop", :require => false
+  gem "guard-reek", :github => "pericles/guard-reek", :require => false
+  gem "pry"
+  gem "appraisal"
+end
+
+gemspec :path => "../"

data/lib/faraday_middleware/response/mashrashify.rb

@@ -0,0 +1,19 @@
+require 'faraday_middleware/response/mashify'
+
+module FaradayMiddleware
+  # Public: Converts parsed response bodies to a Hashie::Trash if they were of
+  # Hash or Array type.
+  class MashRashify < Mashify
+    dependency do
+      require 'hashie/mash/rash'
+      self.mash_class = ::Hashie::Mash::Rash
+    end
+  end
+end
+
+if Faraday::Middleware.respond_to? :register_middleware
+  Faraday::Response.register_middleware mashrashify: FaradayMiddleware::MashRashify
+end
+
+# deprecated alias
+Faraday::Response::MashRashify = FaradayMiddleware::MashRashify

data/lib/hashie/mash/rash.rb

@@ -0,0 +1,41 @@
+require 'hashie/mash'
+
+module Hashie
+  class Mash::Rash < Mash
+    protected
+
+    def convert_key(key) #:nodoc:
+      underscore_string(key.to_s)
+    end
+
+    # Unlike its parent Mash, a Rash will convert other Hashie::Hash values to a Rash when assigning
+    # instead of respecting the existing subclass
+    def convert_value(val, duping = false) #:nodoc:
+      case val
+      when self.class
+        val.dup
+      when ::Hash
+        val = val.dup if duping
+        self.class.new(val)
+      when Array
+        val.collect { |e| convert_value(e) }
+      else
+        val
+      end
+    end
+
+    # converts a camel_cased string to a underscore string
+    # subs spaces with underscores, strips whitespace
+    # Same way ActiveSupport does string.underscore
+    def underscore_string(str)
+      str.to_s.strip
+        .gsub(' ', '_')
+        .gsub(/::/, '/')
+        .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+        .gsub(/([a-z\d])([A-Z])/, '\1_\2')
+        .tr('-', '_')
+        .squeeze('_')
+        .downcase
+    end
+  end
+end

data/lib/nexmos.rb

@@ -2,6 +2,7 @@ require 'logger'
 require 'active_support/core_ext/hash'
 require 'faraday'
 require 'faraday_middleware'
+require 'faraday_middleware/response/mashrashify'
 require 'nexmos/version'
 require 'nexmos/base'
 module Nexmos

data/lib/nexmos/account.rb

@@ -1,5 +1,5 @@
 module Nexmos
   class Account < Base
-    self.define_api_calls(:account)
+    define_api_calls(:account)
   end
-end
+end

data/lib/nexmos/base.rb

@@ -1,11 +1,10 @@
 module Nexmos
   class Base
-
     def initialize(key = ::Nexmos.api_key, secret = ::Nexmos.api_secret)
-      raise 'api_key should be set' if !key.present?
-      raise 'api_secret should be set' if !secret.present?
+      fail 'api_key should be set' unless key.present?
+      fail 'api_secret should be set' unless secret.present?
       @default_params = {
-        'api_key' => key,
+        'api_key'    => key,
         'api_secret' => secret
       }
     end
@@ -24,23 +23,23 @@ module Nexmos
 
     def get_response(args, params)
       method = args[:method]
-      url = args[:url]
-      raise 'url or method params missing' if !method.present? || !url.present?
+      url    = args[:url]
+      fail 'url or method params missing' if !method.present? || !url.present?
       res = connection.__send__(method, url, params)
       if res.success?
         data = if res.body.is_a?(::Hash)
                  res.body.merge(:success? => true)
                else
-                 ::Hashie::Mash.new({:success? => true})
+                 ::Hashie::Mash.new(:success? => true)
                end
         return data
       end
-      failed_res = ::Hashie::Mash.new({:success? => false, :not_authorized? => false, :failed? => false})
+      failed_res = ::Hashie::Mash.new(:success? => false, :not_authorized? => false, :failed? => false)
       case res.status
       when 401
-       failed_res.merge! :not_authorized? => true
+        failed_res.merge! :not_authorized? => true
       when 420
-       failed_res.merge! :failed? => true
+        failed_res.merge! :failed? => true
       end
       failed_res
     end
@@ -51,7 +50,7 @@ module Nexmos
 
     def camelize_params(params)
       if params.respond_to?(:transform_keys!)
-        params.transform_keys!{|key| key.camelize(:lower)}
+        params.transform_keys! { |key| key.camelize(:lower) }
       else
         params.keys.each do |key|
           params[key.camelize(:lower)] = params.delete(key)
@@ -60,19 +59,16 @@ module Nexmos
     end
 
     def check_required_params(args, params)
-      if args[:required]
-        required = params.slice(*args[:required])
-        unless required.keys.sort == args[:required].sort
-          missed = (args[:required] - required.keys).join(',')
-          raise ArgumentError, "#{missed} params required"
-        end
-      end
+      return unless args[:required]
+      required = params.slice(*args[:required])
+      return if required.keys.sort == args[:required].sort
+      missed = (args[:required] - required.keys).join(',')
+      fail ArgumentError, "#{missed} params required"
     end
 
     class << self
-
       def define_api_calls(key)
-        ::Nexmos.apis[key].each do |k,v|
+        ::Nexmos.apis[key].each do |k, v|
           define_method(k) do |*args|
             params = args[0] || {}
             make_api_call(v, params)
@@ -82,22 +78,22 @@ module Nexmos
 
       def faraday_options
         {
-          :url => 'https://rest.nexmo.com',
-          :headers => {
-            :accept =>  'application/json',
-            :user_agent => ::Nexmos.user_agent
+          url:     'https://rest.nexmo.com',
+          headers: {
+            accept:     'application/json',
+            user_agent: ::Nexmos.user_agent
           }
         }
       end
 
       def connection
         @connection ||= Faraday::Connection.new(faraday_options) do |conn|
-          conn.request  :url_encoded
-          conn.response :rashify
-          conn.response :json, :content_type => /\bjson$/
-          conn.adapter  Faraday.default_adapter
+          conn.request :url_encoded
+          conn.response :mashrashify
+          conn.response :json, content_type: /\bjson$/
+          conn.adapter Faraday.default_adapter
         end
       end
     end # self
   end # Base
-end # Nexmos
+end # Nexmos

data/lib/nexmos/message.rb

@@ -1,5 +1,5 @@
 module Nexmos
   class Message < Base
-    self.define_api_calls(:message)
+    define_api_calls(:message)
   end
-end
+end

data/lib/nexmos/number.rb

@@ -1,5 +1,5 @@
 module Nexmos
   class Number < Base
-    self.define_api_calls(:number)
+    define_api_calls(:number)
   end
-end
+end