tweetomator 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c236c8c5a61cb44e41f72ea90ff1456d9410a12
-  data.tar.gz: def353fd186f96425936d53df3a4ad20cbfaf257
+  metadata.gz: ee9921fb4af9976b501bfd786a5706786c698c23
+  data.tar.gz: 453aaa443cf898ff723c44a17627912a2f19fe4f
 SHA512:
-  metadata.gz: b79c91124edaa43786d5ebf22e34b84a533fb254ae4409afa49c96ee7f9286c70abf0cfc4ee6fde7fe7fa7bed66cc7597c95373286d74fe4e09426b0a26e346c
-  data.tar.gz: 14d1b4c40016cc50c67f2e5b00ad4a89b9cf3687358eab21131791b57725782385fd6f91ad9948edb9d4b4d1fc5029d18b8ba57a9cbf31bf87c48abed2e73f3f
+  metadata.gz: 421e091954bbe6e1a192ed3e6640613392a8c1b60eb109ee961b4cec1ad724e6d794c4f5ede4edf4e57a510c7b3cc35af004ea461cafd9b59af619e8674aea82
+  data.tar.gz: b0af408a5ef23d05b6148baec4dca4212fd24bc11d0d98600d7f7aee026b818c8301915932134620dc1dc60dc75d39201b0932aee271d7b816232c9418084d58

data/lib/composers/markov_composer.rb

@@ -5,6 +5,7 @@ require_relative 'composer'
 class MarkovComposer < Composer
   def initialize(config, twitter_client, tweet_finder, emoji_finder)
     super(config, twitter_client, tweet_finder, emoji_finder)
+    @conjunctions = %w(after which and besides as since till until when whenever but despite if of or else so because considering due to a since whereas while whilst to yet)
     @chain = {}
     reader = TextReader.new(config.input_text_file)
     reader.process_input_text_file
@@ -55,6 +56,7 @@ class MarkovComposer < Composer
   end
 
   def clean_up(text)
+    text = clean_last_word(text.gsub(/\s+/m, ' ').strip.split(' '))
     text = text.strip.capitalize
     if text[text.length - 1].match('[A-Za-z]') != nil && text.length < @max_length
       text << %w(. ! ? . .).sample
@@ -62,6 +64,14 @@ class MarkovComposer < Composer
     text
   end
 
+  def clean_last_word(words)
+    if @conjunctions.include?(words.last)
+      words.slice!(-1)
+      return clean_last_word(words)
+    end
+    return words.join(' ')
+  end
+
   def create_tweet(text)
     hashtags = []
     hashtags << @default_hashtag if @default_hashtag != '' && (text.length + @default_hashtag.length + 2) < @max_length

data/lib/tweetomator/version.rb

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

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: tweetomator
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Nat Young
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-07 00:00:00.000000000 Z
+date: 2016-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rake
   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'
 - !ruby/object:Gem::Dependency
   name: minitest
   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'
 - !ruby/object:Gem::Dependency
   name: flickraw
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: twitter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Captivate your twitter audience with a series of interesting tweets and
@@ -102,7 +102,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -136,17 +136,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Twitter automation for the time poor.
@@ -155,4 +155,3 @@ test_files:
 - test/lib/composers/random_composer_test.rb
 - test/lib/finders/flickr_findr_test.rb
 - test/lib/finders/tweet_finder_test.rb
-has_rdoc: