wikipedia-client 1.7.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8024a11ef6429ca95c92e25f64702723e4ef490
-  data.tar.gz: aefa68138e1a5f9bd4b764628c51577f2d82e887
+  metadata.gz: 67327f1838111f1bed4ca3182d8cc835ea4e90a1
+  data.tar.gz: f8d7f4f997ea1e8e75dcf218722e75bccc05943c
 SHA512:
-  metadata.gz: fe5bc76004bc8dca7530f87ac9b2c719c14bf45e81b9285da6e6f08c2b894c2e24e6baf8a5242a46611ec6e359c16c9be87088420e4da24077dc0e6dce04dca4
-  data.tar.gz: 951a31d710ac2e3a69c10b37bb4e07a456e5bf6a77e5607f06f5eb46ccaf7bbaaf13612d34d5169119cebcd60dfde8cf036448311e0228bb92b203c4809c9730
+  metadata.gz: 233353d769eb80065b44c2e18f109431d471f84b93daf5257f3de460a6d21f0deb581764cfc949c7431f89ec6e6db77b75a8d8f988ace6f8f1d26305a591f0f4
+  data.tar.gz: 95cbac02fbe073e72b0ec9a2f6b8cd1874279492f83842c8ae1e166e9d000018f63fe02749be704fce9b3ab0a6c9455dbf31254bc1f79a9ef5a202ac7d5f4845

data/.rubocop.yml

@@ -24,4 +24,4 @@ Style/SymbolArray:
   Enabled: false
 
 Metrics/ClassLength:
-  Max: 120
+  Max: 125

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    wikipedia-client (1.7.1)
+    wikipedia-client (1.8.0)
 
 GEM
   remote: https://rubygems.org/

data/README.textile

@@ -60,6 +60,18 @@ page.image_urls
 
 => ["http://upload.wikimedia.org/wikipedia/en/e/e1/Getting_Things_Done.jpg"]
 
+default width: 200
+
+page.image_thumburls
+
+=> ["https://upload.wikimedia.org/wikipedia/en/thumb/e/e1/Getting_Things_Done.jpg/200px-Getting_Things_Done.jpg"]
+
+or with custom width argument:
+
+page.image_thumburls(100)
+
+=> ["https://upload.wikimedia.org/wikipedia/en/thumb/e/e1/Getting_Things_Done.jpg/100px-Getting_Things_Done.jpg"]
+
 page.image_descriptionurls
 
 => ["http://en.wikipedia.org/wiki/File:Getting_Things_Done.jpg"]

data/lib/wikipedia/client.rb

@@ -42,12 +42,13 @@ module Wikipedia
       }.merge( options ) )
     end
 
-    # http://en.wikipedia.org/w/api.php?action=query&format=json&prop=imageinfo&iiprop=url&titles=File:Flower.png
+    # http://en.wikipedia.org/w/api.php?action=query&format=json&prop=imageinfo&iiprop=url&iiurlwidth=200&titles=File:Albert%20Einstein%20Head.jpg
     def request_image( title, options = {} )
       request( {
         action: 'query',
         prop: 'imageinfo',
         iiprop: 'url',
+        iiurlwidth: options && options[:iiurlwidth] ? options[:iiurlwidth] : 200,
         titles: title
       }.merge( options ) )
     end

data/lib/wikipedia/page.rb

@@ -68,6 +68,10 @@ module Wikipedia
       page['imageinfo'].first['url'] if page['imageinfo']
     end
 
+    def image_thumburl
+      page['imageinfo'].first['thumburl'] if page['imageinfo']
+    end
+
     def image_descriptionurl
       page['imageinfo'].first['descriptionurl'] if page['imageinfo']
     end
@@ -76,6 +80,11 @@ module Wikipedia
       image_metadata.map(&:image_url) unless image_metadata.nil?
     end
 
+    def image_thumburls( width = nil )
+      options = width.nil? ? {} : { iiurlwidth: width }
+      image_metadata( options ).map(&:image_thumburl) unless image_metadata( options ).nil?
+    end
+
     def image_descriptionurls
       image_metadata.map(&:image_descriptionurl) unless image_metadata.nil?
     end
@@ -92,11 +101,11 @@ module Wikipedia
       @data
     end
 
-    def image_metadata
+    def image_metadata( options = {} )
       unless @cached_image_metadata
         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) }
+        @cached_image_metadata = filtered.map { |title| Wikipedia.find_image(title, options) }
       end
       @cached_image_metadata || []
     end

data/lib/wikipedia/version.rb

@@ -1,3 +1,3 @@
 module Wikipedia
-  VERSION = '1.7.1'.freeze
+  VERSION = '1.8.0'.freeze
 end

data/spec/lib/client_spec.rb

@@ -150,6 +150,38 @@ describe Wikipedia::Client, '.find page (Edsger_Dijkstra)' do
       expect(@page.image_urls).to include('https://upload.wikimedia.org/wikipedia' + image)
     end
   end
+
+  it 'should collect the image thumbnail urls with default width' do
+    @client.follow_redirects = true
+    @page = @client.find('Edsger Dijkstra')
+    [
+      '/en/thumb/4/4a/Commons-logo.svg/200px-Commons-logo.svg.png',
+      '/en/thumb/4/48/Folder_Hexagonal_Icon.svg/200px-Folder_Hexagonal_Icon.svg.png',
+      '/commons/thumb/5/57/Dijkstra_Animation.gif/200px-Dijkstra_Animation.gif',
+      '/commons/thumb/c/c9/Edsger_Dijkstra_1994.jpg/200px-Edsger_Dijkstra_1994.jpg',
+      '/commons/thumb/d/d9/Edsger_Wybe_Dijkstra.jpg/200px-Edsger_Wybe_Dijkstra.jpg',
+      '/commons/thumb/0/00/Complex-adaptive-system.jpg/200px-Complex-adaptive-system.jpg',
+      '/en/thumb/4/4d/Centrum-wiskunde-informatica-logo.png/200px-Centrum-wiskunde-informatica-logo.png'
+    ].each do |image|
+      expect(@page.image_thumburls).to include('https://upload.wikimedia.org/wikipedia' + image)
+    end
+  end
+
+  it 'should collect the image thumbnail urls with specified width' do
+    @client.follow_redirects = true
+    @page = @client.find('Edsger Dijkstra')
+    [
+      '/en/thumb/4/4a/Commons-logo.svg/100px-Commons-logo.svg.png',
+      '/en/thumb/4/48/Folder_Hexagonal_Icon.svg/100px-Folder_Hexagonal_Icon.svg.png',
+      '/commons/thumb/5/57/Dijkstra_Animation.gif/100px-Dijkstra_Animation.gif',
+      '/commons/thumb/c/c9/Edsger_Dijkstra_1994.jpg/100px-Edsger_Dijkstra_1994.jpg',
+      '/commons/thumb/d/d9/Edsger_Wybe_Dijkstra.jpg/100px-Edsger_Wybe_Dijkstra.jpg',
+      '/commons/thumb/0/00/Complex-adaptive-system.jpg/100px-Complex-adaptive-system.jpg',
+      '/en/thumb/4/4d/Centrum-wiskunde-informatica-logo.png/100px-Centrum-wiskunde-informatica-logo.png'
+    ].each do |image|
+      expect(@page.image_thumburls(100)).to include('https://upload.wikimedia.org/wikipedia' + image)
+    end
+  end
 end
 
 describe Wikipedia::Client, '.find page (Rails) at jp' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wikipedia-client
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0
 platform: ruby
 authors:
 - Cyril David
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-06 00:00:00.000000000 Z
+date: 2017-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake