wikipedia-client 1.6.4 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e089650b23ba504667789874fd323f5b1d390748
-  data.tar.gz: dca70f883ac007d84802bb7a60ddae8139683f93
+  metadata.gz: 4d6ed4bb192a667887ef04c277ad4eaf97df8c17
+  data.tar.gz: fbe125b740c244cbfa3e6331173d010e297561bc
 SHA512:
-  metadata.gz: 3493584b84a4c54b164a0cc97c9499574394bb50014b4ab88764c569a20520daf0666cb9878c3dafab6d8225b6c4c196af73697ae3f6ed7f9ef85f704a3da060
-  data.tar.gz: 1606ba0242ff30cbd0ff9ad405ab3efa734c2d22c1f51764b1e93b6140b578d65f61e2e7810e347b95200dfe4d082314b350b5a986def757e8cc7b94639ecfc6
+  metadata.gz: 55c76474579183cabf2723533472b40bf49fdb8f1265a7f3b001a2b6546defe2c776e6e28001e96607bd314847c8e04fdecc2e68b2709487e8e040e1a11a63c8
+  data.tar.gz: 9277b3ebf017c75ec101df7d8b03afedf5235b02b2c7e7f223216e95fc445cd5cc4ce01c11587568ca0acf3f9dd9d8db9acce8b427ea664cff65c40691b3079b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    wikipedia-client (1.6.4)
+    wikipedia-client (1.7.0)
 
 GEM
   remote: https://rubygems.org/
@@ -9,7 +9,7 @@ GEM
     addressable (2.3.5)
     ast (2.3.0)
     builder (3.2.2)
-    diff-lcs (1.2.4)
+    diff-lcs (1.3)
     faraday (0.8.8)
       multipart-post (~> 1.2.0)
     git (1.2.6)
@@ -32,7 +32,7 @@ GEM
       nokogiri (= 1.5.10)
       rake
       rdoc
-    json (1.8.3)
+    json (1.8.6)
     jwt (0.1.8)
       multi_json (>= 1.5)
     multi_json (1.8.1)
@@ -55,14 +55,18 @@ GEM
     rake (10.1.0)
     rdoc (4.0.1)
       json (~> 1.4)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.5)
-    rspec-expectations (2.14.3)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.3)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.4)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.4)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.4)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.4)
     rubocop (0.48.1)
       parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
@@ -77,13 +81,13 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  jeweler
-  rake
-  rdoc
-  rspec
-  rubocop
-  thoughtbot-shoulda
+  jeweler (~> 1.8)
+  rake (~> 10.1)
+  rdoc (~> 4.0)
+  rspec (~> 3.0)
+  rubocop (~> 0.48)
+  thoughtbot-shoulda (~> 2.11, >= 2.11)
   wikipedia-client!
 
 BUNDLED WITH
-   1.15.0
+   1.15.1

data/lib/wikipedia.rb

@@ -39,7 +39,7 @@ module Wikipedia
     domain    'en.wikipedia.org'
     path      'w/api.php'
     user_agent(
-      'wikipedia-client/1.3 (https://github.com/kenpratt/wikipedia-client)'
+      'wikipedia-client/1.7 (https://github.com/kenpratt/wikipedia-client)'
     )
   end
 

data/lib/wikipedia/version.rb

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

data/spec/lib/client_spec.rb

@@ -7,7 +7,7 @@ describe Wikipedia::Client, '.find page (mocked)' do
     @client = Wikipedia::Client.new
     @edsger_dijkstra = File.read(File.dirname(__FILE__) + '/../fixtures/Edsger_Dijkstra.json')
     @edsger_content  = JSON.parse(File.read(File.dirname(__FILE__) + '/../fixtures/Edsger_content.txt'))['content']
-    @client.should_receive(:request).and_return(@edsger_dijkstra)
+    expect(@client).to receive(:request).and_return(@edsger_dijkstra)
   end
 
   it 'should execute a request for the page' do
@@ -15,27 +15,27 @@ describe Wikipedia::Client, '.find page (mocked)' do
   end
 
   it 'should return a page object' do
-    @client.find('Edsger_Dijkstra').should be_an_instance_of(Wikipedia::Page)
+    expect(@client.find('Edsger_Dijkstra')).to be_an_instance_of(Wikipedia::Page)
   end
 
   it 'should return a page with the correct content' do
     @page = @client.find('Edsger_Dijkstra')
-    @page.content.should == @edsger_content
+    expect(@page.content).to eq(@edsger_content)
   end
 
   it 'should return a page with a title of Edsger W. Dijkstra' do
     @page = @client.find('Edsger_Dijkstra')
-    @page.title.should == 'Edsger W. Dijkstra'
+    expect(@page.title).to eq('Edsger W. Dijkstra')
   end
 
   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'
+    expect(@page.fullurl).to eq('http://en.wikipedia.org/wiki/Edsger_W._Dijkstra')
   end
 
   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: '
+    expect(@page.text).to start_with 'Edsger Wybe Dijkstra (Dutch pronunciation: '
   end
 
   it 'should return a page with categories' do
@@ -47,7 +47,7 @@ describe Wikipedia::Client, '.find page (mocked)' do
       '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)
+      expect(@page.categories).to include(category)
     end
   end
 
@@ -57,7 +57,7 @@ describe Wikipedia::Client, '.find page (mocked)' do
       '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)
+      expect(@page.links).to include(link)
     end
   end
 
@@ -70,7 +70,7 @@ describe Wikipedia::Client, '.find page (mocked)' do
       'File:Copyright-problem.svg',
       'File:Edsger Wybe Dijkstra.jpg'
     ].each do |file|
-      @page.images.should include(file)
+      expect(@page.images).to include(file)
     end
   end
 end
@@ -81,12 +81,12 @@ describe Wikipedia::Client, '.find page with one section (mocked)' do
     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)
+    expect(@client).to receive(:request).and_return(@edsger_dijkstra)
   end
 
   it 'should have the correct sanitized intro' do
     @page = @client.find('Edsger_Dijkstra', rvsection: 0)
-    @page.sanitized_content.should == @edsger_content
+    expect(@page.sanitized_content).to eq(@edsger_content)
   end
 end
 
@@ -94,7 +94,7 @@ 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)
+    expect(@client).to receive(:request).and_return(@edsger_dijkstra)
   end
 
   it 'should execute a request for the image' do
@@ -102,17 +102,17 @@ describe Wikipedia::Client, '.find image (mocked)' do
   end
 
   it 'should return a page object' do
-    @client.find_image('File:Edsger Wybe Dijkstra.jpg').should be_an_instance_of(Wikipedia::Page)
+    expect(@client.find_image('File:Edsger Wybe Dijkstra.jpg')).to be_an_instance_of(Wikipedia::Page)
   end
 
   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'
+    expect(@page.title).to eq('File:Edsger Wybe Dijkstra.jpg')
   end
 
   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'
+    expect(@page.image_url).to eq('http://upload.wikimedia.org/wikipedia/commons/d/d9/Edsger_Wybe_Dijkstra.jpg')
   end
 end
 
@@ -124,13 +124,13 @@ describe Wikipedia::Client, '.find page (Edsger_Dijkstra)' do
 
   it 'should get a redirect when trying Edsger Dijkstra' do
     @page = @client.find('Edsger Dijkstra')
-    @page.should be_redirect
+    expect(@page).to be_redirect
   end
 
   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
+    expect(@page).not_to be_redirect
   end
 
   it 'should collect the image urls' do
@@ -147,7 +147,7 @@ describe Wikipedia::Client, '.find page (Edsger_Dijkstra)' do
       '/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)
+      expect(@page.image_urls).to include('https://upload.wikimedia.org/wikipedia' + image)
     end
   end
 end
@@ -161,13 +161,13 @@ describe Wikipedia::Client, '.find page (Rails) at jp' do
 
   it 'should get a redirect when trying Rails' do
     @page = @client.find('Rails')
-    @page.should be_redirect
+    expect(@page).to be_redirect
   end
 
   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
+    expect(@page).not_to be_redirect
   end
 end
 
@@ -179,7 +179,7 @@ describe Wikipedia::Client, '.find random page' do
   it 'should get random pages' do
     @page1 = @client.find_random.title
     @page2 = @client.find_random.title
-    @page1.should_not == @page2
+    expect(@page1).not_to eq(@page2)
   end
 end
 
@@ -188,16 +188,16 @@ describe Wikipedia::Client, 'page.summary (mocked)' do
     @client = Wikipedia::Client.new
     @edsger_dijkstra = File.read(File.dirname(__FILE__) + '/../fixtures/Edsger_Dijkstra.json')
     @edsger_content  = JSON.parse(File.read(File.dirname(__FILE__) + '/../fixtures/Edsger_content.txt'))['content']
-    @client.should_receive(:request).and_return(@edsger_dijkstra)
+    expect(@client).to receive(:request).and_return(@edsger_dijkstra)
   end
 
   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] ( );'\
+    expect(@page.summary).to eq('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.'
+    ' program computation. This annual award was renamed the Dijkstra Prize the following year, in his honor.')
   end
 end

data/spec/lib/sanitize_spec.rb

@@ -8,7 +8,7 @@ describe Wikipedia::Page, '.sanitize wiki markup' do
     it "should sanitize #{name} properly" do
       @raw = File.read(raw_filename)
       @sanitized = File.read(sanitized_filename).strip
-      Wikipedia::Page.sanitize(@raw).strip.should == @sanitized
+      expect(Wikipedia::Page.sanitize(@raw).strip).to eq(@sanitized)
     end
   end
 end

data/spec/lib/url_spec.rb

@@ -3,6 +3,6 @@ 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
     url = Wikipedia::Url.new('http://en.wikipedia.org/wiki/Getting_Things_Done')
-    url.title.should == 'Getting_Things_Done'
+    expect(url.title).to eq('Getting_Things_Done')
   end
 end

data/spec/lib/wikipedia_spec.rb

@@ -3,18 +3,18 @@ require File.dirname(__FILE__) + '/../spec_helper'
 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)
+    expect(page).to be_an_instance_of(Wikipedia::Page)
   end
 
   it 'should return a Page with a title' do
     page = Wikipedia.find('Getting_Things_Done')
-    page.title.should_not be_nil
+    expect(page.title).not_to be_nil
   end
 
   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
+    expect(page1.title).to eq(page2.title)
   end
 end

data/wikipedia-client.gemspec

@@ -32,17 +32,17 @@ Gem::Specification.new do |s|
   s.require_paths    << 'lib'
   s.rdoc_options     << '--title' << 'wikipedia-client' << '--main' << '-ri'
 
-  s.add_development_dependency('rake')
-  s.add_development_dependency('rspec')
-  s.add_development_dependency('rdoc')
-  s.add_development_dependency('jeweler')
-  s.add_development_dependency('rubocop')
+  s.add_development_dependency('rake', '~> 10.1')
+  s.add_development_dependency('rspec', '~> 3.0')
+  s.add_development_dependency('rdoc', '~> 4.0')
+  s.add_development_dependency('jeweler', '~> 1.8')
+  s.add_development_dependency('rubocop', '~> 0.48')
 
   if s.respond_to? :specification_version
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0')
-      s.add_development_dependency('thoughtbot-shoulda', ['>= 0'])
+      s.add_development_dependency('thoughtbot-shoulda', '~> 2.11', ['>= 2.11'])
     else
       s.add_dependency('thoughtbot-shoulda', ['>= 0'])
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wikipedia-client
 version: !ruby/object:Gem::Version
-  version: 1.6.4
+  version: 1.7.0
 platform: ruby
 authors:
 - Cyril David
@@ -13,92 +13,98 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-24 00:00:00.000000000 Z
+date: 2017-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.48'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.48'
 - !ruby/object:Gem::Dependency
   name: thoughtbot-shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.11'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.11'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.11'
 description: Ruby client for the Wikipedia API
 email: ken@kenpratt.net
 executables: []