cinch-twitter 0.2.0 → 0.3.1

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 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`.
 

data/Gemfile

@@ -3,7 +3,7 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 gem 'activesupport', '>= 3.0.0'
-gem 'twitter', '>= 2.5.0'
+gem 'twitter', '>= 3.0.0'
 gem 'cinch', '>= 2.0.3'
 
 # Add dependencies to develop your gem here.

data/Gemfile.lock

@@ -21,7 +21,7 @@ GEM
     rdoc (3.12)
       json (~> 1.4)
     simple_oauth (0.1.8)
-    twitter (2.5.0)
+    twitter (3.1.1)
       faraday (~> 0.8)
       multi_json (~> 1.3)
       simple_oauth (~> 0.1.6)
@@ -36,5 +36,5 @@ DEPENDENCIES
   cinch (>= 2.0.3)
   jeweler (~> 1.8.4)
   rdoc (~> 3.12)
-  twitter (>= 2.5.0)
+  twitter (>= 3.0.0)
   yard (~> 0.7)

data/README.md

@@ -12,14 +12,16 @@ Usage
 * `?ts [term]` - Searches for three of the most recent tweets regarding the specified query
 
 Shorthand commands are also available: 
-* `@[username]<+D>`, @#[id]
+* `@[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

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.1

data/cinch-twitter.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "cinch-twitter"
-  s.version = "0.2.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mark Seymour"]
-  s.date = "2012-06-28"
+  s.date = "2012-07-10"
   s.description = "A Twitter plugin for Cinch."
   s.email = "mark.seymour.ns@gmail.com"
   s.extra_rdoc_files = [
@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
 
     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>, [">= 2.5.0"])
+      s.add_runtime_dependency(%q<twitter>, [">= 3.0.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"])
@@ -51,7 +51,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
     else
       s.add_dependency(%q<activesupport>, [">= 3.0.0"])
-      s.add_dependency(%q<twitter>, [">= 2.5.0"])
+      s.add_dependency(%q<twitter>, [">= 3.0.0"])
       s.add_dependency(%q<cinch>, [">= 2.0.3"])
       s.add_dependency(%q<yard>, ["~> 0.7"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
@@ -60,7 +60,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<activesupport>, [">= 3.0.0"])
-    s.add_dependency(%q<twitter>, [">= 2.5.0"])
+    s.add_dependency(%q<twitter>, [">= 3.0.0"])
     s.add_dependency(%q<cinch>, [">= 2.0.3"])
     s.add_dependency(%q<yard>, ["~> 0.7"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])

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

@@ -8,11 +8,11 @@ module Cinch
       module Formatter
 
         def format_tweet(tweet)
-          tweet_text = expand_uris(tweet.text, tweet.attrs["entities"]["urls"])
+          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.text.length == 140
+          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{</?[^>]+?>}, '' )}"
@@ -24,11 +24,11 @@ module Cinch
         end
 
         def format_search(tweet)
-          tweet_text = expand_uris(tweet.text, tweet.attrs["entities"]["urls"])
+          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.text.length == 140
+          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
@@ -36,7 +36,7 @@ module Cinch
         end
 
         def format_tweep_info(tweep)
-          tweep_status_text = expand_uris(tweep.status.text, tweep.status.attrs["entities"]["urls"])
+          tweep_status_text = expand_uris(tweep.status.full_text, tweep.status.urls)
           head =  "#{Cinch::Formatting.format(:aqua,tweep.name)}" + Cinch::Formatting.format(:silver," (#{tweep.screen_name})") + Cinch::Formatting.format(:grey," - #{tweep.url} https://twitter.com/#{tweep.screen_name}")
           bio = ""
           bio = Cinch::Formatting.format(:aqua,"\"#{tweep.description.strip}\"") if !tweep.description.blank?
@@ -66,12 +66,7 @@ module Cinch
         private
         
         def expand_uris t, uris
-          tweet = t.dup
-          uris.each {|u|
-            expanded_url, url = u["expanded_url"], u["url"]
-            tweet.gsub! url, expanded_url
-          }
-          return tweet
+          uris.each_with_object(t) {|entity,tweet| tweet.gsub!(entity.url, entity.expanded_url) }
         end
 
       end

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

@@ -58,7 +58,7 @@ module Cinch
             params = {term: "cat"}.merge(params)
             begin
               results = []
-              ::Twitter.search(params[:term], include_entities: true, rpp: 3, result_type: "recent").each {|status|
+              ::Twitter.search(params[:term], include_entities: true, rpp: 3, result_type: "recent").results.each {|status|
                 params[:username] = status.from_user
                 results << format_search(status)
               }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cinch-twitter
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-28 00:00:00.000000000 Z
+date: 2012-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: cinch
   requirement: !ruby/object:Gem::Requirement
@@ -160,7 +160,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -173112557
+      hash: 257628495
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: