cinch-twitter 1.0.4 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d69b378bedbf627bd39cdaf33ccb5fa07344375
-  data.tar.gz: 80b3210196ce6d6e7122decbffcc2ada839e20b4
+  metadata.gz: 5c78167e8dea6ad52e63fde4d37a76883fb6dbc8
+  data.tar.gz: 108e50c4e34bca3660891fc63b09af43240c9b79
 SHA512:
-  metadata.gz: 858ddf3cef0223bb6a139705b112edd644ead6f51b114dc3d60a8ad09eac09e720c9e9d3ab9a53e50a7b883c9c199bdf4bc42a5de4632b3f51235bdbcdaa8d55
-  data.tar.gz: e07b9e4543de97dd496a3b50aeb395002b52efb97da0f0dc95de6bb0b279daa42b1a901c849503412c6bab310ffeeba0642ad91f65776a00198a44feb906b8b1
+  metadata.gz: cd97aa5ab04f56e044b00e0e52e063f4f23ede8851e7f6cc739144efc258bdcd23a05e0e0a11967804a79309548a13149f9e784e2f054bf4fa0ffa6674adda2e
+  data.tar.gz: 2429229aae5a5234f8271eeebfb01eb49fa691aa779873114f01bbce34346bfb9230f0dd77ea2957a65bc9a92037d88aed4d3daca402d5b6ae6959414dae18de

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# Version 2.0.2
+  * Brings everything up to the latest version of the Twitter gem. Portions rewritten by @Namasteh.
+
 # Version 1.0.4
   * Fixes an issue where retweeted statuses' have no user associated with them
 

data/README.md

@@ -47,8 +47,8 @@ Example:
       access_keys: { 
         consumer_key: "XXXXXXX", 
         consumer_secret: "XXXXXXX", 
-        oauth_token: "XXXXXXX", 
-        oauth_token_secret: "XXXXXXX" 
+        access_token: "XXXXXXX", 
+        access_token_secret: "XXXXXXX" 
       } 
     }
 

data/cinch-twitter.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |spec|
   
   spec.name          = "cinch-twitter"
   spec.version       = Cinch::Twitter::VERSION
-  spec.authors       = ["Mark Seymour"]
-  spec.email         = ["mark.seymour.ns@gmail.com"]
+  spec.authors       = ["Mark Seymour" "Richard Banks"]
+  spec.email         = ["mark.seymour.ns@gmail.com" "namaste@rawnet.net"]
   spec.description   = %q{A Twitter plugin for Cinch.}
   spec.summary       = %q{A Cinch plugin for accessing Twitter.}
   spec.homepage      = "https://github.com/mseymour/cinch-twitter"
@@ -20,11 +20,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # Gem dependencies
-  spec.add_dependency 'twitter', '~> 4.8'
-  spec.add_dependency 'cinch', '~> 2.0'
-  spec.add_dependency "oj", "~> 2.0.14"
+  spec.add_dependency 'twitter', '~> 5.8'
+  spec.add_dependency 'cinch', '~> 2.1'
+  spec.add_dependency 'oj', '~> 2.0'
+  spec.add_dependency 'time-lord', '~> 1.0'
 
   # Development dependencies
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency 'rake', '~> 0'
 end

data/lib/cinch/plugins/twitter.rb

@@ -3,106 +3,120 @@
 require "oj"
 require "twitter"
 require "cgi"
+require "time-lord"
 
 module Cinch
   module Plugins
     class Twitter
       include Cinch::Plugin
-      
-      TWITTER_URL_BASE = 'https://twitter.com/'
-      ERROR_TPL = Cinch::Formatting.format(:bold, 'Uhoh! »') + ' %s'
-      
-      set(
-        plugin_name: "Twitter",
-        help: "Access Twitter from the comfort of your IRC client! Usage:\n* `!tw <username><-D>` - Gets the latest tweet of the specified user, or the tweet 'D' tweets back, between 1 and 20.\n* `!tw #[id]` - Gets the tweet at the specified ID\n* `?tw [username]` - Gets the specified user's Twitter profile\n* `?ts [term]` - Searches for three of the most recent tweets regarding the specified query\n\nShorthand: `@[username]<+D>`, @#[id]",
-        required_options: [:access_keys])
-      
-      def initialize *args
+
+      set :plugin_name, 'twitter'
+      set :help, <<-USAGE.gsub(/^ {6}/, '')
+        A Twitter plugin for the bot!
+        Usage:
+        * !tw <handle(-D)>: Fetch the latest Tweet from the bot or include an offset (I.E. !tw someuser-2) to fetch (-D) Tweets back (up to 19)
+        * @<handle(-D): Same as above, just shorthand.
+        * !t-search <terms>: Searches recent tweets containing your terms and returns the most recent three. You can search hash tags or do 'to:<handle>' to get the most recent tweets sent to that handle.
+        USAGE
+
+      def initialize(*args)
         super
-        ::Twitter.configure do |c|
-          c.consumer_key = config[:access_keys][:consumer_key]
-          c.consumer_secret = config[:access_keys][:consumer_secret]
-          c.oauth_token = config[:access_keys][:oauth_token]
-          c.oauth_token_secret = config[:access_keys][:oauth_token_secret]
+          @client = twitter_client
         end
-      end
-      
+
       match /tw (\w+)(?:-(\d+))?$/, method: :execute_tweet
       match /(\w+)(?:-(\d+))?$/, method: :execute_tweet, prefix: /^@/
-      def execute_tweet m, username, offset
+
+      def execute_tweet(m, username, offset)
         offset ||= 0
-        
-        user = ::Twitter.user(username)
-        
-        return m.reply ERROR_TPL % "#{user.screen_name}'s tweets are protected." if user.protected?
-        return m.reply "#{user.screen_name} is lame because they haven't tweeted yet!" if user.status.nil?
-        
-        # Getting the user's 20 latest tweets if our offset is greater than 0:
+
+        user = @client.user(username)
+
+        return m.reply "This user's tweets are protected!" if user.protected?
+        return m.reply "This user hasn't tweeted yet!" if user.status.nil?
+
         if offset.to_i > 0
-          tweets = ::Twitter.user_timeline(user)
-          return m.reply ERROR_TPL % "You cannot backtrack more than #{tweets.count.pred} tweets before the current tweet." if offset.to_i > tweets.count.pred
+          tweets = @client.user_timeline(user)
+          return m.reply "You can not backtrack more than #{tweets.count.pred} tweets before the current tweet!" if offset.to_i > tweets.count.pred
           tweet = tweets[offset.to_i]
-        # Otherwise, just get the latest tweet from the user object.
+
         else
           tweet = user.status
         end
         m.reply format_tweet(tweet)
       rescue ::Twitter::Error::NotFound => e
-        m.reply ERROR_TPL % "#{username} doesn't exist."
+        m.reply "#{username} doesn't exist."
       rescue ::Twitter::Error => e
-        m.reply ERROR_TPL % "#{e.message.gsub(/user/i, username)}. (#{e.class})"
+        m.reply "#{e.message.gsub(/user/i, username)}. (#{e.class})"
+      end
+
+      match /t-search (.+)/, method: :execute_search
+
+      def execute_search(m, term)    
+        @client.search("#{term}", :result_type => "recent").take(3).each do |tweet|
+        m.reply format_tweet(tweet)
       end
-      
-      
+    end
+
       match /tw #(\d+)$/, method: :execute_id
       match /#(\d+)$/, method: :execute_id, prefix: /^@/
-      def execute_id m, id
-        tweet = ::Twitter.status(id)
-        
-        #return m.reply ERROR_TPL % "#{user.screen_name}'s tweets are protected." if user.protected?
-        
+
+      def execute_id(m, id)
+        tweet = @client.status(id)
+
         m.reply format_tweet(tweet)
       rescue ::Twitter::Error::NotFound => e
-        m.reply ERROR_TPL % "#{id} doesn't exist."
+        m.reply "#{id} doesn't exist."
       rescue ::Twitter::Error => e
-        m.reply ERROR_TPL % "#{e.message.gsub(/user/i, id)}. (#{e.class})" 
-      end
-      
+        m.reply "#{e.message.gsub(/user/i, id)}. (#{e.class})"
+    end
+
       private
-      
-      def format_tweet tweet
+
+      def format_tweet(tweet)
         # Username (and retweeted username if applicable)
         head = []
         head << tweet.user.screen_name
         if tweet.retweet?
           head << (tweet.retweeted_status.user.nil? ? "(RT)" : ("(RT from %s)" % tweet.retweeted_status.user.screen_name))
         end
-        
+
         # Tweet tweet
         body = expand_uris(CGI.unescapeHTML(!!tweet.retweet? ? tweet.retweeted_status.full_text : tweet.full_text).gsub("\n", " ").squeeze(" "), tweet.urls)
-        
+
         # Metadata
+        ttime = tweet.created_at
         tail = []
-        tail << tweet.created_at.strftime("at %b %-d %Y, %-l:%M %p %Z")
+        tail << ttime.ago.to_words
         tail << "from #{tweet.place.full_name}" if !!tweet.place
-        tail << "via #{tweet.source.gsub( %r{</?[^>]+?>}, '' )}"
-        
+        tail << "via #{tweet.source.gsub( %r{</?[^>]+?>}, "" )}"
+
         # URLs for tweet and replied to:
         urls = []
-        urls << "#{TWITTER_URL_BASE}#{tweet.user.screen_name}/status/#{tweet.id}"
+        urls << "https://twitter.com/#{tweet.user.screen_name}/status/#{tweet.id}"
         urls << "in reply to #{format_reply_url(tweet.in_reply_to_screen_name, tweet.in_reply_to_status_id)}" if tweet.reply?
-        
-        [Format(:bold, [*head, '»'] * ' '), body, ['(', tail * ' · ', ')'].join, urls * ' '].join(' ')
+
+        [Format(:bold, [*head, "»"] * " "), body, ["(", tail * " · ", ")"].join, urls * " "].join(" ")
       end
-      
+
       def format_reply_url(username, id)
-        "#{TWITTER_URL_BASE}#{username}#{"/status/#{id}" if !!id}"
+        "https://twitter.com/#{username}#{"/status/#{id}" if !!id}"
       end
-      
+
       def expand_uris(t, uris)
-        uris.each_with_object(t) {|entity,tweet| tweet.gsub!(entity.url, entity.expanded_url) }
+        uris.each_with_object(t) {            |entity, tweet| tweet.gsub!(entity.url, entity.expanded_url)        }
+      end
+
+      def twitter_client          
+        ::Twitter::REST::Client.new do |c|
+          c.consumer_key =        config[:access_keys][:consumer_key]
+          c.consumer_secret =     config[:access_keys][:consumer_secret]
+          c.access_token =        config[:access_keys][:access_token]
+          c.access_token_secret = config[:access_keys][:access_token_secret]
+        end
       end
-      
     end
   end
 end
+
+

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

@@ -1,5 +1,5 @@
 module Cinch
   module Twitter
-    VERSION = "1.0.4"
+    VERSION = "2.0.2"
   end
 end

metadata

@@ -1,94 +1,108 @@
 --- !ruby/object:Gem::Specification
 name: cinch-twitter
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 2.0.2
 platform: ruby
 authors:
-- Mark Seymour
+- Mark SeymourRichard Banks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-04 00:00:00.000000000 Z
+date: 2014-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: twitter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.8'
+        version: '5.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.8'
+        version: '5.8'
 - !ruby/object:Gem::Dependency
   name: cinch
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: oj
+  name: time-lord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.14
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.14
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !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'
 description: A Twitter plugin for Cinch.
 email:
-- mark.seymour.ns@gmail.com
+- mark.seymour.ns@gmail.comnamaste@rawnet.net
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .document
-- .gitignore
+- ".document"
+- ".gitignore"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -107,18 +121,19 @@ 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.0.6
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: A Cinch plugin for accessing Twitter.
 test_files: []
+has_rdoc: