klout 1.0.1 → 2.0.0

data/.travis.yml

@@ -1 +1 @@
-rvm: 1.9.2
+rvm: 1.9.3

data/Gemfile

@@ -1,13 +1,13 @@
 source "http://rubygems.org"
 
+gem 'httparty'
 gem 'json'
-gem 'xml-simple'
 
 group :development do
-	gem 'bundler', '~> 1.0.0'
-	gem 'fakeweb'
-	gem 'guard-rspec'
-	gem 'jeweler', '~> 1.6.4'
-	gem 'simplecov'
-  gem 'rspec'
+	gem 'bundler', '> 1.0.0'
+	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

@@ -1,6 +1,6 @@
-= Klout
+= Klout {<img src="http://travis-ci.org/terra-firma/klout.png" />}[http://travis-ci.org/terra-firma/klout] {<img src="https://gemnasium.com/terra-firma/klout.png" alt="Dependency Status" />}[https://gemnasium.com/terra-firma/klout]
 
-Klout is a Ruby gem that provides a wrapper for interacting with the {Klout API}[http://developer.klout.com/docs/read/api/API].
+Klout is a Ruby gem that provides a wrapper for interacting with the {Klout API}[http://klout.com/s/developers/v2]. <i>Note: this gem only supports {version 2}[http://klout.com/s/developers/v2] of the Klout API. Use the {V1 branch}[https://github.com/terra-firma/klout/tree/v1] if you need legacy support.</i>
 
 == Requirements
 
@@ -12,28 +12,40 @@ You will need a {Klout API Key}[http://developer.klout.com/member/register] in o
 
 == Usage
 
-Please refer to the {Klout API Documentation}[http://developer.klout.com/docs/read/api/API] for more information about the API, or follow the examples below:
+Please refer to the {Klout API Documentation}[http://klout.com/s/developers/v2] for more information about the API, or follow the examples below:
 
-  k = Klout::API.new('your_secret_api_key')
+  require 'klout'
+  k = Klout::API.new('api_key')
 
-There are also configuration options:
+If you set the +ENV['KLOUT_API_KEY']+ environment variable you don't need to pass anything:
 
-  k = Klout::API.new('your_secret_api_key', {:format => 'xml', :secure => true})
+  k = Klout::API.new('api_key')
 
-Once you have created a Klout object, you can interact with the API to find out how much influence certain Twitter users have. You can also pass comma-delimited string of multiple Twitter usernames as well.
+Obtain the +klout_id+ for someone using their Twitter screen name or numerical Twitter ID:
 
-  k.klout('dhh')
-  k.klout('dhh, rails')
-  
-  k.show('dhh')
-  k.topics('dhh')
-  
-  k.influencer_of('rails')
-  k.influenced_by('dhh, rails')
+  k.identity('screen_name')
+  k.identity(12345678)
+  k.identity('screen_name', :ks)  # Query a different network.
 
-== Travis Build Status
+Once you have a +klout_id+ for someone, you can access their Klout score, influence and topics:
 
-{<img src="http://travis-ci.org/terra-firma/klout.png" />}[http://travis-ci.org/terra-firma/klout]
+  k.users klout_id
+  k.users klout_id, :score
+  k.users klout_id, :influence
+  k.users klout_id, :topics
+
+And that's it!
+
+== Caching
+
+The {Klout API Documentation}[http://klout.com/s/developers/v2] has great information about what data can be cached safely, and for how long, in order to improve the performance of your app.
+
+== Errors
+
+When an error is received an instance of <code>Klout::API::Error</code> will be returned so that you can rescue accordingly:
+
+  rescue Klout::API::Error > error
+    ...
 
 == Contributing to Klout
  

data/Rakefile

@@ -17,26 +17,31 @@ Jeweler::Tasks.new do |gem|
   gem.name = "klout"
   gem.homepage = "http://github.com/terra-firma/klout"
   gem.license = "MIT"
-  gem.summary = %Q{Ruby gem for interacting with the Klout API.}
-  gem.description = %Q{Ruby gem for interacting with the Klout API.}
+  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
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-task :default => :test
+RSpec::Core::RakeTask.new(:rcov) do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+end
+
+task :default => :spec
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
+
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = "klout #{version}"
   rdoc.rdoc_files.include('README*')

data/VERSION

@@ -1 +1 @@
-1.0.1
+2.0.0

data/klout.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{klout}
-  s.version = "1.0.1"
+  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 = [%q{Brian Getting}]
-  s.date = %q{2012-02-02}
-  s.description = %q{Ruby gem for interacting with the Klout API.}
-  s.email = %q{brian@terra-firma-design.com}
+  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"
   ]
@@ -26,48 +26,51 @@ Gem::Specification.new do |s|
     "klout.gemspec",
     "lib/klout.rb",
     "lib/klout/api.rb",
-    "spec/klout/fixtures/klout.json",
-    "spec/klout/fixtures/klout.xml",
+    "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.homepage = %q{http://github.com/terra-firma/klout}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.8}
-  s.summary = %q{Ruby gem for interacting with the Klout API.}
+  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_runtime_dependency(%q<xml-simple>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<fakeweb>, [">= 0"])
-      s.add_development_dependency(%q<guard-rspec>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, [">= 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<xml-simple>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<fakeweb>, [">= 0"])
-      s.add_dependency(%q<guard-rspec>, [">= 0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
-      s.add_dependency(%q<rspec>, [">= 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<xml-simple>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<fakeweb>, [">= 0"])
-    s.add_dependency(%q<guard-rspec>, [">= 0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
-    s.add_dependency(%q<rspec>, [">= 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
 

data/lib/klout.rb

@@ -1,7 +1,4 @@
-require 'uri'
-require 'net/http'
-require 'rubygems'
+require 'httparty'
 require 'json'
-require 'xmlsimple'
 
 require 'klout/api'

data/lib/klout/api.rb

@@ -1,57 +1,69 @@
 module Klout
   class API
-    # Blank slate
-    instance_methods.each do |m|
-      undef_method m unless m.to_s =~ /^__|object_id|method_missing|respond_to?|to_s|inspect/
+    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
     
-    # Initialize
-    def initialize(api_key, config = {})
-      defaults = {
-        :format   => 'json',
-        :secure   => false
-      }
-      @config = defaults.merge(config).freeze
-      @api_key = api_key
-      protocol = @config[:secure] ? 'https' : 'http'
-      api_base = URI.parse("#{protocol}://api.klout.com/")
-      @klout_api = Net::HTTP.new(api_base.host, api_base.port)
+    def base_api_url # :nodoc:
+      "http://api.klout.com/v2"
     end
     
-    # Class Methods
-    def call(api_method, usernames)
-      path = '/1'
-      path += '/users' if ['show', 'topics'].include?(api_method.to_s)
-      path += '/soi' if ['influenced_by', 'influencer_of'].include?(api_method.to_s)
-      path += "/#{api_method}.#{@config[:format]}"
-      path += "?key=#{@api_key}"
-      path += "&users=#{URI.escape(usernames.gsub(/ /,''))}"
-      url = Net::HTTP::Get.new(path)
-      response = @klout_api.request(url)
-      # TODO: Clean this up when Klout fixes their ambiguous 404 responses.
-      raise APIError.new(response.code, response.message) if response.code.to_i > 202
-      return nil if response.body == ''
-      @config[:format] == 'xml' ? XmlSimple.xml_in(response.body, {'ForceArray' => false}) : JSON.parse(response.body)
+    # === 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
     
-    def method_missing(api_method, *args) # :nodoc:
-      call(api_method, *args)
-    # TODO: Need Klout to fix their ambiguous 404 responses.
-    #rescue Klout::APIError => error
-      #super if error.message == "<404> Not Found"
+    # === 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
     
-    def respond_to?(api_method) # :nodoc:
-      call(api_method, 'twitter')
-    rescue Klout::APIError => error
-      error.message == "<404> Not Found" ? false : true
+    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
-  end
-  
-  class APIError < StandardError
-    # Initialize
-    def initialize(code, message)
-      super "<#{code}> #{message}"
+    
+    class Error < StandardError
     end
   end
 end

data/spec/klout/fixtures/identity.json

@@ -0,0 +1,4 @@
+{
+	"id": "54887627490056592",
+	"network": "ks"
+}

data/spec/klout/fixtures/influence.json

@@ -0,0 +1,45 @@
+{
+	"myInfluencers" : [
+	{
+		"entity" : {
+			"id" : "851563",
+			"payload" : {
+				"kloutId" : "851563",
+				"score" : {
+					"score" : 100.0
+				},
+				"topics" : [
+				{
+					"topicData" : {
+						"id" : "8655841127676549162",
+						"displayName" : "Social Media",
+						"name" : "social media",
+						"slug" : "social-media",
+						"imageUrl" : "http://kcdn3.klout.com/static/images/topics/social-media2.png"
+					},
+					"score" : 90.0,
+					"strength" : "strong",
+					"seconds" : 7736654
+				}
+				]
+			}
+		}
+	}
+	],
+	"myInfluencees" : [
+	{
+		"entity" : {
+			"id" : "54606150835198872",
+			"payload" : {
+				"kloutId" : "54606150835198872",
+				"score" : {
+					"score" : 14.543242454528809
+				},
+				"topics" : []
+			}
+		}
+	}
+	],
+	"myInfluencersCount" : 15,
+	"myInfluenceesCount" : 138166
+}

data/spec/klout/fixtures/score.json

@@ -0,0 +1,8 @@
+{
+	"score": 18.162389755249023,
+	"scoreDelta": {
+		"dayChange": -0.09396934509277344,
+		"weekChange": -0.5575828552246094,
+		"monthChange": -0.7959918975830078
+	}
+}

data/spec/klout/fixtures/topics.json

@@ -0,0 +1,37 @@
+[
+{
+	"id": "9050521595422321114",
+	"displayName": "Email Marketing",
+	"name": "email marketing",
+	"slug": "email-marketing",
+	"imageUrl": "http://kcdn3.klout.com/static/images/icons/generic-topic.png"
+},
+{
+	"id": "8450884106658763087",
+	"displayName": "Law",
+	"name": "law",
+	"slug": "law",
+	"imageUrl": "http://kcdn3.klout.com/static/images/topics/law_a883efae09bbe8bea4677d217d18fa85.png"
+},
+{
+	"id": "9219221220892053994",
+	"displayName": "Ruby",
+	"name": "ruby",
+	"slug": "ruby",
+	"imageUrl": "http://kcdn3.klout.com/static/images/topics/ruby_2f7531a7ddf45d64367d533f8674c714.png"
+},
+{
+	"id": "6843285985518810775",
+	"displayName": "Ruby on Rails",
+	"name": "ruby on rails",
+	"slug": "ruby-on-rails",
+	"imageUrl": "http://kcdn3.klout.com/static/images/topics/ruby on rails_3efb002572bbce5be4c27932ca05e52a.png"
+},
+{
+	"id": "7815",
+	"displayName": "Manhattan",
+	"name": "manhattan",
+	"slug": "manhattan",
+	"imageUrl": "http://kcdn3.klout.com/static/images/icons/generic-topic.png"
+}
+]

data/spec/klout/fixtures/user.json

@@ -0,0 +1,6 @@
+{
+	"kloutId": "635263",
+	"score": {
+		"score": 76.60027313232422
+	}
+}

data/spec/klout/klout_spec.rb

@@ -2,57 +2,54 @@ require 'spec_helper'
 
 module Klout
   describe API do
+    API_URL = "http://api.klout.com/v2/"
     
-    API_URL         = "http://api.klout.com/1"
-    API_URL_SECURE  = "http://api.klout.com:443/1"
-
-    it "requires an API key" do
-      expect {Klout::API.new}.should raise_error(ArgumentError)
-    end
-    
-    it "also accepts config options" do
-      expect {Klout::API.new(@api_key, {:secure => true})}.should_not raise_error(ArgumentError)
-    end
-    
-    it "requires username passed to methods" do
-      k = Klout::API.new(@apikey)
-      expect {k.klout}.should raise_error(ArgumentError)
-    end
-
-    it "can make a request to the API" do
-      FakeWeb.register_uri(:get, "#{API_URL}/klout.json?key=#{@api_key}&users=testuser", :body => @json_response)
-      k = Klout::API.new(@api_key)
-      k.klout('testuser')['status'].should eq(200)
+    describe "initializing" do
+      it "requires an API key" do
+        expect {Klout::API.new}.should raise_error(ArgumentError)
+      end
     end
     
-    it "can make a secure request to the API" do
-      FakeWeb.register_uri(:get, "#{API_URL_SECURE}/klout.json?key=#{@api_key}&users=testuser", :body => @json_response)
-      k = Klout::API.new(@api_key, {:secure => true})
-      k.klout('testuser')['users'].first['kscore'].should eq("30.01")
-    end
-    
-    it "can return XML from the API" do
-      FakeWeb.register_uri(:get, "#{API_URL}/klout.xml?key=#{@api_key}&users=testuser", :body => @xml_response)
-      k = Klout::API.new(@api_key, {:format => 'xml'})
-      k.klout('testuser')['user'].first['kscore'].should eq("30.01")
-    end
-
-    it "injects the 'user' prefix for user requests" do
-      FakeWeb.register_uri(:get, "#{API_URL}/users/show.json?key=#{@api_key}&users=testuser", :body => @json_response)
-      k = Klout::API.new(@api_key)
-      k.show('testuser')['status'].should eq(200)
-    end
-
-    it "injects the 'soi' prefix for influence requests" do
-      FakeWeb.register_uri(:get, "#{API_URL}/soi/influenced_by.json?key=#{@api_key}&users=testuser", :body => @json_response)
-      k = Klout::API.new(@api_key)
-      k.influenced_by('testuser')['status'].should eq(200)
-    end
-
-    it "only responds to methods supported by the Klout API" do
-      FakeWeb.register_uri(:get, "#{API_URL}/bogus_method.json?key=#{@api_key}&users=twitter", :status => ["404", "Not Found"])
-      k = Klout::API.new(@api_key)
-      k.respond_to?("bogus_method").should eq(false)
+    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
   end
 end

data/spec/spec_helper.rb

@@ -6,8 +6,7 @@ FakeWeb.allow_net_connect = false
 RSpec.configure do |config|
   config.before(:each) do
     FakeWeb.clean_registry
-    @api_key = 'valid-api-key'
-    @json_response = File.read(File.expand_path('spec/klout/fixtures/klout.json'))
-    @xml_response = File.read(File.expand_path('spec/klout/fixtures/klout.xml'))
+    @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: 1.0.1
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-02 00:00:00.000000000Z
+date: 2012-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: json
-  requirement: &2165150660 !ruby/object:Gem::Requirement
+  name: httparty
+  requirement: &70240588720160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165150660
+  version_requirements: *70240588720160
 - !ruby/object:Gem::Dependency
-  name: xml-simple
-  requirement: &2165149560 !ruby/object:Gem::Requirement
+  name: json
+  requirement: &70240588719280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,74 +32,74 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2165149560
+  version_requirements: *70240588719280
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2165148720 !ruby/object:Gem::Requirement
+  requirement: &70240588717680 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>'
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2165148720
+  version_requirements: *70240588717680
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &2165147780 !ruby/object:Gem::Requirement
+  requirement: &70240588716380 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *2165147780
+  version_requirements: *70240588716380
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2165146760 !ruby/object:Gem::Requirement
+  requirement: &70240588715040 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.0
   type: :development
   prerelease: false
-  version_requirements: *2165146760
+  version_requirements: *70240588715040
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2165145780 !ruby/object:Gem::Requirement
+  requirement: &70240588714220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.4
+        version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *2165145780
+  version_requirements: *70240588714220
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &2165144920 !ruby/object:Gem::Requirement
+  requirement: &70240588707800 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *2165144920
+  version_requirements: *70240588707800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2165128940 !ruby/object:Gem::Requirement
+  requirement: &70240588707100 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.9.0
   type: :development
   prerelease: false
-  version_requirements: *2165128940
-description: Ruby gem for interacting with the Klout API.
+  version_requirements: *70240588707100
+description: Klout is a Ruby gem for interacting with the Klout API.
 email: brian@terra-firma-design.com
 executables: []
 extensions: []
@@ -116,8 +116,11 @@ files:
 - klout.gemspec
 - lib/klout.rb
 - lib/klout/api.rb
-- spec/klout/fixtures/klout.json
-- spec/klout/fixtures/klout.xml
+- 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
 homepage: http://github.com/terra-firma/klout
@@ -135,7 +138,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -135046269901848319
+      hash: 1810060536700847596
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -144,8 +147,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.8
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: Ruby gem for interacting with the Klout API.
+summary: A Ruby gem for interacting with the Klout API.
 test_files: []

data/spec/klout/fixtures/klout.json

@@ -1,13 +0,0 @@
-{
-	"status": 200,
-	"users": [
-		{
-			"twitter_screen_name": "sampler",
-			"kscore": "30.01"
-		},
-		{
-			"twitter_screen_name": "another",
-			"kscore": "60.02"
-		}
-	]
-}

data/spec/klout/fixtures/klout.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<users>
-  <user>
-    <twitter_screen_name>sampler</twitter_screen_name>
-    <kscore>30.01</kscore>
-  </user>
-	<user>
-    <twitter_screen_name>another</twitter_screen_name>
-    <kscore>60.02</kscore>
-  </user>
-</users>