tweetomator 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fcc324183e143e5b0cdc10f46ce302813f6c887
-  data.tar.gz: 6be15674f917def226b68a7333af27b65806e87f
+  metadata.gz: 4fe9ed9b8f25c3191d276c5bfb8f1ab7e667743f
+  data.tar.gz: 44d3f6ca11bad6d7fc44d40bf9692ffd15dfcc92
 SHA512:
-  metadata.gz: 92db45f499d31361254fda74f3a3f37ac31fc4ffa5586a47e618e6f0d3f234cd11ea56780a97a8e9cc7a2d3729bc4a72e0dd9bb842df1bd8b2f534389236d747
-  data.tar.gz: 4db5bc27fb25590e749a98de830d1c4760d6f9b3f1b09b100228325e2b3ad56d460a3a67f5de47060f4b0d3f631967d54e68d8cd006b2b4ec12a1f8b0d6aaecc
+  metadata.gz: 6956fea6e07501934c388484916b6cb31a2cdd768f54764b7ae1303528cf74918bc2d426a4c56d6a2c60ddc8edbd6e556be97647f01ce32d550c4fa01a97cf70
+  data.tar.gz: 9420997993d3a8a833ffb88b5aaf0626408764abf9b0b8cd50fef96ef7a5c6cea4fc288f3c9e1e52930b4e719fcfaa64fa1466ba97e17f908ed54011c4ca2c7d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tweetomator (1.0.2)
+    tweetomator (1.0.3)
       flickraw
       rufus-scheduler
       twitter
@@ -9,7 +9,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.7)
+    addressable (2.3.8)
     buftok (0.2.0)
     equalizer (0.0.9)
     faraday (0.9.0)
@@ -18,7 +18,7 @@ GEM
     http (0.6.3)
       http_parser.rb (~> 0.6.0)
     http_parser.rb (0.6.0)
-    json (1.8.2)
+    json (1.8.3)
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
     minitest (5.5.1)

data/README.md

@@ -18,17 +18,17 @@ Or install it yourself as:
 
 ## Usage
 
-**Third-party API Keys required:
+**Third-party API Keys required:**
 
 - Twitter: https://dev.twitter.com
-  * Create a new app and set the permissions to *read and write
+  * Create a new app and set the permissions to *read and write*
 - Flickr: https://www.flickr.com/services/apps/create/apply
 
 Create a new instance of each config class in config/config.rb
 
 (name/type)
 
-**TwitterConfig
+**TwitterConfig**
 
 - consumer_key / String
 - consumer_secret / String
@@ -37,34 +37,30 @@ Create a new instance of each config class in config/config.rb
 - username / String
 - tweet_max_length / int
 
-**FlickrConfig
+**FlickrConfig**
 
 - api_key / String
 - shared_secret / String
 
-**TweetomatorConfig
+**TweetomatorConfig**
 
 - twitter_config / TwitterConfig
 - flickr_config / FlickrConfig
-- topics / Array (String)
-- blacklist / Array (String)
-- stop_words / Array (String)
-- delay_in_seconds int
+- topics / Array<String>
+- blacklist / Array<String>
+- stop_words / Array<String>
+- delay_in_seconds / int
 
 
 Create a new Tweetomator
 
 e.g.
 
-twitter_config = TwitterConfig.new([...])
-
-flickr_config = FlickrConfig.new([...])
-
-tweetomator_config = TweetomatorConfig.new(twitter, flickr, [...])
-
-tweetomator = Tweetomator.new(tweetomator_config)
-
-tweetomator.run
+    twitter_config = TwitterConfig.new([...])
+    flickr_config = FlickrConfig.new([...])
+    tweetomator_config = TweetomatorConfig.new(twitter, flickr, [...])
+    tweetomator = Tweetomator.new(tweetomator_config)
+    tweetomator.run
 
 ## Contributing
 

data/lib/clients/flickr_client.rb

@@ -16,6 +16,6 @@ class FlickrClient
   end
 
   def search(query)
-    flickr.photos.search(tags: query, min_upload_date: Fixed::MIN_UPLOAD_DATE)
+    flickr.photos.search(tags: query, min_upload_date: Fixed::MIN_UPLOAD_DATE, safe_search: 1)
   end
 end

data/lib/{composer.rb → composers/random_composer.rb}

@@ -1,7 +1,7 @@
 require 'cgi'
-require_relative 'tweet'
+require_relative '../tweet'
 
-class Composer
+class RandomComposer
   def initialize(tweet_finder, emoji_finder, blacklist, twitter_client, max_length)
     @tweet_finder = tweet_finder
     @emoji_finder = emoji_finder

data/lib/finders/emoji_finder.rb

@@ -1,5 +1,3 @@
-require 'open-uri'
-
 class EmojiFinder
   def find
     [(127744..127775),

data/lib/tweetomator.rb

@@ -3,7 +3,7 @@ require 'twitter'
 require 'rufus-scheduler'
 require_relative 'tweet'
 require_relative 'tweetomator'
-require_relative 'composer'
+require_relative 'composers/random_composer'
 require_relative 'config/config'
 require_relative 'finders/tweet_finder'
 require_relative 'finders/flickr_findr'
@@ -39,7 +39,7 @@ class Tweetomator
     flickr_client = FlickrClient.new(config.flickr_config)
     @flickr_finder = FlickrFindr.new(flickr_client)
     emoji_finder = EmojiFinder.new
-    @composer = Composer.new(@tweet_finder, emoji_finder, config.blacklist, @twitter_client, config.twitter_config.tweet_max_length)
+    @random_composer = RandomComposer.new(@tweet_finder, emoji_finder, config.blacklist, @twitter_client, config.twitter_config.tweet_max_length)
     @downloader = Downloader.new
     @scheduler = Rufus::Scheduler.new
   end
@@ -56,12 +56,12 @@ class Tweetomator
   end
 
   def tweet!
-    tweet = @composer.compose
+    tweet = @random_composer.compose
     tweet.post!
   end
 
   def tweet_with_image!
-    tweet = @composer.compose
+    tweet = @random_composer.compose
     flickr_query = @tweet_finder.find_random_word(tweet.hashtag)
     image_uri = @flickr_finder.find(flickr_query)
     image_local = @downloader.download(image_uri, 'image')

data/lib/tweetomator/version.rb

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

data/test/lib/{composer_test.rb → composers/random_composer_test.rb}

@@ -1,8 +1,8 @@
 require 'minitest/autorun'
-require_relative '../../lib/composer'
-require_relative '../../lib/tweetomator'
+require_relative '../../../lib/composers/random_composer'
+require_relative '../../../lib/tweetomator'
 
-class TestComposer < Minitest::Unit::TestCase
+class TestRandomComposer < Minitest::Unit::TestCase
   def setup
     tweet_1 = 'I just backedeyeyeyey Potato Salad on @Kickstarter kck.st/1pLytCe'
     tweet_2 = 'I HAVE NYANED FOR 48.9 SECONDS! http://nyan.cat  via @nyannyancat'
@@ -15,26 +15,21 @@ class TestComposer < Minitest::Unit::TestCase
     mock_tweet_client = Minitest::Mock.new
     @blacklist = %w(sri lanka)
     @max_length = 100
-    @composer = Composer.new(mock_tweet_finder, mock_emoji_finder, @blacklist, mock_tweet_client, @max_length)
+    @random_composer = RandomComposer.new(mock_tweet_finder, mock_emoji_finder, @blacklist, mock_tweet_client, @max_length)
   end
 
   def test_that_tweet_is_short_enough
-    tweet = @composer.compose
+    tweet = @random_composer.compose
     assert tweet.with_hashtag.length <= @max_length, true
   end
 
   def test_that_stop_words_are_removed
-    tweet = @composer.compose
+    tweet = @random_composer.compose
     refute tweet.with_hashtag.split.any? { |word| @blacklist.include?(word) }, true
   end
 
   def test_that_links_are_removed
-    tweet = @composer.compose
+    tweet = @random_composer.compose
     refute tweet.with_hashtag.split.any? { |word| %w(kck.st/1pLytCe http://nyan.cat).include?(word) }, true
   end
-
-  def test_that_emoji_is_trololo
-    tweet = @composer.compose
-    assert tweet.with_hashtag.split.any? { |word| word == ':trollface:' }, true
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tweetomator
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Nat Young
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-01 00:00:00.000000000 Z
+date: 2015-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -110,7 +110,7 @@ files:
 - Rakefile
 - lib/clients/flickr_client.rb
 - lib/clients/twitter_client.rb
-- lib/composer.rb
+- lib/composers/random_composer.rb
 - lib/config/config.rb
 - lib/finders/emoji_finder.rb
 - lib/finders/flickr_findr.rb
@@ -119,7 +119,7 @@ files:
 - lib/tweet.rb
 - lib/tweetomator.rb
 - lib/tweetomator/version.rb
-- test/lib/composer_test.rb
+- test/lib/composers/random_composer_test.rb
 - test/lib/finders/flickr_findr_test.rb
 - test/lib/finders/tweet_finder_test.rb
 - tweetomator.gemspec
@@ -148,6 +148,6 @@ signing_key:
 specification_version: 4
 summary: Twitter automation for the time poor.
 test_files:
-- test/lib/composer_test.rb
+- test/lib/composers/random_composer_test.rb
 - test/lib/finders/flickr_findr_test.rb
 - test/lib/finders/tweet_finder_test.rb