wikipedia-client 1.6.3 → 1.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc643a753689499852495f809ef17e63ecdc968b
-  data.tar.gz: 5c6271d1b84337745ffa2379e375adb1d55e5f82
+  metadata.gz: e089650b23ba504667789874fd323f5b1d390748
+  data.tar.gz: dca70f883ac007d84802bb7a60ddae8139683f93
 SHA512:
-  metadata.gz: 162151de9346486e71d8c2e531141a5cb13b8efab0813681f673f0b3024145ece60d53470936a9e93d079988831f92918b8197f92a3d7c7ade7bf6cacaf55c50
-  data.tar.gz: 38482ca139a614462b2b55cff1e9bb69e17a4ba45cc0befb9ffd5171eb5ab20b2966d9e40a77cf2b2bdd290c4e48f3914e48a32c142497747d6b98ff17341244
+  metadata.gz: 3493584b84a4c54b164a0cc97c9499574394bb50014b4ab88764c569a20520daf0666cb9878c3dafab6d8225b6c4c196af73697ae3f6ed7f9ef85f704a3da060
+  data.tar.gz: 1606ba0242ff30cbd0ff9ad405ab3efa734c2d22c1f51764b1e93b6140b578d65f61e2e7810e347b95200dfe4d082314b350b5a986def757e8cc7b94639ecfc6

data/.editorconfig

@@ -0,0 +1,12 @@
+; This file is for unifying the coding style for different editors and IDEs.
+; More information at http://EditorConfig.org
+
+root = true
+; Use 2 spaces for indentation in all files
+[*]
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+indent_style = space
+indent_size = 2
+insert_final_newline = true

data/.gitignore

@@ -5,3 +5,5 @@
 *.tmp
 *.log
 pkg/*
+coverage/
+rdoc/

data/.rubocop.yml

@@ -0,0 +1,24 @@
+Metrics/LineLength:
+  Max: 120
+  AllowURI: true
+
+Metrics/MethodLength:
+  Max: 15
+
+Style/SpaceInsideParens:
+  Enabled: false
+
+Style/RescueModifier:
+  Enabled: false
+
+Style/SpaceInsidePercentLiteralDelimiters:
+  Enabled: false
+
+Style/RegexpLiteral:
+  AllowInnerSlashes: true
+
+Style/Documentation:
+  Enabled: false
+
+Style/SymbolArray:
+  Enabled: false

data/Gemfile.lock

@@ -1,12 +1,13 @@
 PATH
   remote: .
   specs:
-    wikipedia-client (1.6.1)
+    wikipedia-client (1.6.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.3.5)
+    ast (2.3.0)
     builder (3.2.2)
     diff-lcs (1.2.4)
     faraday (0.8.8)
@@ -45,7 +46,12 @@ GEM
       multi_json (~> 1.0)
       multi_xml (~> 0.5)
       rack (~> 1.2)
+    parser (2.4.0.0)
+      ast (~> 2.2)
+    powerpack (0.1.1)
     rack (1.5.2)
+    rainbow (2.2.2)
+      rake
     rake (10.1.0)
     rdoc (4.0.1)
       json (~> 1.4)
@@ -57,7 +63,15 @@ GEM
     rspec-expectations (2.14.3)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.3)
+    rubocop (0.48.1)
+      parser (>= 2.3.3.1, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (~> 1.0, >= 1.0.1)
+    ruby-progressbar (1.8.1)
     thoughtbot-shoulda (2.11.1)
+    unicode-display_width (1.2.1)
 
 PLATFORMS
   ruby
@@ -67,8 +81,9 @@ DEPENDENCIES
   rake
   rdoc
   rspec
+  rubocop
   thoughtbot-shoulda
   wikipedia-client!
 
 BUNDLED WITH
-   1.10.5
+   1.15.0

data/README.textile

@@ -76,7 +76,7 @@ h2. Configuration
 
 This is by default configured like this:
 
-<pre><code>Wikipedia.Configure {
+<pre><code>Wikipedia.configure {
   domain 'en.wikipedia.org'
   path   'w/api.php'
 }</code></pre>
@@ -115,8 +115,6 @@ h3. Pushing a new release of the Gem
 
 Edit <code>lib/wikipedia/version.rb</code>, changing <code>VERSION</code>.
 
-Edit <code>wikipedia-client.gemspec</code>, changing <code>s.date</code> to today's date.
-
 Build the gem: <code>bundle exec gem build wikipedia-client.gemspec</code>
 
 Commit the changes: <code>git commit -a -m 'Version bump to 1.4.0' && git push</code>
@@ -138,6 +136,7 @@ Christian Hellsten <christian.hellsten@gmail.com>
 Christopher Quackenbush <christopher@quackenbush.me>
 Cyril David
 Francesco Serra <afnecors@gmail.com>
+Harman Singh
 ivobenedito <ivobenedito@gmail.com>
 Justin Harrison <justin@matthin.com>
 Ken Pratt <ken@kenpratt.net>

data/Rakefile

@@ -1,38 +1,24 @@
-$:.push File.expand_path("../lib", __FILE__)
-require 'rubygems'
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
 require 'rake'
+require 'rubocop/rake_task'
+require 'rspec/core/rake_task'
+require 'rdoc/task'
+require 'wikipedia/version'
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
+task default: [:spec, :rubocop]
 
 desc 'Test the wikipedia plugin.'
-task :spec do
-  spec_path = File.expand_path(File.dirname(__FILE__) + '/spec/**/*.rb')
-  system("rspec -cfs #{spec_path}")
-end
+RSpec::Core::RakeTask.new(:spec)
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
+desc 'Run spec with coverage'
+task :coverage do
+  ENV['COVERAGE'] = 'true'
+  Rake::Task['spec'].execute
 end
 
-task :default => :spec
+desc 'Run rubocop'
+RuboCop::RakeTask.new(:rubocop)
 
-require 'rdoc/task'
-require "wikipedia/version"
 Rake::RDocTask.new do |rdoc|
   version = Wikipedia::VERSION
 

data/install.rb

@@ -1 +1 @@
-puts File.read(File.dirname(__FILE__) + '/README')
+puts File.read(File.dirname(__FILE__) + '/README')

data/lib/wikipedia.rb

@@ -25,22 +25,29 @@ module Wikipedia
     client.find_random( options )
   end
 
-  def self.Configure(&block)
+  def self.configure(&block)
     Configuration.instance.instance_eval(&block)
   end
 
-  Configure {
+  # rubocop:disable Style/MethodName
+  def self.Configure(&block)
+    configure(&block)
+  end
+
+  configure do
     protocol  'https'
     domain    'en.wikipedia.org'
     path      'w/api.php'
     user_agent(
       'wikipedia-client/1.3 (https://github.com/kenpratt/wikipedia-client)'
     )
-  }
+  end
 
-  private
+  class << self
+    private
 
-  def self.client
-    @client ||= Wikipedia::Client.new
+    def client
+      @client ||= Wikipedia::Client.new
+    end
   end
 end

data/lib/wikipedia/client.rb

@@ -1,7 +1,7 @@
 module Wikipedia
   class Client
     # see http://en.wikipedia.org/w/api.php
-    BASE_URL = ":protocol://:domain/:path?action=:action&format=json"
+    BASE_URL = ':protocol://:domain/:path?action=:action&format=json'.freeze
 
     attr_accessor :follow_redirects
 
@@ -12,7 +12,7 @@ module Wikipedia
     def find( title, options = {} )
       title = Url.new(title).title rescue title
       page = Page.new( request_page( title, options ) )
-      while follow_redirects and page.redirect?
+      while follow_redirects && page.redirect?
         page = Page.new( request_page( page.redirect_title, options ) )
       end
       page
@@ -25,87 +25,88 @@ module Wikipedia
 
     def find_random( options = {} )
       require 'json'
-      data = JSON::load( request_random( options ) )
-      title = data["query"]["pages"].values[0]["title"]
+      data = JSON.parse( request_random( options ) )
+      title = data['query']['pages'].values[0]['title']
       find( title, options )
     end
 
     # http://en.wikipedia.org/w/api.php?action=query&format=json&prop=revisions%7Clinks%7Cimages%7Ccategories&rvprop=content&titles=Flower%20(video%20game)
     def request_page( title, options = {} )
       request( {
-                 :action => "query",
-                 :prop => %w{ info revisions links extlinks images categories coordinates templates extracts },
-                 :rvprop => "content",
-                 :inprop => "url",
-                 :explaintext => "",
-                 :titles => title
-               }.merge( options ) )
+        action: 'query',
+        prop: %w[ info revisions links extlinks images categories coordinates templates extracts ],
+        rvprop: 'content',
+        inprop: 'url',
+        explaintext: '',
+        titles: title
+      }.merge( options ) )
     end
 
     # http://en.wikipedia.org/w/api.php?action=query&format=json&prop=imageinfo&iiprop=url&titles=File:Flower.png
     def request_image( title, options = {} )
       request( {
-                 :action => "query",
-                 :prop => "imageinfo",
-                 :iiprop => "url",
-                 :titles => title
-               }.merge( options ) )
+        action: 'query',
+        prop: 'imageinfo',
+        iiprop: 'url',
+        titles: title
+      }.merge( options ) )
     end
 
     # http://en.wikipedia.org/w/api.php?action=query&generator=random&grnnamespace=0&prop=info
     def request_random( options = {} )
       request( {
-                 :action => "query",
-                 :generator => "random",
-                 :grnnamespace => "0",
-                 :prop => "info"
-               }.merge( options ) )
+        action: 'query',
+        generator: 'random',
+        grnnamespace: '0',
+        prop: 'info'
+      }.merge( options ) )
     end
 
     def request( options )
       require 'open-uri'
-      URI.parse( url_for( options ) ).read( "User-Agent" => Configuration[:user_agent] )
+      URI.parse( url_for( options ) ).read( 'User-Agent' => Configuration[:user_agent] )
     end
 
     protected
-      def configuration_options
-        {
-          :protocol   => Configuration[:protocol],
-          :domain     => Configuration[:domain],
-          :path       => Configuration[:path],
-        }
-      end
 
-      def url_for( options )
-        url = BASE_URL.dup
-        options = configuration_options.merge( options )
-        options.each do |key, val|
-          value = urlify_value( val )
-          if url.include?( ":#{key}" )
-            url.sub! ":#{key}", value
-          else
-            url << "&#{key}=#{value}"
-          end
-        end
-        url
-      end
+    def configuration_options
+      {
+        protocol: Configuration[:protocol],
+        domain:   Configuration[:domain],
+        path:     Configuration[:path]
+      }
+    end
 
-      def urlify_value( val )
-        case val
-        when Array
-          encode( val.flatten.join( '|' ) )
+    def url_for( options )
+      url = BASE_URL.dup
+      options = configuration_options.merge( options )
+      options.each do |key, val|
+        value = urlify_value( val )
+        if url.include?( ":#{key}" )
+          url.sub! ":#{key}", value
         else
-          encode( val )
+          url << "&#{key}=#{value}"
         end
       end
+      url
+    end
 
-      def encode( val )
-        case val
-        when String
-          URI.encode( val ).gsub( '&', '%26' )
-        else
-          val
-        end
+    def urlify_value( val )
+      case val
+      when Array
+        encode( val.flatten.join( '|' ) )
+      else
+        encode( val )
       end
+    end
+
+    def encode( val )
+      case val
+      when String
+        URI.encode( val ).gsub( '&', '%26' )
+      else
+        val
+      end
+    end
   end
 end

data/lib/wikipedia/configuration.rb

@@ -7,11 +7,9 @@ module Wikipedia
     def self.directives(*directives)
       directives.each do |directive|
         define_method directive do |*args|
-          if args.empty?
-            return instance_variable_get("@#{directive}")
-          else
-            instance_variable_set("@#{directive}", args.first)
-          end
+          return instance_variable_get("@#{directive}") if args.empty?
+
+          instance_variable_set("@#{directive}", args.first)
         end
       end
     end

data/lib/wikipedia/page.rb

@@ -1,13 +1,15 @@
 module Wikipedia
   class Page
+    attr_reader :json
+
     def initialize(json)
       require 'json'
       @json = json
-      @data = JSON::load(json)
+      @data = JSON.parse(json)
     end
 
     def page
-      @data['query']['pages'].values.first
+      @data['query']['pages'].values.first if @data['query']['pages']
     end
 
     def content
@@ -23,9 +25,7 @@ module Wikipedia
     end
 
     def redirect_title
-      if matches = redirect?
-        matches[1]
-      end
+      redirect?[1] rescue nil
     end
 
     def title
@@ -45,23 +45,23 @@ module Wikipedia
     end
 
     def summary
-      (page['extract'].split("=="))[0].strip if page['extract']
+      page['extract'].split('==')[0].strip if page['extract'] && page['extract'] != ''
     end
 
     def categories
-      page['categories'].map {|c| c['title'] } if page['categories']
+      page['categories'].map { |c| c['title'] } if page['categories']
     end
 
     def links
-      page['links'].map {|c| c['title'] } if page['links']
+      page['links'].map { |c| c['title'] } if page['links']
     end
 
     def extlinks
-      page['extlinks'].map {|c| c['*'] } if page['extlinks']
+      page['extlinks'].map { |c| c['*'] } if page['extlinks']
     end
 
     def images
-      page['images'].map {|c| c['title'] } if page['images']
+      page['images'].map { |c| c['title'] } if page['images']
     end
 
     def image_url
@@ -73,11 +73,11 @@ module Wikipedia
     end
 
     def image_urls
-      image_metadata.map {|img| img.image_url }
+      image_metadata.map(&:image_url)
     end
 
     def image_descriptionurls
-      image_metadata.map {|img| img.image_descriptionurl }
+      image_metadata.map(&:image_descriptionurl)
     end
 
     def coordinates
@@ -90,61 +90,54 @@ module Wikipedia
 
     def image_metadata
       unless @cached_image_metadata
-        if list = images
-          filtered = list.select {|i| i =~ /:.+\.(jpg|jpeg|png|gif|svg)$/i && !i.include?("LinkFA-star") }
-          @cached_image_metadata = filtered.map {|title| Wikipedia.find_image(title) }
-        end
+        return if images.nil?
+        filtered = images.select { |i| i =~ /:.+\.(jpg|jpeg|png|gif|svg)$/i && !i.include?('LinkFA-star') }
+        @cached_image_metadata = filtered.map { |title| Wikipedia.find_image(title) }
       end
       @cached_image_metadata || []
     end
 
     def templates
-      page['templates'].map {|c| c['title'] } if page['templates']
-    end
-
-    def json
-      @json
+      page['templates'].map { |c| c['title'] } if page['templates']
     end
 
+    # rubocop:disable Metrics/MethodLength
+    # rubocop:disable Metrics/AbcSize
     def self.sanitize( s )
-      if s
-        s = s.dup
-
-        # strip anything inside curly braces!
-        while s =~ /\{\{[^\{\}]+?\}\}/
-          s.gsub!(/\{\{[^\{\}]+?\}\}/, '')
-        end
-
-        # strip info box
-        s.sub!(/^\{\|[^\{\}]+?\n\|\}\n/, '')
-
-        # strip internal links
-        s.gsub!(/\[\[([^\]\|]+?)\|([^\]\|]+?)\]\]/, '\2')
-        s.gsub!(/\[\[([^\]\|]+?)\]\]/, '\1')
-
-        # strip images and file links
-        s.gsub!(/\[\[Image:[^\[\]]+?\]\]/, '')
-        s.gsub!(/\[\[File:[^\[\]]+?\]\]/, '')
-
-        # convert bold/italic to html
-        s.gsub!(/'''''(.+?)'''''/, '<b><i>\1</i></b>')
-        s.gsub!(/'''(.+?)'''/, '<b>\1</b>')
-        s.gsub!(/''(.+?)''/, '<i>\1</i>')
-
-        # misc
-        s.gsub!(/<ref[^<>]*>[\s\S]*?<\/ref>/, '')
-        s.gsub!(/<!--[^>]+?-->/, '')
-        s.gsub!('  ', ' ')
-        s.strip!
-
-        # create paragraphs
-        sections = s.split("\n\n")
-        if sections.size > 1
-          s = sections.map {|paragraph| "<p>#{paragraph.strip}</p>" }.join("\n")
-        end
-
-        s
+      return unless s
+
+      # strip anything inside curly braces!
+      s.gsub!(/\{\{[^\{\}]+?\}\}/, '') while s =~ /\{\{[^\{\}]+?\}\}/
+
+      # strip info box
+      s.sub!(/^\{\|[^\{\}]+?\n\|\}\n/, '')
+
+      # strip internal links
+      s.gsub!(/\[\[([^\]\|]+?)\|([^\]\|]+?)\]\]/, '\2')
+      s.gsub!(/\[\[([^\]\|]+?)\]\]/, '\1')
+
+      # strip images and file links
+      s.gsub!(/\[\[Image:[^\[\]]+?\]\]/, '')
+      s.gsub!(/\[\[File:[^\[\]]+?\]\]/, '')
+
+      # convert bold/italic to html
+      s.gsub!(/'''''(.+?)'''''/, '<b><i>\1</i></b>')
+      s.gsub!(/'''(.+?)'''/, '<b>\1</b>')
+      s.gsub!(/''(.+?)''/, '<i>\1</i>')
+
+      # misc
+      s.gsub!(/<ref[^<>]*>[\s\S]*?<\/ref>/, '')
+      s.gsub!(/<!--[^>]+?-->/, '')
+      s.gsub!('  ', ' ')
+      s.strip!
+
+      # create paragraphs
+      sections = s.split("\n\n")
+      if sections.size > 1
+        s = sections.map { |paragraph| "<p>#{paragraph.strip}</p>" }.join("\n")
       end
+
+      s
     end
   end
 end

data/lib/wikipedia/url.rb

@@ -3,10 +3,10 @@ module Wikipedia
     def initialize(wiki_url)
       @wiki_url = wiki_url
     end
-    
+
     def title
       return @title if @title
-      
+
       uri     = URI.parse( @wiki_url )
       @title  = URI.decode( uri.path.split('/').last )
     end

data/lib/wikipedia/version.rb

@@ -1,3 +1,3 @@
 module Wikipedia
-  VERSION = "1.6.3"
+  VERSION = '1.6.4'.freeze
 end

data/script/add_sanitization_test

@@ -1,20 +1,20 @@
 #!/usr/bin/env ruby
 
-$LOAD_PATH.unshift File.join(File.dirname(__FILE__), "..", "lib")
-require "wikipedia"
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+require 'wikipedia'
 
-SANITIZATION_SAMPLE_PATH = File.join(File.dirname(__FILE__), "..", "spec", "fixtures", "sanitization_samples")
+SANITIZATION_SAMPLE_PATH = File.join(File.dirname(__FILE__), '..', 'spec', 'fixtures', 'sanitization_samples')
 
 def add_sanitization_test(url)
   title = Wikipedia::Url.new(url).title
-  page = Wikipedia.find(title, :rvsection => 0)
-  File.open(File.join(SANITIZATION_SAMPLE_PATH, "#{title}-raw.txt"), 'w') {|f| f << page.content }
-  File.open(File.join(SANITIZATION_SAMPLE_PATH, "#{title}-sanitized.txt"), 'w') {|f| f << page.sanitized_content }
+  page = Wikipedia.find(title, rvsection: 0)
+  File.open(File.join(SANITIZATION_SAMPLE_PATH, "#{title}-raw.txt"), 'w') { |f| f << page.content }
+  File.open(File.join(SANITIZATION_SAMPLE_PATH, "#{title}-sanitized.txt"), 'w') { |f| f << page.sanitized_content }
 end
 
-if __FILE__ == $0
+if __FILE__ == $PROGRAM_NAME
   unless ARGV.size == 1
-    puts "Usage: #{$0} http://en.wikipedia.org/wiki/Social_Democratic_Party_of_Kyrgyzstan"
+    puts "Usage: #{$PROGRAM_NAME} http://en.wikipedia.org/wiki/Social_Democratic_Party_of_Kyrgyzstan"
     exit 0
   end
   url = ARGV[0]

data/spec/lib/client_spec.rb

@@ -1,164 +1,203 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 require 'json'
 
-describe Wikipedia::Client, ".find page (mocked)" do
+# rubocop:disable Metrics/BlockLength
+describe Wikipedia::Client, '.find page (mocked)' do
   before(:each) do
     @client = Wikipedia::Client.new
     @edsger_dijkstra = File.read(File.dirname(__FILE__) + '/../fixtures/Edsger_Dijkstra.json')
-    @edsger_content  = JSON::load(File.read(File.dirname(__FILE__) + '/../fixtures/Edsger_content.txt'))['content']
+    @edsger_content  = JSON.parse(File.read(File.dirname(__FILE__) + '/../fixtures/Edsger_content.txt'))['content']
     @client.should_receive(:request).and_return(@edsger_dijkstra)
   end
 
-  it "should execute a request for the page" do
+  it 'should execute a request for the page' do
     @client.find('Edsger_Dijkstra')
   end
 
-  it "should return a page object" do
+  it 'should return a page object' do
     @client.find('Edsger_Dijkstra').should be_an_instance_of(Wikipedia::Page)
   end
 
-  it "should return a page with the correct content" do
+  it 'should return a page with the correct content' do
     @page = @client.find('Edsger_Dijkstra')
     @page.content.should == @edsger_content
   end
 
-  it "should return a page with a title of Edsger W. Dijkstra" do
+  it 'should return a page with a title of Edsger W. Dijkstra' do
     @page = @client.find('Edsger_Dijkstra')
     @page.title.should == 'Edsger W. Dijkstra'
   end
 
-  it "should return a page with the correct URL" do
+  it 'should return a page with the correct URL' do
     @page = @client.find('Edsger_Dijkstra')
     @page.fullurl.should == 'http://en.wikipedia.org/wiki/Edsger_W._Dijkstra'
   end
 
-  it "should return a page with the correct plain text extract" do
+  it 'should return a page with the correct plain text extract' do
     @page = @client.find('Edsger_Dijkstra')
     @page.text.should start_with 'Edsger Wybe Dijkstra (Dutch pronunciation: '
   end
 
-  it "should return a page with categories" do
+  it 'should return a page with categories' do
     @page = @client.find('Edsger_Dijkstra')
-    @page.categories.should == ["Category:1930 births", "Category:2002 deaths", "Category:All pages needing cleanup", "Category:Articles needing cleanup from April 2009", "Category:Articles with close paraphrasing from April 2009", "Category:Computer pioneers", "Category:Dutch computer scientists", "Category:Dutch physicists", "Category:Eindhoven University of Technology faculty", "Category:Fellows of the Association for Computing Machinery"]
-  end
-
-  it "should return a page with links" do
+    [
+      'Category:1930 births', 'Category:Fellows of the Association for Computing Machinery',
+      'Category:2002 deaths', 'Category:Articles with close paraphrasing from April 2009',
+      'Category:Computer pioneers', 'Category:Eindhoven University of Technology faculty',
+      'Category:Dutch physicists', 'Category:Articles needing cleanup from April 2009',
+      'Category:All pages needing cleanup', 'Category:Dutch computer scientists'
+    ].each do |category|
+      @page.categories.should include(category)
+    end
+  end
+
+  it 'should return a page with links' do
     @page = @client.find('Edsger_Dijkstra')
-    @page.links.should == ["ACM Turing Award", "ALGOL", "ALGOL 60", "Adi Shamir", "Adriaan van Wijngaarden", "Agile software development", "Alan Kay", "Alan Perlis", "Algorithm", "Allen Newell"]
+    [
+      'ALGOL', 'Alan Kay', 'ALGOL 60', 'Agile software development', 'ACM Turing Award',
+      'Algorithm', 'Adi Shamir', 'Alan Perlis', 'Allen Newell', 'Adriaan van Wijngaarden'
+    ].each do |link|
+      @page.links.should include(link)
+    end
   end
 
-  it "should return a page with images" do
+  it 'should return a page with images' do
     @page = @client.find('Edsger_Dijkstra')
-    @page.images.should == ["File:Copyright-problem.svg", "File:Dijkstra.ogg", "File:Edsger Wybe Dijkstra.jpg", "File:Speaker Icon.svg", "File:Wikiquote-logo-en.svg"]
+    [
+      'File:Dijkstra.ogg',
+      'File:Speaker Icon.svg',
+      'File:Wikiquote-logo-en.svg',
+      'File:Copyright-problem.svg',
+      'File:Edsger Wybe Dijkstra.jpg'
+    ].each do |file|
+      @page.images.should include(file)
+    end
   end
 end
 
-describe Wikipedia::Client, ".find page with one section (mocked)" do
+describe Wikipedia::Client, '.find page with one section (mocked)' do
   before(:each) do
     @client = Wikipedia::Client.new
-    @edsger_dijkstra = File.read(File.dirname(__FILE__) + '/../fixtures/Edsger_Dijkstra_section_0.json')
-    @edsger_content = File.read(File.dirname(__FILE__) + '/../fixtures/sanitization_samples/Edsger_W_Dijkstra-sanitized.txt').strip
+    dir_name = File.dirname(__FILE__)
+    @edsger_dijkstra = File.read(dir_name + '/../fixtures/Edsger_Dijkstra_section_0.json')
+    @edsger_content = File.read(dir_name + '/../fixtures/sanitization_samples/Edsger_W_Dijkstra-sanitized.txt').strip
     @client.should_receive(:request).and_return(@edsger_dijkstra)
   end
 
-  it "should have the correct sanitized intro" do
-    @page = @client.find('Edsger_Dijkstra', :rvsection => 0)
+  it 'should have the correct sanitized intro' do
+    @page = @client.find('Edsger_Dijkstra', rvsection: 0)
     @page.sanitized_content.should == @edsger_content
   end
 end
 
-describe Wikipedia::Client, ".find image (mocked)" do
+describe Wikipedia::Client, '.find image (mocked)' do
   before(:each) do
     @client = Wikipedia::Client.new
     @edsger_dijkstra = File.read(File.dirname(__FILE__) + '/../fixtures/File_Edsger_Wybe_Dijkstra_jpg.json')
     @client.should_receive(:request).and_return(@edsger_dijkstra)
   end
 
-  it "should execute a request for the image" do
+  it 'should execute a request for the image' do
     @client.find_image('File:Edsger Wybe Dijkstra.jpg')
   end
 
-  it "should return a page object" do
+  it 'should return a page object' do
     @client.find_image('File:Edsger Wybe Dijkstra.jpg').should be_an_instance_of(Wikipedia::Page)
   end
 
-  it "should return a page with a title of File:Edsger Wybe Dijkstra.jpg" do
+  it 'should return a page with a title of File:Edsger Wybe Dijkstra.jpg' do
     @page = @client.find_image('File:Edsger Wybe Dijkstra.jpg')
     @page.title.should == 'File:Edsger Wybe Dijkstra.jpg'
   end
 
-  it "should return a page with an image url" do
+  it 'should return a page with an image url' do
     @page = @client.find_image('File:Edsger Wybe Dijkstra.jpg')
-    @page.image_url.should == "http://upload.wikimedia.org/wikipedia/commons/d/d9/Edsger_Wybe_Dijkstra.jpg"
+    @page.image_url.should == 'http://upload.wikimedia.org/wikipedia/commons/d/d9/Edsger_Wybe_Dijkstra.jpg'
   end
 end
 
-describe Wikipedia::Client, ".find page (Edsger_Dijkstra)" do
+describe Wikipedia::Client, '.find page (Edsger_Dijkstra)' do
   before(:each) do
     @client = Wikipedia::Client.new
     @client.follow_redirects = false
   end
 
-  it "should get a redirect when trying Edsger Dijkstra" do
+  it 'should get a redirect when trying Edsger Dijkstra' do
     @page = @client.find('Edsger Dijkstra')
     @page.should be_redirect
   end
 
-  it "should get a final page when follow_redirects is true" do
+  it 'should get a final page when follow_redirects is true' do
     @client.follow_redirects = true
     @page = @client.find('Edsger Dijkstra')
     @page.should_not be_redirect
   end
 
-  it "should collect the image urls" do
+  it 'should collect the image urls' do
     @client.follow_redirects = true
     @page = @client.find('Edsger Dijkstra')
-    @page.image_urls.should == ["https://upload.wikimedia.org/wikipedia/en/4/4a/Commons-logo.svg", "https://upload.wikimedia.org/wikipedia/commons/5/57/Dijkstra_Animation.gif", "https://upload.wikimedia.org/wikipedia/commons/6/6a/Dining_philosophers.png", "https://upload.wikimedia.org/wikipedia/commons/c/c9/Edsger_Dijkstra_1994.jpg", "https://upload.wikimedia.org/wikipedia/commons/d/d9/Edsger_Wybe_Dijkstra.jpg", "https://upload.wikimedia.org/wikipedia/en/4/48/Folder_Hexagonal_Icon.svg", "https://upload.wikimedia.org/wikipedia/commons/7/7b/Rail-semaphore-signal-Dave-F.jpg", "https://upload.wikimedia.org/wikipedia/commons/2/21/Speaker_Icon.svg", "https://upload.wikimedia.org/wikipedia/commons/f/fa/Wikiquote-logo.svg"]
+    [
+      '/en/4/4a/Commons-logo.svg',
+      '/en/4/48/Folder_Hexagonal_Icon.svg',
+      '/commons/5/57/Dijkstra_Animation.gif',
+      '/commons/c/c9/Edsger_Dijkstra_1994.jpg',
+      '/commons/d/d9/Edsger_Wybe_Dijkstra.jpg',
+      '/commons/0/00/Complex-adaptive-system.jpg',
+      '/en/4/4d/Centrum-wiskunde-informatica-logo.png',
+      '/commons/7/7b/An_illustration_of_the_dining_philosophers_problem.png',
+      '/commons/3/37/Detail_of_a_1Kb_ferrite_core_RAM-module_of_an_1960s_Electrologica_X1_computer.jpg'
+    ].each do |image|
+      @page.image_urls.should include('https://upload.wikimedia.org/wikipedia' + image)
+    end
   end
 end
 
-describe Wikipedia::Client, ".find page (Rails) at jp" do
+describe Wikipedia::Client, '.find page (Rails) at jp' do
   before(:each) do
-    Wikipedia.Configure { domain "ja.wikipedia.org" }
+    Wikipedia.configure { domain 'ja.wikipedia.org' }
     @client = Wikipedia::Client.new
     @client.follow_redirects = false
   end
 
-  it "should get a redirect when trying Rails" do
+  it 'should get a redirect when trying Rails' do
     @page = @client.find('Rails')
     @page.should be_redirect
   end
 
-  it "should get a final page when follow_redirects is true" do
+  it 'should get a final page when follow_redirects is true' do
     @client.follow_redirects = true
     @page = @client.find('Rails')
     @page.should_not be_redirect
   end
 end
 
-describe Wikipedia::Client, ".find random page" do
+describe Wikipedia::Client, '.find random page' do
   before(:each) do
     @client = Wikipedia::Client.new
   end
 
-  it "should get random pages" do
-    @page1 = @client.find_random().title
-    @page2 = @client.find_random().title
+  it 'should get random pages' do
+    @page1 = @client.find_random.title
+    @page2 = @client.find_random.title
     @page1.should_not == @page2
   end
 end
 
-describe Wikipedia::Client, "page.summary (mocked)" do
+describe Wikipedia::Client, 'page.summary (mocked)' do
   before(:each) do
     @client = Wikipedia::Client.new
     @edsger_dijkstra = File.read(File.dirname(__FILE__) + '/../fixtures/Edsger_Dijkstra.json')
-    @edsger_content  = JSON::load(File.read(File.dirname(__FILE__) + '/../fixtures/Edsger_content.txt'))['content']
+    @edsger_content  = JSON.parse(File.read(File.dirname(__FILE__) + '/../fixtures/Edsger_content.txt'))['content']
     @client.should_receive(:request).and_return(@edsger_dijkstra)
   end
 
-  it "should return only the summary" do
+  it 'should return only the summary' do
     @page = @client.find('Edsger_Dijkstra')
-    @page.summary.should == 'Edsger Wybe Dijkstra (Dutch pronunciation: [ˈɛtsxər ˈʋibə ˈdɛikstra] ( ); 11 May 1930 – 6 August 2002) was a Dutch computer scientist. He received the 1972 Turing Award for fundamental contributions to developing programming languages, and was the Schlumberger Centennial Chair of Computer Sciences at The University of Texas at Austin from 1984 until 2000.
-Shortly before his death in 2002, he received the ACM PODC Influential Paper Award in distributed computing for his work on self-stabilization of program computation. This annual award was renamed the Dijkstra Prize the following year, in his honor.'
+    @page.summary.should == 'Edsger Wybe Dijkstra (Dutch pronunciation: [ˈɛtsxər ˈʋibə ˈdɛikstra] ( );'\
+    ' 11 May 1930 – 6 August 2002) was a Dutch computer scientist. He received the 1972 Turing Award for fundamental'\
+    ' contributions to developing programming languages, and was the Schlumberger Centennial Chair of Computer'\
+    " Sciences at The University of Texas at Austin from 1984 until 2000.\nShortly before his death in 2002, he"\
+    ' received the ACM PODC Influential Paper Award in distributed computing for his work on self-stabilization of'\
+    ' program computation. This annual award was renamed the Dijkstra Prize the following year, in his honor.'
   end
 end

data/spec/lib/sanitize_spec.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 require 'json'
 
-describe Wikipedia::Page, ".sanitize wiki markup" do
+describe Wikipedia::Page, '.sanitize wiki markup' do
   Dir[File.dirname(__FILE__) + '/../fixtures/sanitization_samples/*-raw.txt'].each do |raw_filename|
     name = raw_filename.sub(/\/(.+?)\-raw\.txt$/, '\1')
     sanitized_filename = raw_filename.sub('-raw', '-sanitized')

data/spec/lib/url_spec.rb

@@ -1,8 +1,8 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
-describe Wikipedia::Url, "like http://en.wikipedia.org/wiki/Getting_Things_Done" do
-  it "should have a title of Getting_Things_Done" do
+describe Wikipedia::Url, 'like http://en.wikipedia.org/wiki/Getting_Things_Done' do
+  it 'should have a title of Getting_Things_Done' do
     url = Wikipedia::Url.new('http://en.wikipedia.org/wiki/Getting_Things_Done')
     url.title.should == 'Getting_Things_Done'
   end
-end
+end

data/spec/lib/wikipedia_spec.rb

@@ -1,19 +1,19 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
-describe Wikipedia, ".find" do
-  it "should return a Wikipedia::Page instance" do
+describe Wikipedia, '.find' do
+  it 'should return a Wikipedia::Page instance' do
     page = Wikipedia.find('Getting_Things_Done')
     page.should be_an_instance_of(Wikipedia::Page)
   end
-  
-  it "should return a Page with a title" do
+
+  it 'should return a Page with a title' do
     page = Wikipedia.find('Getting_Things_Done')
     page.title.should_not be_nil
   end
-  
-  it "should return a Page given a URL" do
+
+  it 'should return a Page given a URL' do
     page1 = Wikipedia.find('Getting_Things_Done')
-    
+
     page2 = Wikipedia.find('http://en.wikipedia.org/wiki/Getting_Things_Done')
     page1.title.should == page2.title
   end

data/spec/spec_helper.rb

@@ -1,4 +1,12 @@
-require 'rubygems'
 require 'rspec'
 
+if ENV['COVERAGE'] == 'true'
+  begin
+    require 'simplecov'
+    SimpleCov.start
+  rescue LoadError
+    abort 'Coverage driver not available. In order to run coverage, you must run: gem install simplecov'
+  end
+end
+
 require File.dirname(__FILE__) + '/../lib/wikipedia'

data/wikipedia-client.gemspec

@@ -1,26 +1,30 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "wikipedia/version"
 
-spec = Gem::Specification.new do |s|
-  s.name    = "wikipedia-client"
+$LOAD_PATH.push File.expand_path('../lib', __FILE__)
+require 'wikipedia/version'
+require 'date'
+
+# rubocop:disable Metrics/BlockLength
+Gem::Specification.new do |s|
+  s.name    = 'wikipedia-client'
   s.version = Wikipedia::VERSION
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
 
   s.license          = 'MIT'
-  s.authors          = ["Cyril David", "Ken Pratt", "Mike Haugland", "Aishwarya Subramanian", "Pietro Menna", "Sophie Rapoport"]
+  s.authors          = ['Cyril David', 'Ken Pratt', 'Mike Haugland',
+                        'Aishwarya Subramanian', 'Pietro Menna', 'Sophie Rapoport']
   s.date             = Date.today.to_s
-  s.description      = "Ruby client for the Wikipedia API"
-  s.email            = "ken@kenpratt.net"
+  s.description      = 'Ruby client for the Wikipedia API'
+  s.email            = 'ken@kenpratt.net'
 
-  s.homepage         = "http://github.com/kenpratt/wikipedia-client"
-  s.rubygems_version = "1.8.23"
-  s.summary          = "Ruby client for the Wikipedia API"
+  s.homepage         = 'http://github.com/kenpratt/wikipedia-client'
+  s.rubygems_version = '1.8.23'
+  s.summary          = 'Ruby client for the Wikipedia API'
   s.platform         = Gem::Platform::RUBY
   s.files            = `git ls-files`.split("\n")
   s.test_files       = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables      = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.executables      = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.has_rdoc         = true
   s.extra_rdoc_files = ['README.textile']
   s.bindir           = 'bin'
@@ -32,17 +36,17 @@ spec = Gem::Specification.new do |s|
   s.add_development_dependency('rspec')
   s.add_development_dependency('rdoc')
   s.add_development_dependency('jeweler')
+  s.add_development_dependency('rubocop')
 
-
-  if s.respond_to? :specification_version then
+  if s.respond_to? :specification_version
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0')
+      s.add_development_dependency('thoughtbot-shoulda', ['>= 0'])
     else
-      s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+      s.add_dependency('thoughtbot-shoulda', ['>= 0'])
     end
   else
-    s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])
+    s.add_dependency('thoughtbot-shoulda', ['>= 0'])
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wikipedia-client
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.4
 platform: ruby
 authors:
 - Cyril David
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-08 00:00:00.000000000 Z
+date: 2017-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -71,6 +71,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thoughtbot-shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -92,7 +106,9 @@ extensions: []
 extra_rdoc_files:
 - README.textile
 files:
+- ".editorconfig"
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
@@ -170,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 3
 summary: Ruby client for the Wikipedia API