bitly 2.0.0.beta.1 → 2.0.0.beta.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f5ea77a3cf31565edfd92df7f3e5295e0921592d46ab2c6a82544c1bdc3b9aa
-  data.tar.gz: 64a22df3165af72fd65954fb70d3af7e04c5e743d52bcc1c94dbb57a8b8c97ea
+  metadata.gz: 4936c99089af48f7096225e8f9a320978a52152d7650644099f1c2e79bfdb212
+  data.tar.gz: 246fc9e55eeb72aabcdba418cf7fa9df8b29f02fc5e6079fa0ed32979b6c5c37
 SHA512:
-  metadata.gz: a30418e79a7c1af67a7b2ab3c98fd21c385fcb6ac690a0a704755e0c5b037da5175c27ef8d1c6ea8d1baa59836e607dfc72416f60178e1781ae203e6056bd4dd
-  data.tar.gz: 4db248dccaf1ef70932ccf1ff3264b22da25d3cc2d0f8c168e6b857afc7ec365ed044ec72d797a513d4349fc3dd0a3294d082291cb9d9947e95c6d2d4a069393
+  metadata.gz: 16a268a0383fff569797929ad3fe90bcf46d38897b1aed760bfe878f5e0dd22b7d9ce126e725c59b76a43d5d96fe571e0d46ffab083af008cabc35bf5a05228e
+  data.tar.gz: d1700910090cd61c35438dafb6050f6d3bdaf8dace92b3d790741f13f6a21e5b2b6e7237d3f4575e469c9f501b44a17e48e4f0981a12e5fc8969f83726efafff

data/.travis.yml

@@ -9,6 +9,7 @@ rvm:
   - 2.6
   - 2.5
   - 2.4
+  - 2.3
   - ruby-head
   - jruby-19mode
   - jruby-head

data/History.txt

@@ -2,6 +2,10 @@
 
 ...
 
+=== 2.0.0.beta.2 / 2020-03-02
+
+* Uses autoload to improve memory consumption
+
 === 2.0.0.beta.1 / 2020-02-15
 
 * Complete overhaul of the gem.

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 

data/bitly.gemspec

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
@@ -9,22 +10,30 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Phil Nash"]
   spec.email         = ["philnash@gmail.com"]
 
-  spec.summary       = %q{Use the bit.ly API to shorten or expand URLs}
-  spec.description   = %q{Use the bit.ly API to shorten or expand URLs. Check out the API documentation at https://dev.bitly.com/.}
+  spec.summary       = %q{Use the Bitly API to shorten or expand URLs}
+  spec.description   = %q{Use the Bitly API version 4 to shorten or expand URLs. Check out the API documentation at https://dev.bitly.com/.}
   spec.homepage      = "https://github.com/philnash/bitly"
   spec.license       = "MIT"
 
+  spec.metadata      = {
+    "bug_tracker_uri"   => "https://github.com/philnash/bitly/issues",
+    "changelog_uri"     => "https://github.com/philnash/bitly/blob/master/History.txt",
+    "documentation_uri" => "https://www.rubydoc.info/gems/bitly/",
+    "homepage_uri"      => "https://github.com/philnash/bitly",
+    "source_code_uri"   => "https://github.com/philnash/bitly"
+  }
+
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
+    f.match(%r{^(test|spec|features|bin|docs)/})
   end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "oauth2", "< 2.0", ">= 0.5.0"
+  spec.required_ruby_version = ">= 2.3.0"
+
+  spec.add_runtime_dependency "oauth2", "< 2.0", ">= 0.5.0"
 
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "simplecov", "~> 0.17.1"
   spec.add_development_dependency "webmock", "~> 3.7.6"

data/lib/bitly.rb

@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
 require "bitly/version"
-require "bitly/error"
-require "bitly/oauth"
-require "bitly/http"
-require "bitly/api"
+
+module Bitly
+  autoload :Error, "bitly/error"
+  autoload :OAuth, "bitly/oauth"
+  autoload :HTTP, "bitly/http"
+  autoload :API, "bitly/api"
+end

data/lib/bitly/api.rb

@@ -3,14 +3,16 @@
 module Bitly
   module API
     BASE_URL = URI("https://api-ssl.bitly.com/v4")
+
+    autoload :Base, File.join(File.dirname(__FILE__), "api/base.rb")
+    autoload :Client, File.join(File.dirname(__FILE__), "api/client.rb")
+    autoload :ClickMetric, File.join(File.dirname(__FILE__), "api/click_metric.rb")
+    autoload :Bitlink, File.join(File.dirname(__FILE__), "api/bitlink.rb")
+    autoload :Organization, File.join(File.dirname(__FILE__), "api/organization.rb")
+    autoload :Group, File.join(File.dirname(__FILE__), "api/group.rb")
+    autoload :User, File.join(File.dirname(__FILE__), "api/user.rb")
+    autoload :BSD, File.join(File.dirname(__FILE__), "api/bsd.rb")
+    autoload :OAuthApp, File.join(File.dirname(__FILE__), "api/oauth_app.rb")
+    autoload :ShortenCounts, File.join(File.dirname(__FILE__), "api/shorten_counts.rb")
   end
 end
-
-require_relative "./api/client"
-require_relative "./api/click_metric"
-require_relative "./api/bitlink"
-require_relative "./api/organization"
-require_relative "./api/group"
-require_relative "./api/user"
-require_relative "./api/bsd"
-require_relative "./api/oauth_app"

data/lib/bitly/api/bitlink.rb

@@ -1,16 +1,17 @@
 # frozen_string_literal: true
 require_relative "./base"
 require_relative "./list"
-require_relative "./bitlink/paginated_list"
-require_relative "./bitlink/deeplink"
-require_relative "./bitlink/clicks_summary"
-require_relative "./bitlink/link_click"
 
 module Bitly
   module API
     ##
     # A Bitlink represents a shortened link within Bitly.
     class Bitlink
+      autoload :PaginatedList, File.join(File.dirname(__FILE__), "bitlink/paginated_list.rb")
+      autoload :Deeplink, File.join(File.dirname(__FILE__), "bitlink/deeplink.rb")
+      autoload :ClicksSummary, File.join(File.dirname(__FILE__), "bitlink/clicks_summary.rb")
+      autoload :LinkClick, File.join(File.dirname(__FILE__), "bitlink/link_click.rb")
+
       include Base
 
       class List < Bitly::API::List ; end

data/lib/bitly/api/group.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 require_relative "./base"
 require_relative "./list"
-require_relative "./group/preferences"
-require_relative "./shorten_counts"
 
 module Bitly
   module API
@@ -11,6 +9,8 @@ module Bitly
     # taken on behalf of a user and group and groups become a container for
     # Bitlinks and metrics.
     class Group
+      autoload :Preferences, File.join(File.dirname(__FILE__), "group/preferences.rb")
+
       include Base
 
       ##

data/lib/bitly/http.rb

@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 
-require_relative "./http/adapters/net_http"
-require_relative "./http/response"
-require_relative "./http/request"
-require_relative "./http/client"
+module Bitly
+  module HTTP
+    autoload :Adapters, File.join(File.dirname(__FILE__), "http/adapters.rb")
+    autoload :Response, File.join(File.dirname(__FILE__), "http/response.rb")
+    autoload :Request, File.join(File.dirname(__FILE__), "http/request.rb")
+    autoload :Client, File.join(File.dirname(__FILE__), "http/client.rb")
+  end
+end

data/lib/bitly/http/adapters.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Bitly
+  module HTTP
+    module Adapters
+      autoload :NetHTTP, File.join(File.dirname(__FILE__), "adapters/net_http.rb")
+    end
+  end
+end

data/lib/bitly/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bitly
-  VERSION = "2.0.0.beta.1"
+  VERSION = "2.0.0.beta.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bitly
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta.1
+  version: 2.0.0.beta.2
 platform: ruby
 authors:
 - Phil Nash
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2020-02-15 00:00:00.000000000 Z
+date: 2020-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth2
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -128,8 +128,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Use the bit.ly API to shorten or expand URLs. Check out the API documentation
-  at https://dev.bitly.com/.
+description: Use the Bitly API version 4 to shorten or expand URLs. Check out the
+  API documentation at https://dev.bitly.com/.
 email:
 - philnash@gmail.com
 executables: []
@@ -145,19 +145,8 @@ files:
 - LICENSE.md
 - README.md
 - Rakefile
-- bin/console
-- bin/oauth
-- bin/setup
 - bitly.gemspec
 - config/env.yml.example
-- docs/authentication.md
-- docs/bitlinks.md
-- docs/branded_short_domains.md
-- docs/groups.md
-- docs/oauth_apps.md
-- docs/organizations.md
-- docs/premium_apis.md
-- docs/users.md
 - lib/bitly.rb
 - lib/bitly/api.rb
 - lib/bitly/api/base.rb
@@ -176,22 +165,24 @@ files:
 - lib/bitly/api/organization.rb
 - lib/bitly/api/shorten_counts.rb
 - lib/bitly/api/user.rb
-- lib/bitly/client.rb
-- lib/bitly/config.rb
 - lib/bitly/error.rb
 - lib/bitly/http.rb
+- lib/bitly/http/adapters.rb
 - lib/bitly/http/adapters/net_http.rb
 - lib/bitly/http/client.rb
 - lib/bitly/http/request.rb
 - lib/bitly/http/response.rb
 - lib/bitly/oauth.rb
-- lib/bitly/v3/client.rb
-- lib/bitly/v3/user.rb
 - lib/bitly/version.rb
 homepage: https://github.com/philnash/bitly
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/philnash/bitly/issues
+  changelog_uri: https://github.com/philnash/bitly/blob/master/History.txt
+  documentation_uri: https://www.rubydoc.info/gems/bitly/
+  homepage_uri: https://github.com/philnash/bitly
+  source_code_uri: https://github.com/philnash/bitly
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -200,7 +191,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
@@ -210,5 +201,5 @@ requirements: []
 rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: Use the bit.ly API to shorten or expand URLs
+summary: Use the Bitly API to shorten or expand URLs
 test_files: []

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "bitly"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)

data/bin/oauth

@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "bitly"
-require "envyable"
-
-Envyable.load('./config/env.yml')
-
-oauth = Bitly::OAuth.new(client_id: ENV['CLIENT_ID'], client_secret: ENV['CLIENT_SECRET'])
-puts oauth.authorize_uri('http://example.com/oauth/redirect')

data/bin/setup

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -vx
-
-bundle install
-
-# Do any other automated setup that you need to do here

data/docs/authentication.md

@@ -1,51 +0,0 @@
-# Authentication
-
-Bitly requires OAuth access tokens to use the API. You will need to [register your application with the Bitly API](bitly.com/a/oauth_apps), you will get a `client_id` and `client_secret`.
-
-There are 3 methods you can use to get an OAuth access token:
-
-- [Account Generic Access Token](#account-generic-access-token)
-- [OAuth Web Flow](#oauth-web-flow)
-- [Resource Owner Credential Grant Flow](#resource-owner-credential-grant-flow)
-
-## Account Generic Access Token
-
-You can get your own OAuth token for your account from the [Bitly console](https://app.bitly.com/). Click on the account drop down menu, then _Profile Settings_ then _Generic Access Token_. Fill in your password and you can generate an OAuth access token.
-
-## OAuth Web Flow
-
-Redirect the user to the Bitly authorization page using your `client_id` and a `redirect_uri` that Bitly should redirect your user to after authorization. You can get the URL like so:
-
-```ruby
-oauth = Bitly::OAuth.new(client_id: client_id, client_secret: client_secret)
-oauth.authorize_uri("http://myexamplewebapp.com/oauth_page")
-#=> "https://bitly.com/oauth/authorize?client_id=client_id&redirect_uri=http%3A%2F%2Fmyexamplewebapp.com%2Foauth_page"
-```
-
-You can pass an optional `state` parameter that will be included, unchanged, in the redirect.
-
-```ruby
-oauth.authorize_uri("http://myexamplewebapp.com/oauth_page", state: "state")
-#=> "https://bitly.com/oauth/authorize?client_id=client_id&redirect_uri=http%3A%2F%2Fmyexamplewebapp.com%2Foauth_page&state=state"
-```
-
-Once the user has authorized you to use their Bitly account, you will get a
-`code` parameter in the redirect. You can exchange that code, along with the
-redirect_uri, for the access token.
-
-```ruby
-oauth.access_token(redirect_uri: "http://myexamplewebapp.com/oauth_page", code: "code")
-#=> "<ACCESS_TOKEN>"
-```
-
-## Resource Owner Credential Grant Flow
-
-If you cannot perform a web flow, the resource owner credential grant flow allows you to take a user's username and password and exchange it for an OAuth access token. If you use this method you _should_ store only the user's access token and never the password.
-
-To use the resource owner credential grant flow, create an OAuth client object then request the access token with the username and password:
-
-```ruby
-oauth = Bitly::OAuth.new(client_id: client_id, client_secret: client_secret)
-oauth.access_token(username: username, password: password)
-#=> "<ACCESS_TOKEN>"
-```

data/docs/bitlinks.md

@@ -1,2 +0,0 @@
-# Bitlinks
-

data/docs/branded_short_domains.md

@@ -1,20 +0,0 @@
-# Branded Short Domains
-
-BSDs is an acronym for branded short domains. A branded short domain is a custom 15 character or less domain for bitlinks. This allows you to customize the domain to your brand.
-
-See the full [Bitly API documentation for BSDs](https://dev.bitly.com/v4/#tag/BSDs).
-
-## List BSDs
-
-With an API client you can list the BSDs available to the authorized user.
-
-```ruby
-client = Bitly::API::Client.new(token: token)
-bsds = client.bsds
-```
-
-Or with the class method
-
-```ruby
-bsds = Bitly::API::BSD.list(client: client)
-```

data/docs/groups.md

@@ -1,80 +0,0 @@
-# Groups
-
-Groups are a subdivision within an [organization](./organizations.md). A [user](./users.md) belongs to a group within an organization. Most actions in the API are on behalf of a group. For example, when you shorten a link, it will be on behalf of a user and a group.
-
-See the full [Bitly API documentation for Groups](https://dev.bitly.com/v4/#tag/Groups).
-
-## List Groups
-
-With an API client you can list the groups available to the authorized user.
-
-```ruby
-client = Bitly::API::Client.new(token: token)
-groups = client.groups
-```
-
-Or with the class method
-
-```ruby
-groups = Bitly::API::Group.list(client: client)
-```
-
-You can also filter groups by an organization guid or an organization object, using the client.
-
-```ruby
-groups = client.groups(organization: organization_guid)
-groups = client.groups(organization: organization)
-```
-
-Or the class method
-
-```ruby
-groups = Bitly::API::Group.list(client: client, organization: organization_guid)
-groups = Bitly::API::Group.list(client: client, organization: organization)
-```
-
-## Fetch a Group
-
-If you have the guid of an group, you can fetch it directly.
-
-```ruby
-group = client.group(guid)
-```
-
-Or with the class method
-
-```ruby
-group = Bitly::API::Group.fetch(client: client, guid: guid)
-```
-
-## Group attributes
-
-Groups have the following attributes:
-
-* `name`
-* `guid`
-* `is_active`
-* `role`
-* `bsds`
-* `organization_guid`
-* `created`
-* `modified`
-
-### A Group's organization
-
-With the `organization_guid` we can get the group's organization directly from the group object.
-
-```ruby
-organization = group.organization
-```
-
-### Group preferences
-
-You can set one preference for a group, the domain that is used to shorten links. Free accounts can only choose `bit.ly` and pro accounts can use any domains they have set up.
-
-```ruby
-preferences = group.preferences
-puts preferences.domain_preference
-
-preferences.update(domain_preference: 'bit.ly')
-```

data/docs/oauth_apps.md

@@ -1,20 +0,0 @@
-# OAuth Apps
-
-You can fetch the details of an OAuth app you have in your account by the `client_id`.
-
-See the full [Bitly documentation for OAuth apps](https://dev.bitly.com/v4/#operation/getOAuthApp)
-
-## Fetch an OAuth app
-
-With the `client_id` of an OAuth app, you can fetch it directly.
-
-```ruby
-client = Bitly::API::Client.new(token: token)
-oauth_app = client.oauth_app(client_id: client_id)
-```
-
-Or with the class method
-
-```ruby
-oauth_app = Bitly::API::OAuthApp.fetch(client: client, client_id: client_id)
-```

data/docs/organizations.md

@@ -1,74 +0,0 @@
-# Organizations
-
-An organization is the top level of the Bitly user hierarchy. Both [Users](./users.md) and [Groups](./groups.md) live within an organization.
-
-See the full [Bitly API documentation for Organizations](https://dev.bitly.com/v4/#tag/Organizations).
-
-## List Organizations
-
-With an API client you can list the organizations available to the authorized user.
-
-```ruby
-client = Bitly::API::Client.new(token: token)
-organizations = client.organizations
-```
-
-Or with the class method:
-
-```ruby
-organizations = Bitly::API::Organization.list(client: client)
-```
-
-## Fetch an Organization
-
-If you have the guid of an organization, you can fetch it directly.
-
-```ruby
-client = Bitly::API::Client.new(token: token)
-organization = client.organization(guid)
-```
-
-Or with the class method
-
-```ruby
-organization = Bitly::API::Organization.fetch(client: client, organization_guid: guid)
-```
-
-## Organization attributes
-
-Organizations have the following attributes:
-
-* `name`
-* `guid`
-* `is_active`
-* `tier`
-* `tier_family`
-* `tier_display_name`
-* `role`
-* `bsds`
-* `created`
-* `modified`
-
-### Organization groups
-
-With an organization you can fetch its related [groups](./groups.md).
-
-```ruby
-client = Bitly::API::Client.new(token: token)
-organization = client.organization(guid)
-groups = organization.groups
-```
-
-This is the same as fetching groups and filtering by an organization guid.
-
-```ruby
-client = Bitly::API::Client.new(token: token)
-organization = client.organization(guid)
-groups = client.groups(organization: organization)
-```
-
-Or filtering in the class method directly.
-
-```ruby
-groups = Bitly::API::Group.list(client: client, organization: organization)
-```

data/docs/users.md

@@ -1 +0,0 @@
-# Users

data/lib/bitly/client.rb

@@ -1,145 +0,0 @@
-require 'rubygems'
-require 'net/http'
-require 'uri'
-
-module Bitly
-  extend Config
-  API_URL     = 'https://api-ssl.bitly.com/'
-  API_VERSION = '2.0.1'
-
-  def self.new(login, api_key = nil, timeout=nil)
-    if api_version == 3
-      Bitly::V3::Client.new(login, api_key, timeout)
-    else
-      Bitly::Client.new(login,api_key)
-    end
-  end
-
-  def self.use_api_version_3
-    self.api_version = 3
-  end
-
-  def self.use_api_version_2
-    self.api_version = 2
-  end
-
-  # get and initialize a client if configured using Config
-  def self.client
-    # api_verison, login, and api_key are set in Config
-    if api_version == 3
-      Bitly::V3::Client.new(login, api_key, timeout)
-    else
-      Bitly::Client.new(login, api_key)
-    end
-  end
-
-  class Client
-
-    include Bitly::Utils
-    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"
-      @login = login
-      @api_key = api_key
-    end
-
-    def shorten(input, opts={})
-      if input.is_a? String
-        request = create_url("shorten", :longUrl => input, :history => (opts[:history] ? 1 : nil))
-        result = get_result(request)
-        result = {:long_url => input}.merge result[input]
-        Bitly::Url.new(@login,@api_key,result)
-      elsif input.is_a? Array
-        request = create_url("shorten", :history => (opts[:history] ? 1 : nil))
-        request.query << "&" + input.map { |long_url| "longUrl=#{CGI.escape(long_url)}" }.join("&") unless input.nil?
-        result = get_result(request)
-        input.map do |long_url|
-          new_url = {:long_url => long_url}.merge result[long_url]
-          long_url = Bitly::Url.new(@login,@api_key,new_url)
-        end
-      else
-        raise ArgumentError.new("Shorten requires either a url or an array of urls")
-      end
-    end
-
-    def expand(input)
-      if input.is_a? String
-        if input.include?('bit.ly/') || input.include?('j.mp/')
-          hash = create_hash_from_url(input)
-          request = create_url "expand", :hash => hash
-          result = get_result(request)
-          result = { :short_url => input, :hash => hash }.merge result[hash]
-        else
-          request = create_url "expand", :hash => input
-          result = get_result(request)
-          result = { :hash => input, :short_url => "http://bit.ly/#{input}" }.merge result[input]
-        end
-        Bitly::Url.new(@login,@api_key,result)
-      elsif input.is_a? Array
-        request = create_url "expand", :hash => input.join(',')
-        result = get_result(request)
-        input.map do |hsh|
-          new_url = {:hash => hsh, :short_url => "http://bit.ly/#{hsh}"}.merge result[hsh]
-          hsh = Bitly::Url.new(@login,@api_key,new_url)
-        end
-      else
-        raise ArgumentError('Expand requires either a short url, a hash or an array of hashes')
-      end
-    end
-
-    def info(input)
-      if input.is_a? String
-        if input.include? "bit.ly/"
-          hash = create_hash_from_url(input)
-          request = create_url 'info', :hash => hash
-          result = get_result(request)
-          result = { :short_url => "http://bit.ly/#{hash}", :hash => hash }.merge result[hash]
-        else
-          request = create_url 'info', :hash => input
-          result = get_result(request)
-          result = { :short_url => "http://bit.ly/#{input}", :hash => input }.merge result[input]
-        end
-        Bitly::Url.new(@login,@api_key,result)
-      elsif input.is_a? Array
-        request = create_url "info", :hash => input.join(',')
-        result = get_result(request)
-        input.map do |hsh|
-          new_url = {:hash => hsh, :short_url => "http://bit.ly/#{hsh}"}.merge result[hsh]
-          hsh = Bitly::Url.new(@login,@api_key,:info => new_url)
-        end
-      else
-        raise ArgumentError.new('Info requires either a short url, a hash or an array of hashes')
-      end
-    end
-
-    def stats(input)
-      if input.is_a? String
-        if input.include? "bit.ly/"
-          hash = create_hash_from_url(input)
-          request = create_url 'stats', :hash => hash
-          result = get_result(request)
-          result = { :short_url => "http://bit.ly/#{hash}", :hash => hash }.merge result
-        else
-          request = create_url 'stats', :hash => input
-          result = get_result(request)
-          result = { :short_url => "http://bit.ly/#{input}", :hash => input }.merge result
-        end
-        Bitly::Url.new(@login,@api_key,:stats => result)
-      else
-        raise ArgumentError.new("Stats requires either a short url or a hash")
-      end
-    end
-
-  end
-
-end
-
-class BitlyError < StandardError
-  attr_reader :code
-  alias :msg :message
-  def initialize(msg, code)
-    @code = code
-    super("#{msg} - '#{code}'")
-  end
-end

data/lib/bitly/config.rb

@@ -1,29 +0,0 @@
-module Bitly
-  module Config
-
-    # bitly client options
-    OPTION_KEYS = [
-      :login,
-      :api_key,
-      :api_version,
-      :timeout
-    ]
-
-    attr_accessor(*OPTION_KEYS)
-
-    alias_method :access_token, :login
-    alias_method :access_token=, :login=
-
-    def configure
-      yield self
-      self
-    end
-
-    def options
-      options = {}
-      OPTION_KEYS.each{|key| options[key] = send(key)}
-      options
-    end
-
-  end
-end

data/lib/bitly/v3/client.rb

@@ -1,207 +0,0 @@
-module Bitly
-  module V3
-    # The client is the main part of this gem. You need to initialize the client with your
-    # username and API key and then you will be able to use the client to perform
-    # all the rest of the actions available through the API.
-    class Client
-      include HTTParty
-      base_uri 'https://api-ssl.bitly.com/v3/'
-
-      # Requires a generic OAuth2 access token or -deprecated- login and api key.
-      # http://dev.bitly.com/authentication.html#apikey
-      # Generic OAuth2 access token: https://bitly.com/a/oauth_apps
-      # ApiKey: Get yours from your account page at https://bitly.com/a/your_api_key
-      # Visit your account at http://bit.ly/a/account
-      def initialize(*args)
-        args.compact!
-        self.timeout = args.last.is_a?(0.class) ? args.pop : nil
-        if args.count == 1
-          # Set generic OAuth2 access token
-          @default_query_opts = { :access_token => args.first }
-        else
-          # Deprecated ApiKey authentication
-          @default_query_opts = {
-            :login => args[0],
-            :apiKey => args[1]
-          }
-        end
-      end
-
-      # Validates a login and api key
-      def validate(x_login, x_api_key)
-        response = get('/validate', :query => { :x_login => x_login, :x_apiKey => x_api_key })
-        return response['data']['valid'] == 1
-      end
-      alias :valid? :validate
-
-      # Checks whether a domain is a bitly.Pro domain
-      def bitly_pro_domain(domain)
-        response = get('/bitly_pro_domain', :query => { :domain => domain })
-        return response['data']['bitly_pro_domain']
-      end
-      alias :pro? :bitly_pro_domain
-
-      # Shortens a long url
-      #
-      # Options can be:
-      #
-      # [domain]                choose bit.ly or j.mp (bit.ly is default)
-      #
-      # [x_login and x_apiKey]  add this link to another user's history (both required)
-      #
-      def shorten(long_url, opts={})
-        query = { :longUrl => long_url }.merge(opts)
-        response = get('/shorten', :query => query)
-        return Bitly::V3::Url.new(self, response['data'])
-      end
-
-      # Expands either a hash, short url or array of either.
-      #
-      # Returns the results in the order they were entered
-      def expand(input)
-        get_method(:expand, input)
-      end
-
-      # Expands either a hash, short url or array of either and gets click data too.
-      #
-      # Returns the results in the order they were entered
-      def clicks(input)
-        get_method(:clicks, input)
-      end
-
-      # Like expand, but gets the title of the page and who created it
-      def info(input)
-        get_method(:info, input)
-      end
-
-      # Looks up the short url and global hash of a url or array of urls
-      #
-      # Returns the results in the order they were entered
-      def lookup(input)
-        input = arrayize(input)
-        query = input.inject([]) { |q, i| q << "url=#{CGI.escape(i)}" }
-        query = "/lookup?" + query.join('&')
-        response = get(query)
-        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
-            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
-            rs[input.index(url['long_url'])] = Bitly::V3::MissingUrl.new(url)
-            input[input.index(url['long_url'])] = nil
-          end
-          rs
-        end
-        return results.length > 1 ? results : results[0]
-      end
-
-      # Expands either a short link or hash and gets the referrer data for that link
-      #
-      # This method does not take an array as an input
-      def referrers(input)
-        get_single_method('referrers', input)
-      end
-
-      # Expands either a short link or hash and gets the country data for that link
-      #
-      # This method does not take an array as an input
-      def countries(input)
-        get_single_method('countries', input)
-      end
-
-      # Takes a short url, hash or array of either and gets the clicks by minute of each of the last hour
-      def clicks_by_minute(input)
-        get_method(:clicks_by_minute, input)
-      end
-
-      # Takes a short url, hash or array of either and gets the clicks by day
-      def clicks_by_day(input, opts={})
-        opts.reject! { |k, v| k.to_s != 'days' }
-        get_method(:clicks_by_day, input, opts)
-      end
-
-      def timeout=(timeout=nil)
-        self.class.default_timeout(timeout) if timeout
-      end
-
-      private
-
-      def arrayize(arg)
-        if arg.is_a?(String)
-          [arg]
-        else
-          arg.dup
-        end
-      end
-
-      def get(method, opts={})
-        opts[:query] ||= {}
-        opts[:query].merge!(@default_query_opts)
-
-        begin
-          response = self.class.get(method, opts)
-        rescue Timeout::Error
-          raise BitlyTimeout.new("Bitly didn't respond in time", "504")
-        end
-
-        if response['status_code'] == 200
-          return response
-        else
-          raise BitlyError.new(response['status_txt'], response['status_code'])
-        end
-      end
-
-      def is_a_short_url?(input)
-        input.match(/^https?:\/\//)
-      end
-
-      def get_single_method(method, input)
-        raise ArgumentError.new("This method only takes a hash or url input") unless input.is_a? String
-        if is_a_short_url?(input)
-          query = "shortUrl=#{CGI.escape(input)}"
-        else
-          query = "hash=#{CGI.escape(input)}"
-        end
-        query = "/#{method}?" + query
-        response = get(query)
-        return Bitly::V3::Url.new(self,response['data'])
-      end
-
-      def get_method(method, input, opts={})
-        input = arrayize(input)
-        query = input.inject([]) do |q, i|
-          if is_a_short_url?(i)
-            q << "shortUrl=#{CGI.escape(i)}"
-          else
-            q << "hash=#{CGI.escape(i)}"
-          end
-        end
-        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 |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
-            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
-            rs[result_index] = Bitly::V3::MissingUrl.new(url)
-            input[result_index] = nil
-          end
-          rs
-        end
-        return results.length > 1 ? results : results[0]
-      end
-    end
-  end
-end
-
-class BitlyTimeout < BitlyError; end

data/lib/bitly/v3/user.rb

@@ -1,134 +0,0 @@
-module Bitly
-  module V3
-    # A user requires an oauth access token. The flow is as follows:
-    #
-    #     o = Bitly::V3::OAuth.new(consumer_token, consumer_secret)
-    #     o.authorize_url(redirect_url)
-    #     #=> "https://bit.ly/oauth/authorize?client_id=#{consumer_token}&type=web_server&redirect_uri=http%3A%2F%2Ftest.local%2Fbitly%2Fauth"
-    # Redirect your users to this url, when they authorize your application
-    # they will be redirected to the url you provided with a code parameter.
-    # Use that parameter, and the exact same redirect url as follows:
-    #
-    #     o.get_access_token_from_code(params[:code], redirect_url)
-    #     #=> #<OAuth2::AccessToken ...>
-    #
-    # Then use that access token to create your user object.
-    #
-    #    u=Bitly::V3::User.new(o.access_token)
-    class User
-      include HTTParty
-      base_uri 'https://api-ssl.bit.ly/v3/'
-      attr_accessor :login, :api_key
-
-      def initialize(access_token)
-        @access_token = access_token
-        @login = access_token['login'] || access_token['username']
-        @api_key = access_token['apiKey'] || access_token['api_key']
-      end
-
-      # OAuth 2 endpoint that provides a list of top referrers (up to 500 per
-      # day) for a given user's bit.ly links, and the number of clicks per referrer.
-      #
-      # http://code.google.com/p/bitly-api/wiki/ApiDocumentation#/v3/user/referrers
-      def referrers(opts={})
-        if @referrers.nil? || opts.delete(:force)
-          @referrers = get_method(:referrers, Bitly::V3::Referrer, opts)
-        end
-        @referrers
-      end
-
-      # OAuth 2 endpoint that provides a list of countries from which clicks
-      # on a given user's bit.ly links are originating, and the number of clicks per country.
-      #
-      # http://code.google.com/p/bitly-api/wiki/ApiDocumentation#/v3/user/countries
-      def countries(opts={})
-        if @countries.nil? || opts.delete(:force)
-          @countries = get_method(:countries, Bitly::V3::Country, opts)
-        end
-        @countries
-      end
-
-      # OAuth 2 endpoint that provides a given user's 100 most popular links
-      # based on click traffic in the past hour, and the number of clicks per link.
-      #
-      # http://code.google.com/p/bitly-api/wiki/ApiDocumentation#/v3/user/realtime_links
-      def realtime_links(opts={})
-        if @realtime_links.nil? || opts.delete(:force)
-          opts.merge!(:access_token => @access_token.token)
-          result = self.class.get("/user/realtime_links", :query => opts)
-          if result['status_code'] == 200
-            @realtime_links = result['data']['realtime_links'].map { |rs| Bitly::V3::RealtimeLink.new(rs) }
-          else
-            raise BitlyError.new(result['status_txt'], result['status_code'])
-          end
-        end
-        @realtime_links
-      end
-
-      # OAuth 2 endpoint that provides the total clicks per day on a user's bit.ly links.
-      #
-      # http://code.google.com/p/bitly-api/wiki/ApiDocumentation#/v3/user/clicks
-      def clicks(opts={})
-        get_clicks(opts)
-        @clicks
-      end
-
-      # Displays the total clicks returned from the clicks method.
-      def total_clicks(opts={})
-        get_clicks(opts)
-        @total_clicks
-      end
-
-      # Returns a Bitly Client using the credentials of the user.
-      def client
-        @client ||= Bitly::V3::Client.new(login, api_key)
-      end
-
-      # OAuth 2 endpoint that provides a given user's link shortening history,
-      # in reverse chronological order (most recent to least recent).
-      def link_history(opts={})
-        opts.merge!(:access_token => @access_token.token)
-        result = self.class.get("/user/link_history", :query => opts)
-        if result['status_code'] == 200
-          results = result['data']['link_history'].inject([]) do |rs, obj|
-            obj['short_url'] = obj['link']
-            obj['hash'] = obj['link'].split('/').last
-            rs << Url.new(client, obj)
-          end
-          return results
-        else
-          raise BitlyError.new(result['status_txt'], result['status_code'])
-        end
-      end
-
-      private
-
-      def get_method(method, klass, opts)
-        opts.merge!(:access_token => @access_token.token)
-        result = self.class.get("/user/#{method.to_s}", :query => opts)
-        if result['status_code'] == 200
-          result['data'][method.to_s].map do |rs|
-            rs.inject([]) do |results, obj|
-              results << klass.new(obj)
-            end
-          end
-        else
-          raise BitlyError.new(result['status_txt'], result['status_code'])
-        end
-      end
-
-      def get_clicks(opts={})
-        if @clicks.nil? || opts.delete(:force)
-          opts.merge!(:access_token => @access_token.token)
-          result = self.class.get("/user/clicks", :query => opts)
-          if result['status_code'] == 200
-            @clicks = result['data']['clicks'].map { |rs| Bitly::V3::Day.new(rs) }
-            @total_clicks = result['data']['total_clicks']
-          else
-            raise BitlyError.new(result['status_txt'], result['status_code'])
-          end
-        end
-      end
-    end
-  end
-end