klout 2.0.0 → 3.0.0

data/.gitignore

@@ -0,0 +1,55 @@
+# rcov generated
+coverage
+
+# rdoc generated
+rdoc
+
+# yard generated
+doc
+.yardoc
+
+# bundler
+.bundle
+
+# jeweler generated
+pkg
+
+# RVM generated
+.rvmrc
+
+*.gem
+Gemfile.lock
+.document
+
+# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
+#
+# * Create a file at ~/.gitignore
+# * Include files you want ignored
+# * Run: git config --global core.excludesfile ~/.gitignore
+#
+# After doing this, these files will be ignored in all your git projects,
+# saving you from having to 'pollute' every project you touch with them
+#
+# Not sure what to needs to be ignored for particular editors/OSes? Here's some ideas to get you started. (Remember, remove the leading # of the line)
+#
+# For MacOS:
+#
+.DS_Store
+
+# For TextMate
+*.tmproj
+tmtags
+
+# For emacs:
+#*~
+#\#*
+#.\#*
+
+# For vim:
+#*.swp
+
+# For redcar:
+#.redcar
+
+# For rubinius:
+#*.rbc

data/Gemfile

@@ -1,13 +1,11 @@
 source "http://rubygems.org"
 
+gem 'hashie'
 gem 'httparty'
 gem 'json'
 
-group :development do
-	gem 'bundler', '> 1.0.0'
+group :development, :test do
 	gem 'fakeweb', '~> 1.3.0'
 	gem 'guard-rspec', '~> 0.7.0'
-	gem 'jeweler', '~> 1.8.3'
-	gem 'simplecov', '~> 0.6.1'
 	gem 'rspec', '~> 2.9.0'
 end

data/README.rdoc

@@ -15,24 +15,15 @@ You will need a {Klout API Key}[http://developer.klout.com/member/register] in o
 Please refer to the {Klout API Documentation}[http://klout.com/s/developers/v2] for more information about the API, or follow the examples below:
 
   require 'klout'
-  k = Klout::API.new('api_key')
-
-If you set the +ENV['KLOUT_API_KEY']+ environment variable you don't need to pass anything:
-
-  k = Klout::API.new('api_key')
-
-Obtain the +klout_id+ for someone using their Twitter screen name or numerical Twitter ID:
-
-  k.identity('screen_name')
-  k.identity(12345678)
-  k.identity('screen_name', :ks)  # Query a different network.
-
-Once you have a +klout_id+ for someone, you can access their Klout score, influence and topics:
-
-  k.users klout_id
-  k.users klout_id, :score
-  k.users klout_id, :influence
-  k.users klout_id, :topics
+  Klout.api_key = ENV['KLOUT_API_KEY']
+  klout_id = Klout::Identity.find_by_screen_name('screen_name')
+  
+  user = Klout::Identity.new(klout_id)
+  user.details
+  user.score
+  user.score.scoreDelta.dayChange
+  user.topics
+  user.influence
 
 And that's it!
 
@@ -42,10 +33,12 @@ The {Klout API Documentation}[http://klout.com/s/developers/v2] has great inform
 
 == Errors
 
-When an error is received an instance of <code>Klout::API::Error</code> will be returned so that you can rescue accordingly:
+Errors are based on the HTTP response of the request, so that you can rescue accordingly:
 
-  rescue Klout::API::Error > error
-    ...
+  rescue Klout::ClientError > req
+	rescue Klout::BadRequest > req
+	rescue Klout::NotFound > req
+	rescue Klout::Unauthorized > req
 
 == Contributing to Klout
  

data/Rakefile

@@ -1,32 +1,10 @@
-# encoding: utf-8
-require 'rubygems'
-require 'bundler'
-
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "klout"
-  gem.homepage = "http://github.com/terra-firma/klout"
-  gem.license = "MIT"
-  gem.summary = %Q{A Ruby gem for interacting with the Klout API.}
-  gem.description = %Q{Klout is a Ruby gem for interacting with the Klout API.}
-  gem.email = "brian@terra-firma-design.com"
-  gem.authors = ["Brian Getting"]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
-
+$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
+require "bundler/version"
+require "rake/testtask"
+require "./lib/klout"
 require 'rspec/core'
 require 'rspec/core/rake_task'
+
 RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = FileList['spec/**/*_spec.rb']
 end
@@ -38,12 +16,14 @@ end
 
 task :default => :spec
 
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+desc "Build the gem"
+task :build do
+  system "gem build klout.gemspec"
+end
 
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "klout #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+desc "Build and release the gem"
+task :release => :build do
+  system "gem push klout-#{Klout::VERSION}.gem"
 end
+
+task :default => :test

data/klout.gemspec

@@ -1,76 +1,28 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
+require 'bundler'
+require 'bundler/version'
+
+require File.expand_path('lib/klout/version')
 
 Gem::Specification.new do |s|
+  s.add_runtime_dependency('hashie')
+  s.add_runtime_dependency('httparty')
+  s.add_runtime_dependency('json')
+  s.add_development_dependency('fakeweb')
+  s.add_development_dependency('guard-rspec')
+  s.add_development_dependency('rspec')
   s.name = "klout"
-  s.version = "2.0.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Getting"]
-  s.date = "2012-04-11"
-  s.description = "Klout is a Ruby gem for interacting with the Klout API."
-  s.email = "brian@terra-firma-design.com"
-  s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
-  s.files = [
-    ".rspec",
-    ".travis.yml",
-    "Gemfile",
-    "Guardfile",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "klout.gemspec",
-    "lib/klout.rb",
-    "lib/klout/api.rb",
-    "spec/klout/fixtures/identity.json",
-    "spec/klout/fixtures/influence.json",
-    "spec/klout/fixtures/score.json",
-    "spec/klout/fixtures/topics.json",
-    "spec/klout/fixtures/user.json",
-    "spec/klout/klout_spec.rb",
-    "spec/spec_helper.rb"
-  ]
+  s.description = %q{Implements the complete functionality of the Klout REST API (v2+).}
+  s.email = ["brian@tatem.ae"]
+  s.executables = `git ls-files -- bin/*`.split("\n").map{|f| File.basename(f)}
+  s.extra_rdoc_files = ["README.rdoc"]
+  s.files = `git ls-files`.split("\n")
   s.homepage = "http://github.com/terra-firma/klout"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
-  s.summary = "A Ruby gem for interacting with the Klout 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"])
-      s.add_runtime_dependency(%q<json>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["> 1.0.0"])
-      s.add_development_dependency(%q<fakeweb>, ["~> 1.3.0"])
-      s.add_development_dependency(%q<guard-rspec>, ["~> 0.7.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.3"])
-      s.add_development_dependency(%q<simplecov>, ["~> 0.6.1"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.9.0"])
-    else
-      s.add_dependency(%q<httparty>, [">= 0"])
-      s.add_dependency(%q<json>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["> 1.0.0"])
-      s.add_dependency(%q<fakeweb>, ["~> 1.3.0"])
-      s.add_dependency(%q<guard-rspec>, ["~> 0.7.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
-      s.add_dependency(%q<simplecov>, ["~> 0.6.1"])
-      s.add_dependency(%q<rspec>, ["~> 2.9.0"])
-    end
-  else
-    s.add_dependency(%q<httparty>, [">= 0"])
-    s.add_dependency(%q<json>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["> 1.0.0"])
-    s.add_dependency(%q<fakeweb>, ["~> 1.3.0"])
-    s.add_dependency(%q<guard-rspec>, ["~> 0.7.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.3"])
-    s.add_dependency(%q<simplecov>, ["~> 0.6.1"])
-    s.add_dependency(%q<rspec>, ["~> 2.9.0"])
-  end
-end
-
+  s.summary = %q{A library which implements the complete functionality of of the Klout REST API (v2+).}
+  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.version = Klout::VERSION
+  s.platform = Gem::Platform::RUBY
+  s.required_rubygems_version = Gem::Requirement.new('>= 1.3.6') if s.respond_to? :required_rubygems_version=
+end

data/lib/klout.rb

@@ -1,4 +1,96 @@
+require 'cgi'
+require 'uri'
 require 'httparty'
-require 'json'
+require 'hashie'
+Hash.send :include, Hashie::HashExtensions
 
-require 'klout/api'
+libdir = File.dirname(__FILE__)
+$LOAD_PATH.unshift(libdir) unless $LOAD_PATH.include?(libdir)
+
+require 'klout/version'
+require 'klout/identity'
+require 'klout/user'
+
+module Klout
+  class << self
+    # Allow Klout.api_key = "..."
+    def api_key=(api_key)
+      Klout.api_key = api_key
+    end
+
+    def base_uri=(uri)
+      Klout.base_uri uri
+    end
+
+    # Allows the initializer to turn off actually communicating to the REST service for certain environments
+    # Requires fakeweb gem to be installed
+    def disable
+      FakeWeb.register_uri(:any, %r|#{Regexp.escape(Klout.base_uri)}|, :body => '{"Disabled":true}', :content_type => 'application/json; charset=utf-8')
+    end
+  end
+
+  # Represents a Klout API error and contains specific data about the error.
+  class KloutError < StandardError
+    attr_reader :data
+    def initialize(data)
+      @data = Hashie::Mash.new(data)
+      super "The Klout API responded with the following error - #{data}"
+    end
+  end
+
+  class ClientError < StandardError; end
+  class ServerError < StandardError; end
+  class BadRequest < KloutError; end
+  class Unauthorized < StandardError; end
+  class NotFound < ClientError; end
+  class Unavailable < StandardError; end
+
+  class Klout
+    include HTTParty
+
+    @@base_uri = "http://api.klout.com/v2/"
+    @@api_key = ""
+    headers({ 
+      'User-Agent' => "klout-rest-#{VERSION}",
+      'Content-Type' => 'application/json; charset=utf-8',
+      'Accept-Encoding' => 'gzip, deflate'
+    })
+    base_uri @@base_uri
+
+    class << self
+      # Get the API key
+      def api_key; @@api_key end
+      
+      # Set the API key
+      def api_key=(api_key)
+        return @@api_key unless api_key
+        @@api_key = api_key
+      end
+
+      # Get the Base URI.
+      def base_uri; @@base_uri end
+
+      def get(*args); handle_response super end
+      def post(*args); handle_response super end
+      def put(*args); handle_response super end
+      def delete(*args); handle_response super end
+
+      def handle_response(response) # :nodoc:
+        case response.code
+        when 400
+          raise BadRequest.new response.parsed_response
+        when 401
+          raise Unauthorized.new
+        when 404
+          raise NotFound.new
+        when 400...500
+          raise ClientError.new response.parsed_response
+        when 500...600
+          raise ServerError.new
+        else
+          response
+        end
+      end
+    end
+  end
+end

data/lib/klout/identity.rb

@@ -0,0 +1,24 @@
+require 'klout'
+require 'json'
+
+module Klout
+  # Represents an identity
+  class Identity
+    class << self
+      def find_by_twitter_id(twitter_id)
+        response = Klout.get "/identity.json/tw/#{twitter_id}", :query => {key: Klout.api_key}
+        Hashie::Mash.new(response)
+      end
+      
+      def find_by_screen_name(screen_name)
+        response = Klout.get "/identity.json/twitter", :query => {key: Klout.api_key, screenName: screen_name}
+        Hashie::Mash.new(response)
+      end
+      
+      def find_by_klout_id(klout_id)
+        response = Klout.get "/identity.json/klout/#{klout_id}/tw", :query => {key: Klout.api_key}
+        Hashie::Mash.new(response)
+      end
+    end
+  end
+end

data/lib/klout/user.rb

@@ -0,0 +1,44 @@
+require 'klout'
+require 'json'
+
+module Klout
+  # Represents a user
+  class User
+    attr_reader :klout_id
+    
+    def initialize(klout_id)
+      @klout_id = klout_id
+    end
+    
+    def details
+      response = get
+      Hashie::Mash.new(response)
+    end
+    
+    def score
+      response = get "score"
+      Hashie::Mash.new(response)
+    end
+    
+    def topics
+      response = get "topics"
+      response.parsed_response
+    end
+    
+    def influence
+      response = get "influence"
+      Hashie::Mash.new(response)
+    end
+    
+    private
+    
+    def get(action = nil)
+      Klout.get uri_for(action), :query => {key: Klout.api_key}
+    end
+    
+    def uri_for(action = nil)
+      action = "/#{action}" if action
+      "/user.json/#{klout_id}#{action}"
+    end
+  end
+end

data/lib/klout/version.rb

@@ -0,0 +1,3 @@
+module Klout
+  VERSION = "3.0.0" unless defined?(Klout::VERSION)
+end

data/rails/init.rb

@@ -0,0 +1 @@
+require 'klout'

data/spec/klout/klout_spec.rb

@@ -1,55 +1,11 @@
 require 'spec_helper'
 
 module Klout
-  describe API do
-    API_URL = "http://api.klout.com/v2/"
-    
-    describe "initializing" do
-      it "requires an API key" do
-        expect {Klout::API.new}.should raise_error(ArgumentError)
-      end
-    end
-    
-    describe "calling the API" do
-      before(:each) do
-        @k = Klout::API.new(@api_key)
-      end
-      
-      describe "for a klout_id" do
-        it "should accept a Twitter ID" do
-          user_id = 500042487
-          FakeWeb.register_uri(:get, "#{API_URL}identity.json/tw/#{user_id}?key=#{@api_key}", :body => File.read(File.expand_path('spec/klout/fixtures/identity.json')))
-          @k.identity(user_id)['id'].should eq('54887627490056592')
-        end
-        
-        it "should accept a Twitter screen name" do
-          screen_name = 'dhh'
-          FakeWeb.register_uri(:get, "#{API_URL}identity.json/twitter?screenName=#{screen_name}&key=#{@api_key}", :body => File.read(File.expand_path('spec/klout/fixtures/identity.json')))
-          @k.identity(screen_name)['id'].should eq('54887627490056592')
-        end
-      end
-      
-      describe "for user" do
-        it "should return profile information" do
-          FakeWeb.register_uri(:get, "#{API_URL}user.json/#{@klout_id}?key=#{@api_key}", :body => File.read(File.expand_path('spec/klout/fixtures/user.json')))
-          @k.user(@klout_id)['kloutId'].to_i.should eq(@klout_id)
-        end
-        
-        it "should return score data" do
-          FakeWeb.register_uri(:get, "#{API_URL}user.json/#{@klout_id}/score?key=#{@api_key}", :body => File.read(File.expand_path('spec/klout/fixtures/score.json')))
-          @k.user(@klout_id, :score)['score'].should eq(18.162389755249023)
-        end
-        
-        it "should return influence data" do
-          FakeWeb.register_uri(:get, "#{API_URL}user.json/#{@klout_id}/influence?key=#{@api_key}", :body => File.read(File.expand_path('spec/klout/fixtures/influence.json')))
-          @k.user(@klout_id, :influence)['myInfluencersCount'].to_i.should eq(15)
-        end
-        
-        it "should return topics data" do
-          FakeWeb.register_uri(:get, "#{API_URL}user.json/#{@klout_id}/topics?key=#{@api_key}", :body => File.read(File.expand_path('spec/klout/fixtures/topics.json')))
-          @k.user(@klout_id, :topics).size.should eq(5)
-        end
-      end
-    end
+  describe Identity do
+    # TODO: test each method
+  end
+  
+  describe User do
+    # TODO: test each method
   end
 end

data/spec/spec_helper.rb

@@ -6,7 +6,7 @@ FakeWeb.allow_net_connect = false
 RSpec.configure do |config|
   config.before(:each) do
     FakeWeb.clean_registry
-    @api_key = '13adsf2dsf67adsf824aadfdsf12'
+    Klout.api_key = '13adsf2dsf67adsf824aadfdsf12'
     @klout_id = 635263
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: klout
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-11 00:00:00.000000000 Z
+date: 2012-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: httparty
-  requirement: &70240588720160 !ruby/object:Gem::Requirement
+  name: hashie
+  requirement: &70312729874460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70240588720160
+  version_requirements: *70312729874460
 - !ruby/object:Gem::Dependency
-  name: json
-  requirement: &70240588719280 !ruby/object:Gem::Requirement
+  name: httparty
+  requirement: &70312729872100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,90 +32,72 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70240588719280
+  version_requirements: *70312729872100
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &70240588717680 !ruby/object:Gem::Requirement
+  name: json
+  requirement: &70312729870320 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>'
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
-  version_requirements: *70240588717680
+  version_requirements: *70312729870320
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70240588716380 !ruby/object:Gem::Requirement
+  requirement: &70312730459220 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70240588716380
+  version_requirements: *70312730459220
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70240588715040 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.7.0
-  type: :development
-  prerelease: false
-  version_requirements: *70240588715040
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &70240588714220 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.8.3
-  type: :development
-  prerelease: false
-  version_requirements: *70240588714220
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: &70240588707800 !ruby/object:Gem::Requirement
+  requirement: &70312730458800 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70240588707800
+  version_requirements: *70312730458800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70240588707100 !ruby/object:Gem::Requirement
+  requirement: &70312730458380 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.9.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70240588707100
-description: Klout is a Ruby gem for interacting with the Klout API.
-email: brian@terra-firma-design.com
+  version_requirements: *70312730458380
+description: Implements the complete functionality of the Klout REST API (v2+).
+email:
+- brian@tatem.ae
 executables: []
 extensions: []
 extra_rdoc_files:
 - README.rdoc
 files:
+- .gitignore
 - .rspec
 - .travis.yml
 - Gemfile
 - Guardfile
 - README.rdoc
 - Rakefile
-- VERSION
 - klout.gemspec
 - lib/klout.rb
-- lib/klout/api.rb
+- lib/klout/identity.rb
+- lib/klout/user.rb
+- lib/klout/version.rb
+- rails/init.rb
 - spec/klout/fixtures/identity.json
 - spec/klout/fixtures/influence.json
 - spec/klout/fixtures/score.json
@@ -136,19 +118,24 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1810060536700847596
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.6
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: A Ruby gem for interacting with the Klout API.
-test_files: []
+summary: A library which implements the complete functionality of of the Klout REST
+  API (v2+).
+test_files:
+- spec/klout/fixtures/identity.json
+- spec/klout/fixtures/influence.json
+- spec/klout/fixtures/score.json
+- spec/klout/fixtures/topics.json
+- spec/klout/fixtures/user.json
+- spec/klout/klout_spec.rb
+- spec/spec_helper.rb

data/VERSION

@@ -1 +0,0 @@
-2.0.0

data/lib/klout/api.rb

@@ -1,69 +0,0 @@
-module Klout
-  class API
-    include HTTParty
-    format :plain
-    default_timeout 30
-    
-    attr_accessor :api_key, :timeout
-    
-    # == Usage
-    #
-    # Initialize with your Klout API key:
-    #
-    # k = Klout::API.new('api-key')
-    #
-    # Or you can set the +ENV['KLOUT_API_KEY']+ environment variable:
-    #
-    # k = Klout::API.new
-    #
-    def initialize(api_key = nil)
-      @api_key = api_key || ENV['KLOUT_API_KEY'] || raise(ArgumentError)
-    end
-    
-    def base_api_url # :nodoc:
-      "http://api.klout.com/v2"
-    end
-    
-    # === Identity
-    #
-    # Use the +identity+ method to get a user's +klout_id+.
-    # Pass either a numerical Twitter ID (Integer) or a Twitter screen name (String)
-    #
-    # k.identity(500042487)
-    # k.identity('dhh')
-    #
-    # You can also select a different network:
-    #
-    # k.identity('dhh', :ks)
-    #
-    def identity(id, network = :tw)
-      path = id.is_a?(Integer) ? "#{network}/#{id}?key=#{@api_key}" : "twitter?screenName=#{id}&key=#{@api_key}"
-      call("/identity.json/#{path}")
-    end
-    
-    # === User
-    #
-    # Use the +user+ method to get information about a user. Pass in a trait
-    # option to get score, influence and topics data:
-    #
-    # k.user(635263)
-    # k.user(635263, :influence)
-    # k.user(635263, :score)
-    # k.user(635263, :topics)
-    #
-    def user(id, trait = nil)
-      lookup = trait.nil? ? '' : "/#{trait.to_s}"
-      call("/user.json/#{id}#{lookup}?key=#{@api_key}")
-    end
-    
-    protected
-    
-    def call(endpoint) # :nodoc:
-      response = self.class.get(base_api_url + endpoint)
-      response.code.to_i == 200 ? JSON.parse(response.body) : raise(API::Error.new("HTTP Response Code: #{response.code}"))
-    end
-    
-    class Error < StandardError
-    end
-  end
-end