pupil 0.6.2 → 0.6.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 563a43e46ef9e6eb1ca21c18f9f013b1b7a381e3
+  data.tar.gz: d18223c01429ae623174b9c634f64bba6d7100e0
+SHA512:
+  metadata.gz: aa39e39dfd5ac39033fe794cd3952a0c21157daed8a7a1473dc2482818ca77809baf9bbcf852df6ab23001f4ca65a40a8c400f6408f048da4ba0628cd40141ca
+  data.tar.gz: 4153554e166dbb3368ef5711c34a62dd95ee2fb164c1b70b9cba66bc6524658a9bd11ccd780be753cd6cdcbae83aaab3a1f3bdd9ebf42efa93ebc32e2832b314

data/.gitignore

@@ -1,9 +1,7 @@
 *.gem
 *.rbc
-.bundle
 .config
 .yardoc
-.DS_Store
 *.tmproj
 tmtags
 Gemfile.lock
@@ -17,4 +15,12 @@ rdoc
 spec/reports
 spec/keys/pupil_testkey.rb
 test/
-tmp
+tmp/
+
+# bundler
+/vendor/bundle
+.bundle
+
+# OS specific
+.DS_Store
+Thumbs.db

data/bin/eyedrops

@@ -7,16 +7,9 @@ require "yaml"
 require "fileutils"
 require "readline"
 require "optparse"
-require "pp"
-
-class String
-  def undent
-    gsub /^.{#{slice(/^ +/).length}}/, ''
-  end
-end
 
 class Eyedrops
-  VERSION = "1.0"
+  VERSION = "1.1"
 end
 
 class Credentials
@@ -42,21 +35,21 @@ class Credentials
 end
 
 def display_help
-  puts <<-EOD.undent
-  Usage: eyedrops [OPTIONS]
-  
-  eyedrops> twitter #=> Prepared Pupil instance
-
-  options:
-    -i, --inspect\tDisplay inspected results
-    -a name, --account name\tSign-in account name
-    -h, --help\tShow help
-    -v, --version\tShow version
-
-  eyedrops commands:
-    help\tShow help
-    quit\tExit eyedrops
-    show-account\tDisplay active account
+  puts <<-EOD
+Usage: eyedrops [OPTIONS]
+
+eyedrops> twitter #=> Prepared Pupil instance
+
+options:
+  -i, --inspect\tDisplay inspected results
+  -a name, --account name\tSign-in account name
+  -h, --help\tShow help
+  -v, --version\tShow version
+
+eyedrops commands:
+  help\tShow help
+  quit\tExit eyedrops
+  show-account\tDisplay active account
   EOD
 end
 

data/bin/pupil

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+#$LOAD_PATH << File.join(File.dirname(File.expand_path(__FILE__)), "../lib")
+require "pupil"
+
+Pupil::CLI.start

data/lib/pupil.rb

@@ -14,4 +14,5 @@ require "pupil/lists"
 require "pupil/friendships"
 require "pupil/blocks"
 require "pupil/search"
-require "pupil/help"
+require "pupil/help"
+require "pupil/cli"

data/lib/pupil/base.rb

@@ -1,4 +1,4 @@
-require "rubygems"
+require "rubygems" if RUBY_VERSION < "1.9.0"
 require "net/http"
 require "uri"
 require "oauth"
@@ -8,7 +8,7 @@ class Pupil
   attr_reader :screen_name
   class NetworkError < StandardError ; end
   
-  TWITTER_API_URL = "http://api.twitter.com"
+  TWITTER_API_URL = "https://api.twitter.com"
 
   # @param [Hash] pupil_key
   def initialize key

data/lib/pupil/cli.rb

@@ -0,0 +1,12 @@
+require "pupil/keygen"
+require "thor"
+
+class Pupil
+  class CLI < Thor
+    desc "gen", "Generate OAuth Keys"
+    def gen
+      gen = Pupil::Keygen.new
+      gen.interactive
+    end
+  end
+end

data/lib/pupil/direct_messages.rb

@@ -3,7 +3,7 @@ class Pupil
   # @param [Hash] param
   # @return [Hash] directmessages
   def direct_messages(param = {})
-    response = self.get("/1/direct_messages.json", param)
+    response = self.get("/1.1/direct_messages.json", param)
     return false unless response
     directmessages = Array.new
     response.each do |element|
@@ -18,7 +18,7 @@ class Pupil
   # @param [Hash] param
   # @return [Hash] directmessage you sent
   def sent_direct_messages(param = {})
-    response = self.get("/1/direct_messages/sent.json", param)
+    response = self.get("/1.1/direct_messages/sent.json", param)
     return false unless response
     directmessages = Array.new
     response.each do |element|
@@ -31,7 +31,7 @@ class Pupil
   
   def send_direct_message(sentence, opts)
     raise ArgumentError, ":to parameter not given" unless opts[:to]
-    response = self.post("/1/direct_messages/new.json", {:text => sentence, guess_parameter(opts[:to]) => opts[:to]})
+    response = self.post("/1.1/direct_messages/new.json", {:text => sentence, guess_parameter(opts[:to]) => opts[:to]})
     return false unless response
     response
   end

data/lib/pupil/friendships.rb

@@ -1,7 +1,7 @@
 class Pupil
   def friends_ids(name=@screen_name)
     name ||= self.profile.screen_name
-    response = self.get("/1/friends/ids.json", {guess_parameter(name) => name})
+    response = self.get("/1.1/friends/ids.json", {guess_parameter(name) => name})
     return false unless response
     ids = []
     response["ids"].each do |element|
@@ -23,7 +23,7 @@ class Pupil
 
   def followers_ids(name=@screen_name)
     name ||= self.profile.screen_name
-    response = self.get("/1/followers/ids.json", {guess_parameter(name) => name})
+    response = self.get("/1.1/followers/ids.json", {guess_parameter(name) => name})
     return false unless response
     ids = []
     response["ids"].each do |element|
@@ -40,13 +40,13 @@ class Pupil
   end
   
   def no_retweet_ids()
-    response = self.get("/1/friendships/no_retweet_ids.json")
+    response = self.get("/1.1/friendships/no_retweet_ids.json")
     return false unless response
     return response
   end
   
   def outgoing(param={})
-    response = self.get("/1/friendships/outgoing.json")
+    response = self.get("/1.1/friendships/outgoing.json")
     return false unless response
     ids = []
     response["ids"].each do |element|
@@ -56,7 +56,7 @@ class Pupil
   end
   
   def incoming(param={})
-    response = self.get("/1/friendships/incoming.json")
+    response = self.get("/1.1/friendships/incoming.json")
     return false unless response
     ids = []
     response["ids"].each do |element|
@@ -71,7 +71,7 @@ class Pupil
   # @return [Boolean] return true if paired users have friendship, or ruturn false
   def friendship?(src, dst)
     param = {"source_#{guess_parameter(src)}" => src, "target_#{guess_parameter(dst)}" => dst}
-    response = self.get("/1/friendships/show.json", param)
+    response = self.get("/1.1/friendships/show.json", param)
     return nil unless response
     if response["relationship"]["source"]["following"] == true && response["relationship"]["target"]["following"] == true then
       return true
@@ -85,7 +85,7 @@ class Pupil
   alias_method "friendships_exists?", "friendship?"
   
   def update_friendships(target, param)
-    response = self.post("/1/friendships/update.json", param)
+    response = self.post("/1.1/friendships/update.json", param)
     return false unless response
     return response
   end
@@ -94,7 +94,7 @@ class Pupil
   # @param [String] name screen_name
   # @return [Hash] response
   def follow(param)
-    response = self.post("/1/friendships/create.json", {guess_parameter(param) => param})
+    response = self.post("/1.1/friendships/create.json", {guess_parameter(param) => param})
     return false unless response
     User.new(response, @access_token)
   end
@@ -103,7 +103,7 @@ class Pupil
   # @param [String] name screen_name
   # @return [Hash] response
   def unfollow(param)
-    response = self.post("/1/friendships/destroy.json", {guess_parameter(param) => param})
+    response = self.post("/1.1/friendships/destroy.json", {guess_parameter(param) => param})
     return false unless response
     User.new response
   end

data/lib/pupil/general.rb

@@ -5,7 +5,7 @@ class Pupil
     when :users
       users = Array.new
       source.each_slice(100) do |sliced|
-        response = self.get("/1/users/lookup.json", {guess_parameter(sliced[0]) => sliced.join(",")}.update(option))
+        response = self.get("/1.1/users/lookup.json", {guess_parameter(sliced[0]) => sliced.join(",")}.update(option))
         return false unless response
         response.each do |element|
           user = User.new(element, @access_token)
@@ -17,7 +17,7 @@ class Pupil
     when :friendships
       fs = Array.new
       source.each_slice(100) do |sliced|
-        response = self.get("/1/friendships/lookup.json", {guess_parameter(sliced[0]) => sliced.join(",")}.update(option))
+        response = self.get("/1.1/friendships/lookup.json", {guess_parameter(sliced[0]) => sliced.join(",")}.update(option))
         return false unless response
 
         response.each do |element|

data/lib/pupil/help.rb

@@ -1,6 +1,6 @@
 class Pupil
   def configuration()
-    response = self.get("/1/help/configuration.json")
+    response = self.get("/1.1/help/configuration.json")
     return response
   end
 end

data/lib/pupil/lists.rb

@@ -2,10 +2,10 @@ class Pupil
   # @return [Hash] lists
   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 = self.get("/1.1/lists/memberships.json", param.reject{|p|p==:contains}.update(guess_parameter(param[:contains]) => param[:contains]))
       response = response["lists"]
     else
-      response = self.get("/1/lists/all.json", param)
+      response = self.get("/1.1/lists/all.json", param)
     end
     return [] unless response
     lists = Array.new
@@ -16,7 +16,7 @@ class Pupil
   end
   
   def create_list(name, option={})
-    response = self.post("/1/lists/create.json", {:name => name}.update(option))
+    response = self.post("/1.1/lists/create.json", {:name => name}.update(option))
     return List.new(response, @access_token)
   end
 end

data/lib/pupil/users.rb

@@ -1,13 +1,13 @@
 class Pupil
   def user(target, option={})
-    response = self.get("/1/users/show.json", {guess_parameter(target) => target}.update(option))
+    response = self.get("/1.1/users/show.json", {guess_parameter(target) => target}.update(option))
     return false unless response
     user = User.new(response, @access_token)
     return user
   end
   
   def search_user(keyword, option={})
-    response = self.get("/1/users/search.json", {:q => keyword}.update(option))
+    response = self.get("/1.1/users/search.json", {:q => keyword}.update(option))
     users = Array.new
     response.each do |element|
       user = User.new(element, @access_token)

data/lib/pupil/version.rb

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

data/pupil.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |gem|
   gem.version       = Pupil::VERSION
   gem.add_dependency "oauth"
   gem.add_dependency "json"
+  gem.add_dependency "thor"
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "yard"

data/spec/pupil_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 # -*- coding: utf-8 -*-
 
 ### WARNING ###
@@ -52,7 +54,7 @@ end
 describe Pupil, "が #user_timeline を呼ぶ時は" do
   before do
     pupil = Pupil.new PUPIL_TESTKEY
-    @user_timeline = pupil.user_timeline pupil.screen_name
+    @user_timeline = pupil.user_timeline pupil.profile.screen_name
   end
   
   it "Array型を返すこと" do
@@ -63,8 +65,8 @@ end
 describe Pupil, "が #friendship? を呼ぶ時は" do
   before do
     pupil = Pupil.new PUPIL_TESTKEY
-    @nonfriendship = pupil.friendship? pupil.screen_name, KNOWN_NONFOLLOWED_USER
-    @friendship = pupil.friendship? pupil.screen_name, KNOWN_USER
+    @nonfriendship = pupil.friendship? pupil.profile.screen_name, KNOWN_NONFOLLOWED_USER
+    @friendship = pupil.friendship? pupil.profile.screen_name, KNOWN_USER
   end
   
   it "フォロー関係に無い場合はFalseClass型を返すこと" do
@@ -76,70 +78,6 @@ describe Pupil, "が #friendship? を呼ぶ時は" do
   end
 end
 
-describe Pupil, "が #follow を呼ぶ時は" do
-  before do
-    pupil = Pupil.new PUPIL_TESTKEY
-    @follow = pupil.follow KNOWN_NONFOLLOWED_USER
-    @follow_fail = pupil.follow UNKNOWN_USER
-  end
-  
-  it "フォローに成功した場合はPupil::User型を返すこと" do
-    @follow.class.should == Pupil::User
-  end
-  
-  it "フォローに失敗した場合はFalseClass型を返すこと" do
-    @follow_fail.class.should == FalseClass
-  end
-end
-
-describe Pupil, "が #unfollow を呼ぶ時は" do
-  before do
-    pupil = Pupil.new PUPIL_TESTKEY
-    @unfollow = pupil.unfollow KNOWN_NONFOLLOWED_USER
-    @unfollow_fail = pupil.unfollow UNKNOWN_USER
-  end
-  
-  it "成功した場合はPupil::User型を返すこと" do
-    @unfollow.class.should == Pupil::User
-  end
-  
-  it "失敗した場合にはFalseClassを返すこと" do
-    @unfollow_fail.class.should == FalseClass
-  end
-end
-
-describe Pupil, "が #block を呼ぶ時は" do
-  before do
-    pupil = Pupil.new PUPIL_TESTKEY
-    @block = pupil.block KNOWN_NONFOLLOWED_USER
-    @block_fail = pupil.block UNKNOWN_USER
-  end
-  
-  it "成功した場合はPupil::User型を返すこと" do
-    @block.class.should == Pupil::User
-  end
-  
-  it "失敗した場合にはFalseClassを返すこと" do
-    @block_fail.class.should == FalseClass
-  end
-end
-
-describe Pupil, "が #unblock を呼ぶ時は" do
-  before do
-    pupil = Pupil.new PUPIL_TESTKEY
-    @unblock = pupil.unblock KNOWN_NONFOLLOWED_USER
-    @unblock_fail = pupil.unblock UNKNOWN_USER
-  end
-  
-  it "成功した場合はPupil::User型を返すこと" do
-    @unblock.class.should == Pupil::User
-  end
-  
-  it "失敗した場合にはFalseClassを返すこと" do
-    @unblock_fail.class.should == FalseClass
-  end
-end
-
 describe Pupil, "が #blocking を呼ぶ時は" do
   before do
     pupil = Pupil.new PUPIL_TESTKEY
@@ -151,17 +89,17 @@ describe Pupil, "が #blocking を呼ぶ時は" do
   end
 end
 
-describe Pupil, "が、 #search を呼ぶ時は" do
+describe Pupil, "が #search を呼ぶ時は" do
   before do
     pupil = Pupil.new PUPIL_TESTKEY
-    @search = pupil.search("Twitter", :rpp => 10)
+    @search = pupil.search("Twitter", :rpp => 1)
   end
   
   it "Array型を返すこと" do
     @search.class.should == Array
   end
   
-  it "sizeが10であること" do
-    @search.size.should == 10
+  it "sizeが1であること" do
+    @search.size.should == 1
   end
 end

metadata

@@ -1,110 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: pupil
 version: !ruby/object:Gem::Version
-  version: 0.6.2
-  prerelease: 
+  version: 0.6.3
 platform: ruby
 authors:
 - Oame
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-31 00:00:00.000000000 Z
+date: 2013-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oauth
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   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.
@@ -112,6 +113,7 @@ email:
 - oame@oameya.com
 executables:
 - eyedrops
+- pupil
 extensions: []
 extra_rdoc_files: []
 files:
@@ -125,10 +127,12 @@ files:
 - README.md
 - Rakefile
 - bin/eyedrops
+- bin/pupil
 - lib/pupil.rb
 - lib/pupil/account.rb
 - lib/pupil/base.rb
 - lib/pupil/blocks.rb
+- lib/pupil/cli.rb
 - lib/pupil/direct_messages.rb
 - lib/pupil/essentials.rb
 - lib/pupil/friendships.rb
@@ -151,27 +155,26 @@ files:
 - spec/spec_helper.rb
 homepage: http://oame.github.com/pupil
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: The "Lazy" Twitter API Library for Ruby 1.9.x
 test_files:
 - spec/pupil_spec.rb