wikipedia-client 1.1.2 → 1.2.0

data/README.textile

@@ -40,7 +40,18 @@ page.images
 
 page.image_urls
 
-=> ["http://upload.wikimedia.org/wikipedia/en/e/e1/Getting_Things_Done.jpg", ...]]</code></pre>
+=> ["http://upload.wikimedia.org/wikipedia/en/e/e1/Getting_Things_Done.jpg"]
+
+page.image_descriptionurls
+=> ["http://en.wikipedia.org/wiki/File:Getting_Things_Done.jpg"]
+
+page.coordinates
+
+=> [48.853, 2.3498, "", "earth"]
+
+page.templates
+
+=> [..., "Template:About", ...]</code></pre>
 
 h2. Configuration
 

data/VERSION

@@ -1 +1 @@
-1.1.2
+1.2.0

data/lib/wikipedia/client.rb

@@ -27,7 +27,7 @@ module Wikipedia
     def request_page( title, options = {} )
       request( {
                  :action => "query",
-                 :prop => %w{ revisions links images categories coordinates },
+                 :prop => %w{ revisions links images categories coordinates templates },
                  :rvprop => "content",
                  :titles => title
                }.merge( options ) )

data/lib/wikipedia/page.rb

@@ -48,17 +48,16 @@ module Wikipedia
       page['imageinfo'].first['url'] if page['imageinfo']
     end
 
+    def image_descriptionurl
+      page['imageinfo'].first['descriptionurl'] if page['imageinfo']
+    end
+
     def image_urls
-      if list = images
-        filtered = list.select {|i| i =~ /^file:.+\.(jpg|jpeg|png|gif)$/i && !i.include?("LinkFA-star") }
-        filtered.map do |title|
-          Wikipedia.find_image( title ).image_url
-        end
-      end
+      image_metadata.map {|img| img.image_url }
     end
 
-    def image_descriptionurl
-      page['imageinfo'].first['descriptionurl'] if page['imageinfo']
+    def image_descriptionurls
+      image_metadata.map {|img| img.image_descriptionurl }
     end
 
     def coordinates
@@ -69,6 +68,20 @@ module Wikipedia
       @data
     end
 
+    def image_metadata
+      unless @cached_image_metadata
+        if list = images
+          filtered = list.select {|i| i =~ /^file:.+\.(jpg|jpeg|png|gif)$/i && !i.include?("LinkFA-star") }
+          @cached_image_metadata = filtered.map {|title| Wikipedia.find_image(title) }
+        end
+      end
+      @cached_image_metadata || []
+    end
+
+    def templates
+      page['templates'].map {|c| c['title'] } if page['templates']
+    end
+
     def json
       @json
     end

data/wikipedia-client.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "wikipedia-client"
-  s.version = "1.1.2"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cyril David", "Ken Pratt", "Mike Haugland"]
-  s.date = "2013-06-26"
+  s.date = "2013-06-27"
   s.description = "Ruby client for the Wikipedia API"
   s.email = "mike.haugland@gmail.com"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wikipedia-client
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2013-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thoughtbot-shoulda