atig 0.4.5 → 0.5.0

data/lib/atig/search.rb

@@ -5,14 +5,16 @@ require 'atig/url_escape'
 module Atig
   class Search
     def search(query, options = {})
+      options[:q] = query
+
       search = URI("https://search.twitter.com")
       search.path = "/search.json"
-      params = options; options[:q] = query
       search.query = options.to_query_str
+
       http = Http.new nil
       req = http.req(:get, search)
       res = http.http(search, 5, 10).request(req)
-      res = JSON.parse(res.body)
+      JSON.parse(res.body)
     rescue Errno::ETIMEDOUT, JSON::ParserError, IOError, Timeout::Error, Errno::ECONNRESET => e
       @log.error e
       text

data/lib/atig/stream.rb

@@ -33,7 +33,7 @@ module Atig
 
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = true
-      request = Net::HTTP::Get.new(uri.request_uri)
+      request = Net::HTTP::Get.new(uri.request_uri, {"Accept-Encoding" => "identity"})
       request.oauth!(http, @access.consumer, @access)
       http.request(request) do |response|
         unless response.code == '200' then

data/lib/atig/twitter.rb

@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 
+require 'timeout'
 require 'atig/basic_twitter'
 require 'atig/http'
 
@@ -17,8 +18,8 @@ module Atig
       r     = []
       cursor = -1
       1.upto(limit) do |num|
-        options = {:cursor => cursor}.merge(opts)
-        ret = api(path, options, { :authenticate => true })
+        options = {cursor: cursor}.merge(opts)
+        ret = api(path, options, { authenticate: true })
         r.concat ret[name]
         cursor = ret[:next_cursor]
         break if cursor.zero?
@@ -30,7 +31,7 @@ module Atig
       methods.each do |m|
         self.module_eval <<END
           def #{m}(path, query = {}, opts = {})
-            opts.update( :method => :#{m})
+            opts.update( method: :#{m})
             api path, query, opts
           end
 END
@@ -56,7 +57,7 @@ END
     end
 
     def oauth(time, req)
-      timeout(time) do
+      Timeout.timeout(time) do
         headers = {}
         req.each{|k,v| headers[k] = v }
 

data/lib/atig/update_checker.rb

@@ -3,7 +3,7 @@
 module Atig
   module UpdateChecker
     def commits
-      uri = URI("https://api.github.com/repos/mzp/atig/commits")
+      uri = URI("https://api.github.com/repos/atig/atig/commits")
       http = Atig::Http.new
       res = http.http(uri).request http.req(:get, uri)
       JSON.parse(res.body)
@@ -47,7 +47,7 @@ module Atig
           end.map {|i| i['commit']['message'] }
         end
       end
-    rescue Errno::ECONNREFUSED, Timeout::Error => e
+    rescue TypeError, Errno::ECONNREFUSED, Timeout::Error
       []
     end
 

data/lib/atig/url_escape.rb

@@ -1,7 +1,7 @@
 # -*- mode:ruby; coding:utf-8 -*-
 
 class Hash
-  # { :f  => "v" }    #=> "f=v"
+  # { f: "v" }    #=> "f=v"
   # { "f" => [1, 2] } #=> "f=1&f=2"
   # { "f" => "" }     #=> "f="
   # { "f" => nil }    #=> "f"

data/lib/atig/version.rb

@@ -1,3 +1,3 @@
 module Atig
-  VERSION = "0.4.5"
+  VERSION = "0.5.0"
 end

data/lib/memory_profiler.rb

@@ -16,7 +16,7 @@
 # each cycle.  You can then use 'diff' to spot which strings were added
 # between runs.
 class MemoryProfiler
-  DEFAULTS = {:delay => 10, :string_debug => false}
+  DEFAULTS = {delay: 10, string_debug: false}
 
   def self.start(opt={})
     opt = DEFAULTS.dup.merge(opt)

data/spec/command/autofix_spec.rb

@@ -1,6 +1,5 @@
 # -*- mode:ruby; coding:utf-8 -*-
 
-require File.expand_path( '../../spec_helper', __FILE__ )
 require 'atig/command/autofix'
 
 describe Atig::Command::Autofix do
@@ -10,24 +9,24 @@ describe Atig::Command::Autofix do
     @opts.autofix = true
     target = status 'hello', 'id'=>'42'
     entry  = entry user(1,'mzp'), target, "entry", 1
-    @statuses.should_receive(:find_by_user).with(@me,:limit=>1).and_return([ entry ])
+    expect(@statuses).to receive(:find_by_user).with(@me,:limit=>1).and_return([ entry ])
   end
 
   it "should post normal tweet" do
     res = status('blah blah')
-    @api.should_receive(:post).with('statuses/update', {:status=>'blah blah'}).and_return(res)
+    expect(@api).to receive(:post).with('statuses/update', {status:'blah blah'}).and_return(res)
 
     call '#twitter', "autofix", %w(blah blah)
   end
 
   it "should delete old similar tweet" do
     res = status('hillo')
-    @api.should_receive(:post).with('statuses/update', {:status=>'hillo'}).and_return(res)
-    @api.should_receive(:post).with("statuses/destroy/42")
-    @statuses.should_receive(:remove_by_id).with(1)
+    expect(@api).to receive(:post).with('statuses/update', {status:'hillo'}).and_return(res)
+    expect(@api).to receive(:post).with("statuses/destroy/42")
+    expect(@statuses).to receive(:remove_by_id).with(1)
 
-    @channel.should_receive(:notify).with("Similar update in previous. Conclude that it has error.")
-    @channel.should_receive(:notify).with("And overwrite previous as new status: hillo")
+    expect(@channel).to receive(:notify).with("Similar update in previous. Conclude that it has error.")
+    expect(@channel).to receive(:notify).with("And overwrite previous as new status: hillo")
 
     call '#twitter', "autofix", %w(hillo)
   end

data/spec/command/destroy_spec.rb

@@ -1,6 +1,5 @@
 # -*- mode:ruby; coding:utf-8 -*-
 
-require File.expand_path( '../../spec_helper', __FILE__ )
 require 'atig/command/destroy'
 
 describe Atig::Command::Destroy,"when status is not removed" do
@@ -12,9 +11,9 @@ describe Atig::Command::Destroy,"when status is not removed" do
 
   it "should specified other's status" do
     entry  = entry user(2,'other'), status('blah blah', 'id'=>'1')
-    @statuses.stub(:find_by_tid).with('b').and_return(entry)
+    allow(@statuses).to receive(:find_by_tid).with('b').and_return(entry)
 
-    @channel.should_receive(:notify).with("The status you specified by the ID tid is not yours.")
+    expect(@channel).to receive(:notify).with("The status you specified by the ID tid is not yours.")
     call "#twitter","destory",%w(b)
   end
 end
@@ -31,20 +30,20 @@ describe Atig::Command::Destroy,"when remove recently tweet" do
 
     stub_status(:find_by_tid,'a' => entry)
     stub_status(:find_by_sid,'mzp:a' => entry)
-    stub_status(:find_by_screen_name,'mzp' => [ entry ], :default=>[])
+    stub_status(:find_by_screen_name,'mzp' => [ entry ], default:[])
 
     # api
-    @api.should_receive(:post).with("statuses/destroy/1")
+    expect(@api).to receive(:post).with("statuses/destroy/1")
 
     # notice
-    @channel.should_receive(:notify).with("Destroyed: blah blah")
+    expect(@channel).to receive(:notify).with("Destroyed: blah blah")
 
     # update topics
     new_entry  = entry @me, status('foo', 'id'=>'2')
-    @gateway.should_receive(:topic).with(new_entry)
+    expect(@gateway).to receive(:topic).with(new_entry)
 
-    @statuses.should_receive(:remove_by_id).with(1).and_return{
-      @statuses.should_receive(:find_by_screen_name).with(@me.screen_name,:limit=>1).and_return{
+    expect(@statuses).to receive(:remove_by_id).with(1){
+      expect(@statuses).to receive(:find_by_screen_name).with(@me.screen_name,:limit=>1){
         [ new_entry ]
       }
     }
@@ -75,16 +74,16 @@ describe Atig::Command::Destroy,"when remove old tweet" do
 
     stub_status(:find_by_tid,'a' => entry)
     stub_status(:find_by_sid,'mzp:a' => entry)
-    stub_status(:find_by_screen_name, @db.me.screen_name => [ entry ], :default=>[])
+    stub_status(:find_by_screen_name, @db.me.screen_name => [ entry ], default:[])
 
     # api
-    @api.should_receive(:post).with("statuses/destroy/1")
+    expect(@api).to receive(:post).with("statuses/destroy/1")
 
     # notice
-    @channel.should_receive(:notify).with("Destroyed: blah blah")
+    expect(@channel).to receive(:notify).with("Destroyed: blah blah")
 
     # update topics
-    @statuses.should_receive(:remove_by_id).with(1)
+    expect(@statuses).to receive(:remove_by_id).with(1)
   end
 
   it "should specified by tid" do

data/spec/command/dm_spec.rb

@@ -1,6 +1,5 @@
 # -*- mode:ruby; coding:utf-8 -*-
 
-require File.expand_path( '../../spec_helper', __FILE__ )
 require 'atig/command/dm'
 
 describe Atig::Command::Dm do
@@ -10,18 +9,18 @@ describe Atig::Command::Dm do
   end
 
   it "should have '/me dm' name" do
-    @gateway.names.should == ['d', 'dm','dms']
+    expect(@gateway.names).to eq(['d', 'dm','dms'])
   end
 
   it "should post the status by API" do
-    @api.should_receive(:post).with('direct_messages/new',
-                                    {:screen_name => 'mzp', :text => 'blah blah'})
-    @channel.should_receive(:notify).with("Sent message to mzp: blah blah")
+    expect(@api).to receive(:post).with('direct_messages/new',
+                                    {screen_name: 'mzp', text: 'blah blah'})
+    expect(@channel).to receive(:notify).with("Sent message to mzp: blah blah")
     call '#twitter', "dm", %w(mzp blah blah)
   end
 
   it "should post the status by API" do
-    @channel.should_receive(:notify).with("/me dm <SCREEN_NAME> blah blah")
+    expect(@channel).to receive(:notify).with("/me dm <SCREEN_NAME> blah blah")
     call '#twitter', "dm", %w()
   end
 end

data/spec/command/favorite_spec.rb

@@ -1,6 +1,5 @@
 # -*- mode:ruby; coding:utf-8 -*-
 
-require File.expand_path( '../../spec_helper', __FILE__ )
 require 'atig/command/favorite'
 
 describe Atig::Command::Favorite do
@@ -14,40 +13,40 @@ describe Atig::Command::Favorite do
 
     stub_status(:find_by_tid,'a' => entry)
     stub_status(:find_by_sid,'mzp:a' => entry)
-    stub_status(:find_by_screen_name,'mzp' => [ entry ], :default=>[])
+    stub_status(:find_by_screen_name,'mzp' => [ entry ], default:[])
   end
 
   it "should post fav by tid" do
-    @api.should_receive(:post).with("favorites/create", {:id => "1"})
-    @channel.should_receive(:notify).with("FAV: mzp: blah blah")
+    expect(@api).to receive(:post).with("favorites/create", {id: "1"})
+    expect(@channel).to receive(:notify).with("FAV: mzp: blah blah")
 
     call "#twitter","fav",%w(a)
   end
 
   it "should post fav by sid" do
-    @api.should_receive(:post).with("favorites/create", {:id => "1"})
-    @channel.should_receive(:notify).with("FAV: mzp: blah blah")
+    expect(@api).to receive(:post).with("favorites/create", {id: "1"})
+    expect(@channel).to receive(:notify).with("FAV: mzp: blah blah")
 
     call "#twitter","fav",%w(mzp:a)
   end
 
   it "should post fav by screen name" do
-    @api.should_receive(:post).with("favorites/create", {:id => "1"})
-    @channel.should_receive(:notify).with("FAV: mzp: blah blah")
+    expect(@api).to receive(:post).with("favorites/create", {id: "1"})
+    expect(@channel).to receive(:notify).with("FAV: mzp: blah blah")
 
     call "#twitter","fav",%w(mzp)
   end
 
   it "should post fav by screen name with at" do
-    @api.should_receive(:post).with("favorites/create", {:id => "1"})
-    @channel.should_receive(:notify).with("FAV: mzp: blah blah")
+    expect(@api).to receive(:post).with("favorites/create", {id: "1"})
+    expect(@channel).to receive(:notify).with("FAV: mzp: blah blah")
 
     call "#twitter","fav",%w(@mzp)
   end
 
   it "should post unfav" do
-    @api.should_receive(:post).with("favorites/destroy", {:id => "1"})
-    @channel.should_receive(:notify).with("UNFAV: mzp: blah blah")
+    expect(@api).to receive(:post).with("favorites/destroy", {id: "1"})
+    expect(@channel).to receive(:notify).with("UNFAV: mzp: blah blah")
 
     call "#twitter","unfav",%w(a)
   end

data/spec/command/limit_spec.rb

@@ -1,6 +1,5 @@
 # -*- mode:ruby; coding:utf-8 -*-
 
-require File.expand_path( '../../spec_helper', __FILE__ )
 require 'atig/command/limit'
 
 describe Atig::Command::Limit do
@@ -9,18 +8,18 @@ describe Atig::Command::Limit do
   before do
     @reset = ::Time.utc(2010,9,25,8,24,12)
     @command = init Atig::Command::Limit
-    @api.stub(:limit).and_return(150)
-    @api.stub(:remain).and_return(148)
-    @api.stub(:reset).and_return(@reset)
+    allow(@api).to receive(:limit).and_return(150)
+    allow(@api).to receive(:remain).and_return(148)
+    allow(@api).to receive(:reset).and_return(@reset)
   end
 
   it "should provide limit command" do
-    @gateway.names.should == ['rls','limit','limits']
+    expect(@gateway.names).to eq(['rls','limit','limits'])
   end
 
   it "should show limit" do
-    @channel.should_receive(:notify).with("148 / 150 (reset at 2010-09-25 08:24:12)")
+    expect(@channel).to receive(:notify).with("148 / 150 (reset at 2010-09-25 08:24:12)")
     call '#twitter', 'limit', []
-    @gateway.notified.should == '#twitter'
+    expect(@gateway.notified).to eq('#twitter')
   end
 end

data/spec/command/location_spec.rb

@@ -1,6 +1,5 @@
 # -*- mode:ruby; coding:utf-8 -*-
 
-require File.expand_path( '../../spec_helper', __FILE__ )
 require 'atig/command/location'
 
 describe Atig::Command::Location do
@@ -11,14 +10,14 @@ describe Atig::Command::Location do
   end
 
   it "should update location" do
-    @api.should_receive(:post).with('account/update_profile',:location=>'some place')
-    @channel.should_receive(:notify).with("You are in some place now.")
+    expect(@api).to receive(:post).with('account/update_profile',:location=>'some place')
+    expect(@channel).to receive(:notify).with("You are in some place now.")
     call '#twitter','location',%w(some place)
   end
 
   it "should reset location" do
-    @api.should_receive(:post).with('account/update_profile',:location=>'')
-    @channel.should_receive(:notify).with("You are nowhere now.")
+    expect(@api).to receive(:post).with('account/update_profile',:location=>'')
+    expect(@channel).to receive(:notify).with("You are nowhere now.")
     call '#twitter','location',%w()
   end
 end

data/spec/command/name_spec.rb

@@ -1,6 +1,5 @@
 # -*- mode:ruby; coding:utf-8 -*-
 
-require File.expand_path( '../../spec_helper', __FILE__ )
 require 'atig/command/name'
 
 describe Atig::Command::Name do
@@ -11,8 +10,8 @@ describe Atig::Command::Name do
   end
 
   it "should update name" do
-    @api.should_receive(:post).with('account/update_profile',:name=>'mzp')
-    @channel.should_receive(:notify).with("You are named mzp.")
+    expect(@api).to receive(:post).with('account/update_profile',:name=>'mzp')
+    expect(@channel).to receive(:notify).with("You are named mzp.")
     call '#twitter', 'name', %w(mzp)
   end
 end

data/spec/command/option_spec.rb

@@ -1,6 +1,5 @@
 # -*- mode:ruby; coding:utf-8 -*-
 
-require File.expand_path( '../spec_helper', File.dirname(__FILE__))
 require 'atig/command/option'
 
 describe Atig::Command::Option do
@@ -11,7 +10,7 @@ describe Atig::Command::Option do
   end
 
   it "should provide option command" do
-    @command.command_name.should == %w(opt opts option options)
+    expect(@command.command_name).to eq(%w(opt opts option options))
   end
 end
 
@@ -24,20 +23,20 @@ describe Atig::Command::Option, 'when have many property' do
     @opts.foo2 = 42
     @opts.foo3 = 42.1
 
-    @opts.stub(:foo1=)
-    @opts.stub(:foo2=)
-    @opts.stub(:foo3=)
+    allow(@opts).to receive(:foo1=)
+    allow(@opts).to receive(:foo2=)
+    allow(@opts).to receive(:foo3=)
   end
 
   it "should list up values" do
     xs = []
-    @channel.stub(:notify){|x| xs << x}
+    allow(@channel).to receive(:notify){|x| xs << x}
     call '#twitter', 'opt', %w()
-    xs.should == [
+    expect(xs).to eq([
                   "foo1 => true",
                   "foo2 => 42",
                   "foo3 => 42.1",
-                 ]
+                 ])
   end
 end
 
@@ -47,19 +46,19 @@ describe Atig::Command::Option, 'when have bool property' do
 
   before do
     @command = init Atig::Command::Option
-    @opts.stub(:foo).and_return true
-    @opts.stub(:foo=){|v| @value = v }
-    @channel.stub(:notify)
+    allow(@opts).to receive(:foo).and_return true
+    allow(@opts).to receive(:foo=){|v| @value = v }
+    allow(@channel).to receive(:notify)
   end
 
   it "should show the value" do
-    @channel.should_receive(:notify).with("foo => true")
+    expect(@channel).to receive(:notify).with("foo => true")
     call '#twitter', 'opt', %w(foo)
   end
 
   it "should update the value" do
     call '#twitter', 'opt', %w(foo false)
-    @value.should be_false
+    expect(@value).to be_falsey
   end
 end
 
@@ -68,19 +67,19 @@ describe Atig::Command::Option, 'when have int property' do
 
   before do
     @command = init Atig::Command::Option
-    @opts.stub(:foo).and_return 42
-    @opts.stub(:foo=){|v| @value = v }
-    @channel.stub(:notify)
+    allow(@opts).to receive(:foo).and_return 42
+    allow(@opts).to receive(:foo=){|v| @value = v }
+    allow(@channel).to receive(:notify)
   end
 
   it "should show the value" do
-    @channel.should_receive(:notify).with("foo => 42")
+    expect(@channel).to receive(:notify).with("foo => 42")
     call '#twitter', 'opt', %w(foo)
   end
 
   it "should update the value" do
     call '#twitter', 'opt', %w(foo 42)
-    @value.should == 42
+    expect(@value).to eq(42)
   end
 end
 
@@ -89,19 +88,19 @@ describe Atig::Command::Option, 'when have float property' do
 
   before do
     @command = init Atig::Command::Option
-    @opts.stub(:foo).and_return 1.23
-    @opts.stub(:foo=){|v| @value = v }
-    @channel.stub(:notify)
+    allow(@opts).to receive(:foo).and_return 1.23
+    allow(@opts).to receive(:foo=){|v| @value = v }
+    allow(@channel).to receive(:notify)
   end
 
   it "should show the value" do
-    @channel.should_receive(:notify).with("foo => 1.23")
+    expect(@channel).to receive(:notify).with("foo => 1.23")
     call '#twitter', 'opt', %w(foo)
   end
 
   it "should update the value" do
     call '#twitter', 'opt', %w(foo 1.24)
-    @value.should == 1.24
+    expect(@value).to eq(1.24)
   end
 end
 
@@ -110,23 +109,23 @@ describe Atig::Command::Option, 'when have string property' do
 
   before do
     @command = init Atig::Command::Option
-    @opts.stub(:foo).and_return "bar"
-    @opts.stub(:foo=){|v| @value = v }
-    @channel.stub(:notify)
+    allow(@opts).to receive(:foo).and_return "bar"
+    allow(@opts).to receive(:foo=){|v| @value = v }
+    allow(@channel).to receive(:notify)
   end
 
   it "should show the value" do
-    @channel.should_receive(:notify).with("foo => bar")
+    expect(@channel).to receive(:notify).with("foo => bar")
     call '#twitter', 'opt', %w(foo)
   end
 
   it "should update the value" do
     call '#twitter', 'opt', %w(foo baz)
-    @value.should == 'baz'
+    expect(@value).to eq('baz')
   end
 
   it "should update the value" do
     call '#twitter', 'opt', %w(foo blah Blah)
-    @value.should == 'blah Blah'
+    expect(@value).to eq('blah Blah')
   end
 end