bitly 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '087fb2a63ecc1d2528e91cc06d415921f30d5358'
-  data.tar.gz: 2b1d6c00ebc719756e84574bf054bd390027c4b5
+  metadata.gz: 6a8801e0af73bf65ac762477c11eab29bf2fb3fe
+  data.tar.gz: 654ce50db6081aa03e871ebfc3cfb7db1c529d2a
 SHA512:
-  metadata.gz: 2c0c174a4c3e6249f35d1b5204639d4e0747a76702b01f0e8cda9c6d27f4e63abf533bfb5bf0afea80ac596455a4f890fe24c23d3d42dcf63dd1837ca4b2f960
-  data.tar.gz: 330100602a53d6b381c3383814450ccb1edc84d7006fa7520ade4a0bf55b8404da0d1ea2bf925e63bcbdd4ad7bb6ab0a94fdd29e721201cadaceda095570744b
+  metadata.gz: eeba81429fdfc4d65107890ae8bb0f6c5c17b924256bfb19d9640ed08aa38fd06ad1d9e4ea42a0a9e29c51b10a2c8b166232fe375767168a974ecbc29b1d2176
+  data.tar.gz: d3b5f93048e1d511a7449a7c647c9d1ed44d9e14e54cd62fcd36f6b7cd739c66414a0ff61b5a42a1602981cbeeb1d6ce6d1e2be82296a2e6e05ba61307455ef4

data/.travis.yml

@@ -2,10 +2,10 @@ language: ruby
 sudo: required
 dist: trusty
 rvm:
+  - 2.5
   - 2.4
   - 2.3
   - 2.2
-  - 2.1
   - ruby-head
   - jruby-19mode
   - jruby-head

data/Rakefile

@@ -7,5 +7,5 @@ desc 'Run tests (default)'
 Rake::TestTask.new(:test) do |t|
   t.test_files = FileList['test/**/test_*.rb']
   t.ruby_opts = ['-Itest']
-  t.ruby_opts << '-rubygems' if defined? Gem
+  t.ruby_opts << '-r rubygems' if defined? Gem
 end

data/lib/bitly/client.rb

@@ -36,7 +36,7 @@ module Bitly
   class Client
 
     include Bitly::Utils
-    attr_accessor *Config::OPTION_KEYS
+    attr_accessor(*Config::OPTION_KEYS)
 
     def initialize(login,api_key)
       warn "[DEPRECATION] The bit.ly version 2 API has been superseded by version 3 and will be removed. See the README for details"

data/lib/bitly/config.rb

@@ -9,7 +9,7 @@ module Bitly
       :timeout
     ]
 
-    attr_accessor *OPTION_KEYS
+    attr_accessor(*OPTION_KEYS)
 
     alias_method :access_token, :login
     alias_method :access_token=, :login=

data/lib/bitly/v3/client.rb

@@ -79,22 +79,22 @@ module Bitly
       # Returns the results in the order they were entered
       def lookup(input)
         input = arrayize(input)
-        query = input.inject([]) { |query, i| query << "url=#{CGI.escape(i)}" }
+        query = input.inject([]) { |q, i| q << "url=#{CGI.escape(i)}" }
         query = "/lookup?" + query.join('&')
         response = get(query)
-        results = response['data']['lookup'].inject([]) do |results, url|
+        results = response['data']['lookup'].inject([]) do |rs, url|
           url['long_url'] = url['url']
           url['url'] = nil
           if url['error'].nil?
             # builds the results array in the same order as the input
-            results[input.index(url['long_url'])] = Bitly::V3::Url.new(self, url)
+            rs[input.index(url['long_url'])] = Bitly::V3::Url.new(self, url)
             # remove the key from the original array, in case the same hash/url was entered twice
             input[input.index(url['long_url'])] = nil
           else
-            results[input.index(url['long_url'])] = Bitly::V3::MissingUrl.new(url)
+            rs[input.index(url['long_url'])] = Bitly::V3::MissingUrl.new(url)
             input[input.index(url['long_url'])] = nil
           end
-          results
+          rs
         end
         return results.length > 1 ? results : results[0]
       end
@@ -156,7 +156,7 @@ module Bitly
       end
 
       def is_a_short_url?(input)
-        input.match(/^http:\/\//)
+        input.match(/^https?:\/\//)
       end
 
       def get_single_method(method, input)
@@ -173,30 +173,30 @@ module Bitly
 
       def get_method(method, input, opts={})
         input = arrayize(input)
-        query = input.inject([]) do |query,i|
+        query = input.inject([]) do |q, i|
           if is_a_short_url?(i)
-            query << "shortUrl=#{CGI.escape(i)}"
+            q << "shortUrl=#{CGI.escape(i)}"
           else
-            query << "hash=#{CGI.escape(i)}"
+            q << "hash=#{CGI.escape(i)}"
           end
         end
-        query = opts.inject(query) do |query, (k,v)|
-          query << "#{k}=#{v}"
+        query = opts.inject(query) do |q, (k,v)|
+          q<< "#{k}=#{v}"
         end
         query = "/#{method}?" + query.join('&')
         response = get(query)
-        results = response['data'][method.to_s].inject([]) do |results, url|
+        results = response['data'][method.to_s].inject([]) do |rs, url|
           result_index = input.index(url['short_url'] || url['hash']) || input.index(url['global_hash'])
           if url['error'].nil?
             # builds the results array in the same order as the input
-            results[result_index] = Bitly::V3::Url.new(self, url)
+            rs[result_index] = Bitly::V3::Url.new(self, url)
             # remove the key from the original array, in case the same hash/url was entered twice
             input[result_index] = nil
           else
-            results[result_index] = Bitly::V3::MissingUrl.new(url)
+            rs[result_index] = Bitly::V3::MissingUrl.new(url)
             input[result_index] = nil
           end
-          results
+          rs
         end
         return results.length > 1 ? results : results[0]
       end

data/lib/bitly/v3/user.rb

@@ -107,12 +107,11 @@ module Bitly
         opts.merge!(:access_token => @access_token.token)
         result = self.class.get("/user/#{method.to_s}", :query => opts)
         if result['status_code'] == 200
-          results = result['data'][method.to_s].map do |rs|
+          result['data'][method.to_s].map do |rs|
             rs.inject([]) do |results, obj|
               results << klass.new(obj)
             end
           end
-          return results
         else
           raise BitlyError.new(result['status_txt'], result['status_code'])
         end

data/lib/bitly/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitly
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Phil Nash
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-23 00:00:00.000000000 Z
+date: 2018-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json