pupil 0.6.1 → 0.6.2

data/.gitignore

@@ -16,6 +16,5 @@ pkg
 rdoc
 spec/reports
 spec/keys/pupil_testkey.rb
-test/tmp
-test/version_tmp
+test/
 tmp

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+0.6.2
+----------------
+
+* 一部API 1.1に対応
+
 0.6.1
 ----------------
 

data/lib/pupil/account.rb

@@ -2,7 +2,7 @@ class Pupil
   # Verify credentials
   # @return [Pupil::User] User credentials
   def verify_credentials
-    response = self.get("/1/account/verify_credentials.json")
+    response = self.get("/1.1/account/verify_credentials.json")
     user = User.new response
     return user
   end
@@ -12,14 +12,14 @@ class Pupil
   # Rate limit statuses
   # @return [Hash] Rate limit statuses
   def rate_limit
-    response = self.get("/account/rate_limit_status.json")
+    response = self.get("/1.1/account/rate_limit_status.json")
     return response
   end
 
   # End oauth session
   # @return [Hash] Result
   def end_session
-    response = self.post("/account/end_session.json")
+    response = self.post("/1.1/account/end_session.json")
     return response
   end
 

data/lib/pupil/base.rb

@@ -12,8 +12,6 @@ class Pupil
 
   # @param [Hash] pupil_key
   def initialize key
-    @screen_name = key[:screen_name] || nil
-    
     @consumer = OAuth::Consumer.new(
       key[:consumer_key],
       key[:consumer_secret],
@@ -24,6 +22,8 @@ class Pupil
       key[:access_token],
       key[:access_token_secret]
     )
+
+    @screen_name = key[:screen_name] || self.profile.screen_name
   end
   
   include Essentials

data/lib/pupil/blocks.rb

@@ -2,7 +2,7 @@ class Pupil
   # @param [Fixnum] id id
   # @return [Pupil::User] response
   def block(param)
-    response = self.post("/blocks/create.json", {guess_parameter(param) => param})
+    response = self.post("/1.1/blocks/create.json", {guess_parameter(param) => param})
     
     if response.class == Hash && response["id"]
       return User.new response
@@ -13,7 +13,7 @@ class Pupil
   # @param [Fixnum] id id
   # @return [Pupil::User] response
   def unblock(param)
-    response = self.post("/blocks/destroy.json", {guess_parameter(param) => param})
+    response = self.post("/1.1/blocks/destroy.json", {guess_parameter(param) => param})
     
     if response.class == Hash && response["id"]
       return User.new response
@@ -23,7 +23,7 @@ class Pupil
 
   # @return [Array] list of blocking users
   def blocking
-    response = self.get("/blocks/blocking.json")
+    response = self.get("/1.1/blocks/list.json")
     return [] if response["nilclasses"]
     users = Array.new
     response["users"].each do |element|

data/lib/pupil/statuses.rb

@@ -10,7 +10,7 @@ class Pupil
   # @option param [Symbol] :exclude #=> [:replies]
   # @option param [Symbol] :contributor_details
   def timeline(param={})
-    response = self.get("/1/statuses/home_timeline.json", param)
+    response = self.get("/1.1/statuses/home_timeline.json", param)
     return false unless response
     statuses = []
     response.each do |element|
@@ -19,13 +19,12 @@ class Pupil
     end
     return statuses
   end
-  
   alias_method :home_timeline, :timeline
   
   # @return [Array] Mention
   # @param [Hash] param
   def mentions(param={})
-    response = self.get("/1/statuses/mentions.json", param)
+    response = self.get("/1.1/statuses/mentions_timeline.json", param)
     return false unless response
     statuses = []
     response.each do |element|
@@ -54,7 +53,7 @@ class Pupil
   #     puts "#{status.user.screen_name}: #{status.text}"
   #   end
   def user_timeline(target, option={})
-    response = self.get("/1/statuses/user_timeline.json", {guess_parameter(target) => target}.update(option))
+    response = self.get("/1.1/statuses/user_timeline.json", {guess_parameter(target) => target}.update(option))
     return false unless response
     statuses = []
     response.each do |element|
@@ -70,7 +69,7 @@ class Pupil
   # @return [Array] Timeline
   # @param [Hash] param
   def public_timeline(param={})
-    response = self.get("/1/statuses/public_timeline.json", param)
+    response = self.get("/1.1/statuses/public_timeline.json", param)
     return false unless response
     statuses = Array.new
     response.each do |element|
@@ -81,7 +80,7 @@ class Pupil
   end
   
   def retweeted_by_me(param={})
-    response = self.get("/1/statuses/retweeted_by_me.json", param)
+    response = self.get("/1.1/statuses/retweeted_by_me.json", param)
     return false unless response
     statuses = Array.new
     response.each do |element|
@@ -92,7 +91,7 @@ class Pupil
   end
   
   def retweeted_to_me(param={})
-    response = self.get("/1/statuses/retweeted_to_me.json", param)
+    response = self.get("/1.1/statuses/retweeted_to_me.json", param)
     return false unless response
     statuses = Array.new
     response.each do |element|
@@ -103,7 +102,7 @@ class Pupil
   end
   
   def retweets_of_me(param={})
-    response = self.get("/1/statuses/retweets_of_me.json", param)
+    response = self.get("/1.1/statuses/retweets_of_me.json", param)
     return false unless response
     statuses = Array.new
     response.each do |element|
@@ -114,7 +113,7 @@ class Pupil
   end
   
   def retweeted_to_user(param={})
-    response = self.get("/1/statuses/retweeted_to_user.json", param)
+    response = self.get("/1.1/statuses/retweeted_to_user.json", param)
     return false unless response
     statuses = Array.new
     response.each do |element|
@@ -125,7 +124,7 @@ class Pupil
   end
   
   def retweeted_by_user(param={})
-    response = self.get("/1/statuses/retweeted_by_user.json", param)
+    response = self.get("/1.1/statuses/retweeted_by_user.json", param)
     return false unless response
     statuses = Array.new
     response.each do |element|
@@ -136,12 +135,12 @@ class Pupil
   end
   
   def oembed(param={})
-    response = self.get("/1/statuses/oembed.json", param)
+    response = self.get("/1.1/statuses/oembed.json", param)
     return response
   end
   
   def status(status_id, param={})
-    response = self.get("/statuses/show/#{status_id}.json", param)
+    response = self.get("/1.1/statuses/show/#{status_id}.json", param)
     return false unless response
     status = Status.new(response, @access_token)
     return status
@@ -149,7 +148,7 @@ class Pupil
   
   def update(status, irt='')
     response = self.post(
-      "/1/statuses/update.json",
+      "/1.1/statuses/update.json",
       "status"=> status,
       "in_reply_to_status_id" => irt
     )
@@ -160,7 +159,7 @@ class Pupil
   alias_method :tweet, :update
 
   def destroy(status_id)
-    response = self.post("/1/statuses/destroy/#{status_id}.json")
+    response = self.post("/1.1/statuses/destroy/#{status_id}.json")
     return false unless response
     response
   end

data/lib/pupil/version.rb

@@ -1,3 +1,3 @@
 class Pupil
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/spec/pupil_spec.rb

@@ -22,7 +22,7 @@ end
 describe Pupil, "が #home_timeline を呼ぶ時は" do
   before do
     pupil = Pupil.new PUPIL_TESTKEY
-    @home_timeline = pupil.home_timeline :count => 50
+    @home_timeline = pupil.home_timeline :count => 20
   end
   
   it "Array型を返すこと" do
@@ -30,7 +30,7 @@ describe Pupil, "が #home_timeline を呼ぶ時は" do
   end
   
   it "sizeが50であること" do
-    @home_timeline.size.should == 50
+    @home_timeline.size.should == 20
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pupil
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-03 00:00:00.000000000Z
+date: 2012-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &70097868260460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70097868260460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70097868259880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70097868259880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70097868259300 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70097868259300
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70097868258700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70097868258700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70097868258280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70097868258280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70097868257780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +101,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70097868257780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: The "Lazy" Twitter API Library for Ruby 1.9.x. Easy to use.
 email:
 - oame@oameya.com
@@ -131,25 +161,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1341416482152180508
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1341416482152180508
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: The "Lazy" Twitter API Library for Ruby 1.9.x
 test_files:
 - spec/pupil_spec.rb
 - spec/spec_helper.rb
-has_rdoc: