cinch-twitterstatus 1.0.1 → 1.1.0

data/.travis.yml

@@ -5,23 +5,23 @@ rvm:
 - 1.9.3
 env:
   global:
-  - secure: ! 'RYlcShCnPWh5tG/gHK2BSqxtBz/GWe66kTv9LBj0dhJAj+/aYxMCO4bnSXQ5
+  - secure: ! 'Yz/VAtfbXwk6JD/2/z6c2SGygNGELrF0dlZ/M5nOrDiKNm8lxpC6w19esGbB
 
-      XFAaRb4OIZ94uaKck1G4sY/crUmcvphNsKSpt8EemY1JL1JLPuoXFblJYPUZ
+      CYt8UtqylceJ2UxYngHLVH48oPb+A5fv21/jDJMqHeO/N4WjwQUOzBZXfZG6
 
-      XWAmMLvYBRmMxvjJgZ3NO0k5RRnTP35i2Fowsj4b3jIul7eJ6ys='
-  - secure: ! 'GKCjuQvI131Rbk5Dd5t4wrN1jP1K7A1wm0abIvWmoTgxOHUIcRwcQTzwrACX
+      lpugXIsT9Q10q0AsXry65YuzZtpY7VkVQUNSBYte7jTcWbLmIWQ='
+  - secure: ! 'CbdMyExVnyHfPQ+scSky8JIlqK0dU7idBrtvipQIA2dGfIIj0lzuUDEqvtAv
 
-      SOf3K7ep185d/q8h7EQ+BZ9DuGLA48c3dLhd1Nf1CplK8QfjZy4UbpZ6AAd1
+      +9A7Mw01ddxQ/tXdixHDBNOhp9Ddz+4/0OSMyIb/5uFy+l7b2B2K4A4R5crI
 
-      8JnB+si7lTYHNRW1YjMg239iOdGUyaK1bSrFk0iYXWUkS80LPnE='
-  - secure: ! 'T7gEZtRyUKS2mcrHpIUmBTMsPGJ5EWcYUQmiIHFch+cSR9hFBc1HvITa4W8M
+      RBc5W5rgzRLnDD7HL4BZMRDpx3sJRLcIH9S4bclXyjkzQ7yzVDc='
+  - secure: ! 'Pl14JkhwMe+HHi1Ht0znd0+TnSzdSGvtG4pX8+oSWuIyfTd3xfoj7Pf1S4P/
 
-      VJfA9qHWI7ybI/q5zJtxh7sXw9YSNntRveEFSWZSoOiRtxZa7Y+ZHoyS56bL
+      7SVnixq2gQh13OaL4Tj2sR6+AHz6n+onareFoKkZPSJuDRh6yXFfvKIdx4MV
 
-      6ttPIfaAPwqhc1IPJBWnoIJF83VNn6hUoVni5M72wGi+wptqAWo='
-  - secure: ! 'SzPZg486jGoOYKQoH9PAdtL91R6DxVKpu4wvBm5K4zMIKnUd7jOtfYs7Ukm5
+      l5lIJbSI4icPWOMk6ObMCzIb/m3m4Z/BG3O5E/6AcJDQa7rspL0='
+  - secure: ! 'Xrh52mNuRCf1kJHpZctrz3gfBZQ/rlC+qz/MlvZ9L7sm1CFSIoJdizrOYawt
 
-      FngWZo5MX5shTp32DCmgpKR9HBX4rxRxTzeriWRztQ22k59w6ftKlnmmEyLw
+      cKOyLfsLrcnJqGbq0s++cSQ2QDggEGxtVkMXxIw7dBFn2icZsKsTN5rh28UR
 
-      lHDU487H20FD7KqwTdHfufD8U1hLmQP8+xjLkEDyiIiJOnLAFfE='
+      W2TakLhFB8f+LQ+/P9PvV1wlSOJQRFItLjjOtcEoQVLi51Pwuzw='

data/README.md

@@ -6,7 +6,8 @@
 [![Coverage Status](https://coveralls.io/repos/bhaberer/cinch-twitterstatus/badge.png?branch=master)](https://coveralls.io/r/bhaberer/cinch-twitterstatus?branch=master)
 [![Code Climate](https://codeclimate.com/github/bhaberer/cinch-twitterstatus.png)](https://codeclimate.com/github/bhaberer/cinch-twitterstatus)
 
-Posts the content of a linked Tweet to the channel, can also follow users and post their tweets.
+Posts the content of a linked Tweet to the channel, can also follow users and
+post their tweets.
 
 ## Installation
 
@@ -32,28 +33,18 @@ For the gem to work alll you will need to is add the gem to your plugins:
       end
     end
 
-And, acquire Twitter credentials. They are simple to acquire, see https://dev.twitter.com/apps/new
+And, acquire Twitter credentials. They are simple to acquire,
+see https://dev.twitter.com/apps/new
 
-Once you have said credentials you will need to pass them to the Plugin's config like so:
+Once you have said credentials you will need to pass them to the Plugin's
+config like so:
 
-    c.plugins.options[Cinch::Plugins::TwitterStatus] = { :consumer_key    => 'consumer_key',
-                                                         :consumer_secret => 'consumer_secret',
-                                                         :oauth_token     => 'oauth_token',
-                                                         :oauth_secret    => 'oauth_secret' }
-
-Then post a link to a specific tweet and the bot should post the content of said tweet to the channel.
-
-### Watching Twitter Users ###
-
-If you have a twitter account that the bot should watch for new tweets, you can
-define it in the config as well:
-    
     c.plugins.options[Cinch::Plugins::TwitterStatus] = { consumer_key:    'consumer_key',
                                                          consumer_secret: 'consumer_secret',
-                                                         oauth_token:     'oauth_token',
-                                                         oauth_secret:    'oauth_secret',
-                                                         watchers:        { '#channel': ['twitteruser'] } }
+                                                         access_token:    'access_token',
+                                                         access_secret:   'access_secret' }
 
+Then post a link to a specific tweet and the bot should post the content of said tweet to the channel.
 
 ## Contributing
 

data/cinch-twitterstatus.gemspec

@@ -4,13 +4,13 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'cinch/plugins/twitterstatus/version'
 
 Gem::Specification.new do |gem|
-  gem.name          = "cinch-twitterstatus"
-  gem.version       = Cinch::Twitterstatus::VERSION
-  gem.authors       = ["Brian Haberer"]
-  gem.email         = ["bhaberer@gmail.com"]
+  gem.name          = 'cinch-twitterstatus'
+  gem.version       = Cinch::Plugins::TwitterStatus::VERSION
+  gem.authors       = ['Brian Haberer']
+  gem.email         = ['bhaberer@gmail.com']
   gem.description   = %q{Cinch IRC bot Plugin that access the Twitter API to post the content of linked twitter statuses to the channel.}
   gem.summary       = %q{Cinch Plugin to post tweets to channel.}
-  gem.homepage      = "https://github.com/bhaberer/cinch-twitterstatus"
+  gem.homepage      = 'https://github.com/bhaberer/cinch-twitterstatus'
   gem.license       = 'MIT'
 
   gem.files         = `git ls-files`.split($/)
@@ -18,11 +18,12 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'rspec'
-  gem.add_development_dependency 'coveralls'
-  gem.add_development_dependency 'cinch-test'
+  gem.add_development_dependency  'rake'
+  gem.add_development_dependency  'rspec'
+  gem.add_development_dependency  'coveralls'
+  gem.add_development_dependency  'cinch-test'
 
-  gem.add_dependency 'twitter',   '~> 4.8.1'
-  gem.add_dependency 'cinch',     '~> 2.0.0'
+  gem.add_dependency              'twitter',          '~> 5.7.1'
+  gem.add_dependency              'cinch',            '~> 2.0.12'
+  gem.add_dependency              'cinch-toolbox',    '~> 1.1.0'
 end

data/lib/cinch-twitterstatus.rb

@@ -1,2 +1,3 @@
+# -*- encoding: utf-8 -*-
 require 'cinch/plugins/twitterstatus/version'
-require 'cinch/plugins/twitterstatus/twitterstatus'
+require 'cinch/plugins/twitterstatus'

data/lib/cinch/plugins/twitterstatus.rb

@@ -0,0 +1,65 @@
+# -*- coding: utf-8 -*-
+require 'cinch'
+require 'cinch/toolbox'
+require 'twitter'
+
+module Cinch::Plugins
+  # Cinch Plugin to post twitter statuses
+  class TwitterStatus
+    include Cinch::Plugin
+
+    self.help = 'Just link to a specific twitter status and I will post the ' +
+                ' content of that tweet.'
+
+    listen_to :channel
+
+    def initialize(*args)
+      super
+      @client = twitter_client
+    end
+
+    def listen(m)
+      Cinch::Toolbox.extract_urls(m.message).each do |url|
+        if url.match(%r(^https?://mobile|w{3}?\.?twitter\.com/))
+          msg = format_tweet(url)
+          m.reply msg unless msg.nil?
+        end
+      end
+    rescue Twitter::Error::NotFound, Twitter::Error::Forbidden
+      debug 'User posted an invalid twitter status'
+    end
+
+    def format_tweet(url)
+      # Parse the url and get the relevant data
+      user, status = parse_twitter_url(url)
+
+      # Return blank if we didn't get a good user and status
+      return if user.nil? || status.nil?
+
+      tweet_text(user, status)
+    end
+
+    def tweet_text(user, status)
+      # Scrub the tweet for returns so we don't have multilined responses.
+      status.gsub!(/[\n]+/, ' ') if status.match(/\n/)
+      "@#{user} tweeted \"#{status}\""
+    end
+
+    private
+
+    def parse_twitter_url(url)
+      tweet_id = url[%r(statuse?s?/(\d+)/?), 1]
+      user     = url[%r(/?#?!?/([^\/]+)/statuse?s?), 1]
+      [user, @client.status(tweet_id).text]
+    end
+
+    def twitter_client
+      Twitter::REST::Client.new do |c|
+        c.consumer_key =        config[:consumer_key]
+        c.consumer_secret =     config[:consumer_secret]
+        c.access_token =        config[:access_token]
+        c.access_token_secret = config[:access_secret]
+      end
+    end
+  end
+end

data/lib/cinch/plugins/twitterstatus/version.rb

@@ -1,5 +1,9 @@
+# -*- encoding: utf-8 -*-
 module Cinch
-  module Twitterstatus
-    VERSION = "1.0.1"
+  module Plugins
+    # Versioning info
+    class TwitterStatus
+      VERSION = '1.1.0'
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cinch-twitterstatus
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-27 00:00:00.000000000 Z
+date: 2014-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.8.1
+        version: 5.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.8.1
+        version: 5.7.1
 - !ruby/object:Gem::Dependency
   name: cinch
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.12
+- !ruby/object:Gem::Dependency
+  name: cinch-toolbox
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 description: Cinch IRC bot Plugin that access the Twitter API to post the content
   of linked twitter statuses to the channel.
 email:
@@ -123,7 +139,7 @@ files:
 - Rakefile
 - cinch-twitterstatus.gemspec
 - lib/cinch-twitterstatus.rb
-- lib/cinch/plugins/twitterstatus/twitterstatus.rb
+- lib/cinch/plugins/twitterstatus.rb
 - lib/cinch/plugins/twitterstatus/version.rb
 - spec/cinch-twitterstatus_spec.rb
 - spec/spec_helper.rb

data/lib/cinch/plugins/twitterstatus/twitterstatus.rb

@@ -1,94 +0,0 @@
-# -*- coding: utf-8 -*-
-require 'cinch'
-require 'twitter'
-
-module Cinch::Plugins
-  class TwitterStatus
-    include Cinch::Plugin
-
-    self.help = 'Just link to a specific twitter status and I will post the content of that tweet.'
-
-    listen_to :channel
-    timer 15, method: :check_watched
-
-    def initialize(*args)
-      super
-      if config
-        Twitter.configure do |c|
-          c.consumer_key =        config[:consumer_key]
-          c.consumer_secret =     config[:consumer_secret]
-          c.oauth_token =         config[:oauth_token]
-          c.oauth_token_secret =  config[:oauth_secret]
-        end
-
-        if config[:watchers]
-          @watched = Hash.new
-          config[:watchers].each_pair do |chan, users|
-            @watched[chan] = Hash.new
-            users.each { |user| refresh_cache(chan, user) }
-          end
-        end
-      end
-    end
-
-    def check_watched
-      return unless @watched
-
-      @watched.keys.each do |chan|
-        @watched[chan].keys.each do |user|
-          begin 
-            # Just check the last tweet, if they are posting more than once
-            # every timer tick I don't want to spam the channel. 
-            tweet = Twitter::Client.new.user_timeline(user).first
-            unless @watched[chan][user].include?(tweet.id)
-              @watched[chan][user] << tweet.id
-              
-              msg = format_tweet(user, Twitter.status(tweet.id).text)
-              Channel(chan).send msg unless msg.nil?
-            end
-            refresh_cache(chan, user)
-          rescue Twitter::Error::NotFound
-            debug "You have set an invalid or protected user (#{user}) to watch, please correct this error"
-          end
-        end
-      end
-    end
-
-    def listen(m)
-      urls = URI.extract(m.message, ["http", "https"])
-      urls.each do |url|
-        if url.match(/^https?:\/\/mobile|w{3}?\.?twitter\.com/)
-          if tweet = url.match(/https?:\/\/mobile|w{3}?\.?twitter\.com\/?#?!?\/([^\/]+)\/statuse?s?\/(\d+)\/?/)
-            msg = format_tweet(tweet[1], Twitter.status(tweet[2]).text)
-            m.reply msg unless msg.nil?
-          end
-        end
-      end
-    rescue Twitter::Error::NotFound
-      debug "User posted an invalid twitter status"
-    rescue Twitter::Error::Forbidden
-      debug "User attempted to post a Protected Tweet or you have not set valid Twitter credentials."
-    end
-
-    private
-
-    def format_tweet(user, status)
-      # Return blank if we didn't get a good user and status
-      return if user.nil? || status.nil?
-
-      # Scrub the tweet for returns so we don't have multilined responses.
-      status.gsub!(/[\n]+/, " ") if status.match(/\n/)
-
-      return "@#{user} tweeted \"#{status}\""
-    end
-
-    def refresh_cache(chan, user)
-      @watched[chan][user] = []
-      Twitter::Client.new.user_timeline(user).each do |tweet|
-        @watched[chan][user] << tweet.id
-      end
-    rescue Twitter::Error::NotFound
-      debug "You have set an invalid or protected user (#{user}) to watch, please correct this error"
-    end
-  end
-end