cinch-twitter 0.3.13 → 1.0.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: e56ca49c5393538538557bc9f7431a5f003e22ca
+  data.tar.gz: bdf4f72769e54bc9525ee27e51bf2b4dc55c86e9
+SHA512:
+  metadata.gz: 04b57feaad9ddaa6adde77350c0e96d956067fdc4587413c61ba14e950e4248fbb835a653e35a47e77e0a15d6c3f12a5586183a48131a8abbc8865d8064f7771
+  data.tar.gz: 5ad0914a81075e66e470b1901c03038c8ec0d85dc8450a1c8adc7bc78aa0cf87b852363b552aaec6117cb3d0b2c30d069141259730c8520691cb8a88908de58b

data/.document

@@ -1,5 +1,5 @@
-lib/**/*.rb
-bin/*
-- 
-features/**/*.feature
-LICENSE.txt
+lib/**/*.rb
+bin/*
+- 
+features/**/*.feature
+LICENSE.txt

data/.gitignore

@@ -0,0 +1,18 @@
+*.gem
+*.rbc
+.DS_Store
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/CHANGELOG.md

@@ -1,28 +1,34 @@
-# Version 0.3.12 + 0.3.13
-  * Various fixes
-  * Fixing Gemfile's dependencies
-
-# Version 0.3.8 .. Version 0.3.11
-  * ?tw <nick> no longer raises an exception when status does not exist.
-
-# Version 0.3.7
-  * Another minor fix. Made https the standard for all links.
-
-# Version 0.3.6
-  * Query commands (?tw, ?ts) now only fire if the command is at the start of the line.
-
-# Version 0.3.4 + 0.3.5
-  * Removed useless addition of the bots nick for ENHANCE_YOUR_CALM and reworded message.
-  * Removed formatting for error messages since Cinch's Format() cannot seem to be accessible in the ErrorHandler module.
-
-# Version 0.3.3
-  * Various updates and fixes
-
-# Version 0.3.0
-  * The plugin now requires Twitter 3.0.0 and above.
-
-# Version 0.2.0
-  * The plugin can now be included via `Cinch::Plugins::Twitter`.
-
-# Version 0.1.0
-  * Initial release
+# Version 1.0.0
+  * Major rewrite from the ground up
+  * Uses Twitter gem 4.8 (API v.1.1)
+  * Removes ?ts and ?tw commands (twitter search and twitter user info respectively)
+  * Your OAuth and access keys can still be entered the same way as before in config
+
+# Version 0.3.12 + 0.3.13
+  * Various fixes
+  * Fixing Gemfile's dependencies
+
+# Version 0.3.8 .. Version 0.3.11
+  * ?tw <nick> no longer raises an exception when status does not exist.
+
+# Version 0.3.7
+  * Another minor fix. Made https the standard for all links.
+
+# Version 0.3.6
+  * Query commands (?tw, ?ts) now only fire if the command is at the start of the line.
+
+# Version 0.3.4 + 0.3.5
+  * Removed useless addition of the bots nick for ENHANCE_YOUR_CALM and reworded message.
+  * Removed formatting for error messages since Cinch's Format() cannot seem to be accessible in the ErrorHandler module.
+
+# Version 0.3.3
+  * Various updates and fixes
+
+# Version 0.3.0
+  * The plugin now requires Twitter 3.0.0 and above.
+
+# Version 0.2.0
+  * The plugin can now be included via `Cinch::Plugins::Twitter`.
+
+# Version 0.1.0
+  * Initial release

data/Gemfile

@@ -1,18 +1,4 @@
-source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
-gem 'activesupport', '>= 3.0.0'
-gem 'twitter', '~> 3.0'
-gem 'cinch', '~> 2.0.3'
-
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-group :development do
-  #gem "shoulda", ">= 0"
-  gem "yard", "~> 0.7"
-  gem "rdoc", "~> 3.12"
-  gem "bundler", ">= 1.0.0"
-  gem "jeweler", "~> 1.8.4"
-  #gem "simplecov", ">= 0"
-end
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in cinch-twitter.gemspec
+gemspec

data/LICENSE.txt

@@ -1,20 +1,22 @@
-Copyright (c) 2012 Mark Seymour
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+Copyright (c) 2013 Mark Seymour
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,61 +1,61 @@
-cinch-twitter
-=============
-
-A Cinch plugin for accessing Twitter, using [John Nunemaker's](https://github.com/jnunemaker) wonderful [Twitter gem](https://github.com/jnunemaker/twitter).
-
-Usage
------
-
-* `!tw <username><+D>` - Gets the latest tweet of the specified user, or the tweet 'D' tweets back, between 1 and 20.
-* `!tw #[id]` - Gets the tweet at the specified ID
-* `?tw [username]` - Gets the specified user's Twitter profile
-* `?ts [term]` - Searches for three of the most recent tweets regarding the specified query
-
-Shorthand commands are also available: 
-* `@[username]<+D>`, `@#[id]`
-
-If for instance, an error occurs (such as a timeout, an account is protected, or can't be found), the plugin will send a notice with an informative message.
-
-Requiring and including the plugin
-----------------------------------
-    require 'cinch/plugins/twitter'
-    # ...
-    Bot.config {|c|
-      # ...
-      c.plugins.plugins << Cinch::Plugins::Twitter
-
-Configuration
--------------
-
-To configure the plugin, you must insert your access keys for the client.
-
-To retrieve your access keys and `oauth` tokens, if you already have an application set up, please visit https://dev.twitter.com/apps, otherwise visit https://dev.twitter.com/apps/new and follow the instructions.
-
-Example:
-
-    c.plugins.options[Cinch::Plugins::Twitter::Client] = { 
-      access_keys: { 
-        consumer_key: "XXXXXXX", 
-        consumer_secret: "XXXXXXX", 
-        oauth_token: "XXXXXXX", 
-        oauth_token_secret: "XXXXXXX" 
-      } 
-    }
-
-Contributing to cinch-twitter
------------------------------
- 
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
-* Fork the project.
-* Start a feature/bugfix branch.
-* Commit and push until you are happy with your contribution.
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
-
-Copyright
----------
-
-Copyright (c) 2012 Mark Seymour. See LICENSE.txt for
-further details.
-
+# Cinch::Twitter
+
+A Cinch plugin for accessing Twitter, using [Erik Michaels-Ober's](https://github.com/sferik/) wonderful [Twitter gem](https://github.com/sferik/twitter).
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+    gem 'cinch-twitter'
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install cinch-twitter
+
+## Usage
+
+### Bot commands
+
+* `!tw <username><+D>` - Gets the latest tweet of the specified user, or the tweet 'D' tweets back, between 1 and 20.
+* `!tw #[id]` - Gets the tweet at the specified ID
+
+Shorthand commands are also available: 
+* `@[username]<+D>`, `@#[id]`
+
+If for instance, an error occurs (such as a timeout, an account is protected, or can't be found), the plugin will send a message to the channel with an informative message.
+
+### Requiring and including the plugin
+    require 'cinch/plugins/twitter'
+    # ...
+    Bot.config {|c|
+      # ...
+      c.plugins.plugins << Cinch::Plugins::Twitter
+
+### Plugin Configuration
+
+To configure the plugin, you must insert your access keys for the client.
+
+To retrieve your access keys and `oauth` tokens, if you already have an application set up, please visit https://dev.twitter.com/apps, otherwise visit https://dev.twitter.com/apps/new and follow the instructions.
+
+Example:
+
+    c.plugins.options[Cinch::Plugins::Twitter::Client] = { 
+      access_keys: { 
+        consumer_key: "XXXXXXX", 
+        consumer_secret: "XXXXXXX", 
+        oauth_token: "XXXXXXX", 
+        oauth_token_secret: "XXXXXXX" 
+      } 
+    }
+
+## Contributing
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request

data/Rakefile

@@ -1,47 +1 @@
-# encoding: utf-8
-
-require 'rubygems'
-require 'bundler'
-begin
-  Bundler.setup(:default, :development)
-rescue Bundler::BundlerError => e
-  $stderr.puts e.message
-  $stderr.puts "Run `bundle install` to install missing gems"
-  exit e.status_code
-end
-require 'rake'
-
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "cinch-twitter"
-  gem.homepage = "http://github.com/mseymour/cinch-twitter"
-  gem.license = "MIT"
-  gem.summary = %Q{A Cinch plugin for accessing Twitter.}
-  gem.description = %Q{A Twitter plugin for Cinch.}
-  gem.email = "mark.seymour.ns@gmail.com"
-  gem.authors = ["Mark Seymour"]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
-
-=begin require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
-require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-  test.rcov_opts << '--exclude "gems/*"'
-end
-
-task :default => :test
-=end
-
-require 'yard'
-YARD::Rake::YardocTask.new
+require "bundler/gem_tasks"

data/cinch-twitter.gemspec

@@ -1,71 +1,30 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = "cinch-twitter"
-  s.version = "0.3.13"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Mark Seymour"]
-  s.date = "2012-10-08"
-  s.description = "A Twitter plugin for Cinch."
-  s.email = "mark.seymour.ns@gmail.com"
-  s.extra_rdoc_files = [
-    "CHANGELOG.md",
-    "LICENSE.txt",
-    "README.md"
-  ]
-  s.files = [
-    ".document",
-    "CHANGELOG.md",
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE.txt",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "cinch-twitter.gemspec",
-    "lib/cinch/plugins/twitter.rb",
-    "lib/cinch/plugins/twitter/error_handler.rb",
-    "lib/cinch/plugins/twitter/formatter.rb",
-    "lib/cinch/plugins/twitter/tweet_handler.rb"
-  ]
-  s.homepage = "http://github.com/mseymour/cinch-twitter"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
-  s.summary = "A Cinch plugin for accessing Twitter."
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activesupport>, [">= 3.0.0"])
-      s.add_runtime_dependency(%q<twitter>, ["~> 3.0"])
-      s.add_runtime_dependency(%q<cinch>, ["~> 2.0.3"])
-      s.add_development_dependency(%q<yard>, ["~> 0.7"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
-    else
-      s.add_dependency(%q<activesupport>, [">= 3.0.0"])
-      s.add_dependency(%q<twitter>, ["~> 3.0"])
-      s.add_dependency(%q<cinch>, ["~> 2.0.3"])
-      s.add_dependency(%q<yard>, ["~> 0.7"])
-      s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, [">= 1.0.0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-    end
-  else
-    s.add_dependency(%q<activesupport>, [">= 3.0.0"])
-    s.add_dependency(%q<twitter>, ["~> 3.0"])
-    s.add_dependency(%q<cinch>, ["~> 2.0.3"])
-    s.add_dependency(%q<yard>, ["~> 0.7"])
-    s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, [">= 1.0.0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-  end
-end
-
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'cinch/plugins/twitter/version'
+
+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.description   = %q{A Twitter plugin for Cinch.}
+  spec.summary       = %q{A Cinch plugin for accessing Twitter.}
+  spec.homepage      = "https://github.com/mseymour/cinch-twitter"
+  spec.license       = "MIT"
+
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  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"
+
+  # Development dependencies
+  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "rake"
+end

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

@@ -0,0 +1,5 @@
+module Cinch
+  module Twitter
+    VERSION = "1.0.0"
+  end
+end

data/lib/cinch/plugins/twitter.rb

@@ -1,83 +1,101 @@
-# coding: utf-8
-
-require 'twitter'
-require 'active_support/core_ext/object/blank'
-require 'active_support/core_ext/array/conversions'
-require 'cinch/plugins/twitter/tweet_handler'
-
-module Cinch
-  module Plugins
-    class Twitter
-      include Cinch::Plugin
-      #include Twitter::TweetHandler
-
-      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)
-        super
-        keys = config[:access_keys]
-        ::Twitter.configure do |c|
-          c.consumer_key = keys["consumer_key"]
-          c.consumer_secret = keys["consumer_secret"]
-          c.oauth_token = keys["oauth_token"]
-          c.oauth_token_secret = keys["oauth_token_secret"]
-        end
-      end
-
-      def is_notice?(m)
-        m.type == :notice ? true : false
-      end
-
-
-      match /tw$/, method: :execute_tweet
-      match /tw (\w+)(?:-(\d+))?$/, method: :execute_tweet
-      match /^@(\w+)(?:-(\d+))?$/, method: :execute_tweet, use_prefix: false
-      def execute_tweet(m, username = nil, nth_tweet = nil)
-        options = {}
-        options[:username] = username unless username.nil?
-        options[:nth_tweet] = nth_tweet unless nth_tweet.nil?
-        result = TweetHandler.tweet_by_username(options)
-        if is_notice?(result)
-          m.user.notice result.message
-        else
-          m.reply result.message
-        end
-      end
-
-      match /tw #(\d+)$/, method: :execute_id
-      match /^@#(\d+)$/, method: :execute_id, use_prefix: false
-      def execute_id(m, id)
-        result = TweetHandler.tweet_by_id(id: id)
-        if is_notice?(result)
-          m.user.notice result.message
-        else
-          m.reply result.message
-        end
-      end
-
-      match /^\?tw (\w+)$/, method: :execute_info, use_prefix: false
-      def execute_info(m, username)
-        result = TweetHandler.tweep_info(username: username)
-        if is_notice?(result)
-          m.user.notice result.message
-        else
-          m.reply result.message
-        end
-      end
-
-      match /^\?ts (.+)$/, method: :execute_search, use_prefix: false
-      def execute_search(m, term)
-        result = TweetHandler.search_by_term(term: term)
-        if is_notice?(result)
-          m.user.notice result.message
-        else
-          m.reply result.message
-        end
-      end
-
-    end
-  end
-end
+# coding: utf-8
+
+require "oj"
+require "twitter"
+
+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
+        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]
+        end
+      end
+      
+      match /tw (\w+)(?:-(\d+))?$/, method: :execute_tweet
+      match /(\w+)(?:-(\d+))?$/, method: :execute_tweet, prefix: /^@/
+      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:
+        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
+          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."
+      rescue ::Twitter::Error => e
+        m.reply ERROR_TPL % "#{e.message.gsub(/user/i, username)}. (#{e.class})"
+      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?
+        
+        m.reply format_tweet(tweet)
+      rescue ::Twitter::Error::NotFound => e
+        m.reply ERROR_TPL % "#{id} doesn't exist."
+      rescue ::Twitter::Error => e
+        m.reply ERROR_TPL % "#{e.message.gsub(/user/i, id)}. (#{e.class})" 
+      end
+      
+      private
+      
+      def format_tweet tweet
+        # Username (and retweeted username if applicable)
+        head = []
+        head << tweet.user.screen_name
+        head << "(RT from %s)" % tweet.retweeted_status.user.screen_name if tweet.retweet?
+        
+        # Tweet tweet
+        body = !!tweet.retweet? ? tweet.retweeted_status.full_text : tweet.full_text
+        
+        # Metadata
+        tail = []
+        tail << tweet.created_at.strftime("at %b %-d %Y, %-l:%M %p %Z")
+        tail << "from #{tweet.place.full_name}" if !!tweet.place
+        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 << "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(' ')
+      end
+      
+      def format_reply_url(username, id)
+        "#{TWITTER_URL_BASE}#{username}#{"/status/#{id}" if !!id}"
+      end
+      
+    end
+  end
+end

metadata

@@ -1,176 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: cinch-twitter
 version: !ruby/object:Gem::Version
-  version: 0.3.13
-  prerelease: 
+  version: 1.0.0
 platform: ruby
 authors:
 - Mark Seymour
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-08 00:00:00.000000000 Z
+date: 2013-06-18 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: twitter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.8'
 - !ruby/object:Gem::Dependency
   name: cinch
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.3
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: oj
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.7'
-  type: :development
+        version: 2.0.14
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: 2.0.14
 - !ruby/object:Gem::Dependency
-  name: rdoc
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.8.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: '0'
 description: A Twitter plugin for Cinch.
-email: mark.seymour.ns@gmail.com
+email:
+- mark.seymour.ns@gmail.com
 executables: []
 extensions: []
-extra_rdoc_files:
-- CHANGELOG.md
-- LICENSE.txt
-- README.md
+extra_rdoc_files: []
 files:
 - .document
+- .gitignore
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
-- VERSION
 - cinch-twitter.gemspec
 - lib/cinch/plugins/twitter.rb
-- lib/cinch/plugins/twitter/error_handler.rb
-- lib/cinch/plugins/twitter/formatter.rb
-- lib/cinch/plugins/twitter/tweet_handler.rb
-homepage: http://github.com/mseymour/cinch-twitter
+- lib/cinch/plugins/twitter/version.rb
+homepage: https://github.com/mseymour/cinch-twitter
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 595335937
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A Cinch plugin for accessing Twitter.
 test_files: []
+has_rdoc: 

data/Gemfile.lock

@@ -1,37 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (3.0.0)
-    cinch (2.0.3)
-    faraday (0.8.1)
-      multipart-post (~> 1.1)
-    git (1.2.5)
-    jeweler (1.8.4)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-      rdoc
-    json (1.7.3)
-    multi_json (1.3.6)
-    multipart-post (1.1.5)
-    rake (0.9.2.2)
-    rdoc (3.12)
-      json (~> 1.4)
-    simple_oauth (0.1.8)
-    twitter (3.1.1)
-      faraday (~> 0.8)
-      multi_json (~> 1.3)
-      simple_oauth (~> 0.1.6)
-    yard (0.8.2.1)
-
-PLATFORMS
-  x86-mingw32
-
-DEPENDENCIES
-  activesupport (>= 3.0.0)
-  bundler (>= 1.0.0)
-  cinch (~> 2.0.3)
-  jeweler (~> 1.8.4)
-  rdoc (~> 3.12)
-  twitter (~> 3.0)
-  yard (~> 0.7)

data/VERSION

@@ -1 +0,0 @@
-0.3.13

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

@@ -1,36 +0,0 @@
-# coding: utf-8
-
-module Cinch
-  module Plugins
-    class Twitter
-      module ErrorHandler
-
-        class Warnings < StandardError
-          class TooManyTweets < Warnings; end;
-          class NoTweets < Warnings; end;
-        end
-
-        def handle_error(ex, username)
-          params = {
-            username: username
-          }
-
-        exceptions = {
-          ::Twitter::Error::BadRequest => "Bad request!",
-          ::Twitter::Error::Unauthorized => "%<username>s's account seems to be protected.",
-          ::Twitter::Error::Forbidden => "Suspended!",
-          ::Twitter::Error::NotFound => "The account \"%<username>s\" seems to be not found!",
-          ::Twitter::Error::NotAcceptable => "An invalid format is specified in the search request.",
-          ::Twitter::Error::EnhanceYourCalm => "Enhance your calm. I am being rate limited.",
-          ::Twitter::Error::InternalServerError => "Something seems to be broken! Please try again in a minute.",
-          ::Twitter::Error::BadGateway => "Twitter seems to be down, or is being upgraded. Please try again in a minute.",
-          ::Twitter::Error::ServiceUnavailable => "Twitter is currently under heavy load. Please try again in a few minutes, and hopefully it'll clear up.",
-          Warnings::TooManyTweets => "You cannot backtrack past 20 tweets.",
-          Warnings::NoTweets => "%<username>s is lame for creating an account and not tweeting yet!"}
-
-          "Uhoh! · #{exceptions[ex.class]} (#{ex.message})" % params;
-        end
-      end
-    end
-  end
-end

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

@@ -1,78 +0,0 @@
-# coding: utf-8
-require 'cgi'
-require 'cinch/formatting'
-
-module Cinch
-  module Plugins
-    class Twitter
-      module Formatter
-
-        def format_tweet(tweet)
-          tweet_text = expand_uris(tweet.full_text, tweet.urls)
-          parts, head, body, tail, urls = [], [], [], [], []
-          head = Cinch::Formatting.format(:bold,"#{tweet.user.screen_name} »")
-          body << CGI::unescapeHTML(tweet_text.gsub("\n", " ").squeeze(" "))
-          body << Cinch::Formatting.format(:aqua,"*twoosh*") if tweet.full_text.length == 140
-          tail << "From #{tweet.place.full_name}" if !tweet.place.blank?
-          tail << "at #{tweet.created_at.strftime("%B %-d, %Y, %-I:%M%P")}"
-          tail << "via #{tweet.source.gsub( %r{</?[^>]+?>}, '' )}"
-          urls << "https://twitter.com/#{tweet.user.screen_name}"
-          urls << Cinch::Formatting.format(:grey,"in reply to") if !tweet.in_reply_to_screen_name.blank?
-          urls << "https://twitter.com/#{tweet.in_reply_to_screen_name}#{"/statuses/#{tweet.in_reply_to_status_id.to_s}" if !tweet.in_reply_to_status_id.blank?}" if !tweet.in_reply_to_screen_name.blank?
-          parts = [head, body, ["(", tail.join(" "), ")"].join, urls].flatten
-          parts.join(" ")
-        end
-
-        def format_search(tweet)
-          tweet_text = expand_uris(tweet.full_text, tweet.urls)
-          parts, head, body, tail, urls = [], [], [], [], []
-          head = Cinch::Formatting.format(:bold,"#{tweet.from_user} »")
-          body << CGI::unescapeHTML(tweet_text.gsub("\n", " ").squeeze(" "))
-          body << Cinch::Formatting.format(:aqua,"*twoosh*") if tweet.full_text.length == 140
-          tail << "at #{tweet.created_at.strftime("%B %-d, %Y, %-I:%M%P")}"
-          urls << "https://twitter.com/#{tweet.from_user}"
-          parts = [head, body, ["(", tail.join(" "), ")"].join, urls].flatten
-          parts.join(" ")
-        end
-
-        def format_tweep_info(tweep)
-          head =  "#{Cinch::Formatting.format(:aqua,tweep.name)}" + Cinch::Formatting.format(:silver," (#{tweep.screen_name})") + Cinch::Formatting.format(:grey," - #{tweep.url ? "#{tweep.url} " : ''}https://twitter.com/#{tweep.screen_name}")
-          bio = ""
-          bio = Cinch::Formatting.format(:aqua,"\"#{tweep.description.strip}\"") if !tweep.description.blank?
-          location = ""
-          location = "They are from #{Cinch::Formatting.format(:aqua,tweep.location.strip)}" if !tweep.location.blank?
-          desc = [] << "has made #{tweep.statuses_count} tweets since #{tweep.created_at.strftime("%B %-d, %Y")}"
-          desc << "follows #{tweep.friends_count} tweeps" if tweep.friends_count > 0
-          desc << "has #{tweep.followers_count} followers" if tweep.followers_count > 0
-          desc << "has favourited #{tweep.favourites_count} tweets" if tweep.favourites_count > 0
-          desc << "is also in #{tweep.listed_count} lists" if tweep.listed_count > 0
-          flags = []
-          flags << "is actually a group-run account" if tweep.contributors_enabled?
-          flags << "is a translator for Twitter" if tweep.is_translator?
-          flags << "is verified" if tweep.verified?
-          flags << "would rather keep their life secret" if tweep.protected?
-          tweet = [] 
-          tweet_tail = []
-          if tweep.status
-            tweep_status_text = expand_uris(tweep.status.full_text, tweep.status.urls)
-            tweet << Cinch::Formatting.format(:aqua,"Their latest tweet:")
-            tweet << CGI::unescapeHTML(tweep_status_text.gsub("\n", " ").squeeze(" "))
-            tweet_tail << "from #{tweep.status.place.full_name}" if !tweep.status.place.blank?
-            tweet_tail << "at #{tweep.status.created_at.strftime("%B %-d, %Y, %-I:%M%P")}"
-          end
-
-          parts = [head, bio, location, desc, flags].reject(&:blank?).map {|e| e.is_a?(Array) ? "#{tweep.name} " + e.to_sentence + "." : e }
-          parts << [tweet, Cinch::Formatting.format(:silver,["(", tweet_tail.join(" "), ")"].join)].join(" ") if tweep.status
-          parts.join("\n")
-        end
-      
-        private
-        
-        def expand_uris t, uris
-          uris.each_with_object(t) {|entity,tweet| tweet.gsub!(entity.url, entity.expanded_url) }
-        end
-
-      end
-    end
-  end
-end

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

@@ -1,77 +0,0 @@
-# coding: utf-8
-require 'cinch/plugins/twitter/formatter'
-require 'cinch/plugins/twitter/error_handler'
-
-module Cinch
-  module Plugins
-    class Twitter
-      module TweetHandler
-        # Handler methods
-        class << self
-          include Formatter
-          include ErrorHandler
-
-          EXCEPTIONS = [::Twitter::Error, ErrorHandler::Warnings]
-          AMessage = Struct.new(:message,:type)
-
-          def tweet_by_username(params={})
-            params = { username: "Twitter", nth_tweet: 0 }.merge(params)
-            begin
-              raise Warnings::TooManyTweets if params[:nth_tweet].to_i > 20
-              timeline = ::Twitter.user_timeline params[:username], include_entities: true, include_rts: true, count: params[:nth_tweet].to_i.succ
-              raise Warnings::NoTweets if timeline.blank?
-              tweet = timeline.last
-              params[:username] = tweet.user.screen_name if !tweet.user.nil? # For proper case.
-
-              return "No tweets!" if timeline.blank?
-              return "Protected!" if tweet.user.protected?
-
-              AMessage.new format_tweet(tweet) # The fun starts here. If there is ever a problem, it'll bubble up here and be caught.
-
-            rescue *EXCEPTIONS => ex
-              AMessage.new handle_error(ex, params[:username]), :notice
-            end
-          end
-
-          def tweet_by_id(params={})
-            params = {id: 0 }.merge(params)
-            begin
-              tweet = ::Twitter.status params[:id], include_entities: true
-              params[:username] = tweet.user.screen_name if !tweet.user.nil? # For easy access.
-              AMessage.new format_tweet(tweet) # If there is ever a problem, it'll bubble up here and be caught.
-            rescue *EXCEPTIONS => ex
-              AMessage.new handle_error(ex, params[:username]), :notice
-            end
-          end
-
-          def tweep_info(params={})
-            params = {username: "Twitter"}.merge(params)
-            begin
-              tweep = ::Twitter.user params[:username], include_entities: true
-              AMessage.new format_tweep_info(tweep)
-            rescue *EXCEPTIONS => ex
-              AMessage.new handle_error(ex, params[:username]), :notice
-            end
-          end
-
-          def search_by_term(params={})
-            params = {term: "cat"}.merge(params)
-            begin
-              results = []
-              ::Twitter.search(params[:term], include_entities: true, rpp: 3, result_type: "recent").results.each {|status|
-                params[:username] = status.from_user
-                results << format_search(status)
-              }
-              results << "There are no results for \"#{params[:term]}\"." if results.empty?
-              AMessage.new results.join("\n")
-            rescue *EXCEPTIONS => ex
-              AMessage.new handle_error(ex, params[:username]), :notice
-            end
-          end
-
-        end
-
-      end
-    end
-  end
-end