pupil 0.1.5 → 0.2.0

data/CHANGELOG.md

@@ -1,4 +1,20 @@
-0.1.5 / Unreleased
+0.2.0
+----------------
+
+* Fixed bug what :include(and :exclude) parameter had not worked.
+* New form are supported.
+  Classic form:
+	pupil = Pupil.new(...)
+    pupil.destroy(status_id) #=> Delete tweet
+  New one:
+	status = timeline.first
+	status.destroy
+* Mutable scheme are supported. When Twitter REST API is changed, Schemes correspond to it automatically.
+* New ways to distinguish screen_name from user_id.
+  If methods catch parameter of number, recognize it as screen_name.
+* Almost Lists API are supported.
+
+0.1.5
 ----------------
 
 * Pupil::Stream Error handling(Pupil::Stream::StreamError) are rejected.

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.2.0

data/lib/pupil.rb

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 $LOAD_PATH << File.dirname(File.expand_path(__FILE__)) if RUBY_VERSION >= "1.9.0"
+require "pupil/essentials"
 require "pupil/base"
 require "pupil/schemes"
 require "pupil/account"

data/lib/pupil/base.rb

@@ -6,7 +6,6 @@ require "json"
 
 class Pupil
   attr_reader :screen_name
-  class UnsupportedParameter < StandardError ; end
   class NetworkError < StandardError ; end
   
   TWITTER_API_URL = "http://api.twitter.com"
@@ -14,74 +13,18 @@ class Pupil
   # @param [Hash] pupil_key
   def initialize key
     @screen_name = key[:screen_name]
-    
+
     @consumer = OAuth::Consumer.new(
-      key[:consumer_key],
-      key[:consumer_secret],
-      :site => TWITTER_API_URL
+    key[:consumer_key],
+    key[:consumer_secret],
+    :site => TWITTER_API_URL
     )
     @access_token = OAuth::AccessToken.new(
-      @consumer,
-      key[:access_token],
-      key[:access_token_secret]
+    @consumer,
+    key[:access_token],
+    key[:access_token_secret]
     )
   end
-
-  # @param [Hash] parameter
-  # @return [String] URL Serialized parameters
-  def self.param_serializer parameter
-    return "" unless parameter.class == Hash
-    ant = Hash.new
-    parameter.each do |key, value|
-      case key.to_sym
-      when :include
-        if value.class == String || Symbol
-          ant[:"include_#{value}"] = :true
-          break
-        end
-
-        value.each do |element|
-          raise UnsupportedParameter, "include_entities is not supported." if element.to_sym == :entities
-          ant[:"include_#{element}"] = :true
-        end
-      when :exclude
-        if value.class == String || Symbol
-          ant[:"exclude_#{value}"] = :true
-          break
-        end
-
-        value.each do |element|
-          ant[:"exclude_#{element}"] = :true
-        end
-      else
-        ant[key.to_sym] = value.to_s
-      end
-    end
-    param = ant.inject(""){|k,v|k+"&#{v[0]}=#{URI.escape(v[1])}"}.sub!(/^&/,"?")
-    return param ? param : ""
-  end
   
-  def param_serializer parameter
-    Pupil.param_serializer parameter
-  end
-  
-  def get url, param={}
-    param_s = param_serializer(param)
-    begin
-      response = @access_token.get(url+param_s).body
-    rescue => vars
-      raise NetworkError, vars
-    end
-    return JSON.parse(response)
-  end
-  
-  def post url, param={}
-    param_s = param_serializer(param)
-    begin
-      response = @access_token.post(url+param_s).body
-    rescue => vars
-      raise NetworkError, vars
-    end
-    return JSON.parse(response)
-  end
+  include Essentials
 end

data/lib/pupil/blocks.rb

@@ -1,13 +1,8 @@
 class Pupil
   # @param [Fixnum] id id
   # @return [Pupil::User] response
-  def block param
-    case param.keys[0].to_sym
-    when :screen_name
-      response = self.post("/blocks/create.json", {:screen_name => param.values[0]})
-    when :id
-      response = self.post("/blocks/create.json", {:user_id => param.values[0]})
-    end
+  def block(param)
+    response = self.post("/blocks/create.json", {guess_parameter(param) => param})
     
     if response.class == Hash && response["id"]
       return User.new response
@@ -17,13 +12,8 @@ class Pupil
 
   # @param [Fixnum] id id
   # @return [Pupil::User] response
-  def unblock param
-    case param.keys[0].to_sym
-    when :screen_name
-      response = self.post("/blocks/destroy.json", {:screen_name => param.values[0]})
-    when :id
-      response = self.post("/blocks/destroy.json", {:user_id => param.values[0]})
-    end
+  def unblock(param)
+    response = self.post("/blocks/destroy.json", {guess_parameter(param) => param})
     
     if response.class == Hash && response["id"]
       return User.new response
@@ -34,6 +24,7 @@ class Pupil
   # @return [Array] list of blocking users
   def blocking
     response = self.get("/blocks/blocking.json")
+    return [] if response["nilclasses"]
     users = Array.new
     response["users"].each do |element|
       user = User.new element

data/lib/pupil/essentials.rb

@@ -0,0 +1,61 @@
+class Pupil
+  module Essentials
+    # @param [Hash] parameter
+    # @return [String] URL Serialized parameters
+    def serialize_parameter parameter
+      return "" unless parameter.class == Hash
+      ant = Hash.new
+      parameter.each do |key, value|
+        case key.to_sym
+        when :include
+          if value.class == String || Symbol
+            ant[:"include_#{value}"] = "true"
+            break
+          end
+        when :exclude
+          if value.class == String || Symbol
+            ant[:"exclude_#{value}"] = "true"
+            break
+          end
+        else
+          ant[key.to_sym] = value.to_s
+        end
+      end
+      param = ant.inject(""){|k,v|k+"&#{v[0]}=#{URI.escape(v[1])}"}.sub!(/^&/,"?")
+      return param ? param : ""
+    end
+
+    def guess_parameter(parameter)
+      case parameter.class.to_s
+      when "Fixnum", "Bignum"
+        :user_id
+      when "Symbol", "String"
+        :screen_name
+      else
+        false
+      end
+    end
+
+    def get(url, param={})
+      param_s = serialize_parameter(param)
+      begin
+        response = @access_token.get(url+param_s).body
+      rescue => vars
+        raise NetworkError, vars
+      end
+      result = JSON.parse(response)
+      return (result["error"].nil? rescue true)? result : false
+    end
+
+    def post(url, param={})
+      param_s = serialize_parameter(param)
+      begin
+        response = @access_token.post(url+param_s).body
+      rescue => vars
+        raise NetworkError, vars
+      end
+      result = JSON.parse(response)
+      return (result["error"].nil? rescue true)? result : false
+    end
+  end
+end

data/lib/pupil/friendships.rb

@@ -1,16 +1,18 @@
 class Pupil
-  def friends_ids name
+  def friends_ids(name=@screen_name)
     response = self.get("/friends/ids/#{name}.json")
-    ids = Array.new
+    return false unless response
+    ids = []
     response.each do |element|
       ids << element
     end
     return ids
   end
 
-  def followers_ids name=@screen_name
+  def followers_ids(name=@screen_name)
     response = self.get("/1/followers/ids/#{name}.json")
-    ids = Array.new
+    return false unless response
+    ids = []
     response.each do |element|
       ids << element
     end
@@ -22,8 +24,9 @@ class Pupil
   # @param [String] dst destination screen_name
   # @return [Boolean] return true if paired users have friendship, or ruturn false
   def friendship?(src, dst)
-    param = {:source_screen_name => src, :target_screen_name => dst}
+    param = {"source_#{guess_parameter(src)}" => src, "target_#{guess_parameter(dst)}" => dst}
     response = self.get("/friendships/show.json", param)
+    return nil unless response
     if response["relationship"]["source"]["following"] == true && response["relationship"]["target"]["following"] == true then
       return true
     else
@@ -37,34 +40,18 @@ class Pupil
   # Follow user for screen_name
   # @param [String] name screen_name
   # @return [Hash] response
-  def follow param
-    case param.keys[0].to_sym
-    when :screen_name
-      response = self.post("/friendships/create.json", {:screen_name => param.values[0]})
-    when :id
-      response = self.post("/friendships/create.json", {:user_id => param.values[0]})
-    end
-    
-    if response.class == Hash && response["id"]
-      return User.new response
-    end
-    return false
+  def follow(param)
+    response = self.post("/friendships/create.json", {guess_parameter(param) => param})
+    return false unless response
+    User.new(response, @access_token)
   end
 
   # Unfollow user for screen_name
   # @param [String] name screen_name
   # @return [Hash] response
-  def unfollow param
-    case param.keys[0].to_sym
-    when :screen_name
-      response = self.post("/friendships/destroy.json", {:screen_name => param.values[0]})
-    when :id
-      response = self.post("/friendships/destroy.json", {:user_id => param.values[0]})
-    end
-    
-    if response.class == Hash && response["id"]
-      return User.new response
-    end
-    return false
+  def unfollow(param)
+    response = self.post("/friendships/destroy.json", {guess_parameter(param) => param})
+    return false unless response
+    User.new response
   end
 end

data/lib/pupil/keygen.rb

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
 $LOAD_PATH << File.dirname(File.expand_path(__FILE__)) if RUBY_VERSION >= "1.9.0"
+require "essentials"
 require "base"
 require "keygen/base"

data/lib/pupil/keygen/base.rb

@@ -6,7 +6,7 @@ class Pupil
     attr_reader :access_token_secret
     class MissingRequiredTokens < StandardError; end
 
-    def initialize opts={}
+    def initialize(opts={})
       @consumer_key = opts[:consumer_key] rescue nil
       @consumer_secret = opts[:consumer_secret] rescue nil
       @access_token = opts[:access_token] rescue nil

data/lib/pupil/lists.rb

@@ -1,34 +1,22 @@
 class Pupil
-  # @param [Fixnum] id list id
-  # @param [String] ids id comma separated
-  # @return [Hash] response
-  def addlist(listid,ids)
-    response = @access_token.post("http://api.twitter.com/1/#{@username}/#{listid}/create_all.xml?user_id=#{ids}")
-    return response
-  end
-
   # @return [Hash] lists
-  def lists
-    response = @access_token.get("http://api.twitter.com/1/#{@username}/lists.xml")
-    doc = REXML::Document.new(response.body)
-    return false if doc.is_error?
-    lists = Array.new
-    doc.get_elements('/lists_list/lists/list').each{|element|
-      list = List.new(element)
-      lists << list
-    }
-    return lists
-  end
-
-  def lists_member_create(listid,id)
-    begin
-      response = @access_token.post("http://api.twitter.com/1/#{@username}/#{listid}/members.xml?id=#{id}")
-    rescue
-      return false
+  def lists(param={})
+    if param[:contains]
+      response = self.get("/1/lists/memberships.json", param.reject{|p|p==:contains}.update(guess_parameter(param[:contains]) => param[:contains]))
+      response = response["lists"]
     else
-      return response
+      response = self.get("/1/lists/all.json", param)
     end
+    return [] unless response
+    lists = Array.new
+    response.each do |list|
+      lists << List.new(list, @access_token)
+    end
+    return lists
   end
   
-  
+  def create_list(name, param={})
+    response = self.post("/1/lists/create.json", {:name => name}.update(param))
+    return List.new(response, @access_token)
+  end
 end

data/lib/pupil/schemes.rb

@@ -1,220 +1,149 @@
 class Pupil
-  class User
-    attr_reader :contributors_enabled
-    attr_reader :created_at
-    attr_reader :default_profile
-    attr_reader :default_profile_image
-    attr_reader :description
-    attr_reader :favourites_count
-    attr_reader :follow_request_sent
-    attr_reader :followers_count
-    attr_reader :following
-    attr_reader :friends_count
-    attr_reader :geo_enabled
-    attr_reader :id
-    attr_reader :id_str
-    attr_reader :is_translator
-    attr_reader :lang
-    attr_reader :listed_count
-    attr_reader :location
-    attr_reader :name
-    attr_reader :notifications
-    attr_reader :profile_background_color
-    attr_reader :profile_background_image_url
-    attr_reader :profile_background_image_url_https
-    attr_reader :profile_background_tile
-    attr_reader :profile_image_url
-    attr_reader :profile_image_url_https
-    attr_reader :profile_link_color
-    attr_reader :profile_sidebar_border_color
-    attr_reader :profile_sidebar_fill_color
-    attr_reader :profile_text_color
-    attr_reader :profile_use_background_image
-    attr_reader :protected
-    attr_reader :screen_name
-    attr_reader :show_all_inline_media
-    attr_reader :status
-    attr_reader :statuses_count
-    attr_reader :time_zone
-    attr_reader :url
-    attr_reader :utc_offset
-    attr_reader :verified
-
-    def initialize j
-      @contributors_enabled = j["contributors_enabled"] rescue nil
-      @created_at = j["created_at"]
-      @default_profile = j["default_profile"]
-      @default_profile_image = j["default_profile_image"]
-      @description = j["description"]
-      @favourites_count = j["favourites_count"]
-      @follow_request_sent = j["follow_request_sent"]
-      @followers_count = j["followers_count"]
-      @following = j["following"]
-      @friends_count = j["friends_count"]
-      @geo_enabled = j["geo_enabled"]
-      @id = j["id"]
-      @id_str = j["id_str"]
-      @is_translator = j["is_translator"]
-      @lang = j["lang"]
-      @listed_count = j["listed_count"]
-      @location = j["location"]
-      @name = j["name"]
-      @notifications = j["notifications"]
-      @profile_background_color = j["profile_background_color"]
-      @profile_background_image_url = j["profile_background_image_url"]
-      @profile_background_image_url_https = j["profile_background_image_url_https"]
-      @profile_background_tile = j["profile_background_tile"]
-      @profile_image_url = j["profile_image_url"]
-      @profile_image_url_https = j["profile_image_url_https"]
-      @profile_link_color = j["profile_link_color"]
-      @profile_sidebar_border_color = j["profile_sidebar_border_color"]
-      @profile_sidebar_fill_color = j["profile_sidebar_fill_color"]
-      @profile_text_color = j["profile_text_color"]
-      @profile_use_background_image = j["profile_use_background_image"]
-      @protected = j["protected"]
-      @screen_name = j["screen_name"]
-      @show_all_inline_media = j["show_all_inline_media"]
-      @status = Pupil::Status.new j["status"] rescue nil
-      @statuses_count = j["statuses_count"]
-      @time_zone = j["time_zone"]
-      @url = j["url"]
-      @utc_offset = j["utc_offset"]
-      @verified = j["verified"]
+  class Scheme
+    protected
+    include Essentials
+    
+    def method_missing(action, *args)
+      return @element[action.to_s] rescue nil
     end
-  end
-  
-  class URL
-    attr_reader :url
-    attr_reader :expanded_url
-    attr_reader :start
-    attr_reader :end
-
-    def initialize(element)
-      @url = element.elements['url'].text()
-      @expanded_url = element.elements['expanded_url'].text()
-      @start = element.attributes['start']
-      @end = element.attributes['end']
+    
+    public
+    
+    def initialize(element, access_token=nil)
+      @access_token = access_token
+      @element = element
     end
+    
+    def methods() @element.keys.map{|k|k.to_sym} ; end
   end
   
-  class Status
-    attr_reader :contributors
-    attr_reader :coordinates
-    attr_reader :created_at
-    attr_reader :favorited
-    attr_reader :geo
-    attr_reader :id
-    attr_reader :id_str
-    attr_reader :in_reply_to_screen_name
-    attr_reader :in_reply_to_status_id
-    attr_reader :in_reply_to_status_id_str
-    attr_reader :in_reply_to_user_id
-    attr_reader :in_reply_to_user_id_str
-    attr_reader :place
-    attr_reader :retweet_count
-    attr_reader :retweeted
-    attr_reader :source
-    attr_reader :text
-    attr_reader :truncated
-    attr_reader :user
-
-    def initialize j
-      @contributors = j["contributors"]
-      @coordinates = j["coordinates"]
-      @created_at = j["created_at"]
-      @favorited = j["favorited"]
-      @geo = j["geo"]
-      @id = j["id"]
-      @id_str = j["id_str"]
-      @in_reply_to_screen_name = j["in_reply_to_screen_name"]
-      @in_reply_to_status_id = j["in_reply_to_status_id"]
-      @in_reply_to_status_id_str = j["in_reply_to_status_id_str"]
-      @in_reply_to_user_id = j["in_reply_to_user_id"]
-      @in_reply_to_user_id_str = j["in_reply_to_user_id_str"]
-      @place = j["place"]
-      @retweet_count = j["retweet_count"]
-      @retweeted = j["retweeted"]
-      j["source"] =~ /href=\"(.+?)\".+?>(.+?)</
-      @source = {:url => $1, :name => $2}
-      @text = j["text"]
-      @truncated = j["truncated"]
-      @user = Pupil::User.new j["user"] rescue nil
+  class User < Scheme
+    def status
+      Pupil::Status.new(@element["status"], @access_token) rescue nil
+    end
+    
+    def reply(sentence, status=nil)
+      response = self.post(
+        "/1/statuses/update.json",
+        "status"=> "@#{@element[:screen_name]} #{sentence}",
+        "in_reply_to_status_id" => status
+      )
+      return response
     end
   end
   
-  class List
-    attr_reader :id
-    attr_reader :name
-    attr_reader :full_name
-    attr_reader :slug
-    attr_reader :description
-    attr_reader :subscriber_count
-    attr_reader :member_count
-    attr_reader :uri
-    attr_reader :following
-    attr_reader :mode
-    attr_reader :user
-
-    def initialize(element)
-      @id = element.elements['id'].text()
-      @name = element.elements['name'].text()
-      @full_name = element.elements['full_name'].text()
-      @slug = element.elements['slug'].text()
-      @description = element.elements['description'].text()
-      @subscriber_count = element.elements['subscriber_count'].text()
-      @member_count = element.elements['member_count'].text()
-      @uri = element.elements['uri'].text()
-      @following = element.elements['following'].text()
-      @mode = element.elements['mode'].text()
-      @user = Pupil::User.new(element.elements['user'])
+  class Status < Scheme
+    def user() Pupil::User.new(@element["user"], @access_token) rescue nil; end
+    
+    def source()
+      @element["source"] =~ /href=\"(.+?)\".+?>(.+?)</
+      {:url => $1, :name => $2}
+    end
+    
+    def entities() Pupil::Entities.new(@element["entities"]) rescue nil; end
+    
+    def destroy()
+      self.post("/1/statuses/destroy/#{@element["id"]}.json")
     end
+    
+    alias_method :delete, :destroy
   end
   
-  class Entities
-    attr_reader :user_mentions
-    attr_reader :urls
-    attr_reader :hashtags
-
-    def initialize(element)
-      @user_mentions = UserMention.new(element.elements['user_mention'])
-      @urls = Pupil::URL.new(element.elements['urls'])
-      @hashtags = Pupil::Hashtag.new(element.elements['hashtags'])
+  class List < Scheme
+    def user() Pupil::User.new(@element["user"], @access_token) rescue nil; end
+    
+    def statuses(param={})
+      response = self.get("/1/lists/statuses.json", {:list_id => @element["id_str"]}.update(param))
+      return false unless response
+      statuses = []
+      response.each do |status|
+        statuses << Pupil::Status.new(status, @access_token)
+      end
+      return statuses
+    end
+    
+    def subscribers(param={})
+      response = self.get("/1/lists/subscribers.json", {:list_id => @element["id_str"]}.update(param))
+      return false unless response
+      users = []
+      response["users"].each do |user|
+        users << Pupil::User.new(user, @access_token)
+      end
+      return users
+    end
+    
+    def members(param={})
+      response = self.get("/1/lists/members.json", {:list_id => @element["id_str"]}.update(param))
+      return false unless response
+      users = []
+      response["users"].each do |u|
+        user = User.new(u.update("_list_id" => @element["id_str"]), @access_token)
+        def user.destroy()
+          response = self.post("/1/lists/members/destroy.json", {:list_id => @element["_list_id"], :user_id => @element["id_str"]})
+        end
+        users << user
+      end
+      return users
+    end
+    
+    def add(param)
+      response = self.post("/1/lists/members/create.json", {:list_id => @element["id_str"], guess_parameter(param) => param})
+      return List.new(response)
     end
+    
+    def strike(param, opts={})
+      response = self.post("/1/lists/members/destroy.json", {guess_parameter(param) => param, :list_id => @element["id_str"]}.update(opts))
+      return response
+    end
+    
+    alias_method :off, :strike
+    
+    def destroy()
+      response = self.post("/1/lists/destroy.json", {:list_id => @element["id_str"]})
+      return List.new(response)
+    end
+    
+    alias_method :delete, :destroy
   end
   
-  class Hashtag
-    attr_reader :text
-    attr_reader :start
-    attr_reader :end
-
-    def initialize(element)
-      @text = element.elements['text'].text()
-      @start = element.attributes['start']
-      @end = element.attributes['end']
+  class Entities < Scheme
+    def urls()
+      urls = []
+      @element["urls"].each do |url|
+        urls << Pupil::URL.new(url)
+      end
+      return urls
+    rescue
+      nil
+    end
+    
+    def hashtags()
+      hashtags = []
+      @element["hashtags"].each do |hashtag|
+        hashtags << Pupil::Hashtag.new(hashtag)
+      end
+      return hashtags
+    rescue
+      nil
+    end
+    
+    def user_mentions()
+      user_mentions = []
+      @element["user_mentions"].each do |user_mention|
+        user_mentions << Pupil::UserMention.new(user_mention)
+      end
+      return user_mentions
+    rescue
+      nil
     end
   end
   
-  class DirectMessage
-    attr_reader :id
-    attr_reader :sender_id
-    attr_reader :text
-    attr_reader :recipient_id
-    attr_reader :created_at
-    attr_reader :sender_screen_name
-    attr_reader :recipient_screen_name
-    attr_reader :sender
-    attr_reader :recipient
-
-    def initialize(element)
-      @id = element.elements['id'].text()
-      @sender_id = element.elements['sender_id'].text()
-      @text = element.elements['text'].text()
-      @recipient_id = element.elements['recipient_id'].text()
-      @created_at = element.elements['created_at'].text()
-      @sender_screen_name = element.elements['sender_screen_name'].text()
-      @recipient_screen_name= element.elements['recipient_screen_name'].text()
-      @sender = Pupil::User.new(element.elements['sender'])
-      @recipient = Pupil::User.new(element.elements['recipient'])
-    end
+  class URL < Scheme; end
+  class Hashtag < Scheme; end
+  class UserMention < Scheme; end
+  
+  class DirectMessage < Scheme
+    def sender() Pupil::User.new(@element["sender"], @access_token) rescue nil; end
+    def recipient() Pupil::User.new(@element["recipient"], @access_token) rescue nil; end
   end
 end

data/lib/pupil/statuses.rb

@@ -10,10 +10,11 @@ class Pupil
   # @option param [Symbol] :exclude #=> [:replies]
   # @option param [Symbol] :contributor_details
   def home_timeline(param={})
-    response = self.get("/statuses/home_timeline.json", param)
-    statuses = Array.new
+    response = self.get("/1/statuses/home_timeline.json", param)
+    return false unless response
+    statuses = []
     response.each do |element|
-      status = Status.new element
+      status = Status.new(element, @access_token)
       statuses << status
     end
     return statuses
@@ -22,10 +23,11 @@ class Pupil
   # @return [Array] Mention
   # @param [Hash] param
   def mentions(param={})
-    response = self.get("/statuses/mentions.json", param)
-    statuses = Array.new
+    response = self.get("/1/statuses/mentions.json", param)
+    return false unless response
+    statuses = []
     response.each do |element|
-      status = Status.new element
+      status = Status.new(element, @access_token)
       statuses << status
     end
     return statuses
@@ -49,11 +51,12 @@ class Pupil
   #   twitter.user_timeline(:screen_name => 'o_ame', :exclude => :replies).each do |status|
   #     puts "#{status.user.screen_name}: #{status.text}"
   #   end
-  def user_timeline(param={})
-    response = self.get("/statuses/user_timeline.json", param)
-    statuses = Array.new
+  def user_timeline(param)
+    response = self.get("/1/statuses/user_timeline.json", {guess_parameter(param) => param})
+    return false unless response
+    statuses = []
     response.each do |element|
-      status = Status.new element
+      status = Status.new(element, @access_token)
       statuses << status
     end
     return statuses
@@ -62,35 +65,38 @@ class Pupil
   # @return [Array] Timeline
   # @param [Hash] param
   def public_timeline(param={})
-    response = self.get("/statuses/public_timeline.json", param)
+    response = self.get("/1/statuses/public_timeline.json", param)
+    return false unless response
     statuses = Array.new
     response.each do |element|
-      status = Status.new element
+      status = Status.new(element, @access_token)
       statuses << status
     end
     return statuses
   end
   
-  def show_status(status_id)
-    response = @access_token.get("/statuses/show/#{status_id}.json").body
-    return response
-    status = Status.new response
+  def status(status_id)
+    response = self.get("/statuses/show/#{status_id}.json")
+    return false unless response
+    status = Status.new(response, @access_token)
     return status
   end
   
   def update(status, irt='')
     response = self.post(
-      "/statuses/update.json",
+      "/1/statuses/update.json",
       "status"=> status,
       "in_reply_to_status_id" => irt
     )
-    return response
+    return false unless response
+    response
   end
   
   alias_method :tweet, :update
 
-  def destroy status_id
-    response = self.post("/statuses/destroy/#{status_id}.json")
-    return response
+  def destroy(status_id)
+    response = self.post("/1/statuses/destroy/#{status_id}.json")
+    return false unless response
+    response
   end
 end

data/lib/pupil/stream.rb

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 $LOAD_PATH << File.dirname(File.expand_path(__FILE__)) if RUBY_VERSION >= "1.9.0"
+require "essentials"
 require "base"
 require "schemes"
 require "stream/base"

data/lib/pupil/stream/base.rb

@@ -5,6 +5,8 @@ class Pupil
       :userstream => "https://userstream.twitter.com/2/user.json",
       :search => "https://stream.twitter.com/1/statuses/filter.json%s"
     }
+    
+    include Essentials
 
     def initialize key
       @screen_name = key[:screen_name]
@@ -29,7 +31,7 @@ class Pupil
     end
 
     def run_get_stream(type, param=nil, &block)
-      uri = URI.parse(STREAM_APIS[type] % Pupil.param_serializer(param))
+      uri = URI.parse(STREAM_APIS[type] % serialize_parameter(param))
       https = Net::HTTP.new(uri.host, uri.port)
       https.use_ssl = true
       https.verify_mode = OpenSSL::SSL::VERIFY_NONE
@@ -70,9 +72,9 @@ class Pupil
       elsif status["event"] == "favorite"
         return Pupil::Stream::Hash.new(status, :favorite)
       elsif status["retweeted_status"]
-        return Pupil::Stream::Status.new(status, :retweeted)
+        return Pupil::Stream::Status.new(status, @access_token, :retweeted)
       elsif status["text"]
-        return Pupil::Stream::Status.new(status)
+        return Pupil::Stream::Status.new(status, @access_token)
       else
         return Pupil::Stream::Hash.new(status, :unknown)
       end
@@ -83,10 +85,10 @@ class Pupil
       attr_reader :event
       attr_reader :retweeted_status
 
-      def initialize(status, event=nil)
-        super(status)
+      def initialize(status, access_token, event=nil)
+        super(status, access_token)
         @event = (event)? event : :status
-        @retweeted_status = status["retweeted_status"]
+        #@retweeted_status = status["retweeted_status"]
       end
     end
 

data/pupil.gemspec

@@ -5,27 +5,23 @@
 
 Gem::Specification.new do |s|
   s.name = "pupil"
-  s.version = "0.1.5"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oame"]
-  s.date = "2012-01-07"
+  s.date = "2012-01-14"
   s.description = "The \"Lazy\" Twitter API Library for Ruby 1.9.x. Easy to use."
   s.email = "oame@oameya.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
-    "README.md",
-    "README.rdoc"
+    "README.md"
   ]
   s.files = [
-    ".document",
-    ".rspec",
     "CHANGELOG.md",
     "Gemfile",
     "Gemfile.lock",
     "LICENSE.txt",
     "README.md",
-    "README.rdoc",
     "Rakefile",
     "VERSION",
     "lib/pupil.rb",
@@ -33,6 +29,7 @@ Gem::Specification.new do |s|
     "lib/pupil/base.rb",
     "lib/pupil/blocks.rb",
     "lib/pupil/direct_messages.rb",
+    "lib/pupil/essentials.rb",
     "lib/pupil/friendships.rb",
     "lib/pupil/keygen.rb",
     "lib/pupil/keygen/base.rb",
@@ -53,7 +50,7 @@ Gem::Specification.new do |s|
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.required_ruby_version = Gem::Requirement.new("~> 1.9.0")
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.15"
   s.summary = "The \"Lazy\" Twitter API Library for Ruby 1.9.x"
 
   if s.respond_to? :specification_version then

data/spec/pupil_spec.rb

@@ -50,7 +50,7 @@ end
 describe Pupil, "が #user_timeline を呼ぶ時は" do
   before do
     pupil = Pupil.new PUPIL_TESTKEY
-    @user_timeline = pupil.user_timeline :screen_name => pupil.screen_name
+    @user_timeline = pupil.user_timeline pupil.screen_name
   end
   
   it "Array型を返すこと" do
@@ -77,8 +77,8 @@ end
 describe Pupil, "が #follow を呼ぶ時は" do
   before do
     pupil = Pupil.new PUPIL_TESTKEY
-    @follow = pupil.follow :screen_name => KNOWN_NONFOLLOWED_USER
-    @follow_fail = pupil.follow :screen_name => UNKNOWN_USER
+    @follow = pupil.follow KNOWN_NONFOLLOWED_USER
+    @follow_fail = pupil.follow UNKNOWN_USER
   end
   
   it "フォローに成功した場合はPupil::User型を返すこと" do
@@ -93,8 +93,8 @@ end
 describe Pupil, "が #unfollow を呼ぶ時は" do
   before do
     pupil = Pupil.new PUPIL_TESTKEY
-    @unfollow = pupil.unfollow :screen_name => KNOWN_NONFOLLOWED_USER
-    @unfollow_fail = pupil.unfollow :screen_name => UNKNOWN_USER
+    @unfollow = pupil.unfollow KNOWN_NONFOLLOWED_USER
+    @unfollow_fail = pupil.unfollow UNKNOWN_USER
   end
   
   it "成功した場合はPupil::User型を返すこと" do
@@ -109,8 +109,8 @@ end
 describe Pupil, "が #block を呼ぶ時は" do
   before do
     pupil = Pupil.new PUPIL_TESTKEY
-    @block = pupil.block :screen_name => KNOWN_NONFOLLOWED_USER
-    @block_fail = pupil.block :screen_name => UNKNOWN_USER
+    @block = pupil.block KNOWN_NONFOLLOWED_USER
+    @block_fail = pupil.block UNKNOWN_USER
   end
   
   it "成功した場合はPupil::User型を返すこと" do
@@ -125,8 +125,8 @@ end
 describe Pupil, "が #unblock を呼ぶ時は" do
   before do
     pupil = Pupil.new PUPIL_TESTKEY
-    @unblock = pupil.unblock :screen_name => KNOWN_NONFOLLOWED_USER
-    @unblock_fail = pupil.unblock :screen_name => UNKNOWN_USER
+    @unblock = pupil.unblock KNOWN_NONFOLLOWED_USER
+    @unblock_fail = pupil.unblock UNKNOWN_USER
   end
   
   it "成功した場合はPupil::User型を返すこと" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pupil
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-07 00:00:00.000000000Z
+date: 2012-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &70291003102160 !ruby/object:Gem::Requirement
+  requirement: &70158376735540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70291003102160
+  version_requirements: *70158376735540
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70291003100160 !ruby/object:Gem::Requirement
+  requirement: &70158376782300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70291003100160
+  version_requirements: *70158376782300
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70291003097540 !ruby/object:Gem::Requirement
+  requirement: &70158376779420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.3.0
   type: :development
   prerelease: false
-  version_requirements: *70291003097540
+  version_requirements: *70158376779420
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70291003096360 !ruby/object:Gem::Requirement
+  requirement: &70158376778060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.6.0
   type: :development
   prerelease: false
-  version_requirements: *70291003096360
+  version_requirements: *70158376778060
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70291003094740 !ruby/object:Gem::Requirement
+  requirement: &70158376776600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70291003094740
+  version_requirements: *70158376776600
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70291003093000 !ruby/object:Gem::Requirement
+  requirement: &70158376775060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70291003093000
+  version_requirements: *70158376775060
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70291003091900 !ruby/object:Gem::Requirement
+  requirement: &70158376811520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70291003091900
+  version_requirements: *70158376811520
 description: The "Lazy" Twitter API Library for Ruby 1.9.x. Easy to use.
 email: oame@oameya.com
 executables: []
@@ -95,16 +95,12 @@ extensions: []
 extra_rdoc_files:
 - LICENSE.txt
 - README.md
-- README.rdoc
 files:
-- .document
-- .rspec
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
 - README.md
-- README.rdoc
 - Rakefile
 - VERSION
 - lib/pupil.rb
@@ -112,6 +108,7 @@ files:
 - lib/pupil/base.rb
 - lib/pupil/blocks.rb
 - lib/pupil/direct_messages.rb
+- lib/pupil/essentials.rb
 - lib/pupil/friendships.rb
 - lib/pupil/keygen.rb
 - lib/pupil/keygen/base.rb
@@ -148,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: The "Lazy" Twitter API Library for Ruby 1.9.x

data/.document

@@ -1,6 +0,0 @@
-lib/**/*.rb
-lib/*.rb
-bin/*
-- 
-features/**/*.feature
-LICENSE.txt

data/.rspec

@@ -1 +0,0 @@
---color

data/README.rdoc

@@ -1,19 +0,0 @@
-= pupil
-
-Pupil is lazy Twitter API Wrapper for Ruby 1.9.x
-
-== Contributing to pupil
- 
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
-* Fork the project
-* Start a feature/bugfix branch
-* Commit and push until you are happy with your contribution
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
-
-== Copyright
-
-Copyright (c) 2011 Oame. See LICENSE.txt for
-further details.
-