cinch-wikipedia 1.0.0 → 1.0.1

data/.travis.yml

@@ -1,5 +1,4 @@
-nguage: ruby
+language: ruby
 rvm:
-  - ruby-head
   - 1.9.2
   - 1.9.3

data/cinch-wikipedia.gemspec

@@ -20,8 +20,9 @@ Gem::Specification.new do |gem|
   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.4'
-  gem.add_dependency 'cinch-toolbox',   '~> 1.0.0'
-  gem.add_dependency 'cinch-cooldown',  '~> 1.0.0'
+  gem.add_dependency 'cinch',           '~> 2.0.5'
+  gem.add_dependency 'cinch-toolbox',   '~> 1.0.3'
+  gem.add_dependency 'cinch-cooldown',  '~> 1.0.1'
 end

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

@@ -1,7 +1,7 @@
 module Cinch
   module Plugins
     class Wikipedia
-      VERSION = "1.0.0"
+      VERSION = "1.0.1"
     end
   end
 end

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

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 require 'cinch'
-require 'cinch-toolbox'
-require 'cinch-cooldown'
+require 'cinch/toolbox'
+require 'cinch/cooldown'
 
 module Cinch::Plugins
   class Wikipedia
@@ -38,7 +38,7 @@ module Cinch::Plugins
         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.include?('Help:Searching')
+        return not_found(wiki_text, url) if wiki_text.nil? || wiki_text.include?('Help:Searching')
       end
 
       # Truncate text and url if they are too long

data/spec/cinch-wikipedia_spec.rb

@@ -1,41 +1,42 @@
 require 'spec_helper'
 
 describe Cinch::Plugins::Wikipedia do
+  include Cinch::Test
 
   before(:all) do
-    @plugin = Cinch::Plugins::Wikipedia.new
+    @bot = make_bot(Cinch::Plugins::Wikipedia)
   end
 
   # normal queries
   it 'should return a definition of a term' do
-    @plugin.send(:get_def, 'computer').
+    get_replies(make_message(@bot, '!wiki computer')).first.text.
       should include("A computer is a general purpose device")
   end
 
   it 'should not return multiple lined definitions' do
-    @plugin.send(:get_def, 'Teenager').
+    get_replies(make_message(@bot, '!wiki Teenager')).first.text.
       should_not include("\n")
   end
 
   it 'should not return definitions that are longer than 250 chars' do
-    @plugin.send(:get_def, 'Teenager').length.
+    get_replies(make_message(@bot, '!wiki Teenager')).first.text.length.
       should == 334
   end
 
   # Not found
   it 'should return an error message when a term is not found' do
-    @plugin.send(:get_def, 'dasdafasfasfasfasafsdfsdfsadf').
+    get_replies(make_message(@bot, '!wiki dasdafasfasfasfasafsdfsdfsadf')).first.text.
       should include("I couldn't find anything for that search, sorry!")
   end
 
   it 'should provide suggestions if one is listed on the page' do
-    @plugin.send(:get_def, 'smegama').
+    get_replies(make_message(@bot, '!wiki smegama')).first.text.
       should include("I couldn't find anything for that search, did you mean 'smegma'?")
   end
 
   # disambiguation
   it 'should return helful information when a disambuation page' do
-    @plugin.send(:get_def, 'hipster').
+    get_replies(make_message(@bot, '!wiki hacker')).first.text.
       should include('is too vague and lead to a disambiguation page')
   end
 end

data/spec/spec_helper.rb

@@ -1,22 +1,11 @@
 require 'coveralls'
-Coveralls.wear!
-require 'cinch-wikipedia'
+require 'simplecov'
 
-def fake_bot
-  bot = Cinch::Bot.new
-  bot.loggers.level = :fatal
-  bot
-  return bot
-end
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+SimpleCov.start
 
-module Cinch
-  module Plugin
-    def initialize(opts = {})
-      @bot = fake_bot
-      @handlers = []
-      @timers   = []
-      # Don't init the bot
-      # __register
-    end
-  end
-end
+require 'cinch-wikipedia'
+require 'cinch/test'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cinch-wikipedia
 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-06-09 00:00:00.000000000 Z
+date: 2013-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -59,6 +59,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: cinch-test
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cinch
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.0.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.4
+        version: 2.0.5
 - !ruby/object:Gem::Dependency
   name: cinch-toolbox
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: cinch-cooldown
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
 description: Cinch plugin that fetches a truncated blurb from the head of a wikipedia
   page.
 email:
@@ -147,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Cinch Wikipedia Plugin