robotwitter 0.1.3 → 0.2.0

data/Gemfile

@@ -1,11 +1,11 @@
-source "http://rubygems.org"
-gem "twitter"
-gem "sqlite3"
-gem "fakeweb"
+source :rubygems
+gem 'twitter'
+gem 'sqlite3'
+gem 'fakeweb'
+gem 'minitest'
+gem 'pry'
 
 group :development do
-  gem "shoulda", ">= 0"
-  gem "bundler", "~> 1.0.0"
-  gem "jeweler", "~> 1.5.2"
-  gem "rcov", ">= 0"
+  gem 'shoulda'
+  gem 'jeweler'
 end

data/Rakefile

@@ -33,13 +33,6 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
 task :default => :test
 
 require 'rake/rdoctask'

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.0

data/example/settings.yml

@@ -1,5 +1,5 @@
-test_login:
-  consumer_key: key
-  consumer_secret: secret
-  oauth_token: oauth_token
-  oauth_token_secret: oauth_token
+serialmaniak_ru:
+  consumer_key: qhQYAKHy5mVWhdqPD0DX1g
+  consumer_secret: bFgbeWrr6y10qtFrC089WswSgbhWdmQPYZxbvB30uwk
+  oauth_token: 27295510-cZOZYtSnRHYEdnLyIcEbWPFaDQz0Ev7RdZanUbZY
+  oauth_token_secret: 6bIrZX6burEjHS5BMrYcQDBFKvtK2lsr4E2sOcnOQYg

data/lib/robotwitter.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'twitter'
+require 'twitter/error/unauthorized'
 require 'open-uri'
 require 'yaml'
 require 'sqlite3'
@@ -16,56 +17,46 @@ module Robotwitter
     # which returns string
     # example of getter
     #
-    #  SQLITE_GETTER = lambda do |s|
+    #  SQLITE_GETTER = lambda do
     #    db = SQLite3::Database.new("database.db")
     #    db.get_first_row( "select * from table" )
     #  end
     def initialize(path, section, &getter)
-      @getter        = getter
-      @followers_ids = nil
-      @following_ids = nil
-      @path          = path
+      @getter, @path, @followers_ids, @following_ids = getter, path, nil, nil
 
       @logger = Logger.new('tweelog.txt', 'weekly')
 
-      begin
-        yml = YAML.load_file(path + '/' + "settings.yml")
-        Twitter.configure do |config|
-          config.consumer_key       = yml[section]['consumer_key']
-          config.consumer_secret    = yml[section]['consumer_secret']
-          config.oauth_token        = yml[section]['oauth_token']
-          config.oauth_token_secret = yml[section]['oauth_token_secret']
-        end
-        @client = Twitter::Client.new
-      rescue Exception => exception
-        @logger.error %/error occurred:  #{exception.inspect}\n#{exception.backtrace.join("\n")}/
+
+      path ||= ''
+      path += '/' if path != ''
+
+      yml = YAML.load_file(path + "settings.yml")
+      Twitter.configure do |config|
+        config.consumer_key       = yml[section]['consumer_key']
+        config.consumer_secret    = yml[section]['consumer_secret']
+        config.oauth_token        = yml[section]['oauth_token']
+        config.oauth_token_secret = yml[section]['oauth_token_secret']
       end
+      @client = Twitter::Client.new
+      @search_client = Twitter
     end
 
     # follow who follows me
     def follow_all_back
-      get_followers_ids
-      get_following_ids
-
-      follow_them = @followers_ids - @following_ids
-      @logger.info 'follows:'
+      follow_them = get_followers_ids - get_following_ids
       follow_them.each do |id|
-        begin
-          @client.follow id
-        rescue
-        end
-        @logger.info id
+        @client.follow(id)
+        @logger.info 'following' + id.to_s
       end
     end
 
     # string '_msg_ somth'
     def send_message(pattern)
       phrase = get_phrase
-      p phrase
       return if phrase == ''
       send = pattern.gsub('_msg_', phrase)
-      @client.update send
-      @logger.info send
+      @client.update(send)
+      @logger.info(send)
     end
 
     def retweet_about(word)
@@ -73,70 +64,54 @@ module Robotwitter
       init_db
       search.each do |result|
         next if @db.retweeted?(result)
-        retweet result
-        @db.save_retweet result
-        @logger.info result['id']
+        retweet(result)
+        @db.save_retweet(result)
+        @logger.info(result['id'])
       end
     end
 
     # follow who tweet about word
     def follow_users_tweets_about(word)
-      users = search_users_tweets_about word
+      users = search_users_tweets_about(word)
 
       get_followers_ids
       get_following_ids
-      @logger.info users
+      @logger.info(users)
       users.each do |user|
         id = user['from_user_id']
         name = user['from_user']
-        begin
-          if (not @followers_ids.include?(id)) and (not @following_ids.include?(id))
-            @client.follow name
-            @logger.info name
-          end
-        rescue  Exception => msg
-          @logger.error "Error #{msg}"
+        if (not @followers_ids.include?(id)) and (not @following_ids.include?(id))
+          @client.follow(name)
+          @logger.info(name)
         end
       end
     end
 
     #unfollow who not following me
     def unfollow_users
-      get_followers_ids
-      get_following_ids
-
-      unfollow_them = @following_ids - @followers_ids
+      unfollow_them = get_following_ids - get_followers_ids
       unfollow_them.each do |id|
-        begin
-          @client.unfollow id
-        rescue
-        end
-        @logger.info id
+        @client.unfollow(id)
+        @logger.info(id)
       end
     end
 
     protected
 
     def init_db
-      @db = Robotwitter::Db.new('tweets', @path) if @db.nil?
-      @db
+      @db ||= Robotwitter::Db.new('tweets', @path)
     end
 
-    # get phrase
+    # get phrase from internal resource
     def get_phrase
       @getter.call(self)
     rescue
       ""
     end
 
-    # ищем пользователей, которые пишут о
+    # search for users tweets about
     def search_users_tweets_about(word, count = 5)
-      resp = Twitter::Search.new.containing(word).locale("ru").no_retweets.per_page(count).fetch
-      if resp.is_a?(Twitter::Unauthorized)
-        @logger.error 'unauthorized'
-        return []
-      end
-      resp
+      @search_client.search(word, :locale => 'ru', :result_type => 'resent', :rpp => count)
     end
 
     # get follower ids
@@ -152,20 +127,19 @@ module Robotwitter
       if @following_ids.nil?
         @following_ids = @client.friend_ids['ids']
       end
+      @following_ids
     end
 
-    # ретвитим
+    # retweet
     # result - hash от поиска
     def retweet(result)
-      begin
-        @client.retweet(result['id'])
-      rescue => desc
-        @logger.error 'error: ' + desc.inspect
-      end
+      @client.retweet(result['id'])
+    rescue => detail
+      @logger.error(detail)
     end
 
     def rate_limit
-      @logger.error @client.rate_limit_status.remaining_hits.to_s + " Twitter API request(s) remaining this hour"
+      @logger.error(@client.rate_limit_status.remaining_hits.to_s + ' Twitter API request(s) remaining this hour')
     end
   end
 end

data/lib/robotwitter/db.rb

@@ -11,12 +11,12 @@ module Robotwitter
     def create_db(name)
       db = SQLite3::Database.new("#{name}.db")
 
-      sql = <<SQL
-          create table #{TABLENAME} (
-            id  integer PRIMARY KEY AUTOINCREMENT,
-            tweet_id string
-          );
-SQL
+      sql = <<-SQL
+            create table #{TABLENAME} (
+              id  integer PRIMARY KEY AUTOINCREMENT,
+              tweet_id string
+            );
+            SQL
 
       db.execute_batch(sql)
     end
@@ -36,7 +36,7 @@ SQL
     # сохраняем ретвитт, чтобы не ретвиттить снова
     # result - результат twitter.search
     def save_retweet result
-      id = result['id_str']
+      id = result.attrs['id_str']
       sql = "insert into #{TABLENAME} (tweet_id) values (#{id})"
       @db.query(sql)
     end

data/robotwitter.gemspec

@@ -4,14 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{robotwitter}
-  s.version = "0.1.3"
+  s.name = "robotwitter"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Krivich Ekaterina}]
-  s.date = %q{2011-08-20}
-  s.description = %q{automate twitter tasks, such as retweetting, following, unfollowing}
-  s.email = %q{krivich.ekaterina@gmail.com}
+  s.authors = ["Krivich Ekaterina"]
+  s.date = "2012-03-13"
+  s.description = "automate twitter tasks, such as retweetting, following, unfollowing"
+  s.email = "krivich.ekaterina@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.rdoc"
@@ -33,15 +33,11 @@ Gem::Specification.new do |s|
     "spec/robotwitter/robotwitter_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/kiote/robotwitter}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.6}
-  s.summary = %q{automate some twitter tasks}
-  s.test_files = [
-    "spec/robotwitter/robotwitter_spec.rb",
-    "spec/spec_helper.rb"
-  ]
+  s.homepage = "http://github.com/kiote/robotwitter"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.17"
+  s.summary = "automate some twitter tasks"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -50,27 +46,27 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<twitter>, [">= 0"])
       s.add_runtime_dependency(%q<sqlite3>, [">= 0"])
       s.add_runtime_dependency(%q<fakeweb>, [">= 0"])
+      s.add_runtime_dependency(%q<minitest>, [">= 0"])
+      s.add_runtime_dependency(%q<pry>, [">= 0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
       s.add_dependency(%q<twitter>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<fakeweb>, [">= 0"])
+      s.add_dependency(%q<minitest>, [">= 0"])
+      s.add_dependency(%q<pry>, [">= 0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-      s.add_dependency(%q<rcov>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
     s.add_dependency(%q<twitter>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<fakeweb>, [">= 0"])
+    s.add_dependency(%q<minitest>, [">= 0"])
+    s.add_dependency(%q<pry>, [">= 0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
-    s.add_dependency(%q<rcov>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
   end
 end
 

data/spec/robotwitter/robotwitter_spec.rb

@@ -1,60 +1,112 @@
-require "spec_helper"
+$LOAD_PATH << File.expand_path('../../', __FILE__)
+require 'spec_helper'
 
-describe "Robotwitter" do
-
-  before do
-    FakeWeb.register_uri(:get, %r|https://api\.twitter\.com/1/followers/ids\.json|,
-                         :body => %|{"ids": [1,2,3]}|)
-    # GET https://api.twitter.com/1/friends/ids.json
-    FakeWeb.register_uri(:get, %r|https://api\.twitter\.com/1/friends/ids\.json|,
-                         :body => %|{"ids": [1,2,3]}|)
-    # POST https://api.twitter.com/1/statuses/update.json
-    FakeWeb.register_uri(:post, %r|https://api\.twitter\.com/1/statuses/update\.json|,
-                         :body => '')
-    # POST https://api.twitter.com/1/statuses/retweet/
-    FakeWeb.register_uri(:post, %r|https://api\.twitter\.com/1/statuses/retweet|,
-                         :body => '')
+describe Robotwitter do
+  def mock_client(object)
+    @mock = MiniTest::Mock.new
+    object.instance_variable_set(:@client, @mock)
   end
 
-  POSTER = lambda do |l|
-    'some tweet'
+  def follower_and_friends
+    ids = [1,2,3,4]
+    @mock.expect(:follower_ids, 'ids' => ids)
+    @mock.expect(:friend_ids,   'ids' => [4,5,6,7,8])
+    ids
   end
 
-  before(:each) do
-    @settings_path = File.expand_path('../../../example', __FILE__)
-    @client = Robotwitter::Robot.new @settings_path, 'test_login', &POSTER
+  def tweet_params
+    ['id' => 'kolyan', 'from_user_id' => 'vasyan_id', 'from_user' => 'vasyan']
   end
 
-  it "should create new object on right init params" do
-    @client.class.to_s.should eq("Robotwitter::Robot")
+  before do
+    @robotwitter = Robotwitter::Robot.new('', 'test_login') do
+      'hello'
+    end
+    mock_client(@robotwitter)
   end
 
-  it "should follows those who follows me" do
-    @client.follow_all_back
-  end
+  # мы фалловим 5 пользователей: [4,5,6,7,8]
+  # нас фалловят 4: [1,2,3,4]
+  # follow_all_back должна зафалловить 3х пользователей: [1,2,3]
+  describe 'follow_all_back' do
+    before do
+      ids = follower_and_friends
+      ids.pop
+      ids.each { |id| @mock.expect(:follow, [], [id]) }
+    end
 
-  it "should tweet a message" do
-    @client.send_message('_msg_ #hash')
+    it 'should follow those, who follows me' do
+      @robotwitter.follow_all_back
+    end
   end
 
-  it "should retweet about word" do
-    @client.retweet_about('something')
-  end
+  # тестируем отправку сообщений
+  # перед отправкой сообщение получается из внешнего источника
+  describe 'send_message' do
+    before do
+      @mock.expect(:update, nil, ['hello there'])
+    end
 
-  it "should follow users tweets about" do
-    @client.follow_users_tweets_about('something')
+    it 'should successfully sends message' do
+      @robotwitter.send_message('_msg_ there')
+    end
   end
 
-  it "should unfollow users who did not following me" do
-    @client.unfollow_users
+  describe 'containing' do
+    # сначала мокаем search_client
+    # он вызывает кучу методов через method chaining и возвращает id твитта
+    before do
+      sk = MiniTest::Mock.new
+      sk.expect(:search, tweet_params, %w/hell/)
+      @robotwitter.instance_variable_set(:@search_client, sk)
+    end
+
+    # тестируем ретвит о каком-то слове
+    describe 'retweet_about' do
+      # мокаем сохраниение в базе
+      before do
+        db = MiniTest::Mock.new
+        db.expect(:nil?, false)
+        db.expect(:retweeted?, false, tweet_params)
+        db.expect(:save_retweet, false, tweet_params)
+
+        @robotwitter.instance_variable_set(:@db, db)
+        @mock.expect(:retweet, nil, %w/kolyan/)
+      end
+
+      it 'should retweet' do
+        @robotwitter.retweet_about('hell')
+      end
+    end
+
+    # тестируем фолловинг пользователей, которые пишут о...
+    describe 'follow_users_tweets_about' do
+      before do
+        follower_and_friends
+        @mock.expect(:follow, [], ['vasyan'])
+      end
+
+      it 'should follow users' do
+        @robotwitter.follow_users_tweets_about('hell')
+      end
+    end
   end
 
-  it "should not tweet if phrase is empty" do
-    EMPTY = lambda do
-      ""
+  # мы фалловим 5 пользователей: [4,5,6,7,8]
+  # нас фалловят 4: [1,2,3,4]
+  # follow_all_back должна отфалловить 3х пользователей: [1,2,3]
+  describe 'unfollow_users' do
+    before do
+      follower_and_friends
+      (1..3).to_a.map {|i| @mock.expect(:unfollow, [], [i])}
     end
 
-    client = Robotwitter::Robot.new @settings_path, 'test_login', &EMPTY
-    client.send_message('_msg_ #hash')
+    it 'should unfollow' do
+      @robotwitter.unfollow_users
+    end
+  end
+
+  after do
+    @mock.verify
   end
 end

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
-$:.unshift(File.dirname(__FILE__))
-$:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
+$LOAD_PATH << File.expand_path('../../lib', __FILE__)
+require 'robotwitter'
+
+require 'minitest/autorun'
+require 'minitest/mock'
+require 'pry'
 
-require 'twitter'
-require 'rspec'
-require 'fakeweb'
-require 'robotwitter'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: robotwitter
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-20 00:00:00.000000000Z
+date: 2012-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twitter
-  requirement: &70244028149820 !ruby/object:Gem::Requirement
+  requirement: &70334826215500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70244028149820
+  version_requirements: *70334826215500
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70244028149300 !ruby/object:Gem::Requirement
+  requirement: &70334826214720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70244028149300
+  version_requirements: *70334826214720
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70244028148780 !ruby/object:Gem::Requirement
+  requirement: &70334826214180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,43 +43,43 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70244028148780
+  version_requirements: *70334826214180
 - !ruby/object:Gem::Dependency
-  name: shoulda
-  requirement: &70244028148280 !ruby/object:Gem::Requirement
+  name: minitest
+  requirement: &70334826211800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
-  version_requirements: *70244028148280
+  version_requirements: *70334826211800
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &70244028147780 !ruby/object:Gem::Requirement
+  name: pry
+  requirement: &70334826210940 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
-  version_requirements: *70244028147780
+  version_requirements: *70334826210940
 - !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &70244028147300 !ruby/object:Gem::Requirement
+  name: shoulda
+  requirement: &70334826188940 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70244028147300
+  version_requirements: *70334826188940
 - !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &70244028146820 !ruby/object:Gem::Requirement
+  name: jeweler
+  requirement: &70334826187180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70244028146820
+  version_requirements: *70334826187180
 description: automate twitter tasks, such as retweetting, following, unfollowing
 email: krivich.ekaterina@gmail.com
 executables: []
@@ -126,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3642077533077290635
+      hash: 1002785137624157305
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -135,10 +135,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: automate some twitter tasks
-test_files:
-- spec/robotwitter/robotwitter_spec.rb
-- spec/spec_helper.rb
+test_files: []