twitter_ebooks 3.0.4 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8e2a04dcaab428f83c3814fb13fcd5688fb2a5c
-  data.tar.gz: 1013e835b68fdfe716e8728be804b2d808393f13
+  metadata.gz: 216097fd35b255ddec313b23165d2567ca7531c3
+  data.tar.gz: 2b54bf321d33cb4b9a72f86049283f1ac8eb4bc8
 SHA512:
-  metadata.gz: aabe87ca2f3291a7a61bc365f08b8ce61069bbe73fd1a2833df81951561cab34b01d40aea86c2fddd3ccfb76d2b7ca25618680c08af04642be1f42b1bdfcde1c
-  data.tar.gz: cb12aa96a44f773bb5ef65b3b7bf75fc52c275d7c752e83b4b2af2ddaf8860107f2674dc5faa68560ac49a1eb8b9d3ba68632989f054293ca0b15d21168d71d1
+  metadata.gz: 7fe62a7fa1c3ac656b8cd9f241a585cf0f12cbb8c3bd426cb2f0b41d62fc84e88ac0fed2a265280784ad79658b9afcfda5967fcfad2f3bbdd1ad02618a361453
+  data.tar.gz: 59dc22b0ba45436013e64a0047253eeeaf743e79a2a1f80fccd1533dc480a2365f94dd667962257b559802cd49c083ec1e84ad786da7c828a6808f7f0793ea05

data/README.md

@@ -17,7 +17,7 @@ A framework for building interactive twitterbots which respond to mentions/DMs.
 - Non-participating users in a mention chain will be dropped after a few tweets
 - [API documentation](http://rdoc.info/github/mispy/twitter_ebooks) and tests
 
-Note that 3.0 is not backwards compatible with 2.x, so upgrade carefully!
+Note that 3.0 is not backwards compatible with 2.x, so upgrade carefully! In particular, **make sure to regenerate your models** since the storage format changed.
 
 ## Installation
 
@@ -40,8 +40,8 @@ class MyBot < Ebooks::Bot
   def configure
     # Consumer details come from registering an app at https://dev.twitter.com/
     # Once you have consumer details, use "ebooks auth" for new access tokens
-    self.consumer_key = '' # Your app consumer key
-    self.consumer_secret = '' # Your app consumer secret
+    self.consumer_key = "" # Your app consumer key
+    self.consumer_secret = "" # Your app consumer secret
 
     # Users to block instead of interacting with
     self.blacklist = ['tnietzschequote']
@@ -87,7 +87,7 @@ MyBot.new("abby_ebooks") do |bot|
 end
 ```
 
-'ebooks start' will run all defined bots in their own threads. The easiest way to run bots in a semi-permanent fashion is with [Heroku](https://www.heroku.com); just make an app, push the bot repository to it, enable a worker process in the web interface and it ought to chug along merrily forever.
+`ebooks start` will run all defined bots in their own threads. The easiest way to run bots in a semi-permanent fashion is with [Heroku](https://www.heroku.com); just make an app, push the bot repository to it, enable a worker process in the web interface and it ought to chug along merrily forever.
 
 The underlying streaming and REST clients from the [twitter gem](https://github.com/sferik/twitter) can be accessed at `bot.stream` and `bot.twitter` respectively.
 

data/bin/ebooks

@@ -58,6 +58,7 @@ STR
     end
 
     FileUtils.cp_r(Ebooks::SKELETON_PATH, path)
+    FileUtils.mv(File.join(path, 'gitignore'), File.join(path, '.gitignore'))
 
     File.open(File.join(path, 'bots.rb'), 'w') do |f|
       template = File.read(File.join(Ebooks::SKELETON_PATH, 'bots.rb'))

data/lib/twitter_ebooks/archive.rb

@@ -50,7 +50,7 @@ module Ebooks
       @client = client || make_client
 
       if File.exists?(@path)
-        @tweets = JSON.parse(File.read(@path), symbolize_names: true)
+        @tweets = JSON.parse(File.read(@path, :encoding => 'utf-8'), symbolize_names: true)
         log "Currently #{@tweets.length} tweets for #{@username}"
       else
         @tweets.nil?

data/lib/twitter_ebooks/bot.rb

@@ -180,12 +180,17 @@ module Ebooks
       @seen_tweets ||= {}
 
       @username = username
+      @delay_range ||= 1..6
       configure
 
       b.call(self) unless b.nil?
       Bot.all << self
     end
 
+    def configure
+      raise ConfigurationError, "Please override the 'configure' method for subclasses of Ebooks::Bot."
+    end
+
     # Find or create the conversation context for this tweet
     # @param tweet [Twitter::Tweet]
     # @return [Ebooks::Conversation]
@@ -379,7 +384,8 @@ module Ebooks
         end
 
         log "Replying to @#{ev.user.screen_name} with: #{meta.reply_prefix + text}"
-        tweet = twitter.update(meta.reply_prefix + text, opts.merge({in_reply_to_status_id: ev.id}))
+        text = meta.reply_prefix + text unless text.match /@#{Regexp.escape ev.user.screen_name}/i
+        tweet = twitter.update(text, opts.merge(in_reply_to_status_id: ev.id))
         conversation(tweet).add(tweet)
         tweet
       else

data/lib/twitter_ebooks/version.rb

@@ -1,3 +1,3 @@
 module Ebooks
-  VERSION = "3.0.4"
+  VERSION = "3.0.5"
 end

data/skeleton/bots.rb

@@ -39,12 +39,12 @@ class MyBot < Ebooks::Bot
 
   def on_mention(tweet)
     # Reply to a mention
-    # reply(tweet, meta(tweet).reply_prefix + "oh hullo")
+    # reply(tweet, "oh hullo")
   end
 
   def on_timeline(tweet)
     # Reply to a tweet in the bot's timeline
-    # reply(tweet, meta(tweet).reply_prefix + "nice tweet")
+    # reply(tweet, "nice tweet")
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twitter_ebooks
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
 platform: ruby
 authors:
 - Jaiden Mispy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2014-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -260,11 +260,11 @@ files:
 - lib/twitter_ebooks/nlp.rb
 - lib/twitter_ebooks/suffix.rb
 - lib/twitter_ebooks/version.rb
-- skeleton/.gitignore
 - skeleton/Gemfile
 - skeleton/Procfile
 - skeleton/bots.rb
 - skeleton/corpus/.gitignore
+- skeleton/gitignore
 - skeleton/model/.gitignore
 - spec/bot_spec.rb
 - spec/data/0xabad1dea.json