atig 0.4.5 → 0.5.0

data/spec/command/uptime_spec.rb

@@ -1,54 +1,53 @@
 # -*- mode:ruby; coding:utf-8 -*-
 
-require File.expand_path( '../../spec_helper', __FILE__ )
 require 'atig/command/uptime'
 
 describe Atig::Command::Uptime do
   include CommandHelper
 
   before do
-    ::Time.should_receive(:now).and_return(::Time.at(0))
+    expect(::Time).to receive(:now).and_return(::Time.at(0))
     @command = init Atig::Command::Uptime
   end
 
   it "should register uptime command" do
-    @gateway.names.should == ['uptime']
+    expect(@gateway.names).to eq(['uptime'])
   end
 
   it "should return mm:ss(min)" do
-    ::Time.should_receive(:now).and_return(::Time.at(0))
-    @channel.should_receive(:notify).with("00:00")
+    expect(::Time).to receive(:now).and_return(::Time.at(0))
+    expect(@channel).to receive(:notify).with("00:00")
     call '#twitter', 'uptime', []
 
-    @gateway.notified.should == '#twitter'
+    expect(@gateway.notified).to eq('#twitter')
   end
 
   it "should return mm:ss(max)" do
-    ::Time.should_receive(:now).and_return(::Time.at(60*60-1))
-    @channel.should_receive(:notify).with("59:59")
+    expect(::Time).to receive(:now).and_return(::Time.at(60*60-1))
+    expect(@channel).to receive(:notify).with("59:59")
     call '#twitter', 'uptime', []
 
-    @gateway.notified.should == '#twitter'
+    expect(@gateway.notified).to eq('#twitter')
   end
 
   it "should return hh:mm:ss(min)" do
-    ::Time.should_receive(:now).and_return(::Time.at(60*60))
-    @channel.should_receive(:notify).with("01:00:00")
+    expect(::Time).to receive(:now).and_return(::Time.at(60*60))
+    expect(@channel).to receive(:notify).with("01:00:00")
     call '#twitter', 'uptime', []
-    @gateway.notified.should == '#twitter'
+    expect(@gateway.notified).to eq('#twitter')
   end
 
   it "should return hh:mm:ss(max)" do
-    ::Time.should_receive(:now).and_return(::Time.at(24*60*60-1))
-    @channel.should_receive(:notify).with("23:59:59")
+    expect(::Time).to receive(:now).and_return(::Time.at(24*60*60-1))
+    expect(@channel).to receive(:notify).with("23:59:59")
     call '#twitter', 'uptime', []
-    @gateway.notified.should == '#twitter'
+    expect(@gateway.notified).to eq('#twitter')
   end
 
   it "should return dd days hh:mm:ss" do
-    ::Time.should_receive(:now).and_return(::Time.at(24*60*60))
-    @channel.should_receive(:notify).with("1 days 00:00")
+    expect(::Time).to receive(:now).and_return(::Time.at(24*60*60))
+    expect(@channel).to receive(:notify).with("1 days 00:00")
     call '#twitter', 'uptime', []
-    @gateway.notified.should == '#twitter'
+    expect(@gateway.notified).to eq('#twitter')
   end
 end

data/spec/command/user_info_spec.rb

@@ -1,6 +1,5 @@
 # -*- mode:ruby; coding:utf-8 -*-
 
-require File.expand_path( '../../spec_helper', __FILE__)
 require 'atig/command/user_info'
 
 describe Atig::Command::UserInfo do
@@ -10,30 +9,28 @@ describe Atig::Command::UserInfo do
     @command = init Atig::Command::UserInfo
     @status  = double "status"
     @user    = double "user"
-    @user.stub(:description).and_return('hogehoge')
-    @user.stub(:status).and_return(@status)
+    allow(@user).to receive(:description).and_return('hogehoge')
+    allow(@user).to receive(:status).and_return(@status)
   end
 
   it "should show the source via DB" do
-    @followings.should_receive(:find_by_screen_name).with('mzp').and_return(@user)
-    @channel.
-      should_receive(:message).
-      with(anything, Net::IRC::Constants::NOTICE).
-      and_return{|s,_|
-        s.status.text.should == "\x01hogehoge\x01"
+    expect(@followings).to receive(:find_by_screen_name).with('mzp').and_return(@user)
+    expect(@channel).
+      to receive(:message).
+      with(anything, Net::IRC::Constants::NOTICE){|s,_|
+        expect(s.status.text).to eq("\x01hogehoge\x01")
       }
     call '#twitter','userinfo',%w(mzp)
   end
 
   it "should show the source via API" do
-    @followings.should_receive(:find_by_screen_name).with('mzp').and_return(nil)
-    @api.should_receive(:get).with('users/show',:screen_name=>'mzp').and_return(@user)
+    expect(@followings).to receive(:find_by_screen_name).with('mzp').and_return(nil)
+    expect(@api).to receive(:get).with('users/show',:screen_name=>'mzp').and_return(@user)
 
-    @channel.
-      should_receive(:message).
-      with(anything, Net::IRC::Constants::NOTICE).
-      and_return{|s,_|
-        s.status.text.should == "\x01hogehoge\x01"
+    expect(@channel).
+      to receive(:message).
+      with(anything, Net::IRC::Constants::NOTICE){|s,_|
+        expect(s.status.text).to eq("\x01hogehoge\x01")
       }
 
     call '#twitter','userinfo',%w(mzp)

data/spec/command/user_spec.rb

@@ -1,6 +1,5 @@
 # -*- mode:ruby; coding:utf-8 -*-
 
-require File.expand_path( '../../spec_helper', __FILE__ )
 require 'atig/command/user'
 
 describe Atig::Command::User do
@@ -10,23 +9,23 @@ describe Atig::Command::User do
   end
 
   it "should have '/me status' name" do
-    @gateway.names.should == ['user', 'u']
+    expect(@gateway.names).to eq(['user', 'u'])
   end
 
   it "should" do
     foo = entry user(1,'mzp'),status('foo')
     bar = entry user(1,'mzp'),status('bar')
     baz = entry user(1,'mzp'),status('baz')
-    @api.
-      should_receive(:get).
+    expect(@api).
+      to receive(:get).
       with('statuses/user_timeline',:count=>20,:screen_name=>'mzp').
       and_return([foo, bar, baz])
-    @statuses.should_receive(:add).with(any_args).at_least(3)
-    @statuses.
-      should_receive(:find_by_screen_name).
+    expect(@statuses).to receive(:add).with(any_args).at_least(3)
+    expect(@statuses).
+      to receive(:find_by_screen_name).
       with('mzp',:limit=>20).
       and_return([foo, bar, baz])
-    @channel.should_receive(:message).with(anything, Net::IRC::Constants::NOTICE).at_least(3)
+    expect(@channel).to receive(:message).with(anything, Net::IRC::Constants::NOTICE).at_least(3)
     call "#twitter","user",%w(mzp)
   end
 
@@ -34,16 +33,16 @@ describe Atig::Command::User do
     foo = entry user(1,'mzp'),status('foo')
     bar = entry user(1,'mzp'),status('bar')
     baz = entry user(1,'mzp'),status('baz')
-    @api.
-      should_receive(:get).
+    expect(@api).
+      to receive(:get).
       with('statuses/user_timeline',:count=>200,:screen_name=>'mzp').
       and_return([foo, bar, baz])
-    @statuses.should_receive(:add).with(any_args).at_least(3)
-    @statuses.
-      should_receive(:find_by_screen_name).
+    expect(@statuses).to receive(:add).with(any_args).at_least(3)
+    expect(@statuses).
+      to receive(:find_by_screen_name).
       with('mzp',:limit=>200).
       and_return([foo, bar, baz])
-    @channel.should_receive(:message).with(anything, Net::IRC::Constants::NOTICE).at_least(3)
+    expect(@channel).to receive(:message).with(anything, Net::IRC::Constants::NOTICE).at_least(3)
     call "#twitter","user",%w(mzp 200)
   end
 end

data/spec/command/version_spec.rb

@@ -1,6 +1,5 @@
 # -*- mode:ruby; coding:utf-8 -*-
 
-require File.expand_path( '../../spec_helper', __FILE__ )
 require 'atig/command/version'
 
 describe Atig::Command::Version do
@@ -9,56 +8,53 @@ describe Atig::Command::Version do
   before do
     @command = init Atig::Command::Version
     @status  = double "status"
-    @status.stub(:source).and_return('<a href="http://echofon.com/" rel="nofollow">Echofon</a>')
+    allow(@status).to receive(:source).and_return('<a href="http://echofon.com/" rel="nofollow">Echofon</a>')
     @user    = double "user"
-    @user.stub(:status).and_return(@status)
+    allow(@user).to receive(:status).and_return(@status)
   end
 
   it "should provide version command" do
-    @gateway.names.should == ['version']
+    expect(@gateway.names).to eq(['version'])
   end
 
   it "should show the source via DB" do
-    @statuses.
-      should_receive(:find_by_screen_name).
+    expect(@statuses).
+      to receive(:find_by_screen_name).
       with('mzp',:limit => 1).
       and_return([ entry(@user,@status) ])
-    @channel.
-      should_receive(:message).
-      with(anything, Net::IRC::Constants::NOTICE).
-      and_return{|s,_|
-        s.status.text.should == "\x01Echofon <http://echofon.com/>\x01"
+    expect(@channel).
+      to receive(:message).
+      with(anything, Net::IRC::Constants::NOTICE){|s,_|
+        expect(s.status.text).to eq("\x01Echofon <http://echofon.com/>\x01")
       }
     call '#twitter','version',%w(mzp)
   end
 
   it "should show the source of web" do
     status  = double "status"
-    status.stub(:source).and_return('web')
-    @statuses.
-      should_receive(:find_by_screen_name).
+    allow(status).to receive(:source).and_return('web')
+    expect(@statuses).
+      to receive(:find_by_screen_name).
       with('mzp',:limit => 1).
       and_return([ entry(@user,status) ])
-    @channel.
-      should_receive(:message).
-      with(anything, Net::IRC::Constants::NOTICE).
-      and_return{|s,_|
-        s.status.text.should == "\x01web\x01"
+    expect(@channel).
+      to receive(:message).
+      with(anything, Net::IRC::Constants::NOTICE){|s,_|
+        expect(s.status.text).to eq("\x01web\x01")
       }
     call '#twitter','version',%w(mzp)
   end
 
   it "should show the source via API" do
-    @statuses.stub(:find_by_screen_name).and_return(@status)
-    @statuses.should_receive(:find_by_screen_name).with('mzp',:limit => 1).and_return(nil)
-    @statuses.should_receive(:add).with(:status => @status, :user => @user, :source=>:version)
-    @api.should_receive(:get).with('users/show',:screen_name=>'mzp').and_return(@user)
-
-    @channel.
-      should_receive(:message).
-      with(anything, Net::IRC::Constants::NOTICE).
-      and_return{|s,_|
-        s.status.text.should == "\x01Echofon <http://echofon.com/>\x01"
+    allow(@statuses).to receive(:find_by_screen_name).and_return(@status)
+    expect(@statuses).to receive(:find_by_screen_name).with('mzp',:limit => 1).and_return(nil)
+    expect(@statuses).to receive(:add).with(status: @status, user: @user, source: :version)
+    expect(@api).to receive(:get).with('users/show',:screen_name=>'mzp').and_return(@user)
+
+    expect(@channel).
+      to receive(:message).
+      with(anything, Net::IRC::Constants::NOTICE){|s,_|
+        expect(s.status.text).to eq("\x01Echofon <http://echofon.com/>\x01")
       }
 
     call '#twitter','version',%w(mzp)

data/spec/command/whois_spec.rb

@@ -1,6 +1,5 @@
 # -*- mode:ruby; coding:utf-8 -*-
 
-require File.expand_path( '../../spec_helper', __FILE__ )
 require 'atig/command/whois'
 require 'atig/command/info'
 
@@ -17,61 +16,61 @@ describe Atig::Command::Whois do
   before do
     @command = init Atig::Command::Whois
     @status  = double 'status'
-    @status.stub(:created_at).and_return(time(::Time.at(42)))
+    allow(@status).to receive(:created_at).and_return(time(::Time.at(42)))
     @user    = double "user"
-    @user.stub(:name)       .and_return('name')
-    @user.stub(:id)         .and_return('10')
-    @user.stub(:screen_name).and_return('screen_name')
-    @user.stub(:description).and_return('blah blah')
-    @user.stub(:protected)  .and_return(false)
-    @user.stub(:location)   .and_return('Tokyo, Japan')
-    @user.stub(:created_at) .and_return(time(::Time.at(0)))
-    @user.stub(:status)     .and_return(@status)
+    allow(@user).to receive(:name)       .and_return('name')
+    allow(@user).to receive(:id)         .and_return('10')
+    allow(@user).to receive(:screen_name).and_return('screen_name')
+    allow(@user).to receive(:description).and_return('blah blah')
+    allow(@user).to receive(:protected)  .and_return(false)
+    allow(@user).to receive(:location)   .and_return('Tokyo, Japan')
+    allow(@user).to receive(:created_at) .and_return(time(::Time.at(0)))
+    allow(@user).to receive(:status)     .and_return(@status)
 
-    ::Time.stub(:now).and_return(::Time.at(50))
-    @followings.stub(:find_by_screen_name).with('mzp').and_return(@user)
+    allow(::Time).to receive(:now).and_return(::Time.at(50))
+    allow(@followings).to receive(:find_by_screen_name).with('mzp').and_return(@user)
   end
 
   it "should proide whois command" do
-    @command.command_name.should == %w(whois)
+    expect(@command.command_name).to eq(%w(whois))
   end
 
   it "should show profile" do
     commands = []
-    @gateway.should_receive(:post){|_,command,_,_,*params|
+    expect(@gateway).to receive(:post){|_,command,_,_,*params|
       commands << command
       case command
       when RPL_WHOISUSER
-        params.should == ['id=10', 'twitter.com', "*", 'name / blah blah']
+        expect(params).to eq(['id=10', 'twitter.com', "*", 'name / blah blah'])
       when RPL_WHOISSERVER
-        params.should == ['twitter.com', 'Tokyo, Japan']
+        expect(params).to eq(['twitter.com', 'Tokyo, Japan'])
       when RPL_WHOISIDLE
-        params.should == ["8", "0", "seconds idle, signon time"]
+        expect(params).to eq(["8", "0", "seconds idle, signon time"])
       when RPL_ENDOFWHOIS
-        params.should == ["End of WHOIS list"]
+        expect(params).to eq(["End of WHOIS list"])
       end
     }.at_least(4)
     call '#twitter','whois',%w(mzp)
-    commands.should == [ RPL_WHOISUSER, RPL_WHOISSERVER, RPL_WHOISIDLE, RPL_ENDOFWHOIS]
+    expect(commands).to eq([ RPL_WHOISUSER, RPL_WHOISSERVER, RPL_WHOISIDLE, RPL_ENDOFWHOIS])
   end
 
   it "should append /protect if the user is protected" do
-    @user.stub(:protected).and_return(true)
+    allow(@user).to receive(:protected).and_return(true)
     commands = []
-    @gateway.should_receive(:post){|_,command,_,_,*params|
+    expect(@gateway).to receive(:post){|_,command,_,_,*params|
       commands << command
       case command
       when RPL_WHOISUSER
-        params.should == ['id=10', 'twitter.com/protected', "*", 'name / blah blah']
+        expect(params).to eq(['id=10', 'twitter.com/protected', "*", 'name / blah blah'])
       when RPL_WHOISSERVER
-        params.should == ['twitter.com/protected', 'Tokyo, Japan']
+        expect(params).to eq(['twitter.com/protected', 'Tokyo, Japan'])
       when RPL_WHOISIDLE
-        params.should == ["8", "0", "seconds idle, signon time"]
+        expect(params).to eq(["8", "0", "seconds idle, signon time"])
       when RPL_ENDOFWHOIS
-        params.should == ["End of WHOIS list"]
+        expect(params).to eq(["End of WHOIS list"])
       end
     }.at_least(4)
     call '#twitter','whois',%w(mzp)
-    commands.should == [ RPL_WHOISUSER, RPL_WHOISSERVER, RPL_WHOISIDLE, RPL_ENDOFWHOIS]
+    expect(commands).to eq([ RPL_WHOISUSER, RPL_WHOISSERVER, RPL_WHOISIDLE, RPL_ENDOFWHOIS])
   end
 end

data/spec/command_helper.rb

@@ -66,7 +66,7 @@ module CommandHelper
   def init(klass)
     @log    = double 'log'
     @opts   = Atig::Option.new({})
-    context = OpenStruct.new :log=>@log, :opts=>@opts
+    context = OpenStruct.new log:@log, opts:@opts
 
     @channel    = double 'channel'
     @gateway    = FakeGateway.new @channel
@@ -88,7 +88,7 @@ module CommandHelper
   end
 
   def stub_status(key, hash)
-    @statuses.stub(key).and_return{|arg,*_|
+    allow(@statuses).to receive(key){|arg,*_|
       hash.fetch(arg, hash[:default])
     }
   end

data/spec/db/followings_spec.rb

@@ -1,6 +1,5 @@
 # -*- mode:ruby; coding:utf-8 -*-
 
-require File.expand_path( '../../spec_helper', __FILE__ )
 require 'atig/db/followings'
 
 describe Atig::Db::Followings,"when it is empty" do
@@ -14,13 +13,13 @@ describe Atig::Db::Followings,"when it is empty" do
   end
 
   it "should be emtpy" do
-    @db.empty?.should be_true
+    expect(@db.empty?).to be_truthy
   end
 end
 
 describe Atig::Db::Followings,"when updated users" do
   def user(id, name, protect, only)
-    OpenStruct.new(:id => id, :screen_name=>name, :protected=>protect, :only=>only)
+    OpenStruct.new(id: id, screen_name:name, protected:protect, only:only)
   end
 
   before do
@@ -43,7 +42,7 @@ describe Atig::Db::Followings,"when updated users" do
   end
 
   it "should return size" do
-    @db.size.should == 2
+    expect(@db.size).to eq(2)
   end
 
   it "should be invalidated" do
@@ -53,56 +52,56 @@ describe Atig::Db::Followings,"when updated users" do
     end
     @db.invalidate
 
-    called.should be_true
+    expect(called).to be_truthy
   end
 
   it "should not empty" do
-    @db.empty?.should be_false
+    expect(@db.empty?).to be_falsey
   end
 
   it "should call listener with :join" do
     @db.update [ @alice, @bob, @charriey ]
-    @listen[:join].should == [ @charriey ]
-    @listen[:part].should == nil
-    @listen[:mode].should == nil
+    expect(@listen[:join]).to eq([ @charriey ])
+    expect(@listen[:part]).to eq(nil)
+    expect(@listen[:mode]).to eq(nil)
   end
 
   it "should call listener with :part" do
     @db.update [ @alice ]
-    @listen[:join].should == nil
-    @listen[:part].should == [ @bob ]
-    @listen[:mode].should == nil
+    expect(@listen[:join]).to eq(nil)
+    expect(@listen[:part]).to eq([ @bob ])
+    expect(@listen[:mode]).to eq(nil)
   end
 
   it "should not found removed user[BUG]" do
-    @db.include?(@bob).should == true
+    expect(@db.include?(@bob)).to eq(true)
     @db.update [ @alice ]
     # now, @bob is not member
-    @db.include?(@bob).should == false
+    expect(@db.include?(@bob)).to eq(false)
   end
 
   it "should call listener with :mode" do
     bob = user 5,'bob', false, false
 
     @db.update [ @alice, bob ]
-    @listen[:join].should == nil
-    @listen[:part].should == nil
-    @listen[:mode].should == [ bob ]
+    expect(@listen[:join]).to eq(nil)
+    expect(@listen[:part]).to eq(nil)
+    expect(@listen[:mode]).to eq([ bob ])
   end
 
   it "should have users" do
-    @db.users.should == [ @alice, @bob ]
+    expect(@db.users).to eq([ @alice, @bob ])
   end
 
   it "should be found by screen_name" do
-    @db.find_by_screen_name('alice').should == @alice
-    @db.find_by_screen_name('???').should == nil
+    expect(@db.find_by_screen_name('alice')).to eq(@alice)
+    expect(@db.find_by_screen_name('???')).to eq(nil)
   end
 
   it "should check include" do
     alice = user @alice.id,'alice', true, true
-    @db.include?(@charriey).should be_false
-    @db.include?(@alice).should be_true
-    @db.include?(alice).should be_true
+    expect(@db.include?(@charriey)).to be_falsey
+    expect(@db.include?(@alice)).to be_truthy
+    expect(@db.include?(alice)).to be_truthy
   end
 end