bitly 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3592942cb5d03b9e56b4f751ee49f03fa59a7e96
-  data.tar.gz: 72f69d6ca04ecff3b8421571b9bea0d970940029
+  metadata.gz: '087fb2a63ecc1d2528e91cc06d415921f30d5358'
+  data.tar.gz: 2b1d6c00ebc719756e84574bf054bd390027c4b5
 SHA512:
-  metadata.gz: 3cff305dfab3f5542b7f96ca2db26befedf5bce50d03e63f0243a2d96b42d11262dfe95f9e06fde19dcf2ee57c7df19ba07e38a5bebea4c562295d784f88bd65
-  data.tar.gz: 1e077835817c1d91860cbf62fec80130a0355d1f056a05ebff70bd4aecfc03a9f711b3a6c6063cf6534bac2064d428d958dc37199b445e3c119ad6daab52fd4e
+  metadata.gz: 2c0c174a4c3e6249f35d1b5204639d4e0747a76702b01f0e8cda9c6d27f4e63abf533bfb5bf0afea80ac596455a4f890fe24c23d3d42dcf63dd1837ca4b2f960
+  data.tar.gz: 330100602a53d6b381c3383814450ccb1edc84d7006fa7520ade4a0bf55b8404da0d1ea2bf925e63bcbdd4ad7bb6ab0a94fdd29e721201cadaceda095570744b

data/.gitignore

@@ -0,0 +1,3 @@
+pkg
+doc
+Gemfile.lock

data/.travis.yml

@@ -0,0 +1,18 @@
+language: ruby
+sudo: required
+dist: trusty
+rvm:
+  - 2.4
+  - 2.3
+  - 2.2
+  - 2.1
+  - ruby-head
+  - jruby-19mode
+  - jruby-head
+  - rbx-3
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-19mode
+    - rvm: jruby-head
+    - rvm: rbx-3

data/History.txt

@@ -1,3 +1,40 @@
+=== Ongoing
+
+* updates
+
+  * Removes development dependency on Echoe and tidies up gemspec
+  * Adds license to gemspec
+
+=== 1.1.0 / 2016-2-25
+
+* 5 minor updates
+
+  * Fixnum & Integer unification for Ruby 2.4+ compatibility (thanks @codebender)
+  * Replaces Fakeweb with Webmock in tests
+  * Fixes instance variable warnings
+  * Fixes redefine method warnigns
+  * Always use HTTPS when using v3 API
+
+=== 1.0.2 / 2016-11-3
+
+* 1 minor update
+
+  * Stops gem breaking on Ruby < 2.2 by only installing an older version of rack.
+
+=== 1.0.1 / 2016-11-3
+
+* 1 minor update
+
+  * Properly sets the API version that is in use.
+
+=== 1.0.0 / 2016-10-21
+
+* 1 minor update
+
+  * Ensures v2 API uses https
+
+It had been too long with this gem in a pre 1.0 state. This rectifies that, even though there were no major or breaking changes.
+
 === 0.10.4 / 2015-01-08
 
 * 1 minor update

data/Rakefile

@@ -1,25 +1,11 @@
-require 'rubygems'
-require 'rake'
-require 'echoe'
-require './lib/bitly/version'
+require 'bundler/gem_tasks'
 
-Echoe.new('bitly', Bitly::VERSION) do |p|
-  p.description = "Use the bit.ly API to shorten or expand URLs"
-  p.url = "http://github.com/philnash/bitly"
-  p.author = "Phil Nash"
-  p.email = "philnash@gmail.com"
-  p.extra_deps = [
-    ['multi_json', '~> 1.3'],
-    ['httparty', '>= 0.7.6'],
-    ['oauth2', '>= 0.5.0', '< 2.0']
-  ]
-  p.development_dependencies = [
-    ['echoe'],
-    ['rake'],
-    ['shoulda'],
-    ['flexmock'],
-    ['webmock'],
-    ['activesupport', '~> 3.2'],
-    ['minitest', '~> 5.8.3']
-  ]
+require 'rake/testtask'
+task :default => [:test]
+
+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
 end

data/bitly.gemspec

@@ -1,61 +1,38 @@
 # -*- encoding: utf-8 -*-
 # stub: bitly 1.1.0 ruby lib
+lib = File.expand_path("../lib", __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'bitly/version'
 
-Gem::Specification.new do |s|
-  s.name = "bitly".freeze
-  s.version = "1.1.0"
+Gem::Specification.new do |spec|
+  spec.name                   = "bitly"
+  spec.version                = Bitly::VERSION
+  spec.authors                = ["Phil Nash"]
+  spec.email                  = "philnash@gmail.com"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 1.2".freeze) if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib".freeze]
-  s.authors = ["Phil Nash".freeze]
-  s.date = "2017-02-25"
-  s.description = "Use the bit.ly API to shorten or expand URLs".freeze
-  s.email = "philnash@gmail.com".freeze
-  s.extra_rdoc_files = ["LICENSE.md".freeze, "README.md".freeze, "lib/bitly.rb".freeze, "lib/bitly/client.rb".freeze, "lib/bitly/config.rb".freeze, "lib/bitly/url.rb".freeze, "lib/bitly/utils.rb".freeze, "lib/bitly/v3.rb".freeze, "lib/bitly/v3/bitly.rb".freeze, "lib/bitly/v3/client.rb".freeze, "lib/bitly/v3/country.rb".freeze, "lib/bitly/v3/day.rb".freeze, "lib/bitly/v3/missing_url.rb".freeze, "lib/bitly/v3/oauth.rb".freeze, "lib/bitly/v3/realtime_link.rb".freeze, "lib/bitly/v3/referrer.rb".freeze, "lib/bitly/v3/url.rb".freeze, "lib/bitly/v3/user.rb".freeze, "lib/bitly/version.rb".freeze]
-  s.files = ["Gemfile".freeze, "History.txt".freeze, "LICENSE.md".freeze, "Manifest".freeze, "README.md".freeze, "Rakefile".freeze, "bitly.gemspec".freeze, "lib/bitly.rb".freeze, "lib/bitly/client.rb".freeze, "lib/bitly/config.rb".freeze, "lib/bitly/url.rb".freeze, "lib/bitly/utils.rb".freeze, "lib/bitly/v3.rb".freeze, "lib/bitly/v3/bitly.rb".freeze, "lib/bitly/v3/client.rb".freeze, "lib/bitly/v3/country.rb".freeze, "lib/bitly/v3/day.rb".freeze, "lib/bitly/v3/missing_url.rb".freeze, "lib/bitly/v3/oauth.rb".freeze, "lib/bitly/v3/realtime_link.rb".freeze, "lib/bitly/v3/referrer.rb".freeze, "lib/bitly/v3/url.rb".freeze, "lib/bitly/v3/user.rb".freeze, "lib/bitly/version.rb".freeze, "test/bitly/test_client.rb".freeze, "test/bitly/test_config.rb".freeze, "test/bitly/test_url.rb".freeze, "test/bitly/test_utils.rb".freeze, "test/fixtures/cnn.json".freeze, "test/fixtures/cnn_and_google.json".freeze, "test/fixtures/expand_cnn.json".freeze, "test/fixtures/expand_cnn_and_google.json".freeze, "test/fixtures/google_and_cnn_info.json".freeze, "test/fixtures/google_info.json".freeze, "test/fixtures/google_stats.json".freeze, "test/fixtures/shorten_error.json".freeze, "test/test_helper.rb".freeze]
-  s.homepage = "http://github.com/philnash/bitly".freeze
-  s.rdoc_options = ["--line-numbers".freeze, "--title".freeze, "Bitly".freeze, "--main".freeze, "README.md".freeze]
-  s.rubyforge_project = "bitly".freeze
-  s.rubygems_version = "2.6.8".freeze
-  s.summary = "Use the bit.ly API to shorten or expand URLs".freeze
-  s.test_files = ["test/bitly/test_client.rb".freeze, "test/bitly/test_config.rb".freeze, "test/bitly/test_url.rb".freeze, "test/bitly/test_utils.rb".freeze, "test/test_helper.rb".freeze]
+  spec.summary                = "Use the bit.ly API to shorten or expand URLs"
+  spec.description            = "Use the bit.ly API to shorten or expand URLs"
+  spec.homepage               = "http://github.com/philnash/bitly"
+  spec.license                = "MIT"
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
+  spec.files                  = `git ls-files -z`.split("\x0")
+  spec.executables            = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files             = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths          = ["lib"]
+  spec.required_ruby_version  = '>= 1.8.7'
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<multi_json>.freeze, ["~> 1.3"])
-      s.add_runtime_dependency(%q<httparty>.freeze, [">= 0.7.6"])
-      s.add_runtime_dependency(%q<oauth2>.freeze, ["< 2.0", ">= 0.5.0"])
-      s.add_development_dependency(%q<echoe>.freeze, [">= 0"])
-      s.add_development_dependency(%q<rake>.freeze, [">= 0"])
-      s.add_development_dependency(%q<shoulda>.freeze, [">= 0"])
-      s.add_development_dependency(%q<flexmock>.freeze, [">= 0"])
-      s.add_development_dependency(%q<webmock>.freeze, [">= 0"])
-      s.add_development_dependency(%q<activesupport>.freeze, ["~> 3.2"])
-      s.add_development_dependency(%q<minitest>.freeze, ["~> 5.8.3"])
-    else
-      s.add_dependency(%q<multi_json>.freeze, ["~> 1.3"])
-      s.add_dependency(%q<httparty>.freeze, [">= 0.7.6"])
-      s.add_dependency(%q<oauth2>.freeze, ["< 2.0", ">= 0.5.0"])
-      s.add_dependency(%q<echoe>.freeze, [">= 0"])
-      s.add_dependency(%q<rake>.freeze, [">= 0"])
-      s.add_dependency(%q<shoulda>.freeze, [">= 0"])
-      s.add_dependency(%q<flexmock>.freeze, [">= 0"])
-      s.add_dependency(%q<webmock>.freeze, [">= 0"])
-      s.add_dependency(%q<activesupport>.freeze, ["~> 3.2"])
-      s.add_dependency(%q<minitest>.freeze, ["~> 5.8.3"])
-    end
-  else
-    s.add_dependency(%q<multi_json>.freeze, ["~> 1.3"])
-    s.add_dependency(%q<httparty>.freeze, [">= 0.7.6"])
-    s.add_dependency(%q<oauth2>.freeze, ["< 2.0", ">= 0.5.0"])
-    s.add_dependency(%q<echoe>.freeze, [">= 0"])
-    s.add_dependency(%q<rake>.freeze, [">= 0"])
-    s.add_dependency(%q<shoulda>.freeze, [">= 0"])
-    s.add_dependency(%q<flexmock>.freeze, [">= 0"])
-    s.add_dependency(%q<webmock>.freeze, [">= 0"])
-    s.add_dependency(%q<activesupport>.freeze, ["~> 3.2"])
-    s.add_dependency(%q<minitest>.freeze, ["~> 5.8.3"])
-  end
+  spec.rdoc_options           = ["--line-numbers", "--title", "Bitly", "--main", "README.md"]
+  spec.extra_rdoc_files       = ["LICENSE.md", "README.md"]
+
+  spec.add_runtime_dependency "multi_json", "~> 1.3"
+  spec.add_runtime_dependency "httparty", ">= 0.7.6"
+  spec.add_runtime_dependency "oauth2", "< 2.0", ">= 0.5.0"
+  spec.add_runtime_dependency "rack", "<2" if RUBY_VERSION.to_f < 2.2
+
+  spec.add_development_dependency "bundler", "~> 1.15"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "shoulda", "~> 3.5.0"
+  spec.add_development_dependency "flexmock"
+  spec.add_development_dependency "webmock"
+  spec.add_development_dependency "minitest", "~> 5.8.3"
 end

data/lib/bitly/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitly
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Phil Nash
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-25 00:00:00.000000000 Z
+date: 2017-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -42,36 +42,36 @@ dependencies:
   name: oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
-  name: echoe
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -90,16 +90,16 @@ dependencies:
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: flexmock
   requirement: !ruby/object:Gem::Requirement
@@ -128,20 +128,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -163,24 +149,9 @@ extensions: []
 extra_rdoc_files:
 - LICENSE.md
 - README.md
-- lib/bitly.rb
-- lib/bitly/client.rb
-- lib/bitly/config.rb
-- lib/bitly/url.rb
-- lib/bitly/utils.rb
-- lib/bitly/v3.rb
-- lib/bitly/v3/bitly.rb
-- lib/bitly/v3/client.rb
-- lib/bitly/v3/country.rb
-- lib/bitly/v3/day.rb
-- lib/bitly/v3/missing_url.rb
-- lib/bitly/v3/oauth.rb
-- lib/bitly/v3/realtime_link.rb
-- lib/bitly/v3/referrer.rb
-- lib/bitly/v3/url.rb
-- lib/bitly/v3/user.rb
-- lib/bitly/version.rb
 files:
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - History.txt
 - LICENSE.md
@@ -219,7 +190,8 @@ files:
 - test/fixtures/shorten_error.json
 - test/test_helper.rb
 homepage: http://github.com/philnash/bitly
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
@@ -234,14 +206,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '1.2'
+      version: '0'
 requirements: []
-rubyforge_project: bitly
+rubyforge_project: 
 rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
@@ -251,4 +223,12 @@ test_files:
 - test/bitly/test_config.rb
 - test/bitly/test_url.rb
 - test/bitly/test_utils.rb
+- test/fixtures/cnn.json
+- test/fixtures/cnn_and_google.json
+- test/fixtures/expand_cnn.json
+- test/fixtures/expand_cnn_and_google.json
+- test/fixtures/google_and_cnn_info.json
+- test/fixtures/google_info.json
+- test/fixtures/google_stats.json
+- test/fixtures/shorten_error.json
 - test/test_helper.rb