ivapi 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6473bb4568ace4bf0a0e6a0ce7e9c0bf34db632b
-  data.tar.gz: 449fff9641875fa73d4cd924d7a846484f2c3208
+  metadata.gz: 36b8caa71c8c90b8859c0b4997cf66402b283fa7
+  data.tar.gz: fe5992ef9ab6d93f82d94b858e7cfdbff8ef8599
 SHA512:
-  metadata.gz: 75c018e5a4ce157aaab383bce1081f0a11510128eff6daf0fb96615efb4b05384556616f72e280cf4154512cabd31c7106a9c56f9ef6ed0e4d7cf8cf4c72e695
-  data.tar.gz: 529644c48c4dbdc0d321c423e0969b9f38e04d96aedf2c4dc79bb63f0286aa57078f423bb330bad7cee454ba5cfb216e9eaf072abb75e3aafd2ece76f6944e67
+  metadata.gz: 0f74ff49ba94ba64da6ea041a3fe91392187ece35ea400769c512cf86252fae18f15cfb06ba7c49f628680e4dfc6eafd44b2570f38e790b79383e76ff3a9507c
+  data.tar.gz: 154ee0a59ccddb3e053a6818343aad2c44b8141ac9c3f13f62a7cf70820e51e736c479d525a8ad64b187c14f972687bba7612ace1b68883275225cb9b3d80cdc

data/Gemfile

@@ -4,11 +4,11 @@ gem 'rake'
 
 group :test do
   gem 'json',         '~> 1.8.1', platforms: [:jruby]
-  gem 'rspec',        '~> 3.0.0'
-  gem 'simplecov',    '~> 0.8.2', require: false
+  gem 'rspec',        '~> 3.1.0'
+  gem 'simplecov',    '~> 0.9.0', require: false
   gem 'webmock',      '~> 1.18.0'
-  gem 'coveralls',    '~> 0.7.0', require: false
-  gem 'guard-rspec',  '~> 4.2.10'
+  gem 'coveralls',    '~> 0.7.1', require: false
+  gem 'guard-rspec',  '~> 4.3.1'
 end
 
 gemspec

data/README.md

@@ -2,11 +2,11 @@
 
 Gem which helps to communicate with Interneto vizija [http://iv.lt][iv.lt] ([http://dedikuoti.lt][dedikuoti.lt]) API.
 
-[![Gem Version](https://badge.fury.io/rb/ivapi.svg)][rubygems]
-[![Build Status](https://secure.travis-ci.org/jpalumickas/ivapi.svg?branch=master)][travis]
-[![Dependency Status](https://gemnasium.com/jpalumickas/ivapi.png?travis)][gemnasium]
-[![Coverage Status](http://img.shields.io/coveralls/jpalumickas/ivapi/master.svg)][coveralls]
-[![Code Climate](http://img.shields.io/codeclimate/github/jpalumickas/ivapi.svg)][codeclimate]
+[![Gem Version](http://img.shields.io/gem/v/ivapi.svg?style=flat)][rubygems]
+[![Build Status](http://img.shields.io/travis/jpalumickas/ivapi.svg?style=flat)][travis]
+[![Dependency Status](http://img.shields.io/gemnasium/jpalumickas/ivapi.svg?style=flat)][gemnasium]
+[![Coverage Status](http://img.shields.io/coveralls/jpalumickas/ivapi/master.svg?style=flat)][coveralls]
+[![Code Climate](http://img.shields.io/codeclimate/github/jpalumickas/ivapi.svg?style=flat)][codeclimate]
 
 ## Installation
 

data/ivapi.gemspec

@@ -12,17 +12,18 @@ Gem::Specification.new do |gem|
   gem.homepage = 'https://github.com/jpalumickas/ivapi/'
   gem.license = 'MIT'
 
-  gem.files = `git ls-files`.split($/)
-  gem.executables = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.files = `git ls-files -z`.split("\x0")
+  gem.executables = gem.files.grep(%r{^bin/}) { |f| File.basename(f) }
   gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_development_dependency 'bundler', '~> 1.0'
   gem.add_dependency 'addressable', '~> 2.3'
   gem.add_dependency 'faraday', '~> 0.9.0'
   gem.add_dependency 'faraday_middleware', '~> 0.9.1'
-  gem.add_dependency 'hashie', '~> 3.0'
-  gem.add_dependency 'multi_json', '~> 1.9'
+  gem.add_dependency 'hashie', '~> 3.3'
+  gem.add_dependency 'multi_json', '~> 1.10'
+  gem.add_development_dependency 'bundler', '~> 1.5'
+  gem.add_development_dependency 'rake', '~> 10.0'
 
   gem.version = Ivapi::VERSION
 end

data/lib/ivapi.rb

@@ -1,11 +1,11 @@
 require 'ivapi/client'
 require 'ivapi/default'
 require 'pry'
+
 module Ivapi
   extend Ivapi::Configuration
 
   class << self
-
     def client
       unless defined?(@client) && @client.same_options?(options)
         @client = Ivapi::Client.new(options)
@@ -20,7 +20,7 @@ module Ivapi
 
     def respond_to?(method_name, include_private = false)
       client.respond_to?(method_name, include_private) || super
-      end if RUBY_VERSION < '1.9'
+    end if RUBY_VERSION < '1.9'
 
     private
 
@@ -28,7 +28,6 @@ module Ivapi
       return super unless client.respond_to?(method_name)
       client.send(method_name, *args, &block)
     end
-
   end
 end
 

data/lib/ivapi/configuration.rb

@@ -3,7 +3,6 @@ require 'ivapi/version'
 
 module Ivapi
   module Configuration
-
     attr_accessor :server_id, :user_agent, :connection_options,
                   :web_endpoint, :api_endpoint
     attr_writer :username, :password
@@ -31,7 +30,7 @@ module Ivapi
       end
       self
     end
-    alias setup reset!
+    alias_method :setup, :reset!
 
     def configure
       yield self

data/lib/ivapi/default.rb

@@ -4,7 +4,6 @@ require 'ivapi/response/rename_keys'
 require 'ivapi/version'
 
 module Ivapi
-
   # Default configuration options for {Client}
   module Default
     # Default API endpoint
@@ -23,23 +22,24 @@ module Ivapi
     # Default Faraday middleware stack
     MIDDLEWARE = RACK_BUILDER_CLASS.new do |builder|
       builder.request :json
+
       builder.use Ivapi::Response::RaiseError
       builder.use FaradayMiddleware::FollowRedirects
       builder.use FaradayMiddleware::Mashify
       builder.use Ivapi::Response::RenameKeys
       builder.use FaradayMiddleware::ParseJson
+
       builder.adapter Faraday.default_adapter
     end
 
     class << self
-
       # Configuration options
       # @return [Hash]
       def options
         Hash[Ivapi::Configuration.keys.map { |key| [key, send(key)] }]
       end
 
-       # Default GitHub username for Basic Auth from ENV
+      # Default GitHub username for Basic Auth from ENV
       # @return [String]
       def username
         ENV['IVAPI_USERNAME']

data/lib/ivapi/response/raise_error.rb

@@ -4,17 +4,14 @@ require 'ivapi/error'
 module Ivapi
   # Faraday response middleware
   module Response
-
     # This class raises an exception based HTTP status codes returned
     # by the API.
     class RaiseError < Faraday::Response::Middleware
-
       private
 
       def on_complete(response)
-        if error = Ivapi::Error.from_response(response)
-          raise error
-        end
+        error = Ivapi::Error.from_response(response)
+        fail error if error
       end
     end
   end

data/lib/ivapi/response/rename_keys.rb

@@ -4,9 +4,7 @@ module Ivapi
   # Faraday response middleware
   module Response
     class RenameKeys < Faraday::Response::Middleware
-      UNUSED_KEYS = [
-        'ac_', 'us_', 'bo_', 'or_', 'se_', 'ta_', 'in_'
-     ].freeze
+      UNUSED_KEYS = %w(ac_ us_ bo_ or_ se_ ta_ in_).freeze
 
       private
 
@@ -16,23 +14,29 @@ module Ivapi
 
       def rename_keys(input)
         if input.is_a?(Hash)
-          new = {}
-          input.map do |key, value|
-            if value.is_a?(Hash)
-              value = rename_keys(value)
-            elsif value.is_a?(Array)
-              value = value.map { |v| rename_keys(v) }
-            end
-
-            new[key.gsub(Regexp.union(UNUSED_KEYS), '')] = value
-          end
-          new
+          rename_keys_from_hash(input)
         elsif input.is_a?(Array)
           input.map { |value| rename_keys(value) }
         else
           input
         end
       end
+
+      def rename_keys_from_hash(input)
+        new_hash = {}
+
+        input.map do |key, value|
+          if value.is_a?(Hash)
+            value = rename_keys(value)
+          elsif value.is_a?(Array)
+            value = value.map { |v| rename_keys(v) }
+          end
+
+          new_hash[key.gsub(Regexp.union(UNUSED_KEYS), '')] = value
+        end
+
+        new_hash
+      end
     end
   end
 end

data/lib/ivapi/version.rb

@@ -1,3 +1,3 @@
 module Ivapi
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

data/spec/ivapi/client_spec.rb

@@ -2,6 +2,10 @@ require 'spec_helper'
 
 describe Ivapi::Client do
 
+  after(:each) do
+    Ivapi.reset!
+  end
+
   it 'works with basic auth and password' do
     url = 'https://api.iv.lt/json.php?nick=foo&password=bar&command=version'
 
@@ -13,15 +17,12 @@ describe Ivapi::Client do
   end
 
   describe 'authentication' do
-    after(:each) do
-      Ivapi.reset!
-    end
-
     it 'should possible to authenticate with configure' do
       Ivapi.configure do |config|
         config.username = 'foo'
         config.password = 'bar'
       end
+
       expect(Ivapi.client).to be_authenticated
     end
 
@@ -37,10 +38,6 @@ describe Ivapi::Client do
   end
 
   describe 'setting server id from client' do
-    before(:each) do
-      Ivapi.reset!
-    end
-
     it 'should not have server id' do
       client = Ivapi::Client.new(username: 'foo', password: 'bar')
       expect(client.server_id).to be_nil
@@ -54,7 +51,6 @@ describe Ivapi::Client do
 
   describe 'manualy setting server id' do
     before(:each) do
-      Ivapi.reset!
       Ivapi.configure do |config|
         config.username = 'foo'
         config.password = 'bar'

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ivapi
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Justas Palumickas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-30 00:00:00.000000000 Z
+date: 2014-09-16 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -72,28 +58,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.10'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
 description: " Gem which helps to communicate with http://www.iv.lt API. "
 email: jpalumickas@gmail.com
 executables: []