cinch-magic 1.0.1 → 1.0.2

data/cinch-magic.gemspec

@@ -4,18 +4,19 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'cinch/plugins/magic/version'
 
 Gem::Specification.new do |gem|
-  gem.name          = "cinch-magic"
+  gem.name          = 'cinch-magic'
   gem.version       = Cinch::Plugins::Magic::VERSION
-  gem.authors       = ["Brian Haberer"]
-  gem.email         = ["bhaberer@gmail.com"]
+  gem.authors       = ['Brian Haberer']
+  gem.email         = ['bhaberer@gmail.com']
   gem.description   = %q{Cinch Plugin that searches http://magiccards.info/ for card information.}
   gem.summary       = %q{Cinch Plugin for Magic Cards}
-  gem.homepage      = "https://github.com/bhaberer/cinch-magic"
+  gem.homepage      = 'https://github.com/bhaberer/cinch-magic'
+  gem.license       = 'MIT'
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
+  gem.require_paths = ['lib']
 
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec'

data/lib/cinch-magic.rb

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

data/lib/cinch/plugins/{magic/magic.rb → magic.rb}

@@ -4,12 +4,13 @@ require 'cinch/toolbox'
 require 'cinch/cooldown'
 
 module Cinch::Plugins
+  # Cinch Plugin to looking MTG cards
   class Magic
     include Cinch::Plugin
 
     enforce_cooldown
 
-    self.help = "Use .mtg <card name> to see the info for that card."
+    self.help = 'Use .mtg <card name> to see the info for that card.'
 
     match /mtg (.*)/
 
@@ -21,21 +22,21 @@ module Cinch::Plugins
 
     def get_card(term)
       # Fetch the html for the search term
-      data = get_card_data(term)
+      data = card_data(term)
 
       # Catch nil responses.
       return '[Magic] Card not found, or problem fetching page.' if data.nil?
 
       # Build card string
-      card = "#{get_card_name(data)} [#{get_card_info(data)}] - #{get_card_text(data)}"
+      card = "#{card_name(data)} [#{card_info(data)}] - #{card_text(data)}"
 
       # Truncate if it's super long
       card = Cinch::Toolbox.truncate(card, 300)
 
-      return "[Magic] #{card} [#{get_card_link(data)}]"
+      "[Magic] #{card} [#{card_link(data)}]"
     end
 
-    def get_card_info(data)
+    def card_info(data)
       text = data[/<p[^>]*>([^<]+)<\/p>/, 1]
 
       # Replace Newlines, unicode lines, total mana, and large spaces.
@@ -47,44 +48,48 @@ module Cinch::Plugins
       # Remove pesky whitespace that might have snuck in...
       text.strip!
 
-      return text
+      text
     rescue
-      debug "Error getting this card's info"
+      debug 'Error getting the card info'
+      return ''
     end
 
-    def get_card_name(data)
-      return data[/<a href=[^>]*>([^<]+)<\/a>/, 1]
+    def card_name(data)
+      data[/<a href=[^>]*>([^<]+)<\/a>/, 1]
     rescue
-      debug "Error finding this card's name"
+      debug 'Error finding the card name'
+      return ''
     end
 
-    def get_card_link(data)
-      return "http://magiccards.info" + data.match(/<a href="([^>]*)">[^<]+<\/a>/)[1]
+    def card_link(data)
+      "http://magiccards.info#{data[/<a href="([^>]*)">[^<]+<\/a>/, 1]}"
     rescue
-      debug "Error finding this card's url"
+      debug 'Error finding the card url'
+      return ''
     end
 
-    def get_card_text(data)
-      return data.match(/<p class="ctext"><b[^>]*>(.+)<\/b><\/p>/)[1].gsub(/<br><br>/, ' ')
+    def card_text(data)
+      data[%r(<p class="ctext"><b[^>]*>(.+)</b></p>), 1].gsub(/<br><br>/, ' ')
     rescue
-      debug "Error finding this card's description"
+      debug 'Error finding the card description'
+      return ''
     end
 
-    def get_card_data(term)
+    def card_data(term)
       # URI Encode the term and build the URL
-      term = URI.escape("!#{term}", Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
+      term = URI.escape("!#{term}",
+                        Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
       url = "http://magiccards.info/query?q=#{term}"
 
       # Make sure the URL is legit
-      url = URI::extract(url, ["http", "https"]).first
+      url = URI.extract(url, %w(http https)).first
 
       # Grab the html block because magiccards.info fucking loves tables
       # and hates helpful ids and classnames
-      return Cinch::Toolbox.get_html_element(url, '//table[3]/tr/td[2]', :xpath_full)
-
+      Cinch::Toolbox.get_html_element(url, '//table[3]/tr/td[2]', :xpath_full)
     rescue
       debug "Error looking up card: #{term}"
-      return nil
+      return
     end
   end
 end

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

@@ -1,7 +1,9 @@
+# -*- encoding : utf-8 -*-
 module Cinch
   module Plugins
+    # Version info
     class Magic
-      VERSION = "1.0.1"
+      VERSION = '1.0.2'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cinch-magic
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2014-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -138,12 +138,13 @@ files:
 - Rakefile
 - cinch-magic.gemspec
 - lib/cinch-magic.rb
-- lib/cinch/plugins/magic/magic.rb
+- lib/cinch/plugins/magic.rb
 - lib/cinch/plugins/magic/version.rb
 - spec/cinch-magic_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/bhaberer/cinch-magic
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -169,3 +170,4 @@ summary: Cinch Plugin for Magic Cards
 test_files:
 - spec/cinch-magic_spec.rb
 - spec/spec_helper.rb
+has_rdoc: