tweetomator 1.2.2 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31e3ee1e6bd6f03201bb4d2a15874d8ff25b593b
-  data.tar.gz: ace90182fe472f30bbc7d26b46da1d7e0f25d245
+  metadata.gz: 6c236c8c5a61cb44e41f72ea90ff1456d9410a12
+  data.tar.gz: def353fd186f96425936d53df3a4ad20cbfaf257
 SHA512:
-  metadata.gz: 53dcfc56dd8bca5f777e2bea6a4cd0c8664d698022de0690c1d0bd5501e99a9afdd46593dcd07ea6fb61a0c3f3ccab346f94cb6e99275d48949fe7915e778fce
-  data.tar.gz: 885982c6c364023887db1cec88b2593a4067e1ef1e921ac26a07cda4218026f908fbb885c5630a2fbaf08de90e5d03ba679709649eb247d269e27f53b32e7715
+  metadata.gz: b79c91124edaa43786d5ebf22e34b84a533fb254ae4409afa49c96ee7f9286c70abf0cfc4ee6fde7fe7fa7bed66cc7597c95373286d74fe4e09426b0a26e346c
+  data.tar.gz: 14d1b4c40016cc50c67f2e5b00ad4a89b9cf3687358eab21131791b57725782385fd6f91ad9948edb9d4b4d1fc5029d18b8ba57a9cbf31bf87c48abed2e73f3f

data/lib/composers/composer.rb

@@ -3,6 +3,7 @@ class Composer
     @max_length = config.twitter_config.tweet_max_length
     @blacklist = config.blacklist
     @stop_words = config.stop_words
+    @default_hashtag = config.default_hashtag
     @twitter_client = twitter_client
     @tweet_finder = tweet_finder
     @emoji_finder = emoji_finder

data/lib/composers/markov_composer.rb

@@ -56,20 +56,21 @@ class MarkovComposer < Composer
 
   def clean_up(text)
     text = text.strip.capitalize
-    if text[text.length-1].match('[A-Za-z]') != nil && text.length < @max_length
+    if text[text.length - 1].match('[A-Za-z]') != nil && text.length < @max_length
       text << %w(. ! ? . .).sample
     end
     text
   end
 
   def create_tweet(text)
-    if [1, 2, 3].sample < 3
+    hashtags = []
+    hashtags << @default_hashtag if @default_hashtag != '' && (text.length + @default_hashtag.length + 2) < @max_length
+    tweet = Tweet.new(text, hashtags, @twitter_client)
+    if [true, false].sample
       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
-        return Tweet.new(text, hashtag.downcase, @twitter_client)
-      end
+      tweet.hashtags << hashtag if hashtag != nil && (tweet.length + hashtag.length + 2) < @max_length
     end
-    return Tweet.new(text, '', @twitter_client)
+    tweet
   end
 
   def insert_emoji(tweet)
@@ -77,4 +78,8 @@ class MarkovComposer < Composer
       tweet.append(@emoji_finder.find)
     end
   end
+
+  def hashtag_fits?(tweet, hashtag)
+    hashtag != nil && (tweet.length + hashtag.length + 1) < @max_length
+  end
 end

data/lib/composers/random_composer.rb

@@ -17,7 +17,7 @@ class RandomComposer < Composer
     text = trim(text, hashtag.length)
     text = replace_a_word(text.split.sample, text)
     text = replace_a_word(emoji, text)
-    Tweet.new(text.capitalize, hashtag, @twitter_client)
+    Tweet.new(text.capitalize, [hashtag], @twitter_client)
   end
 
   def compose_image_query(query)

data/lib/config/config.rb

@@ -37,9 +37,9 @@ end
 class TweetomatorConfig
   include Validatable
 
-  attr_reader :twitter_config, :flickr_config, :topics, :blacklist, :stop_words, :delay_in_seconds, :composer_type, :input_text_file
+  attr_reader :twitter_config, :flickr_config, :topics, :blacklist, :stop_words, :delay_in_seconds, :composer_type, :input_text_file, :default_hashtag
 
-  def initialize(twitter_config, flickr_config, topics, blacklist, stop_words, delay_in_seconds, composer_type, input_text_file)
+  def initialize(twitter_config, flickr_config, topics, blacklist, stop_words, delay_in_seconds, composer_type, input_text_file, default_hashtag='')
     @twitter_config = twitter_config
     @flickr_config = flickr_config
     @topics = topics
@@ -48,5 +48,6 @@ class TweetomatorConfig
     @delay_in_seconds = delay_in_seconds
     @composer_type = composer_type
     @input_text_file = input_text_file
+    @default_hashtag = default_hashtag
   end
 end

data/lib/tweet.rb

@@ -1,27 +1,27 @@
 class Tweet
-  attr_reader :hashtag
+  attr_accessor :hashtags
 
-  def initialize(text, hashtag, twitter_client)
+  def initialize(text, hashtags, twitter_client)
     @text = text
-    @hashtag = hashtag
+    @hashtags = hashtags
     @twitter_client = twitter_client
   end
 
   def post!(image = '')
     if image.length > 0 && File.exists?(image)
-      @twitter_client.update_with_media(self.with_hashtag, File.new(image))
+      @twitter_client.update_with_media(self.with_hashtags, File.new(image))
       File.delete(image)
     else
-      @twitter_client.update(self.with_hashtag)
+      @twitter_client.update(self.with_hashtags)
     end
   end
 
-  def with_hashtag
-    (@hashtag && @hashtag.length > 0) ? "#{@text} ##{@hashtag}" : @text
+  def with_hashtags
+    (@hashtags && @hashtags.size > 0) ? "#{@text}#{hashtags.reduce('') { |str, h| str << " ##{h}" }}" : @text
   end
 
   def length
-    with_hashtag.length
+    with_hashtags.length
   end
 
   def append(text)

data/lib/tweetomator/version.rb

@@ -1,3 +1,3 @@
 class Tweetomator
-  VERSION = '1.2.2'
+  VERSION = '1.2.4'
 end

data/test/lib/composers/markov_composer_test.rb

@@ -19,6 +19,7 @@ class TestMarkovComposer < Minitest::Unit::TestCase
     mock_config = Minitest::Mock.new
     mock_config.expect :twitter_config, mock_twitter_config
     mock_config.expect :blacklist, @blacklist
+    mock_config.expect :default_hashtag, 'potato'
     mock_config.expect :stop_words, @stop_words
     mock_config.expect :input_text_file, 'text.txt'
     mock_text_reader = MiniTest::Mock.new
@@ -32,7 +33,6 @@ class TestMarkovComposer < Minitest::Unit::TestCase
 
   def test_that_tweet_is_short_enough
     tweet = @markov_composer.compose_tweet
-    puts tweet.with_hashtag
-    assert tweet.with_hashtag.length <= @max_length, true
+    assert tweet.with_hashtags.length <= @max_length, true
   end
 end

data/test/lib/composers/random_composer_test.rb

@@ -23,22 +23,23 @@ class TestRandomComposer < Minitest::Unit::TestCase
     mock_config.expect :twitter_config, mock_twitter_config
     mock_config.expect :max_length, @max_length
     mock_config.expect :blacklist, @blacklist
+    mock_config.expect :default_hashtag, 'potato'
     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
-    assert tweet.with_hashtag.length <= @max_length, true
+    assert tweet.with_hashtags.length <= @max_length, true
   end
 
   def test_that_blacklisted_words_are_removed
     tweet = @random_composer.compose_tweet
-    refute tweet.with_hashtag.split.any? { |word| @blacklist.include?(word) }, true
+    refute tweet.with_hashtags.split.any? { |word| @blacklist.include?(word) }, true
   end
 
   def test_that_links_are_removed
     tweet = @random_composer.compose_tweet
-    refute tweet.with_hashtag.split.any? { |word| %w(kck.st/1pLytCe http://nyan.cat).include?(word) }, true
+    refute tweet.with_hashtags.split.any? { |word| %w(kck.st/1pLytCe http://nyan.cat).include?(word) }, true
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tweetomator
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.4
 platform: ruby
 authors:
 - Nat Young
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-05 00:00:00.000000000 Z
+date: 2015-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler