bitlyr 0.9.0

data/History.txt

@@ -0,0 +1,146 @@
+=== 0.8.0 / 2012-1-17
+
+* Major Refactor
+
+  * Adds Authentication Strategies
+  * Client supports OAuth & Login/ApiKey strategies
+  * User supports AccessToken strategy
+  * Forked original project. Pull requests in original project showed no movement.
+
+=== 0.7.0 / 2011-1-8
+
+* 1 major bug fix
+
+  * Updates OAuth2 gem and fixes OAuth class
+
+* 1 minor enhancement
+
+  Adds link_history to user model
+
+=== 0.6.2 / 2011-11-10
+
+* 2 minor enhancements
+
+  * Adds days parameter to clicks_by_minute v3 API call
+  * Converts Readme to markdown
+
+* 2 minor bug fixes
+
+  * Increases HTTParty version to avoid issues with Rubygems
+  * Stops mutating arguments on array methods
+
+=== 0.6.1 / 2011-01-12
+
+* 1 minor enhancement
+
+  * Updated OAuth2 gem and used extra information to save login and api_key to user objects
+
+=== 0.6.0 / 2011-01-03
+
+* 1 major enhancement
+
+  * Added OAuth 2 and User calls for the version 3 API
+
+=== 0.5.5 / 2010-12-22
+
+* 1 minor bug fix
+
+  * fixed method redifined warnings
+
+=== 0.5.4 / 2010-12-01
+
+* 4 minor enhancements
+
+  * Added referrers, countries, clicks_by_minute and clicks_by_day calls to the version 3 API
+
+=== 0.5.3 / 2010-07-30
+
+* 1 minor enhancement
+
+  * Added the info call to the version 3 API
+
+=== 0.5.2 / 2010-07-18
+
+* 1 minor enhancement
+
+  * Added the lookup call to the version 3 API.
+
+=== 0.5.1 / 2010-05-26
+
+* 1 bug fix
+
+  * When expanding a short url with the v3 module, user hash and short url weren't being set properly
+
+=== 0.5.0 / 2010-05-12
+
+* Loads of major enhancements
+
+  * Support for version 3 of the bit.ly API
+  * deprecation for version 2 client object
+
+=== 0.4.0 / 2009-12-19
+
+* 1 major enhancement
+
+  * support for j.mp urls
+
+=== 0.3.2 / 2009-11-15
+
+* 1 bug fix
+
+  * called the wrong variable in case of error in the creation of a Url object
+
+=== 0.3.1 / 2009-07-29
+
+* 1 minor enhancement
+
+  * removed require 'rubygems' from library (http://gist.github.com/54177)
+
+=== 0.3 / 2009-07-09
+
+* 1 major enhancement
+
+  * a full set of tests, properly mocked
+
+* 1 minor enhancement
+
+  * calling bitly.shorten(:history => 1) will add the url to the api user's history.
+
+* 1 bug fix
+
+  * you can no longer call shorten with a keyword, this was unsupported in the API and consequently removed
+
+=== 0.2 / 2009-06-23
+
+* 1 enhancement
+
+  * Depends on Crack instead of JSON, so can run on Jruby
+
+* 1 bug fix
+
+  * Does not choke when bit.ly chokes. Returns a BitlyError instead
+
+=== 0.1.4 / 2009-04-13
+
+* 1 bug fix
+
+  * Urls with parameters were choking, changed to using CGI.
+
+=== 0.1.2 / 2009-03-12
+
+* 1 minor enhancement
+
+  * Allows to add a keyword for shortening urls
+
+=== 0.1.1 / 2009-01-26
+
+* 1 bug fix
+
+  * Didn't include dependency on JSON
+
+=== 0.1.0 / 2009-01-26
+
+* 1 major enhancement
+
+  * First release
+

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2010 philnash
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -0,0 +1,97 @@
+# bitlyr
+
+## DESCRIPTION:
+
+A Ruby API for [http://bit.ly](http://bit.ly)
+
+[http://code.google.com/p/bitly-api/wiki/ApiDocumentation](http://code.google.com/p/bitly-api/wiki/ApiDocumentation)
+
+## NOTE:
+
+Bitly recently released their version 3 API. From this 0.9.0 release, the gem with only use the version 3 API.
+
+The gem will continue to support both Username and ApiKey as well as the OAuth Client ID and Client Secret
+
+To use, you will need to select a authorization strategy:
+
+    strategy = Bitlyr::Strategy::ApiKey.new(username, api_key)
+
+or
+
+    strategy = Bitlyr::Strategy::OAuth.new(client_id, client_secret)
+
+Once you have a strategy, you can initialize your client:
+
+    client = Bitlyr::Client.new(strategy)
+
+which will give you a ``Bitlyr::Client`` which provides access to the version 3 endpoints (``shorten``, ``expand``, ``clicks``, ``validate`` and ``bitly_pro_domain``). See [http://api.bit.ly](http://api.bit.ly) for details.
+
+
+## INSTALLATION:
+
+    gem install bitlyr
+
+## USAGE:
+
+Please see the Bit.ly API documentation [http://api.bit.ly](http://api.bit.ly) for details on the V3 API.
+
+Create a Bitlyr client using your username and api key as follows:
+
+    client = Bitlyr.new(:login => "login", :api_key => "api_key")
+
+or
+
+    client = Bitlyr.new(:client_id => "client id", :client_secret => "client secret", :token => "token")
+
+You can then use that client to shorten or expand urls or return more information or statistics as so:
+
+    client.shorten('http://www.google.com')
+    client.shorten('http://www.google.com', :history => 1) # adds the url to the api user's history
+    client.expand('wQaT') || client.expand('http://bit.ly/wQaT')
+    client.info('wQaT')   || client.info('http://bit.ly/wQaT')
+    client.stats('wQaT')  || client.info('http://bit.ly/wQaT')
+
+Each can be used in all the methods described in the API docs, the shorten function, for example, takes a url or an array of urls.
+
+All four functions return a ``Bitlyr::Url`` object (or an array of ``Bitlyr::Url`` objects if you supplied an array as the input). You can then get all the information required from that object.
+
+    url = client.shorten('http://www.google.com') #=> Bitlyr::Url
+
+    url.clicks_by_day    #=> an array of ``Bitlyr::Day``s
+    url.countries        #=> an array of ``Bitlyr::Country``s
+    url.referrers        #=> an array of ``Bitlyr::Referrer``s
+    url.clicks_by_minute #=> an array of 60 integers representing clicks over the last 60 minutes
+    url.created_by       #=> string  / http://code.google.com/p/bitly-api/wiki/ApiDocumentation#/v3/info
+    url.global_clicks    #=> integer / http://code.google.com/p/bitly-api/wiki/ApiDocumentation#/v3/clicks
+    url.global_hash      #=> string  / http://code.google.com/p/bitly-api/wiki/ApiDocumentation#/v3/info
+    url.long_url         #=> string  / http://code.google.com/p/bitly-api/wiki/ApiDocumentation#/v3/expand
+    url.new_hash?        #=> boolean / http://code.google.com/p/bitly-api/wiki/ApiDocumentation#/v3/shorten
+    url.short_url        #=> string  / http://code.google.com/p/bitly-api/wiki/ApiDocumentation#/v3/shorten
+    url.title            #=> string  / http://code.google.com/p/bitly-api/wiki/ApiDocumentation#/v3/info
+    url.user_clicks      #=> integer / http://code.google.com/p/bitly-api/wiki/ApiDocumentation#/v3/clicks
+    url.user_hash        #=> string  / http://code.google.com/p/bitly-api/wiki/ApiDocumentation#/v3/expand
+
+## LICENSE:
+
+> (The MIT License)
+>
+> Copyright (c) 2012 Jonathon Storer
+>
+> Permission is hereby granted, free of charge, to any person obtaining
+> a copy of this software and associated documentation files (the
+> 'Software'), to deal in the Software without restriction, including
+> without limitation the rights to use, copy, modify, merge, publish,
+> distribute, sublicense, and/or sell copies of the Software, and to
+> permit persons to whom the Software is furnished to do so, subject to
+> the following conditions:
+>
+> The above copyright notice and this permission notice shall be
+> included in all copies or substantial portions of the Software.
+>
+> THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+> EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+> MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+> IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+> CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+> TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+> SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.rdoc

@@ -0,0 +1,37 @@
+= bitly
+
+== DESCRIPTION:
+
+A Ruby API for version 3 of the http://bit.ly API, including j.mp and bitly.Pro support.
+
+http://api.bit.ly
+
+== INSTALLATION:
+
+<tt>gem install bitly</tt>
+
+== USAGE:
+
+Create a client using your username and API key from http://bit.ly
+
+<tt>bitly = Bitly.new(username, api_key)</tt>
+
+Then use that client to shorten or expand urls and hashes.
+
+<tt>bitly.shorten('http://google.com')</tt>
+
+See the {documentation}[http://philnash.github.com/bitly/rdoc/index.html] for more details.
+
+== Note on Patches/Pull Requests
+ 
+* Fork the project.
+* Make your feature addition or bug fix.
+* Add tests for it. This is important so I don't break it in a
+  future version unintentionally.
+* Commit, do not mess with rakefile, version, or history.
+  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+* Send me a pull request. Bonus points for topic branches.
+
+== Copyright
+
+Copyright (c) 2010 philnash. See LICENSE for details.

data/Rakefile

@@ -0,0 +1,43 @@
+require 'rubygems'
+require 'rake'
+
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  gem.name = "bitlyr"
+  gem.summary = "A ruby wrapper for the bit.ly API"
+  gem.description = <<-DESCRIPTION
+A ruby wrapper for version 3 of the bit.ly API
+Supports Login/ApiKey & OAuth authentication
+DESCRIPTION
+  gem.email = "jonathon.scott.storer@gmail.com"
+  gem.homepage = "http://github.com/jonstorer/bitlyr"
+  gem.authors = ["jonstorer"]
+  gem.add_dependency 'httparty', ">= 0.7.6"
+  gem.add_dependency 'crack', ">= 0.1.4"
+  gem.add_dependency 'oauth2', '>= 0.1.1'
+  gem.add_development_dependency "shoulda", ">= 0"
+  gem.add_development_dependency "jeweler", ">= 1.4.0"
+  gem.add_development_dependency "rcov", ">= 0"
+  gem.add_development_dependency "mocha", ">= 0.10.0"
+  gem.add_development_dependency "fakeweb", ">= 1.2.8"
+  # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+end
+
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
+end
+
+task :default => :test
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "bitlyr #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end

data/VERSION

@@ -0,0 +1 @@
+0.9.0

data/bitlyr.gemspec

@@ -0,0 +1,154 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "bitlyr"
+  s.version = "0.9.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["jonstorer"]
+  s.date = "2012-01-17"
+  s.description = "A ruby wrapper for version 3 of the bit.ly API\nSupports Login/ApiKey & OAuth authentication\n"
+  s.email = "jonathon.scott.storer@gmail.com"
+  s.extra_rdoc_files = [
+    "LICENSE",
+    "README.md",
+    "README.rdoc"
+  ]
+  s.files = [
+    "History.txt",
+    "LICENSE",
+    "README.md",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "bitlyr.gemspec",
+    "lib/bitlyr.rb",
+    "lib/bitlyr/client.rb",
+    "lib/bitlyr/country.rb",
+    "lib/bitlyr/day.rb",
+    "lib/bitlyr/error.rb",
+    "lib/bitlyr/lib/core_ext/hash.rb",
+    "lib/bitlyr/lib/core_ext/string.rb",
+    "lib/bitlyr/missing_url.rb",
+    "lib/bitlyr/realtime_link.rb",
+    "lib/bitlyr/referrer.rb",
+    "lib/bitlyr/response.rb",
+    "lib/bitlyr/strategy/access_token.rb",
+    "lib/bitlyr/strategy/api_key.rb",
+    "lib/bitlyr/strategy/base.rb",
+    "lib/bitlyr/strategy/oauth.rb",
+    "lib/bitlyr/url.rb",
+    "lib/bitlyr/user.rb",
+    "test/fixtures/9uX1TE.json",
+    "test/fixtures/9uX1TEclicks.json",
+    "test/fixtures/9uX1TEclicks2.json",
+    "test/fixtures/9uX1TEinfo.json",
+    "test/fixtures/9uX1TEinfo2.json",
+    "test/fixtures/auth_fail.json",
+    "test/fixtures/auth_success.json",
+    "test/fixtures/betaworks.json",
+    "test/fixtures/betaworks2.json",
+    "test/fixtures/betaworks_jmp.json",
+    "test/fixtures/betaworks_other_user.json",
+    "test/fixtures/bitly9uX1TE.json",
+    "test/fixtures/bitly_pro_domain.json",
+    "test/fixtures/clicks_by_day.json",
+    "test/fixtures/clicks_by_day1.json",
+    "test/fixtures/clicks_by_day2.json",
+    "test/fixtures/clicks_by_minute1_url.json",
+    "test/fixtures/clicks_by_minute2_url.json",
+    "test/fixtures/clicks_by_minute_hash.json",
+    "test/fixtures/clicks_by_minute_hashes.json",
+    "test/fixtures/country_hash.json",
+    "test/fixtures/country_hash2.json",
+    "test/fixtures/country_url.json",
+    "test/fixtures/failure.json",
+    "test/fixtures/invalid_bitly_pro_domain.json",
+    "test/fixtures/invalid_credentials.json",
+    "test/fixtures/invalid_domain.json",
+    "test/fixtures/invalid_user.json",
+    "test/fixtures/invalid_x_api_key.json",
+    "test/fixtures/lookup_multiple_url.json",
+    "test/fixtures/lookup_not_real_url.json",
+    "test/fixtures/lookup_single_url.json",
+    "test/fixtures/missing_hash.json",
+    "test/fixtures/multiple_info.json",
+    "test/fixtures/multiple_url_click.json",
+    "test/fixtures/multiple_urls.json",
+    "test/fixtures/not_bitly_pro_domain.json",
+    "test/fixtures/not_found_info.json",
+    "test/fixtures/referrer_hash.json",
+    "test/fixtures/referrer_hash2.json",
+    "test/fixtures/referrer_url.json",
+    "test/fixtures/success.json",
+    "test/fixtures/url_info.json",
+    "test/fixtures/user_clicks.json",
+    "test/fixtures/user_countries.json",
+    "test/fixtures/user_realtime_links.json",
+    "test/fixtures/user_referrers.json",
+    "test/fixtures/valid_user.json",
+    "test/integration/strategy/test_api_key.rb",
+    "test/integration/strategy/test_oauth.rb",
+    "test/integration/test_client.rb",
+    "test/integration/test_user.rb",
+    "test/test_helper.rb",
+    "test/unit/core_ext/test_hash.rb",
+    "test/unit/core_ext/test_string.rb",
+    "test/unit/strategy/test_access_token.rb",
+    "test/unit/strategy/test_api_key.rb",
+    "test/unit/strategy/test_base.rb",
+    "test/unit/strategy/test_oauth.rb",
+    "test/unit/test_bitly.rb",
+    "test/unit/test_client.rb",
+    "test/unit/test_country.rb",
+    "test/unit/test_day.rb",
+    "test/unit/test_error.rb",
+    "test/unit/test_missing.rb",
+    "test/unit/test_realtime_link.rb",
+    "test/unit/test_referrer.rb",
+    "test/unit/test_response.rb",
+    "test/unit/test_url.rb",
+    "test/unit/test_user.rb"
+  ]
+  s.homepage = "http://github.com/jonstorer/bitlyr"
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.10"
+  s.summary = "A ruby wrapper for the bit.ly API"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<httparty>, [">= 0.7.6"])
+      s.add_runtime_dependency(%q<crack>, [">= 0.1.4"])
+      s.add_runtime_dependency(%q<oauth2>, [">= 0.1.1"])
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.4.0"])
+      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<mocha>, [">= 0.10.0"])
+      s.add_development_dependency(%q<fakeweb>, [">= 1.2.8"])
+    else
+      s.add_dependency(%q<httparty>, [">= 0.7.6"])
+      s.add_dependency(%q<crack>, [">= 0.1.4"])
+      s.add_dependency(%q<oauth2>, [">= 0.1.1"])
+      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 1.4.0"])
+      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<mocha>, [">= 0.10.0"])
+      s.add_dependency(%q<fakeweb>, [">= 1.2.8"])
+    end
+  else
+    s.add_dependency(%q<httparty>, [">= 0.7.6"])
+    s.add_dependency(%q<crack>, [">= 0.1.4"])
+    s.add_dependency(%q<oauth2>, [">= 0.1.1"])
+    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 1.4.0"])
+    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<mocha>, [">= 0.10.0"])
+    s.add_dependency(%q<fakeweb>, [">= 1.2.8"])
+  end
+end
+

data/lib/bitlyr/client.rb

@@ -0,0 +1,153 @@
+module Bitlyr
+
+  # 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
+    extend Forwardable
+
+    delegate [ :validate, :valid? ] => :strategy
+
+    # Requires a Bitlyr::Strategy
+    def initialize(strategy)
+      raise ArgumentError, "Requires a Bitlyr::Strategy" unless strategy.is_a?(Bitlyr::Strategy::Base)
+
+      @strategy = strategy
+    end
+
+    # Checks whether a domain is a Bitly Pro Domain
+    def bitly_pro_domain(domain)
+      response = get(:bitly_pro_domain, :domain => domain)
+      return response['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, options={})
+      response = get(:shorten, { :longUrl => long_url }.merge(options))
+      return Bitlyr::Url.new(self, response)
+    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 = input.to_a
+      response = get(:lookup, :url => input)
+      results = response['lookup'].inject([]) do |results, url|
+        url['long_url'] = url.delete('url')
+        if url['error'].nil?
+          # builds the results array in the same order as the input
+          results[input.index(url['long_url'])] = Bitlyr::Url.new(self, url)
+        else
+          results[input.index(url['long_url'])] = Bitlyr::MissingUrl.new(url)
+        end
+        # remove the key from the original array, in case the same hash/url was entered twice
+        input[input.index(url['long_url'])] = nil
+        results
+      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, options={})
+      options.reject! { |k, v| k.to_s != 'days' }
+      get_method(:clicks_by_day, input, options)
+    end
+
+    private
+
+    def strategy
+      @strategy
+    end
+
+    def is_a_short_url?(input)
+      input.match(/^http:\/\//)
+    end
+
+    def get_single_method(method, input)
+      raise ArgumentError.new("This method only takes a hash or url input") unless input.is_a? String
+
+      key = is_a_short_url?(input) ? :shortUrl : :hash
+
+      response = get(method, key => input.to_a)
+      return Bitlyr::Url.new(self, response)
+    end
+
+    def get_method(method, input, options={})
+      options.symbolize_keys!
+      input = input.to_a
+
+      input.each do |i|
+        key = is_a_short_url?(i) ? :shortUrl : :hash
+        (options[key] ||= []) << i
+      end
+
+      response = get(method, options)
+
+      results = response[method.to_s].inject([]) do |results, 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] = Bitlyr::Url.new(self, url)
+        else
+          results[result_index] = Bitlyr::MissingUrl.new(url)
+        end
+        # remove the key from the original array, in case the same hash/url was entered twice
+        input[result_index] = nil
+        results
+      end
+      return results.length > 1 ? results : results[0]
+    end
+
+    def get(method, options={})
+      strategy.request(:get, method, options)
+    end
+  end
+end

data/lib/bitlyr/country.rb

@@ -0,0 +1,10 @@
+module Bitlyr
+  class Country
+    attr_reader :clicks, :country
+
+    def initialize(options = {})
+      @clicks  = options['clicks']
+      @country = options['country']
+    end
+  end
+end

data/lib/bitlyr/day.rb

@@ -0,0 +1,12 @@
+module Bitlyr
+
+  # Day objects are created by the clicks_by_day method of a url
+  class Day
+    attr_reader :clicks, :day_start
+
+    def initialize(options = {})
+      @clicks    = options['clicks']
+      @day_start = Time.at(options['day_start']) if options['day_start']
+    end
+  end
+end