cinch-links-tumblr 1.0.0 → 1.0.1

data/lib/cinch-links-tumblr.rb

@@ -1,2 +1,3 @@
+# -*- coding: utf-8 -*-
 require 'cinch/plugins/links-tumblr/version'
-require 'cinch/plugins/links-tumblr/links-tumblr'
+require 'cinch/plugins/links-tumblr'

data/lib/cinch/plugins/{links-tumblr/links-tumblr.rb → links-tumblr.rb}

@@ -1,11 +1,13 @@
 # -*- coding: utf-8 -*-
 require 'open-uri'
 require 'tumblr'
+require 'yaml'
 require 'cinch'
 require 'cinch-storage'
 require 'cinch/toolbox'
 
 module Cinch::Plugins
+  # Cinch Plugin to tumbl links from a given channel to a configured tumblr.
   class LinksTumblr
     include Cinch::Plugin
 
@@ -13,7 +15,7 @@ module Cinch::Plugins
 
     match /tumblr/
 
-    self.help = 'Use .tumblr for the url and password (if any) for the channel\'s tumblr.'
+    self.help = 'Use .tumblr for the url/password for the channel\'s tumblr.'
 
     def initialize(*args)
       super
@@ -39,7 +41,7 @@ module Cinch::Plugins
     end
 
     def listen(m)
-      urls = URI.extract(m.message, ["http", "https"])
+      urls = URI.extract(m.message, %w(http https))
       urls.each do |url|
         @storage.data[m.channel.name] ||= []
 
@@ -47,7 +49,8 @@ module Cinch::Plugins
         unless @storage.data[m.channel.name].include?(url)
           tumble(url, m.user.nick)
 
-          # Store the links to try and cut down on popular urls getting tumbled 20 times
+          # Store the links to try and cut down on popular urls getting
+          # tumbled 20 times
           @storage.data[m.channel.name] << url
         end
         @storage.synced_save(@bot)
@@ -58,17 +61,14 @@ module Cinch::Plugins
 
     def tumble(url, nick)
       title = Cinch::Toolbox.get_page_title(url)
-      # Parse out common Redit formats
-      if redit = url.match(/^https?:\/\/.*imgur\.com.*\/([A-Za-z0-9]+\.\S{3})/)
-        post_image("http://i.imgur.com/#{redit[1]}", title, nick)
-      elsif redit = url.match(/^https?:\/\/.*imgur\.com.*\/([A-Za-z0-9]+)\/?/)
-        # It may not be a jpg, but most browsers will read the meta regardless.
-        post_image("http://i.imgur.com/#{redit[1]}.jpg", title, nick)
+      # Imgur
+      if url.match(%r(^https?:\/\/.*imgur\.com))
+        post_image(url, title, nick)
       # Images
       elsif url.match(/\.jpg|jpeg|gif|png$/i)
         post_image(url, title, nick)
       # Youtube / Vimeo
-      elsif url.match(/https?:\/\/[^\/]*\.?(youtube|youtu|vimeo)\./)
+      elsif url.match(%r(https?://[^\/]*\.?(youtube|youtu|vimeo)\.))
         post_video(url, title, nick)
       # Everything else
       else
@@ -76,34 +76,49 @@ module Cinch::Plugins
       end
     end
 
+    def post_imgur(url, title, nick)
+      # Imgur direct links
+      imgur = url[%r(^https?://.*imgur\.com.*/([A-Za-z0-9]+\.\S{3})), 1]
+
+      unless imgur
+        # It may not be a jpg, but most browsers will read the meta regardless.
+        imgur = url[%r(^https?://.*imgur\.com.*/([A-Za-z0-9]+)/?), 1] + '.jpg'
+      end
+      post_image("http://i.imgur.com/#{imgur}", title, nick)
+    end
+
     def post_link(url, title = nil, nick = nil)
-      document = tumblr_header(:link, { title: title, tags: nick })
+      document = tumblr_header(:link, title: title, tags: nick)
       document << url
       tumblr_post(document)
     end
 
     def post_image(url, title = nil, nick = nil)
-      document = tumblr_header(:text, { title: title, tags: [nick, 'image'] })
-      document << "<p><a href='#{url}'><img src='#{url}' style='max-width: 650px;'/></a><br/><a href='#{url}'>#{url}</a></p>"
+      document = tumblr_header(:text, title: title, tags: [nick, 'image'])
+      document << "<p><a href='#{url}'>" +
+                  "<img src='#{url}' style='max-width: 650px;'/></a><br/>" +
+                  "<a href='#{url}'>#{url}</a></p>"
       tumblr_post(document)
     end
 
     def post_video(url, title, nick = nil)
-      document = tumblr_header(:video, { caption: title, tags: [nick, 'video'] })
+      document = tumblr_header(:video,
+                               caption: title, tags: [nick, 'video'])
       document << url
       tumblr_post(document)
     end
 
     def tumblr_header(type = :text, options = {})
       opts = { type: type, hostname: @hostname }.update(options)
-      doc = YAML::dump(opts)
+      doc = Psych.dump(opts)
       doc << "---\n"
-      return doc
+      doc
     end
 
     def credential_check
       if @creds.values.include?(nil)
-        raise ArgumentError, 'Credentials are not set correctly, please see documentation.'
+        fail ArgumentError,
+             'Credentials are not set correctly, please see documentation.'
       end
     end
 
@@ -113,10 +128,9 @@ module Cinch::Plugins
       request = post.post(client)
 
       request.perform do |response|
-        if response.success?
-          debug "Successfully posted to Tumblr"
-        else
-          debug "Something went wrong posting to Tumblr #{response.code} #{response.message}"
+        unless response.success?
+          debug 'Something went wrong posting to Tumblr ' +
+                "#{response.code} #{response.message}"
         end
       end
     end

data/lib/cinch/plugins/links-tumblr/version.rb

@@ -1,7 +1,9 @@
+# -*- coding: utf-8 -*-
 module Cinch
   module Plugins
+    # Versioning info
     class LinksTumblr
-      VERSION = "1.0.0"
+      VERSION = '1.0.1'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cinch-links-tumblr
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-13 00:00:00.000000000 Z
+date: 2014-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -186,7 +186,7 @@ files:
 - Rakefile
 - cinch-links-tumblr.gemspec
 - lib/cinch-links-tumblr.rb
-- lib/cinch/plugins/links-tumblr/links-tumblr.rb
+- lib/cinch/plugins/links-tumblr.rb
 - lib/cinch/plugins/links-tumblr/version.rb
 - spec/cinch-links-tumblr_spec.rb
 - spec/spec_helper.rb