twitpic 0.2.0 → 0.3.0

data/README.rdoc

@@ -10,6 +10,12 @@ Library for TwitPic API.
 
 == SYNOPSIS:
 
+Use ad command line tool:
+
+  twitpic Picture.png
+
+Use as library:
+
   twitpic = TwitPic.new(username, password)
   twitpic.upload('Picture.png', 'My Picture')
 

data/Rakefile

@@ -16,6 +16,7 @@ spec = Gem::Specification.new do |s|
   s.files = %w(Rakefile README.rdoc History.txt) + Dir.glob("{bin,lib,spec}/**/*")
   s.add_dependency("mime-types", ">= 1.15")
   s.add_dependency("highline", ">= 1.5.1")
+  s.add_dependency("rubytter", ">= 0.8.0")
   s.executables = ["twitpic"]
   s.authors = %w(jugyo)
   s.email = 'jugyo.org@gmail.com'

data/bin/twitpic

@@ -2,6 +2,7 @@
 
 require 'rubygems'
 require 'twitpic'
+require 'rubytter'
 require 'optparse'
 require "highline"
 
@@ -18,6 +19,16 @@ OptionParser.new do |o|
   o.on('-p', '--password=PASSWORD') {|v| password = v}
   o.on('-m', '--message=MESSAGE') {|v| message = v}
   o.on('-s', '--screencapture') {|v| screencapture = true}
+  o.on('-c', '--conf=CONFNAME') { |v|
+    begin
+      conf = Pit.get v
+      username = conf["username"]
+      password = conf["password"]
+    rescue
+      puts 'You don\'t have pit module. Please install pit.'
+      puts 'for example: gem install pit'
+    end
+  }
   o.permute!(ARGV)
   file = ARGV.first
   if file.nil? && screencapture.nil?
@@ -29,7 +40,7 @@ end
 if file.nil? && screencapture
   file = '/tmp/twitpic_screencapture.png'
   File.delete(file) if File.exists?(file)
-  puts 'Please capture screen...'
+  puts 'Please capture screen!'
   system 'screencapture', '-i', '-f', file
   unless File.exists?(file)
     puts 'Aboat!'
@@ -37,10 +48,30 @@ if file.nil? && screencapture
   end
 end
 
+# try pit
+if username.nil? && password.nil?
+  begin
+    require 'pit'
+    puts 'Load twitter config from pit...'
+    config = Pit.get('twitter')
+    username = config['username']
+    password = config['password']
+  rescue LoadError
+  end
+end
+
+# try highline
 highline = HighLine.new
 username = highline.ask('USERNAME: ') unless username
 password = highline.ask('PASSWORD: ') {|q| q.echo = '*'} unless password
 message = highline.ask('MESSAGE: ') unless message
 
 puts 'Uploading...'
-TwitPic.new(username, password).upload(file, message)
+url = TwitPic.new(username, password).upload(file)[:mediaurl]
+puts "  => \"#{url}\""
+
+message.strip!
+post_message = "#{message} #{url}"
+puts "Post to Twitter..."
+Rubytter.new(username, password).update(post_message) if message
+puts "  => \"#{post_message}\""

data/lib/twitpic.rb

@@ -1,9 +1,12 @@
 require "net/https"
 require "uri"
 require 'mime/types'
+require "rexml/document"
 
 class TwitPic
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
+
+  class APIError < StandardError; end
 
   def initialize(username, password)
     @username = username
@@ -37,7 +40,21 @@ class TwitPic
       response = http.post(uri.path, body, headers)
       response.body
     end
-    xml
+    parse_response(xml)
+  end
+
+  def parse_response(xml)
+    doc = REXML::Document.new(xml)
+    error_element = REXML::XPath.match(doc, "/rsp/err").first
+    if error_element
+      raise APIError, error_element.attribute('code').value + ': ' + error_element.attribute('code').value
+    else
+      result = {}
+      [:statusid, :userid, :mediaid, :mediaurl].each do |key|
+        result[key] = REXML::XPath.match(doc, "/rsp/#{key}").first.text rescue nil
+      end
+      result
+    end
   end
 
   def create_body(parts, file_path, boundary)

data/spec/twitpic_spec.rb

@@ -32,6 +32,40 @@ password\r
     EOS
   end
 
+  describe 'response data is valid' do
+    before(:each) do
+      @xml = <<-XML
+<?xml version="1.0" encoding="UTF-8"?>
+<rsp status="ok">
+  <statusid>1111</statusid>
+  <userid>11111</userid>
+  <mediaid>abc123</mediaid>
+  <mediaurl>http://twitpic.com/abc123</mediaurl>
+</rsp>
+      XML
+    end
+
+    it 'should parse xml' do
+      result = @twitpic.parse_response(@xml)
+      result.should == {:statusid=>"1111", :userid=>"11111", :mediaid=>"abc123", :mediaurl=>"http://twitpic.com/abc123"}
+    end
+  end
+
+  describe 'response data is invalid' do
+    before(:each) do
+      @xml = <<-XML
+<?xml version="1.0" encoding="UTF-8"?>
+<rsp stat="fail">
+  <err code="1001" msg="Invalid twitter username or password" />
+</rsp>
+      XML
+    end
+
+    it 'should raise error' do
+      lambda {@twitpic.parse_response(@xml)}.should raise_error(TwitPic::APIError)
+    end
+  end
+
   describe 'with message' do
     it 'should call method "post"' do
       file_path = File.dirname(__FILE__) + '/test.txt'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: twitpic
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - jugyo
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-20 00:00:00 +09:00
+date: 2009-07-06 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,6 +32,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.5.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rubytter
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.8.0
+    version: 
 description: Library for TwitPic API.
 email: jugyo.org@gmail.com
 executables: 
@@ -51,6 +61,8 @@ files:
 - spec/twitpic_spec.rb
 has_rdoc: true
 homepage: http://github.com/jugyo/twitpic
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
@@ -74,9 +86,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: twitpic
-rubygems_version: 1.3.1
+rubygems_version: 1.3.4
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Library for TwitPic API.
 test_files: []