Skip to content

Commit

Permalink
Added page.image_descriptionurls method, updated README.
Browse files Browse the repository at this point in the history
  • Loading branch information
kenpratt committed Jun 27, 2013
1 parent 6df5281 commit 466d39e
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 11 deletions.
9 changes: 6 additions & 3 deletions README.textile
Expand Up @@ -40,15 +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"]
=> [48.853, 2.3498, "", "earth"]

page.templates

=> [..., "Template:About", ...]
=> [..., "Template:About", ...]</code></pre>

h2. Configuration

Expand Down
25 changes: 17 additions & 8 deletions lib/wikipedia/page.rb
Expand Up @@ -48,17 +48,16 @@ def image_url
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
Expand All @@ -69,6 +68,16 @@ def raw_data
@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
Expand Down

0 comments on commit 466d39e

Please sign in to comment.