pingfm 2.1.0 → 2.1.2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pingfm (2.0.0)
+    pingfm (2.1.2)
       slop
 
 GEM

data/lib/pingfm.rb

@@ -4,5 +4,5 @@ require 'pingfm/client'
 require 'pingfm/config'
 
 module Pingfm
-  VERSION = '2.1.0'
+  VERSION = '2.1.2'
 end

data/lib/pingfm/client.rb

@@ -2,6 +2,7 @@ require 'net/http'
 require 'rexml/document' # TODO: Rewrite this to use something faster (Nokogiri, possibly).
 
 module Pingfm
+  # TODO: The status_ok and status_fail methods need a little thought.
   class Client
 
     # The registered API key for the Ping.fm Ruby library client.
@@ -22,7 +23,7 @@ module Pingfm
     #
     # Optional arguments:
     # [limit] Limit the results returned; default is 25.
-    # [order] = Which direction to order the returned results by date; default is descending.
+    # [order] Which direction to order the returned results by date; default is 'DESC'.
     #
     # If successful returns:
     #   {'status' => 'OK', 'messages' => [{'id' => 'messageid', 'method' => 'messsagemethod', 'rfc' => 'date', 'unix' => 'date', 'title' => 'messagetitle', 'body' => 'messagebody', 'services' => [{'id' => 'serviceid', 'name' => 'servicename'}, ...]}, ...]}
@@ -62,6 +63,37 @@ module Pingfm
       end
     end
 
+    # Returns the last +limit+ number of links the user has shortened and posted through Ping.fm.
+    #
+    # Optional arguments:
+    # [limit] Limit the results returned; default is 25.
+    # [order] The sort order of the results; default is 'DESC'.
+    #
+    # If successful returns:
+    #   {'status' => 'OK', 'links' => [{ 'short' => 'http://ping.fm/}, ...]}
+    def links(limit = 25, order = 'DESC')
+      response = get_response('user.links', 'limit' => limit, 'order' => order)
+      if response.elements['rsp'].attributes['status'] == 'OK'
+        links = []
+        response.elements.each('rsp/links/link') do |link|
+          links << {
+            'date'  => link.elements['date'].attributes['rfc'],
+            'short' => link.elements['short'].text,
+            'long'  => link.elements['long'].text,
+          }
+        end
+        status_ok('links' => links)
+      else
+        status_fail(response)
+      end
+    end
+
+    def url_create
+    end
+
+    def url_resolve
+    end
+
     # Posts a message to the user's Ping.fm services.
     #
     # Arguments:
@@ -99,7 +131,7 @@ module Pingfm
     def services
       response = get_response('user.services')
       if response.elements['rsp'].attributes['status'] == 'OK'
-        services = status_ok()
+        services = status_ok
         services['services'] = []
         response.elements.each('rsp/services/service') do |service|
           services['services'].push({'id' => service.attributes['id'],
@@ -188,6 +220,17 @@ module Pingfm
       end
     end
 
+    # Returns the full user app key from the provided <tt>mobile_key</tt>.
+    def user_key(mobile_key)
+      response = get_response('user.key', 'mobile_key' => mobile_key)
+      if response.elements['rsp'].attributes['status'] == 'OK'
+        app_key = response.elements['rsp'].elements['key'].text
+        status_ok('app_key' => app_key)
+      else
+        status_fail(response)
+      end
+    end
+
     # Validates the API key and user APP key.
     #
     # If successful returns:
@@ -221,13 +264,13 @@ module Pingfm
     end
 
     # Successful response.
-    def status_ok
-      return {'status' => 'OK'}
+    def status_ok(info = {})
+      return {'status' => 'OK'}.merge(info)
     end
 
     # Failed response.
     def status_fail(response)
-      if response.elements.include? 'rsp/message'
+      if response.elements.include?('rsp/message')
         message = response.elements['rsp/message'].text
       else
         message = "Unknown error from Ping.fm."

data/lib/pingfm/config.rb

@@ -1,3 +1,5 @@
+require 'yaml'
+
 module Pingfm
   class ConfigNotFound < Exception; end
 

data/spec/pingfm/client_spec.rb

@@ -1,5 +1,7 @@
 require 'spec_helper'
 
+# TODO: These specs kinda suck.
+
 describe Pingfm::Client do
   it 'should have an API_URL' do
     Pingfm::Client::API_URL.should_not be_nil
@@ -158,6 +160,38 @@ describe Pingfm::Client, "with expected results" do
     result['status'].should eql('OK')
   end
 
+  it "should get the user app key from the mobile_key" do
+    init_user_key_response
+
+    uri = URI.parse "#{Pingfm::Client::API_URL}/#{@service_type}"
+    @params.merge!('mobile_key' => @mobile_key)
+
+    http_resp = mock('response')
+    http_resp.should_receive(:body).and_return(@response)
+    Net::HTTP.should_receive(:post_form).with(uri, @params).and_return(http_resp)
+
+    result = @client.user_key(@mobile_key)
+    result.should_not be_empty
+    result['status'].should_not be_nil
+    result['app_key'].should == @app_key
+  end
+
+  it "should get the user's links" do
+    init_user_links_response
+
+    uri = URI.parse "#{Pingfm::Client::API_URL}/#{@service_type}"
+    @params.merge!('limit' => 25, 'order' => 'DESC')
+
+    http_resp = mock('response')
+    http_resp.should_receive(:body).and_return(@response)
+    Net::HTTP.should_receive(:post_form).with(uri, @params).and_return(http_resp)
+
+    result = @client.links
+    result.should_not be_empty
+    result['status'].should_not be_nil
+    result['links'].should_not be_empty
+  end
+
 end
 
 describe Pingfm::Client, "with error messages" do

data/spec/spec_helper.rb

@@ -54,6 +54,7 @@ EOXML
   def init_system_services_response
     @service_type = 'system.services'
     @response = <<EOXML
+<?xml version="1.0"?>
 <rsp status="OK">
   <transaction>12345</transaction>
   <method>system.services</method>
@@ -99,7 +100,7 @@ EOXML
   def init_latest_response
     @service_type = 'user.latest'
     @response = <<EOXML
-  <?xml version="1.0"?>
+<?xml version="1.0"?>
 <rsp status="OK">
   <transaction>12345</transaction>
   <method>user.latest</method>
@@ -136,6 +137,43 @@ EOXML
     </message>
   </messages>
 </rsp>
+EOXML
+  end
+
+  def init_user_links_response
+    @service_type = 'user.links'
+    @response = <<EOXML
+<?xml version="1.0"?>
+<rsp status="OK">
+  <transaction>12345</transaction>
+  <method>user.links</method>
+  <links>
+    <link>
+      <date rfc="Mon, 14 Sep 2009 01:53:12 -0500" unix="1252911192" />
+      <short>http://ping.fm/1souk</short>
+      <long>http://www.techcrunch.com/2009/09/13/intuit-to-acquire-former-techcrunch50-winner-mint-for-170-million/</long>
+    </link>
+    <link>
+      <date rfc="Mon, 14 Sep 2009 00:26:10 -0500" unix="1252905970" />
+      <short>http://ping.fm/U5azR</short>
+      <long>http://www.wired.com/wiredscience/2009/09/gallery_dinoauction/</long>
+    </link>
+  </links>
+</rsp>
+EOXML
+  end
+
+  def init_user_key_response
+    @service_type = 'user.key'
+    @app_key      = 'USER_APP_KEY'
+    @mobile_key   = 'MOBILE_KEY'
+    @response = <<EOXML
+<?xml version="1.0"?>
+<rsp status="OK">
+  <transaction>12345</transaction>
+  <method>user.key</method>
+  <key>#{@app_key}</key>
+</rsp>
 EOXML
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pingfm
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -15,7 +15,7 @@ date: 2011-06-12 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
-  requirement: &76760630 !ruby/object:Gem::Requirement
+  requirement: &76732520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *76760630
+  version_requirements: *76732520
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &76759860 !ruby/object:Gem::Requirement
+  requirement: &76731170 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,7 +34,7 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *76759860
+  version_requirements: *76731170
 description: Ping.fm (http://ping.fm) is a simple service that makes updating your
   social networks a snap, and this it's Ruby library.
 email: