tweetomator 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fe9ed9b8f25c3191d276c5bfb8f1ab7e667743f
-  data.tar.gz: 44d3f6ca11bad6d7fc44d40bf9692ffd15dfcc92
+  metadata.gz: 499c4df1bff2a96595cffa6188a37a5d3aa05e87
+  data.tar.gz: 853355749050b089c4bd9a80d3ebb8b6aa923853
 SHA512:
-  metadata.gz: 6956fea6e07501934c388484916b6cb31a2cdd768f54764b7ae1303528cf74918bc2d426a4c56d6a2c60ddc8edbd6e556be97647f01ce32d550c4fa01a97cf70
-  data.tar.gz: 9420997993d3a8a833ffb88b5aaf0626408764abf9b0b8cd50fef96ef7a5c6cea4fc288f3c9e1e52930b4e719fcfaa64fa1466ba97e17f908ed54011c4ca2c7d
+  metadata.gz: a184e4fdbb68947988767bc8b2ef1a2e85260f3b624fc2e2b3fa4eb350f492a285fa24cfec06765b212e2578a22f187f69ced5cf4a51d01c51bb384ddc0864e3
+  data.tar.gz: f41e1638fac1a420ef0610aeab93583786f9e4ad36fef8087b44acec8e48252b2a26734f4d025c7a51387b734921268a3784520fce3d9b18467f02e8065cf4f6

data/lib/composers/composer.rb

@@ -0,0 +1,18 @@
+class Composer
+  def initialize(config, twitter_client, tweet_finder, emoji_finder)
+    @blacklist = config.blacklist
+    @max_length = config.max_length
+    @stop_words = config.stop_words
+    @twitter_client = twitter_client
+    @tweet_finder = tweet_finder
+    @emoji_finder = emoji_finder
+  end
+
+  def compose_tweet
+    raise NoMethodError 'implement compose_tweet'
+  end
+
+  def compose_image_query(query)
+    raise NoMethodError 'implement compose_image_query(query)'
+  end
+end

data/lib/composers/markov_composer.rb

@@ -0,0 +1,66 @@
+require_relative '../tweet'
+require_relative '../io/text_reader'
+require_relative 'composer'
+
+class MarkovComposer < Composer
+  def initialize(config, twitter_client, tweet_finder, emoji_finder)
+    super(config, twitter_client, tweet_finder, emoji_finder)
+    @chain = {}
+    reader = TextReader.new(config.input_text_file)
+    reader.process_input_text_file
+    @beginnings = reader.beginnings
+    @lines = reader.lines
+    build_chain(@lines.join.split)
+  end
+
+  def compose_tweet
+    text = ''
+    word = @beginnings.sample
+    until text.count('.') == 1 || text.length + word.length + 1 >= @max_length
+      text = "#{text}#{word} "
+      word = get(word)
+    end
+    text = clean_up(text)
+    hashtag = @lines.sample.split.reject { |w| w.strip.nil? || /[^A-Za-z]/.match(w.strip) != nil || @stop_words.include?(w.strip) }.sample
+    if hashtag != nil && (text.length + hashtag.length + 1) < @max_length && (1..4).to_a.sample == 4
+      return Tweet.new(clean_up(text), hashtag.downcase, @twitter_client)
+    end
+    return Tweet.new(clean_up(text), '', @twitter_client)
+  end
+
+  def compose_image_query(query)
+    "##{@chain.keys.reject { |k| @stop_words.include?(k) }.sample}"
+  end
+
+  private
+
+  def build_chain(words)
+    words.each_with_index do |word, i|
+      add(word, words[i + 1]) unless i >= words.size - 2
+    end
+  end
+
+  def add(word, next_word)
+    @chain[word] = Hash.new(0) if @chain[word] == nil
+    @chain[word][next_word] += 1
+  end
+
+  def get(word)
+    return '' if @chain[word] == nil
+    sum = @chain[word].reduce(0) { |sum, kv| sum += kv[1] }
+    random = rand(sum) + 1
+    count = 0
+    @chain[word].find do |w, i|
+      count += i
+      count >= random
+    end.first
+  end
+
+  def clean_up(text)
+    text = text.strip.capitalize
+    if text[text.length-1].match('[A-Za-z]') != nil && text.length < @max_length
+      text << '.'
+    end
+    text
+  end
+end

data/lib/composers/random_composer.rb

@@ -1,19 +1,16 @@
-require 'cgi'
 require_relative '../tweet'
+require_relative 'composer'
+require 'cgi'
 
-class RandomComposer
-  def initialize(tweet_finder, emoji_finder, blacklist, twitter_client, max_length)
-    @tweet_finder = tweet_finder
-    @emoji_finder = emoji_finder
-    @blacklist = blacklist
-    @twitter_client = twitter_client
-    @max_length = max_length
+class RandomComposer < Composer
+  def initialize(config, twitter_client, tweet_finder, emoji_finder)
+    super(config, twitter_client, tweet_finder, emoji_finder)
   end
 
-  def compose
+  def compose_tweet
     tweets = @tweet_finder.find_tweets
     tweets = tweets.map { |t| normalize(t) }
-    hashtag = @tweet_finder.find_random_word(tweets.sample)
+    hashtag = find_random_word(tweets.sample)
     emoji = @emoji_finder.find
     text = tweets.join([', ', ' - ', '! '].sample)
     text = filter(text)
@@ -23,8 +20,22 @@ class RandomComposer
     Tweet.new(text.capitalize, hashtag, @twitter_client)
   end
 
+  def compose_image_query(query)
+    find_random_word(query)
+  end
+
   private
 
+  def find_random_word(query)
+    term = extract_one_word(query)
+    tweet = @tweet_finder.find_tweet(term)
+    extract_one_word(tweet)
+  end
+
+  def extract_one_word(tweet)
+    tweet.split.reject { |w| /[^A-Za-z0-9]/.match(w.strip) != nil || @stop_words.include?(w.strip) }.sample
+  end
+
   def normalize(tweet)
     CGI.unescapeHTML(tweet.gsub(/(@([^\s])+|http([^\s])+|([^\s])+\/([^\s])+|)/, ''))
         .gsub(/\s+/, ' ')

data/lib/config/config.rb

@@ -39,12 +39,13 @@ class TweetomatorConfig
 
   attr_reader :twitter_config, :flickr_config, :topics, :blacklist, :stop_words, :delay_in_seconds
 
-  def initialize(twitter_config, flickr_config, topics, blacklist, stop_words, delay_in_seconds)
+  def initialize(twitter_config, flickr_config, topics, blacklist, stop_words, delay_in_seconds, composer_type)
     @twitter_config = twitter_config
     @flickr_config = flickr_config
     @topics = topics
     @blacklist = blacklist
     @stop_words = stop_words
     @delay_in_seconds = delay_in_seconds
+    @composer_type = composer_type
   end
 end

data/lib/finders/tweet_finder.rb

@@ -1,8 +1,7 @@
 class TweetFinder
-  def initialize(client, topics, stop_words)
+  def initialize(client, topics)
     @client = client
     @topics = topics
-    @stop_words = stop_words
   end
 
   def find_tweets
@@ -14,16 +13,4 @@ class TweetFinder
   def find_tweet(query)
     @client.search(query)
   end
-
-  def find_random_word(query)
-    term = extract_one_word(query)
-    tweet = find_tweet(term)
-    extract_one_word(tweet)
-  end
-
-  private
-
-  def extract_one_word(tweet)
-    tweet.split.reject { |w| /[^A-Za-z0-9]/.match(w.strip) != nil || @stop_words.include?(w.strip) }.sample
-  end
 end

data/lib/io/text_reader.rb

@@ -0,0 +1,15 @@
+class TextReader
+  attr_accessor :beginnings, :lines
+
+  def initialize(input_text_file)
+    @input_text_file = input_text_file
+    @beginnings = []
+    @lines = []
+  end
+
+  def process_input_text_file
+    @lines = File.readlines(@input_text_file)
+    @beginnings = @lines.collect { |s| s.split(' ').first }.reject { |w| w.nil? }
+    return self
+  end
+end

data/lib/tweetomator/version.rb

@@ -1,3 +1,3 @@
 class Tweetomator
-  VERSION = '1.0.3'
+  VERSION = '1.1.0'
 end

data/lib/tweetomator.rb

@@ -35,20 +35,20 @@ class Tweetomator
   def somebody_set_us_up_the_bot(config)
     @delay = config.delay_in_seconds
     @twitter_client = TwitterClient.new(config.twitter_config)
-    @tweet_finder = TweetFinder.new(@twitter_client, config.topics, config.stop_words)
+    tweet_finder = TweetFinder.new(@twitter_client, config.topics)
     flickr_client = FlickrClient.new(config.flickr_config)
     @flickr_finder = FlickrFindr.new(flickr_client)
     emoji_finder = EmojiFinder.new
-    @random_composer = RandomComposer.new(@tweet_finder, emoji_finder, config.blacklist, @twitter_client, config.twitter_config.tweet_max_length)
+    @composer = config.composer_type.class.new(config, @twitter_client, tweet_finder, emoji_finder)
     @downloader = Downloader.new
     @scheduler = Rufus::Scheduler.new
   end
 
   def do_stuff
-    r = (1..4).to_a.sample
-    if r < 3
+    r = (1..10).to_a.sample
+    if r < 2
       tweet_with_image!
-    elsif r < 4
+    elsif r < 9
       tweet!
     else
       follow!
@@ -56,13 +56,13 @@ class Tweetomator
   end
 
   def tweet!
-    tweet = @random_composer.compose
+    tweet = @composer.compose_tweet
     tweet.post!
   end
 
   def tweet_with_image!
-    tweet = @random_composer.compose
-    flickr_query = @tweet_finder.find_random_word(tweet.hashtag)
+    tweet = @composer.compose_tweet
+    flickr_query = @composer.compose_image_query(tweet.hashtag)
     image_uri = @flickr_finder.find(flickr_query)
     image_local = @downloader.download(image_uri, 'image')
     tweet.post!(image_local)

data/test/lib/composers/markov_composer_test.rb

@@ -0,0 +1,36 @@
+require 'minitest/autorun'
+require_relative '../../../lib/composers/markov_composer'
+require_relative '../../../lib/tweetomator'
+
+class TestMarkovComposer < Minitest::Unit::TestCase
+  def setup
+    cool_story = "So there I am, in Sri Lanka, formerly Ceylon, at about 3 o'clock in the morning, \nlooking for one thousand brown M&Ms to fill a brandy glass, or Ozzy wouldn't go on stage that night. So, Jeff Beck pops his head 'round the door, \n and mentions there's a little sweets shop on the edge of town. So - we go. And - it's closed. So there's me, and Keith Moon, and David Crosby, breaking into that little sweets shop, eh. Well, instead of a guard dog, they've got this bloody great big Bengal tiger. I managed to take out the tiger with a can of mace, but the shopkeeper and his son... that's a different story altogether. I had to beat them to death with their own shoes. Nasty business, really, but sure enough I got the M&Ms, and Ozzy went on stage and did a great show."
+    riveting_tale = "And even in this cosmopolitan trend, he did that precede and open the way to other more advanced civilizations. \n About henceforth in Europe, no cease to be a citizen of his country, it is not, in any way, International? no one  \n can shut, like the snail, by its shell: all need air, space wider for match the new needs, their aspirations."
+    @amazing_narrative = "#{cool_story} #{riveting_tale}"
+    mock_emoji_finder = Minitest::Mock.new
+    mock_emoji_finder.expect :find, ':trollface:'
+    mock_tweet_finder = Minitest::Mock.new
+    mock_tweet_client = Minitest::Mock.new
+    @max_length = 100
+    @blacklist = %w(sri lanka)
+    @stop_words = %w(Potato Salad)
+    mock_config = Minitest::Mock.new
+    mock_config.expect :max_length, @max_length
+    mock_config.expect :blacklist, @blacklist
+    mock_config.expect :stop_words, @stop_words
+    mock_config.expect :input_text_file, 'text.txt'
+    mock_text_reader = MiniTest::Mock.new
+    mock_text_reader.expect :process_input_text_file, mock_text_reader
+    mock_text_reader.expect :beginnings, @amazing_narrative.split
+    mock_text_reader.expect :lines, @amazing_narrative.split("\n")
+    TextReader.stub :new, mock_text_reader do
+      @markov_composer = MarkovComposer.new(mock_config, mock_tweet_client, mock_tweet_finder, mock_emoji_finder)
+    end
+  end
+
+  def test_that_tweet_is_short_enough
+    tweet = @markov_composer.compose_tweet
+    puts tweet.with_hashtag
+    assert tweet.with_hashtag.length <= @max_length, true
+  end
+end

data/test/lib/composers/random_composer_test.rb

@@ -11,25 +11,31 @@ class TestRandomComposer < Minitest::Unit::TestCase
     mock_emoji_finder.expect :find, ':trollface:'
     mock_tweet_finder = Minitest::Mock.new
     mock_tweet_finder.expect :find_tweets, [tweet_1, tweet_2, cool_story]
+    mock_tweet_finder.expect :find_tweet, tweet_1, [String]
     mock_tweet_finder.expect :find_random_word, 'amazing', [String]
     mock_tweet_client = Minitest::Mock.new
-    @blacklist = %w(sri lanka)
     @max_length = 100
-    @random_composer = RandomComposer.new(mock_tweet_finder, mock_emoji_finder, @blacklist, mock_tweet_client, @max_length)
+    @blacklist = %w(sri lanka)
+    @stop_words = %w(Potato Salad)
+    mock_config = Minitest::Mock.new
+    mock_config.expect :max_length, @max_length
+    mock_config.expect :blacklist, @blacklist
+    mock_config.expect :stop_words, @stop_words
+    @random_composer = RandomComposer.new(mock_config, mock_tweet_client, mock_tweet_finder, mock_emoji_finder)
   end
 
   def test_that_tweet_is_short_enough
-    tweet = @random_composer.compose
+    tweet = @random_composer.compose_tweet
     assert tweet.with_hashtag.length <= @max_length, true
   end
 
-  def test_that_stop_words_are_removed
-    tweet = @random_composer.compose
+  def test_that_blacklisted_words_are_removed
+    tweet = @random_composer.compose_tweet
     refute tweet.with_hashtag.split.any? { |word| @blacklist.include?(word) }, true
   end
 
   def test_that_links_are_removed
-    tweet = @random_composer.compose
+    tweet = @random_composer.compose_tweet
     refute tweet.with_hashtag.split.any? { |word| %w(kck.st/1pLytCe http://nyan.cat).include?(word) }, true
   end
 end

data/test/lib/finders/tweet_finder_test.rb

@@ -7,16 +7,11 @@ class TestTweetFinder < Minitest::Unit::TestCase
     mock_client = Minitest::Mock.new
     3.times { mock_client.expect :search, search_result, [String] }
     stop_words = search_result.split
-    @finder = TweetFinder.new(mock_client, ['Trumpets', 'Bookmarks', 'Potato Salads'], stop_words)
+    @finder = TweetFinder.new(mock_client, ['Trumpets', 'Bookmarks', 'Potato Salads'])
   end
 
   def test_that_it_finds_a_tweet_per_query
     tweets = @finder.find_tweets
     assert_equal tweets.size, 3
   end
-
-  def test_stop_words_are_filtered_from_find_random_word
-    word = @finder.find_random_word('something')
-    assert_equal word, nil
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tweetomator
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Nat Young
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-14 00:00:00.000000000 Z
+date: 2015-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -110,15 +110,19 @@ files:
 - Rakefile
 - lib/clients/flickr_client.rb
 - lib/clients/twitter_client.rb
+- lib/composers/composer.rb
+- lib/composers/markov_composer.rb
 - lib/composers/random_composer.rb
 - lib/config/config.rb
 - lib/finders/emoji_finder.rb
 - lib/finders/flickr_findr.rb
 - lib/finders/tweet_finder.rb
 - lib/io/downloader.rb
+- lib/io/text_reader.rb
 - lib/tweet.rb
 - lib/tweetomator.rb
 - lib/tweetomator/version.rb
+- test/lib/composers/markov_composer_test.rb
 - test/lib/composers/random_composer_test.rb
 - test/lib/finders/flickr_findr_test.rb
 - test/lib/finders/tweet_finder_test.rb
@@ -148,6 +152,8 @@ signing_key:
 specification_version: 4
 summary: Twitter automation for the time poor.
 test_files:
+- test/lib/composers/markov_composer_test.rb
 - test/lib/composers/random_composer_test.rb
 - test/lib/finders/flickr_findr_test.rb
 - test/lib/finders/tweet_finder_test.rb
+has_rdoc: