atig 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e201d9ce1842a733c03d41341dd68c6d9b87532
-  data.tar.gz: 0a3320335a18a898edc078983d931fe96638d9ab
+  metadata.gz: f52437a64db888b7a72bfcb418fdfe62222e0380
+  data.tar.gz: 064c715ba416098c2602455f2d637f662a63b06d
 SHA512:
-  metadata.gz: 71203f2d8ba4e7ce17683c1a814754a9f83e51593861154209e683f24ac60a0b33eda8247ca78fcdb7342c722e05940c839e2e358d00b297e1d5351352a24aff
-  data.tar.gz: a7f51a1b6a287ce03f2afaac5691b0edb780aab67b1e8d056a48c62d4a8c8ce2743cb742ee32cc20378fdf2f0a6d5b34c7d502cacd555758304a48bdf77bd452
+  metadata.gz: 2d7094055345ec00bebe4b8a2ea7a8f36c26500dfc8530c9fc25c5d8d353c584209dd11c25b66b921c1d76b5e3e6f14bdc85c0a3176e1458806a7813963754ec
+  data.tar.gz: 28ecc6f10e97b88ffd6215d9c6e1688a9a4572edbeda0479a526fde67c33f97d4d81aec4d958e53f8f191d6909a4803fade7e0b3d876fb5041c71c62ad872413

data/docs/options.rst

@@ -36,12 +36,17 @@ only
 
 発言関連
 ------------------------------
+stream
+  `UserStream`_ を有効にします。
+  実行中の変更には対応していません。
 footer=\ ``footer``
   発言の末尾に、 ``footer`` を追加します。
   ただし ``footer`` がfalseの場合は、追加しません。
 old_style_reply
   @nickで始まる発言が、@nick の最新の発言へのreplyとなるモードに切り替えます。
 
+.. _UserStream: https://dev.twitter.com/docs/streaming-apis/streams/user
+
 URL短縮関係
 ------------------------------
 

data/lib/atig/agent/timeline.rb

@@ -4,11 +4,18 @@ require 'atig/agent/agent'
 module Atig
   module Agent
     class Timeline < Atig::Agent::Agent
+      DEFAULT_INTERVAL = 60
+
       def initialize(context, api, db)
-        return if context.opts.stream
+        @opts = context.opts
+        return if @opts.stream
         super
       end
-      def interval; 30 end
+
+      def interval
+        @interval ||= @opts.interval.nil? ? DEFAULT_INTERVAL : @opts.interval.to_i
+      end
+
       def path; '/statuses/home_timeline' end
       def source; :timeline end
     end

data/lib/atig/ifilter/expand_url.rb

@@ -16,33 +16,43 @@ module Atig
       end
 
       def call(status)
-        target = if @opts.untiny_whole_urls then
-                   URI.regexp(%w[http https])
-                 else
-                   %r{
-			http:// (?:
-				(?: bit\.ly | (?: tin | rub) yurl\.com | j\.mp | t\.co
-                                  | htn.to
-				  | is\.gd | cli\.gs | tr\.im | u\.nu | airme\.us
-				  | ff\.im | twurl.nl | bkite\.com | tumblr\.com
-				  | pic\.gd | sn\.im | digg\.com | goo\.gl)
-				/ [0-9a-z=-]+ |
-				blip\.fm/~ (?> [0-9a-z]+) (?! /) |
-				flic\.kr/[a-z0-9/]+
-			)
-		   }ix
-                 end
-
+        target = short_url_regexp
+        entities = status.entities
         status.merge :text => status.text.gsub(target) {|url|
-          x = @cache[url]
-          if x then
-            x
-          else
-            @cache[url] = resolve_http_redirect(URI(url)).to_s || url
+          unless entities.nil? or (entities = entities.urls).empty?
+            @cache[url] ||= search_url_from_entities(url, entities)
           end
+          @cache[url] ||= resolve_http_redirect(URI(url)).to_s || url
         }
       end
 
+      private
+
+      def short_url_regexp
+        return URI.regexp(%w[http https]) if @opts.untiny_whole_urls
+        %r{
+          https?:// (?:
+                    (?: bit\.ly | (?: tin | rub) yurl\.com | j\.mp | t\.co
+                      | htn.to
+                      | is\.gd | cli\.gs | tr\.im | u\.nu | airme\.us
+                      | ff\.im | twurl.nl | bkite\.com | tumblr\.com
+                      | pic\.gd | sn\.im | digg\.com | goo\.gl)
+                    / [0-9a-z=-]+ |
+                    blip\.fm/~ (?> [0-9a-z]+) (?! /) |
+                    flic\.kr/[a-z0-9/]+
+          )
+        }ix
+      end
+
+      def search_url_from_entities(url, entities)
+        expanded_url = nil
+        entities.reject! do |entity|
+          entity.url == url &&
+            (expanded_url = entity.expanded_url)
+        end
+        expanded_url
+      end
+
       def resolve_http_redirect(uri, limit = 3)
         return uri if limit.zero? or uri.nil?
         log :debug, uri.inspect

data/lib/atig/version.rb

@@ -1,3 +1,3 @@
 module Atig
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/spec/command/destroy_spec.rb

@@ -12,7 +12,7 @@ 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)
+    @statuses.stub(:find_by_tid).with('b').and_return(entry)
 
     @channel.should_receive(:notify).with("The status you specified by the ID tid is not yours.")
     call "#twitter","destory",%w(b)
@@ -27,7 +27,7 @@ describe Atig::Command::Destroy,"when remove recently tweet" do
 
     target = status 'blah blah', 'id'=>'1'
     entry  = entry @me, target,'entry',1
-    @res   = mock 'res'
+    @res   = double 'res'
 
     stub_status(:find_by_tid,'a' => entry)
     stub_status(:find_by_sid,'mzp:a' => entry)
@@ -71,7 +71,7 @@ describe Atig::Command::Destroy,"when remove old tweet" do
 
     target = status 'blah blah', 'id'=>'1'
     entry  = entry @me, target,'entry',1
-    @res   = mock 'res'
+    @res   = double 'res'
 
     stub_status(:find_by_tid,'a' => entry)
     stub_status(:find_by_sid,'mzp:a' => entry)

data/spec/command/favorite_spec.rb

@@ -10,7 +10,7 @@ describe Atig::Command::Favorite do
 
     target = status 'blah blah', 'id'=>'1'
     entry  = entry user(1,'mzp'), target
-    @res   = mock 'res'
+    @res   = double 'res'
 
     stub_status(:find_by_tid,'a' => entry)
     stub_status(:find_by_sid,'mzp:a' => entry)

data/spec/command/limit_spec.rb

@@ -9,9 +9,9 @@ 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)
+    @api.stub(:limit).and_return(150)
+    @api.stub(:remain).and_return(148)
+    @api.stub(:reset).and_return(@reset)
   end
 
   it "should provide limit command" do

data/spec/command/option_spec.rb

@@ -24,14 +24,14 @@ 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=)
+    @opts.stub(:foo1=)
+    @opts.stub(:foo2=)
+    @opts.stub(:foo3=)
   end
 
   it "should list up values" do
     xs = []
-    @channel.stub!(:notify){|x| xs << x}
+    @channel.stub(:notify){|x| xs << x}
     call '#twitter', 'opt', %w()
     xs.should == [
                   "foo1 => true",
@@ -47,9 +47,9 @@ 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)
+    @opts.stub(:foo).and_return true
+    @opts.stub(:foo=){|v| @value = v }
+    @channel.stub(:notify)
   end
 
   it "should show the value" do
@@ -68,9 +68,9 @@ 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)
+    @opts.stub(:foo).and_return 42
+    @opts.stub(:foo=){|v| @value = v }
+    @channel.stub(:notify)
   end
 
   it "should show the value" do
@@ -89,9 +89,9 @@ 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)
+    @opts.stub(:foo).and_return 1.23
+    @opts.stub(:foo=){|v| @value = v }
+    @channel.stub(:notify)
   end
 
   it "should show the value" do
@@ -110,9 +110,9 @@ 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)
+    @opts.stub(:foo).and_return "bar"
+    @opts.stub(:foo=){|v| @value = v }
+    @channel.stub(:notify)
   end
 
   it "should show the value" do

data/spec/command/reply_spec.rb

@@ -10,7 +10,7 @@ describe Atig::Command::Reply do
 
     target = status 'blah blah', 'id'=>'1'
     entry  = entry user(1,'mzp'), target
-    @res   = mock 'res'
+    @res   = double 'res'
 
     stub_status(:find_by_tid,'a' => entry)
     stub_status(:find_by_sid,'mzp:a' => entry)

data/spec/command/retweet_spec.rb

@@ -6,17 +6,17 @@ require 'atig/command/retweet'
 describe Atig::Command::Retweet do
   include CommandHelper
   before do
-    bitly =  mock("Bitly")
-    bitly.stub!(:shorten).and_return{|s|
+    bitly =  double("Bitly")
+    bitly.stub(:shorten).and_return{|s|
       "[#{s}]"
     }
-    Atig::Bitly.stub!(:no_login).and_return(bitly)
+    Atig::Bitly.stub(:no_login).and_return(bitly)
 
     @command = init Atig::Command::Retweet
 
     target = status 'blah blah blah blah blah blah blah blah', 'id'=>'1'
     entry  = entry user(1,'mzp'), target
-    @res   = mock 'res'
+    @res   = double 'res'
 
     stub_status(:find_by_tid,'a' => entry)
     stub_status(:find_by_sid,'mzp:a' => entry)

data/spec/command/thread_spec.rb

@@ -6,7 +6,7 @@ require 'atig/command/thread'
 describe Atig::Command::Thread do
   include CommandHelper
   before do
-    u = mock 'user'
+    u = double 'user'
     @entries = [
                 entry(u, status(''),'entry-0'),
                 entry(u, status('','in_reply_to_status_id'=>2),'entry-1'),
@@ -16,10 +16,10 @@ describe Atig::Command::Thread do
                ]
     @command = init Atig::Command::Thread
     @messages = []
-    @channel.stub!(:message).and_return{|entry,_|
+    @channel.stub(:message).and_return{|entry,_|
       @messages.unshift entry
     }
-    @statuses.stub!(:find_by_status_id).with(anything).and_return{|id|
+    @statuses.stub(:find_by_status_id).with(anything).and_return{|id|
       @entries[id.to_i]
     }
   end

data/spec/command/time_spec.rb

@@ -7,9 +7,9 @@ describe Atig::Command::Time do
   include CommandHelper
 
   def user(offset, tz)
-    u = mock "user-#{offset}"
-    u.stub!(:utc_offset).and_return(offset)
-    u.stub!(:time_zone).and_return(tz)
+    u = double "user-#{offset}"
+    u.stub(:utc_offset).and_return(offset)
+    u.stub(:time_zone).and_return(tz)
     u
   end
 

data/spec/command/user_info_spec.rb

@@ -8,10 +8,10 @@ describe Atig::Command::UserInfo do
 
   before do
     @command = init Atig::Command::UserInfo
-    @status  = stub "status"
-    @user    = stub "user"
-    @user.stub!(:description).and_return('hogehoge')
-    @user.stub!(:status).and_return(@status)
+    @status  = double "status"
+    @user    = double "user"
+    @user.stub(:description).and_return('hogehoge')
+    @user.stub(:status).and_return(@status)
   end
 
   it "should show the source via DB" do

data/spec/command/version_spec.rb

@@ -8,10 +8,10 @@ describe Atig::Command::Version do
 
   before do
     @command = init Atig::Command::Version
-    @status  = stub "status"
-    @status.stub!(:source).and_return('<a href="http://echofon.com/" rel="nofollow">Echofon</a>')
-    @user    = stub "user"
-    @user.stub!(:status).and_return(@status)
+    @status  = double "status"
+    @status.stub(:source).and_return('<a href="http://echofon.com/" rel="nofollow">Echofon</a>')
+    @user    = double "user"
+    @user.stub(:status).and_return(@status)
   end
 
   it "should provide version command" do
@@ -33,8 +33,8 @@ describe Atig::Command::Version do
   end
 
   it "should show the source of web" do
-    status  = stub "status"
-    status.stub!(:source).and_return('web')
+    status  = double "status"
+    status.stub(:source).and_return('web')
     @statuses.
       should_receive(:find_by_screen_name).
       with('mzp',:limit => 1).
@@ -49,7 +49,7 @@ describe Atig::Command::Version do
   end
 
   it "should show the source via API" do
-    @statuses.stub!(:find_by_screen_name).and_return(@status)
+    @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)

data/spec/command/whois_spec.rb

@@ -16,20 +16,20 @@ describe Atig::Command::Whois do
 
   before do
     @command = init Atig::Command::Whois
-    @status  = stub 'status'
-    @status.stub!(:created_at).and_return(time(::Time.at(42)))
-    @user    = stub "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)
+    @status  = double 'status'
+    @status.stub(: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)
 
-    ::Time.stub!(:now).and_return(::Time.at(50))
-    @followings.stub!(:find_by_screen_name).with('mzp').and_return(@user)
+    ::Time.stub(:now).and_return(::Time.at(50))
+    @followings.stub(:find_by_screen_name).with('mzp').and_return(@user)
   end
 
   it "should proide whois command" do
@@ -56,7 +56,7 @@ describe Atig::Command::Whois do
   end
 
   it "should append /protect if the user is protected" do
-    @user.stub!(:protected).and_return(true)
+    @user.stub(:protected).and_return(true)
     commands = []
     @gateway.should_receive(:post){|_,command,_,_,*params|
       commands << command

data/spec/command_helper.rb

@@ -64,13 +64,13 @@ end
 
 module CommandHelper
   def init(klass)
-    @log    = mock 'log'
+    @log    = double 'log'
     @opts   = Atig::Option.new({})
     context = OpenStruct.new :log=>@log, :opts=>@opts
 
-    @channel    = mock 'channel'
+    @channel    = double 'channel'
     @gateway    = FakeGateway.new @channel
-    @api        = mock 'api'
+    @api        = double 'api'
     @statuses   = FakeDbEntry.new 'status DB'
     @followings = FakeDbEntry.new 'followings DB'
     @lists      = {
@@ -88,7 +88,7 @@ module CommandHelper
   end
 
   def stub_status(key, hash)
-    @statuses.stub!(key).and_return{|arg,*_|
+    @statuses.stub(key).and_return{|arg,*_|
       hash.fetch(arg, hash[:default])
     }
   end

data/spec/db/sized_uniq_array_spec.rb

@@ -6,8 +6,8 @@ require 'ostruct'
 
 describe Atig::Db::SizedUniqArray do
   def item(id)
-    item = stub "Item-#{id}"
-    item.stub!(:id).and_return id
+    item = double "Item-#{id}"
+    item.stub(:id).and_return id
     item
   end
 

data/spec/ifilter/expand_url_spec.rb

@@ -10,7 +10,7 @@ end
 
 describe Atig::IFilter::ExpandUrl, "when disable whole url" do
   def filtered(text)
-    ifilter = Atig::IFilter::ExpandUrl.new OpenStruct.new(:log=>mock('log'),:opts=>OpenStruct.new)
+    ifilter = Atig::IFilter::ExpandUrl.new OpenStruct.new(:log=>double('log'),:opts=>OpenStruct.new)
     ifilter.call status(text)
   end
 
@@ -26,7 +26,7 @@ end
 describe Atig::IFilter::ExpandUrl, "when enable whole url" do
   def filtered(text)
     context = OpenStruct.new(
-                             :log  => mock('log'),
+                             :log  => double('log'),
                              :opts => OpenStruct.new(:untiny_whole_urls=>true))
     ifilter = Atig::IFilter::ExpandUrl.new(context)
     ifilter.call status(text)
@@ -42,3 +42,24 @@ describe Atig::IFilter::ExpandUrl, "when enable whole url" do
   end
 end
 
+describe Atig::IFilter::ExpandUrl, "when has urls entities" do
+  def filtered(text, opts)
+    context = OpenStruct.new(
+                             :log => double('log'),
+                             :opts => OpenStruct.new)
+    ifilter = Atig::IFilter::ExpandUrl.new(context)
+    ifilter.call status(text, opts)
+  end
+
+  it "should expand t.co" do
+    opts = {
+      "entities" => {
+        "urls" => [{
+          "url" => "http://t.co/1Vyoux4kB8",
+          "expanded_url" => "http://example.com/"
+        }]
+      }
+    }
+    filtered("http://t.co/1Vyoux4kB8", opts).should be_text("http://example.com/")
+  end
+end

data/spec/ifilter/sid_spec.rb

@@ -6,7 +6,7 @@ require 'atig/twitter_struct'
 
 describe Atig::IFilter::Sid, "when disable tid" do
   def filtered(text)
-    ifilter = Atig::IFilter::Sid.new(OpenStruct.new(:log=>mock('log'),
+    ifilter = Atig::IFilter::Sid.new(OpenStruct.new(:log=>double('log'),
                                                     :opts=>OpenStruct.new))
     ifilter.call status(text,'sid'=>1)
   end
@@ -18,7 +18,7 @@ end
 
 describe Atig::IFilter::Sid, "when enable tid" do
   def filtered(text)
-    ifilter = Atig::IFilter::Sid.new(OpenStruct.new(:log=>mock('log'),
+    ifilter = Atig::IFilter::Sid.new(OpenStruct.new(:log=>double('log'),
                                                     :opts=>OpenStruct.new(:sid=>true)))
     ifilter.call status(text,'sid'=>1)
   end

data/spec/ifilter/tid_spec.rb

@@ -6,7 +6,7 @@ require 'atig/twitter_struct'
 
 describe Atig::IFilter::Tid, "when disable tid" do
   def filtered(text)
-    ifilter = Atig::IFilter::Tid.new(OpenStruct.new(:log=>mock('log'),
+    ifilter = Atig::IFilter::Tid.new(OpenStruct.new(:log=>double('log'),
                                                     :opts=>OpenStruct.new))
     ifilter.call status(text,'tid'=>1)
   end
@@ -18,7 +18,7 @@ end
 
 describe Atig::IFilter::Tid, "when enable tid" do
   def filtered(text)
-    ifilter = Atig::IFilter::Tid.new(OpenStruct.new(:log=>mock('log'),
+    ifilter = Atig::IFilter::Tid.new(OpenStruct.new(:log=>double('log'),
                                                     :opts=>OpenStruct.new(:tid=>true)))
     ifilter.call status(text,'tid'=>1)
   end

data/spec/ofilter/escape_url_spec.rb

@@ -9,7 +9,7 @@ end
 
 describe Atig::OFilter::EscapeUrl do
   before do
-    @logger = mock('Logger')
+    @logger = double('Logger')
     @logger.should_receive(:info).at_most(:once)
     @logger.should_receive(:error).at_most(:once)
     @logger.should_receive(:debug).at_most(:once)
@@ -32,7 +32,7 @@ end
 if defined? ::Punycode then
   describe Atig::OFilter::EscapeUrl,"when punycode is enabled" do
     before do
-      @logger = mock('Logger')
+      @logger = double('Logger')
       @logger.should_receive(:info).at_most(:once)
       @logger.should_receive(:error).at_most(:once)
       @logger.should_receive(:debug).at_most(:once)

data/spec/ofilter/short_url_spec.rb

@@ -6,9 +6,9 @@ require 'ostruct'
 
 describe Atig::OFilter::ShortUrl,"when no-login bitly" do
   before do
-    logger = mock('Logger')
-    bitly =  mock("Bitly")
-    bitly.stub!(:shorten).and_return{|s|
+    logger = double('Logger')
+    bitly =  double("Bitly")
+    bitly.stub(:shorten).and_return{|s|
       "[#{s}]"
     }
     Atig::Bitly.should_receive(:no_login).with(logger).and_return(bitly)
@@ -24,9 +24,9 @@ end
 
 describe Atig::OFilter::ShortUrl,"when no-login bitly with size" do
   before do
-    logger = mock('Logger')
-    bitly =  mock("Bitly")
-    bitly.stub!(:shorten).and_return{|s|
+    logger = double('Logger')
+    bitly =  double("Bitly")
+    bitly.stub(:shorten).and_return{|s|
       "[#{s}]"
     }
     Atig::Bitly.should_receive(:no_login).with(logger).and_return(bitly)
@@ -42,9 +42,9 @@ end
 
 describe Atig::OFilter::ShortUrl,"when login bitly" do
   before do
-    logger = mock('Logger')
-    bitly =  mock("Bitly")
-    bitly.stub!(:shorten).and_return{|s|
+    logger = double('Logger')
+    bitly =  double("Bitly")
+    bitly.stub(:shorten).and_return{|s|
       "[#{s}]"
     }
     Atig::Bitly.should_receive(:login).with(logger,"username","api_key").and_return(bitly)
@@ -60,9 +60,9 @@ end
 
 describe Atig::OFilter::ShortUrl,"when login bitly with size" do
   before do
-    logger = mock('Logger')
-    bitly =  mock("Bitly")
-    bitly.stub!(:shorten).and_return{|s|
+    logger = double('Logger')
+    bitly =  double("Bitly")
+    bitly.stub(:shorten).and_return{|s|
       "[#{s}]"
     }
     Atig::Bitly.should_receive(:login).with(logger,"username","api_key").and_return(bitly)
@@ -78,9 +78,9 @@ end
 
 describe Atig::OFilter::ShortUrl,"when unu bitly" do
   before do
-    logger = mock('Logger')
-    unu =  mock("Unu")
-    unu.stub!(:shorten).and_return{|s|
+    logger = double('Logger')
+    unu =  double("Unu")
+    unu.stub(:shorten).and_return{|s|
       "[#{s}]"
     }
     Atig::Unu.should_receive(:new).with(logger).and_return(unu)
@@ -96,9 +96,9 @@ end
 
 describe Atig::OFilter::ShortUrl,"when no-login unu with size" do
   before do
-    logger = mock('Logger')
-    unu =  mock("Unu")
-    unu.stub!(:shorten).and_return{|s|
+    logger = double('Logger')
+    unu =  double("Unu")
+    unu.stub(:shorten).and_return{|s|
       "[#{s}]"
     }
     Atig::Unu.should_receive(:new).with(logger).and_return(unu)
@@ -114,7 +114,7 @@ end
 
 describe Atig::OFilter::ShortUrl,"when nop" do
   before do
-    logger = mock('Logger')
+    logger = double('Logger')
 
     @ofilter = Atig::OFilter::ShortUrl.new(OpenStruct.new(:log=>logger, :opts=>OpenStruct.new()))
   end

data/spec/spec_helper.rb

@@ -19,17 +19,17 @@ def status(text, opt = {})
 end
 
 def user(id, name)
-  user = stub("User-#{name}")
-  user.stub!(:id).and_return(id)
-  user.stub!(:screen_name).and_return(name)
+  user = double("User-#{name}")
+  user.stub(:id).and_return(id)
+  user.stub(:screen_name).and_return(name)
   user
 end
 
 def entry(user, status, name = 'entry', id = 0)
-  entry = stub name
-  entry.stub!('id').and_return(id)
-  entry.stub!('user').and_return(user)
-  entry.stub!('status').and_return(status)
+  entry = double name
+  entry.stub('id').and_return(id)
+  entry.stub('user').and_return(user)
+  entry.stub('status').and_return(status)
   entry
 end
 

data/spec/update_checker_spec.rb

@@ -13,8 +13,8 @@ describe Atig::UpdateChecker,'when use git version' do
   end
 
   before do
-    Atig::UpdateChecker.stub!(:git?).and_return(true)
-    Atig::UpdateChecker.stub!(:commits).
+    Atig::UpdateChecker.stub(:git?).and_return(true)
+    Atig::UpdateChecker.stub(:commits).
       and_return [
                   commit('a', 'foo'),
                   commit('b', 'bar'),
@@ -25,29 +25,29 @@ describe Atig::UpdateChecker,'when use git version' do
   end
 
   it "should not do anything when use HEAD version" do
-    Atig::UpdateChecker.stub!(:local_repos?).and_return true
-    Atig::UpdateChecker.stub!(:server_version).and_return rev('a')
+    Atig::UpdateChecker.stub(:local_repos?).and_return true
+    Atig::UpdateChecker.stub(:server_version).and_return rev('a')
 
     Atig::UpdateChecker.latest.should == []
   end
 
   it "should notify when not use HEAD version" do
-    Atig::UpdateChecker.stub!(:local_repos?).and_return false
-    Atig::UpdateChecker.stub!(:server_version).and_return rev('b')
+    Atig::UpdateChecker.stub(:local_repos?).and_return false
+    Atig::UpdateChecker.stub(:server_version).and_return rev('b')
 
     Atig::UpdateChecker.latest.should == [ 'foo' ]
   end
 
   it "should notify many changes" do
-    Atig::UpdateChecker.stub!(:local_repos?).and_return false
-    Atig::UpdateChecker.stub!(:server_version).and_return rev('d')
+    Atig::UpdateChecker.stub(:local_repos?).and_return false
+    Atig::UpdateChecker.stub(:server_version).and_return rev('d')
 
     Atig::UpdateChecker.latest.should == [ 'foo', 'bar', 'baz' ]
   end
 
   it "should notify all changes" do
-    Atig::UpdateChecker.stub!(:local_repos?).and_return false
-    Atig::UpdateChecker.stub!(:server_version).and_return rev('z')
+    Atig::UpdateChecker.stub(:local_repos?).and_return false
+    Atig::UpdateChecker.stub(:server_version).and_return rev('z')
 
     Atig::UpdateChecker.latest.should == [ 'foo', 'bar', 'baz', 'xyzzy', 'fuga' ]
   end

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: atig
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - SHIBATA Hiroshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-02 00:00:00.000000000 Z
+date: 2013-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: net-irc
   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: oauth
   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
     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: json
   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: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Atig.rb is Twitter Irc Gateway.
@@ -130,9 +130,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - README.mkdn
@@ -308,17 +308,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.1.8
 signing_key: 
 specification_version: 4
 summary: Atig.rb is forked from cho45's tig.rb. We improve some features of tig.rb.
@@ -366,3 +366,4 @@ test_files:
 - spec/sized_hash_spec.rb
 - spec/spec_helper.rb
 - spec/update_checker_spec.rb
+has_rdoc: