cinch-wikipedia 1.0.1 → 1.0.3

data/cinch-wikipedia.gemspec

@@ -4,25 +4,26 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'cinch/plugins/wikipedia/version'
 
 Gem::Specification.new do |gem|
-  gem.name          = "cinch-wikipedia"
+  gem.name          = 'cinch-wikipedia'
   gem.version       = Cinch::Plugins::Wikipedia::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 fetches a truncated blurb from the head of a wikipedia page.}
   gem.summary       = %q{Cinch Wikipedia Plugin}
-  gem.homepage      = "https://github.com/bhaberer/cinch-wikipedia"
+  gem.homepage      = 'https://github.com/bhaberer/cinch-wikipedia'
+  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'
-  gem.add_development_dependency 'coveralls'
-  gem.add_development_dependency 'cinch-test'
+  gem.add_development_dependency  'rake'
+  gem.add_development_dependency  'rspec'
+  gem.add_development_dependency  'coveralls'
+  gem.add_development_dependency  'cinch-test'
 
-  gem.add_dependency 'cinch',           '~> 2.0.5'
-  gem.add_dependency 'cinch-toolbox',   '~> 1.0.3'
-  gem.add_dependency 'cinch-cooldown',  '~> 1.0.1'
+  gem.add_dependency              'cinch',           '~> 2.0.12'
+  gem.add_dependency              'cinch-toolbox',   '~> 1.1.0'
+  gem.add_dependency              'cinch-cooldown',  '~> 1.1.1'
 end

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

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

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

@@ -4,12 +4,13 @@ require 'cinch/toolbox'
 require 'cinch/cooldown'
 
 module Cinch::Plugins
+  # Plugin to allow users to search wikipedia.
   class Wikipedia
     include Cinch::Plugin
 
     enforce_cooldown
 
-    self.help = "Use .wiki <term> to see the Wikipedia info for that term."
+    self.help = 'Use .wiki <term> to see the Wikipedia info for that term.'
 
     match /wiki (.*)/
     match /wikipedia (.*)/
@@ -20,43 +21,46 @@ module Cinch::Plugins
     end
 
     def execute(m, term)
-      m.reply get_def(term)
+      m.reply wiki(term)
     end
 
     private
 
-    def get_def(term)
+    def wiki(term)
       # URI Encode
       term = URI.escape(term, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
       url = "http://en.wikipedia.org/w/index.php?search=#{term}"
 
+      # Truncate text and url if they are too long
+      text = Cinch::Toolbox.truncate(get_def(term, url), @max_length)
+      url  = Cinch::Toolbox.shorten(url)
+
+      "Wikipedia ∴ #{text} [#{url}]"
+    end
+
+    def get_def(term, url)
       cats = Cinch::Toolbox.get_html_element(url, '#mw-normal-catlinks')
       if cats && cats.include?('Disambiguation')
         wiki_text = "'#{term} is too vague and lead to a disambiguation page."
       else
-        # Grab the text
         wiki_text = Cinch::Toolbox.get_html_element(url, '#mw-content-text p')
-
-        # Check for search errors
-        return not_found(wiki_text, url) if wiki_text.nil? || wiki_text.include?('Help:Searching')
+        if wiki_text.nil? || wiki_text.include?('Help:Searching')
+          return not_found(wiki_text, url)
+        end
       end
-
-      # Truncate text and url if they are too long
-      text = Cinch::Toolbox.truncate(wiki_text, @max_length)
-      url  = Cinch::Toolbox.shorten(url)
-
-      return "Wikipedia ∴ #{text} [#{url}]"
+      wiki_text
     end
 
     def not_found(wiki_text, url)
-      msg = "I couldn't find anything for that search"
-      if alt_term_text = Cinch::Toolbox.get_html_element(url, '.searchdidyoumean')
+      msg = "I couldn't find anything for that search, "
+      alt_term_text = Cinch::Toolbox.get_html_element(url, '.searchdidyoumean')
+      if alt_term_text
         alt_term = alt_term_text[/\ADid you mean: (\w+)\z/, 1]
-        msg << ", did you mean '#{alt_term}'?"
+        msg << "did you mean '#{alt_term}'?"
       else
-        msg << ", sorry!"
+        msg << 'sorry!'
       end
-      return msg
+      msg
     end
   end
 end

data/lib/cinch-wikipedia.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cinch-wikipedia
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-21 00:00:00.000000000 Z
+date: 2014-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 2.0.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 2.0.12
 - !ruby/object:Gem::Dependency
   name: cinch-toolbox
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.3
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: cinch-cooldown
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.1.1
 description: Cinch plugin that fetches a truncated blurb from the head of a wikipedia
   page.
 email:
@@ -139,12 +139,13 @@ files:
 - Rakefile
 - cinch-wikipedia.gemspec
 - lib/cinch-wikipedia.rb
+- lib/cinch/plugins/wikipedia.rb
 - lib/cinch/plugins/wikipedia/version.rb
-- lib/cinch/plugins/wikipedia/wikipedia.rb
 - spec/cinch-wikipedia_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/bhaberer/cinch-wikipedia
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths: