tweetomator 1.1.8 → 1.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75184920fcc8565f58e1048072a439a4d6b41773
-  data.tar.gz: 45fd555f9194cc36e2f02f700efa16379ca1c877
+  metadata.gz: b5d25f56d5ff4f9bcf039eef79b1e3f305e56924
+  data.tar.gz: d228c5535d82e0cde622b2a41ac132a49bead8d4
 SHA512:
-  metadata.gz: 24db3bfa199ce4d4a3a4979faf65ac21b56f68e4c12afcc15a09298dcb598e4939c946fa525f86c16324f923d1b855660b99baea9752b844bcacb7fa9ae291e7
-  data.tar.gz: 57733d19766fdd0aa410ff6584620917556f32f89319f78c6bfd448ecd7d3ba9ca29b84b45d608db05c64add4196998d103c4f83c5cb1f27163cb46f0d5bf9c0
+  metadata.gz: f057d70b33b1405e7e66aebe093454c998bf54adfb0376305526e46abbcc4a7bccf17250b4999da9b7f17dd1eb9f2f20bfea0acf6e51cd5c04dc6c5c117a9627
+  data.tar.gz: e42afa09452a2676a96d180756c69b0a32a6bd576b91bd3aa01ba82b2fd8c6acb04a4156a962122269fb7051fe8912b1b3c6d52d8223865869db4a2d5f48b63e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tweetomator (1.1.7)
+    tweetomator (1.1.9)
       flickraw
       rufus-scheduler
       twitter

data/lib/composers/markov_composer.rb

@@ -21,11 +21,9 @@ class MarkovComposer < Composer
       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)
+    tweet = create_tweet(text)
+    insert_emoji(tweet) if [true, false].sample
+    tweet
   end
 
   def compose_image_query(query)
@@ -63,4 +61,20 @@ class MarkovComposer < Composer
     end
     text
   end
+
+  def create_tweet(text)
+    if [1, 2, 3].sample < 3
+      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
+    end
+    return Tweet.new(text, '', @twitter_client)
+  end
+
+  def insert_emoji(tweet)
+    if tweet.length < @max_length + " #{127872.chr('utf-8')}".length
+      tweet.append(@emoji_finder.find)
+    end
+  end
 end

data/lib/tweet.rb

@@ -23,4 +23,8 @@ class Tweet
   def length
     with_hashtag.length
   end
+
+  def append(text)
+    @text << ' ' << text
+  end
 end

data/lib/tweetomator/version.rb

@@ -1,3 +1,3 @@
 class Tweetomator
-  VERSION = '1.1.8'
+  VERSION = '1.1.9'
 end

data/lib/tweetomator.rb

@@ -46,10 +46,10 @@ class Tweetomator
   end
 
   def do_stuff
-    r = (1..10).to_a.sample
-    if r < 3
+    r = (1..9).to_a.sample
+    if r < 4
       tweet_with_image!
-    elsif r < 9
+    elsif r < 7
       tweet!
     else
       follow!

data/test/lib/composers/markov_composer_test.rb

@@ -8,7 +8,7 @@ class TestMarkovComposer < Minitest::Unit::TestCase
     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_emoji_finder.expect :find, 127872.chr('utf-8')
     mock_tweet_finder = Minitest::Mock.new
     mock_tweet_client = Minitest::Mock.new
     @max_length = 100

data/test/lib/composers/random_composer_test.rb

@@ -8,7 +8,7 @@ class TestRandomComposer < Minitest::Unit::TestCase
     tweet_2 = 'I HAVE NYANED FOR 48.9 SECONDS! http://nyan.cat  via @nyannyancat'
     cool_story = "So there I am, in Sri Lanka, formerly Ceylon, at about 3 o'clock in the morning, looking 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, 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."
     mock_emoji_finder = Minitest::Mock.new
-    mock_emoji_finder.expect :find, ':trollface:'
+    mock_emoji_finder.expect :find, 127872.chr('utf-8')
     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]
@@ -17,7 +17,10 @@ class TestRandomComposer < Minitest::Unit::TestCase
     @max_length = 100
     @blacklist = %w(sri lanka)
     @stop_words = %w(Potato Salad)
+    mock_twitter_config = Minitest::Mock.new
+    mock_twitter_config.expect :tweet_max_length, @max_length
     mock_config = Minitest::Mock.new
+    mock_config.expect :twitter_config, mock_twitter_config
     mock_config.expect :max_length, @max_length
     mock_config.expect :blacklist, @blacklist
     mock_config.expect :stop_words, @stop_words

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tweetomator
 version: !ruby/object:Gem::Version
-  version: 1.1.8
+  version: 1.1.9
 platform: ruby
 authors:
 - Nat Young