rubytter 0.9.2 → 0.9.3

data/Rakefile

@@ -1,45 +1,51 @@
-# -*- coding: utf-8 -*-
-$:.unshift File.dirname(__FILE__) + '/lib/'
-require 'rubytter'
-require 'spec/rake/spectask'
+require 'rubygems'
+require 'rake'
 
-desc 'run all specs'
-Spec::Rake::SpecTask.new do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.spec_opts = ['-c']
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = "rubytter"
+    gem.summary = %Q{Simple twitter client.}
+    gem.description = %Q{Rubytter is a simple twitter client.}
+    gem.email = "jugyo.org@gmail.com"
+    gem.homepage = "http://github.com/jugyo/rubytter"
+    gem.authors = ["jugyo"]
+    gem.files = FileList['lib/**/*.rb', 'README.rdoc', 'History.txt', 'Rakefile', 'spec/**/*.rb', 'spec/**/*.json', 'examples/**/*.rb']
+    gem.add_dependency("json_pure", ">= 1.1.3")
+    gem.add_development_dependency "rspec"
+    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+  end
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
 end
 
-desc 'Generate gemspec'
-task :gemspec do |t|
-  open('rubytter.gemspec', "wb" ) do |file|
-    file << <<-EOS
-Gem::Specification.new do |s|
-  s.name = 'rubytter'
-  s.version = '#{Rubytter::VERSION}'
-  s.summary = "Simple twitter client."
-  s.description = "Rubytter is a simple twitter client."
-  s.files = %w( #{Dir['lib/**/*.rb'].join(' ')}
-                #{Dir['spec/**/*.rb'].join(' ')}
-                #{Dir['spec/**/*.json'].join(' ')}
-                #{Dir['examples/**/*.rb'].join(' ')}
-                README.rdoc
-                History.txt
-                Rakefile )
-  s.add_dependency("json_pure", ">= 1.1.3")
-  s.author = 'jugyo'
-  s.email = 'jugyo.org@gmail.com'
-  s.homepage = 'http://github.com/jugyo/rubytter'
-  s.rubyforge_project = 'rubytter'
-  s.has_rdoc = true
-  s.rdoc_options = ["--main", "README.rdoc", "--exclude", "spec"]
-  s.extra_rdoc_files = ["README.rdoc", "History.txt"]
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
+  spec.spec_opts = ['-c']
 end
-    EOS
-  end
-  puts "Generate gemspec"
+
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
 end
 
-desc 'Generate gem'
-task :gem => :gemspec do |t|
-  system 'gem', 'build', 'rubytter.gemspec'
+task :spec => :check_dependencies
+
+task :default => :spec
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  if File.exist?('VERSION')
+    version = File.read('VERSION')
+  else
+    version = ""
+  end
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "rubytter #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/lib/rubytter/connection.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 class Rubytter
   class Connection
-    attr_reader :protocol, :port, :proxy_uri
+    attr_reader :protocol, :port, :proxy_uri, :enable_ssl
 
     def initialize(options = {})
       @proxy_host = options[:proxy_host]
@@ -11,14 +11,6 @@ class Rubytter
       @proxy_uri = nil
       @enable_ssl = options[:enable_ssl]
 
-      if @proxy_host
-        @http_class = Net::HTTP::Proxy(@proxy_host, @proxy_port,
-                                       @proxy_user, @proxy_password)
-        @proxy_uri =  "http://" + @proxy_host + ":" + @proxy_port.to_s + "/"
-      else
-        @http_class = Net::HTTP
-      end
-
       if @enable_ssl
         @protocol = "https"
         @port = 443
@@ -26,6 +18,14 @@ class Rubytter
         @protocol = "http"
         @port = 80
       end
+
+      if @proxy_host
+        @http_class = Net::HTTP::Proxy(@proxy_host, @proxy_port,
+                                       @proxy_user, @proxy_password)
+        @proxy_uri =  "#{@protocol}://" + @proxy_host + ":" + @proxy_port.to_s + "/"
+      else
+        @http_class = Net::HTTP
+      end
     end
 
     def start(host, port = nil, &block)

data/lib/rubytter.rb

@@ -8,9 +8,6 @@ require 'rubytter/connection'
 require 'rubytter/oauth_rubytter'
 
 class Rubytter
-
-  VERSION = '0.9.2'
-
   class APIError < StandardError
     attr_reader :response
     def initialize(msg, response = nil)
@@ -30,6 +27,7 @@ class Rubytter
     @header.merge!(options[:header]) if options[:header]
     @app_name = options[:app_name]
     @connection = Connection.new(options)
+    @connection_for_search = Connection.new(options.merge({:enable_ssl => false}))
   end
 
   def self.api_settings
@@ -40,6 +38,7 @@ class Rubytter
       public_timeline         /statuses/public_timeline
       friends_timeline        /statuses/friends_timeline
       replies                 /statuses/replies
+      mentions                /statuses/mentions
       user_timeline           /statuses/user_timeline/%s
       show                    /statuses/show/%s
       friends                 /statuses/friends/%s
@@ -67,6 +66,13 @@ class Rubytter
       disable_notification    /notifications/leave/%s         post
       block                   /blocks/create/%s               post
       unblock                 /blocks/destroy/%s              delete
+      block_exists            /blocks/exists/%s               get
+      blocking                /blocks/blocking                get
+      blocking_ids            /blocks/blocking/ids            get
+      saved_searches          /saved_searches                 get
+      saved_search            /saved_searches/show/%s         get
+      create_saved_search     /saved_searches/create          post
+      remove_saved_search     /saved_searches/destroy/%s      delete
     ".strip.split("\n").map{|line| line.strip.split(/\s+/)}
   end
 
@@ -94,6 +100,12 @@ class Rubytter
     __update_status(params)
   end
 
+  alias_method :__create_saved_search, :create_saved_search
+  def create_saved_search(arg)
+    arg = {:query => arg} if arg.kind_of?(String)
+    __create_saved_search(arg)
+  end
+
   def update(status, params = {})
     update_status(params.merge({:status => status}))
   end
@@ -123,7 +135,8 @@ class Rubytter
     param_str = '?' + self.class.to_param_str(params.merge({:q => query}))
     path = path + param_str unless param_str.empty?
     req = create_request(Net::HTTP::Get.new(path), false)
-    json_data = http_request("search.#{@host}", req)
+
+    json_data = http_request("search.#{@host}", req, nil, @connection_for_search)
     self.class.structize(
       json_data['results'].map do |result|
         self.class.search_result_to_hash(result)
@@ -149,8 +162,9 @@ class Rubytter
     }
   end
 
-  def http_request(host, req, param_str = nil)
-    res = @connection.start(host) do |http|
+  def http_request(host, req, param_str = nil, connection = nil)
+    connection ||= @connection
+    res = connection.start(host) do |http|
       if param_str
         http.request(req, param_str)
       else

data/spec/rubytter_spec.rb

@@ -358,5 +358,25 @@ class Rubytter
       end
       o
     end
+
+    describe 'spec for ssl' do
+      before do
+        @ssl_rubytter = Rubytter.new('foo', 'bar', {:enable_ssl => true})
+      end
+
+      it 'connection is enabled ssl' do
+        @ssl_rubytter.instance_eval{@connection.enable_ssl}.should == true
+      end
+
+      it 'connection_for_search is not ever ssl' do
+        connection_for_search = @ssl_rubytter.instance_eval{@connection_for_search}
+        connection_for_search.enable_ssl.should == false
+
+        @ssl_rubytter.should_receive(:http_request).
+          with('search.twitter.com', anything, nil, connection_for_search).
+          and_return({'results' => []})
+        @ssl_rubytter.search('rubytter')
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubytter
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - jugyo
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-18 00:00:00 +09:00
+date: 2009-10-30 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.1.3
     version: 
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: Rubytter is a simple twitter client.
 email: jugyo.org@gmail.com
 executables: []
@@ -30,14 +40,10 @@ extensions: []
 
 extra_rdoc_files: 
 - README.rdoc
-- History.txt
 files: 
-- lib/rubytter/connection.rb
-- lib/rubytter/oauth_rubytter.rb
-- lib/rubytter.rb
-- spec/rubytter_spec.rb
-- spec/spec_helper.rb
-- spec/search.json
+- History.txt
+- README.rdoc
+- Rakefile
 - examples/direct_message.rb
 - examples/favorite.rb
 - examples/follow.rb
@@ -47,19 +53,19 @@ files:
 - examples/search.rb
 - examples/update_status.rb
 - examples/user.rb
-- README.rdoc
-- History.txt
-- Rakefile
+- lib/rubytter.rb
+- lib/rubytter/connection.rb
+- lib/rubytter/oauth_rubytter.rb
+- spec/rubytter_spec.rb
+- spec/search.json
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/jugyo/rubytter
 licenses: []
 
 post_install_message: 
 rdoc_options: 
-- --main
-- README.rdoc
-- --exclude
-- spec
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -76,10 +82,20 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: rubytter
-rubygems_version: 1.3.4
+rubyforge_project: 
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Simple twitter client.
-test_files: []
-
+test_files: 
+- spec/rubytter_spec.rb
+- spec/spec_helper.rb
+- examples/direct_message.rb
+- examples/favorite.rb
+- examples/follow.rb
+- examples/friends_timeline.rb
+- examples/limit.rb
+- examples/replies.rb
+- examples/search.rb
+- examples/update_status.rb
+- examples/user.rb