atig 0.3.12 → 0.4.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a668ea6939dbd49b48c52d0e89c8d8493e718f0
-  data.tar.gz: 6d9d3a3f73da3132bad8d87388ffdb5e80660273
+  metadata.gz: 975f7bc77cc611f0825ec3ae132d4c530494297c
+  data.tar.gz: 72f9b9c6390ac1b9b740a5641476cb1901a50fde
 SHA512:
-  metadata.gz: 3e0cb65867555b96e19e536647c007491d9737a8b09d5de43f6d12075afd3a0a585b974d776409e78236d2fd7ed2d1edb72e96501a3c98daace0f525b992c6b3
-  data.tar.gz: 9ca51fc9cd745a12a9d9c9d49786198c600005da9b42adf1b569eddd12de33e4ef9ae7778b36f6b2d6493fe2945d4ecf22bbd7ec0ca95dbec462441e25cd149f
+  metadata.gz: 96f4e9f26a887e3b56e62e523fbe62285b328b4399948134aac7a45628a5d452b2b05dcff52cbbf92626785d4ee3c58afa9a61ff033bad74898ae9f9ad94ede0
+  data.tar.gz: f3532ae36835e30cfb899caf36adb8d0ebcf27e415c07ab66f8ddd0563e97fc8f9e31a1c890c5ad5dc6f7e1c4d29149de378bd24b626eb35613fe2c88e8ee57e

data/.travis.yml

@@ -0,0 +1,5 @@
+rvm:
+  - 1.9.3
+  - 2.0.0
+
+script: bundle exec rake spec

data/atig.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency 'bundler'
   gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'coveralls'
 end

data/lib/atig/agent.rb

@@ -1,4 +1,3 @@
-require 'atig/agent/own_list'
 require 'atig/agent/full_list'
 require 'atig/agent/following'
 require 'atig/agent/list_status'

data/lib/atig/agent/following.rb

@@ -22,15 +22,15 @@ module Atig
 
       def update(api)
         if @db.followings.empty?
-          friends = api.page("statuses/friends/#{@db.me.id}", :users)
+          friends = api.page("friends/list", :users, {:user_id => @db.me.id})
         else
           @db.me = api.post("account/update_profile")
           return if @db.me.friends_count == @db.followings.size
-          friends = api.page("statuses/friends/#{@db.me.id}", :users)
+          friends = api.page("friends/list", :users, {:user_id => @db.me.id})
         end
 
         if @opts.only
-          followers = api.page("followers/ids/#{@db.me.id}", :ids)
+          followers = api.page("friends/ids", :ids, {:user_id => @db.me.id})
           friends.each do|friend|
             friend[:only] = !followers.include?(friend.id)
           end

data/lib/atig/agent/full_list.rb

@@ -7,8 +7,8 @@ module Atig
   module Agent
     class FullList < List
       def entry_points
-        [ "#{@db.me.screen_name}/lists",
-          "#{@db.me.screen_name}/lists/subscriptions"
+        [
+          "lists/list",
         ]
       end
 

data/lib/atig/agent/list.rb

@@ -12,16 +12,16 @@ module Atig
         @db  = db
         log :info, "initialize"
 
-        @db.lists.on_invalidated{|name|
+        @db.lists.on_invalidated do |name|
           log :info, "invalidated #{name}"
-          api.delay(0){|t|
+          api.delay(0) do |t|
             if name == :all then
               full_update t
             else
-              @db.lists[name].update t.page("#{@db.me.screen_name}/#{name}/members", :users, true)
+              @db.lists[name].update t.page("lists/members", :users, {:owner_screen_name => @db.me.screen_name, :slug => name})
             end
-          }
-        }
+          end
+        end
         api.repeat( interval ) do|t|
           self.full_update t
         end
@@ -29,11 +29,11 @@ module Atig
 
       def full_update(t)
         lists = entry_points.map{|entry|
-          t.page(entry, :lists, true)
-        }.flatten
+          t.get(entry)
+        }.flatten.compact
 
         users = {}
-        lists.map do|list|
+        lists.map do |list|
           name = if list.user.screen_name == @db.me.screen_name then
                    "#{list.slug}"
                  else
@@ -41,8 +41,8 @@ module Atig
                  end
           begin
             users[name] =
-              t.page("#{list.user.screen_name}/#{list.slug}/members", :users, true)
-          rescue APIFailed => e
+              t.page("lists/members", :users, {:owner_screen_name => list.user.screen_name, :slug => list.slug})
+          rescue => e
             log :error, e.inspect
             users[name] =
               @db.lists.find_by_list_name(list.slug)

data/lib/atig/agent/list_status.rb

@@ -20,8 +20,9 @@ class Atig::Agent::ListStatus
         q = {}
         q.update(:since_id => @prev[name]) if @prev.key?(name)
 
-        screen_name,slug = parse name
-        statuses = t.get("#{screen_name}/lists/#{slug}/statuses",q)
+        screen_name, slug = parse name
+        q.update(:owner_screen_name => screen_name, :slug => slug)
+        statuses = t.get("lists/statuses", q)
         statuses.reverse_each do|status|
           db.statuses.transaction do|d|
             d.add(:status => status,

data/lib/atig/agent/mention.rb

@@ -9,7 +9,7 @@ module Atig
         super
       end
       def interval; 180 end
-      def path; '/statuses/mentions' end
+      def path; '/statuses/mentions_timeline' end
       def source; :mention end
     end
   end

data/lib/atig/agent/noretweets.rb

@@ -17,7 +17,7 @@ module Atig
       end
 
       def update(api)
-        @db.noretweets.clear.concat( api.get("friendships/no_retweet_ids") )
+        @db.noretweets.clear.concat( api.get("friendships/no_retweets/ids") )
       end
     end
   end

data/lib/atig/channel/list.rb

@@ -73,4 +73,3 @@ module Atig
     end
   end
 end
-

data/lib/atig/command/autofix.rb

@@ -1,4 +1,5 @@
 # -*- mode:ruby; coding:utf-8 -*-
+
 require 'atig/command/command'
 require 'atig/levenshtein'
 

data/lib/atig/command/command.rb

@@ -9,11 +9,11 @@ module Atig
         @gateway = gateway
         @api     = api
         @db      = db
-	@gateway.ctcp_action(*command_name) do |target, mesg, command, args|
+        @gateway.ctcp_action(*command_name) do |target, mesg, command, args|
           action(target, mesg, command, args){|m|
             gateway[target].notify m
           }
-	end
+        end
       end
 
       def find_by_tid(tid)

data/lib/atig/command/destroy.rb

@@ -1,5 +1,5 @@
 # -*- mode:ruby; coding:utf-8 -*-
-require 'time'
+
 require 'atig/command/command'
 require 'atig/command/info'
 

data/lib/atig/command/dm.rb

@@ -20,7 +20,7 @@ module Atig
         text = mesg.split(" ", 3)[2]
         api.delay(0) do|t|
           t.post("direct_messages/new",{
-                   :user => user,
+                   :screen_name => user,
                    :text => text
                  })
           yield "Sent message to #{user}: #{text}"

data/lib/atig/command/favorite.rb

@@ -14,7 +14,7 @@ module Atig
         args.each do|tid|
           if entry = Info.find_status(db, tid)
             api.delay(0){|t|
-              res = t.post("favorites/#{method}/#{entry.status.id}")
+              res = t.post("favorites/#{method}", {:id => entry.status.id})
               yield "#{command.upcase}: #{entry.user.screen_name}: #{entry.status.text}"
             }
           else

data/lib/atig/gateway/channel.rb

@@ -86,6 +86,7 @@ END
       end
 
       private
+
       def run_filters(entry)
         status = entry.status.merge(:tid=>entry.tid, :sid=>entry.sid)
         @filters.inject(status) {|x, f| f.call x }.text

data/lib/atig/oauth.rb

@@ -21,6 +21,7 @@ module Atig
 
     attr_reader :access
     attr_reader :oauth
+
     def initialize(context, nick)
       uri = URI(context.opts.api_base)
       site = "http://#{uri.host}"

data/lib/atig/option.rb

@@ -29,7 +29,7 @@ module Atig
       end
     end
 
-    default_value :api_base,        'https://api.twitter.com/1/'
+    default_value :api_base,        'https://api.twitter.com/1.1/'
     default_value :stream_api_base, 'https://userstream.twitter.com/2/'
     default_value :search_api_base, 'http://search.twitter.com/'
 

data/lib/atig/twitter.rb

@@ -1,5 +1,5 @@
-#!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
+
 require 'atig/basic_twitter'
 require 'atig/http'
 
@@ -12,16 +12,14 @@ module Atig
       @http  = Atig::Http.new @log
     end
 
-    # authenticate = trueでないとSSL verified errorがでることがある
-    def page(path, name, authenticate = true, &block)
+    def page(path, name, opts = {}, &block)
       limit = 0.98 * @remain # 98% of IP based rate limit
       r     = []
       cursor = -1
       1.upto(limit) do |num|
-        # next_cursor にアクセスするとNot found が返ってくることがあるので，その時はbreak
-        ret = api(path, { :cursor => cursor }, { :authenticate => authenticate }) rescue break
-        arr = ret[name.to_s]
-        r.concat arr
+        options = {:cursor => cursor}.merge(opts)
+        ret = api(path, options, { :authenticate => true })
+        r.concat ret[name]
         cursor = ret[:next_cursor]
         break if cursor.zero?
       end

data/lib/atig/version.rb

@@ -1,3 +1,3 @@
 module Atig
-  VERSION = "0.3.12"
+  VERSION = "0.4.0.beta1"
 end

data/spec/command/dm_spec.rb

@@ -15,7 +15,7 @@ describe Atig::Command::Dm do
 
   it "should post the status by API" do
     @api.should_receive(:post).with('direct_messages/new',
-                                    {:user=>'mzp', :text=> 'blah blah'})
+                                    {:screen_name => 'mzp', :text => 'blah blah'})
     @channel.should_receive(:notify).with("Sent message to mzp: blah blah")
     call '#twitter', "dm", %w(mzp blah blah)
   end

data/spec/command/favorite_spec.rb

@@ -18,35 +18,35 @@ describe Atig::Command::Favorite do
   end
 
   it "should post fav by tid" do
-    @api.should_receive(:post).with("favorites/create/1")
+    @api.should_receive(:post).with("favorites/create", {:id => "1"})
     @channel.should_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/1")
+    @api.should_receive(:post).with("favorites/create", {:id => "1"})
     @channel.should_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/1")
+    @api.should_receive(:post).with("favorites/create", {:id => "1"})
     @channel.should_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/1")
+    @api.should_receive(:post).with("favorites/create", {:id => "1"})
     @channel.should_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/1")
+    @api.should_receive(:post).with("favorites/destroy", {:id => "1"})
     @channel.should_receive(:notify).with("UNFAV: mzp: blah blah")
 
     call "#twitter","unfav",%w(a)

data/spec/option_spec.rb

@@ -69,7 +69,7 @@ describe Atig::Option do
   end
 
   it "should have default value" do
-    @opt.api_base.should == 'https://api.twitter.com/1/'
+    @opt.api_base.should == 'https://api.twitter.com/1.1/'
   end
 
   it "should list up all fields" do

data/spec/spec_helper.rb

@@ -5,7 +5,6 @@ require 'bundler'
 Bundler.setup
 Bundler.require :default, :test
 
-
 require 'atig/monkey'
 require 'command_helper'
 
@@ -15,7 +14,7 @@ RSpec::Matchers.define :be_text do |text|
   end
 end
 
-def status(text,opt={})
+def status(text, opt = {})
   Atig::TwitterStruct.make(opt.merge('text' => text))
 end
 
@@ -26,10 +25,13 @@ def user(id, name)
   user
 end
 
-def entry(user,status,name='entry',id=0)
+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
 end
+
+require 'coveralls'
+Coveralls.wear!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atig
 version: !ruby/object:Gem::Version
-  version: 0.3.12
+  version: 0.4.0.beta1
 platform: ruby
 authors:
 - SHIBATA Hiroshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-02 00:00:00.000000000 Z
+date: 2013-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -108,6 +108,20 @@ dependencies:
     - - '>='
       - !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.
 email:
 - shibata.hiroshi@gmail.com
@@ -118,6 +132,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - README.mkdn
@@ -159,8 +174,6 @@ files:
 - lib/atig/agent/list_status.rb
 - lib/atig/agent/mention.rb
 - lib/atig/agent/noretweets.rb
-- lib/atig/agent/other_list.rb
-- lib/atig/agent/own_list.rb
 - lib/atig/agent/stream_follow.rb
 - lib/atig/agent/timeline.rb
 - lib/atig/agent/user_stream.rb
@@ -300,9 +313,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3

data/lib/atig/agent/other_list.rb

@@ -1,18 +0,0 @@
-# -*- mode:ruby; coding:utf-8 -*-
-
-require 'atig/util'
-require 'atig/agent/list'
-
-module Atig
-  module Agent
-    class OtherList < List
-      def entry_points
-        [ "#{@db.me.screen_name}/lists/subscriptions" ]
-      end
-
-      def interval
-        3600
-      end
-    end
-  end
-end

data/lib/atig/agent/own_list.rb

@@ -1,18 +0,0 @@
-# -*- mode:ruby; coding:utf-8 -*-
-
-require 'atig/util'
-require 'atig/agent/list'
-
-module Atig
-  module Agent
-    class OwnList < List
-      def entry_points
-        [ "#{@db.me.screen_name}/lists" ]
-      end
-
-      def interval
-        3600
-      end
-    end
-  end
-end