flickru 0.0.13 → 0.0.14

data/README

@@ -23,9 +23,11 @@ flickru automatically sets the following Flickr metadata:
 Before uploading photos, please, make sure that you have correctly named each
 photos parent directory according to the name format 'TITLE[@LOCATION[#PRECISION]]',
 where:
- (1) TITLE is the desired title for the photos stored in the directory
- (2) LOCATION is the location of the photos. Flickru gets locations in two ways:
-   (a) the Wikipedia page name (whitespaces allowed) of the location (if exists) or
+ (1) TITLE is the desired title for the photos stored in the directory. If no
+     LOCATION is given, flickru tries to extract the location from Wikipedia
+     page TITLE.
+ (2) LOCATION is the location of the photos, specified as:
+   (a) the Wikipedia page name (whitespaces allowed) of the location or
    (b) its coordinates LATITUDE,LONGITUDE
  (3) PRECISION is the Flickr geolocation precision. Flickru sets it to one of
      the following case insentitive literals: 'street', 'city', 'region',

data/bin/geowiki

@@ -18,7 +18,7 @@ function usage {
 }
 
 function error {
-   echo -e "\033[31m$APP_NAME: $1: $2\033[0m" 1>&2
+   echo -e "\033[31m$APP_NAME:$1: $2\033[0m" 1>&2
 }
 
 #################

data/lib/flickru/location.rb

@@ -3,13 +3,13 @@ require 'rbconfig'
 # gems
 require 'colorize'
 require 'escape'
+require 'open-uri'
 # flickru
 require 'flickru/ruby'
 require 'flickru/string'
 
 class Location
 
-  GEOWIKI = File.expand_path(File.join File.dirname(__FILE__), '..', '..', 'bin', 'geowiki')
   DEFAULT_ACCURACY = "street"
   COORD_PATTERN = "-?[0-9]+\.?[0-9]*"
 
@@ -47,7 +47,7 @@ class Location
 
 private
 
-  def self.parse location
+  def Location.parse location
 # TODO special characters MAY be escaped
     idx_accuracy = location.index('#') ? location.index('#') : location.length
     idx_place    = location.index('@') ? location.index('@') : idx_accuracy
@@ -59,15 +59,10 @@ private
     [name, place, accuracy]
   end
 
-  def self.locate place
+  def Location.locate place
     the_place = place # needed for RuntimeError reporting
     begin
-      is_win  = case RbConfig::CONFIG['target_os']
-                when /mswin|mingw|cygwin/i then true
-                else false end
-      command = Escape.shell_command((is_win ? ['bash'] : []) + [GEOWIKI, place])
-      null    = is_win ? 'NUL' : '/dev/null'
-      place = `#{command} 2> #{null}`[0..-2] \
+      place = Location.geowiki place \
         if place !~ /^#{COORD_PATTERN}, *#{COORD_PATTERN}$/
       if place =~ /^#{COORD_PATTERN}, *#{COORD_PATTERN}$/
         # latitude, longitude
@@ -76,12 +71,7 @@ private
         raise RuntimeError
       end
     rescue
-      message = "location #{the_place} not found"
-      if is_win
-        message += ", please, verify that command 'bash' (from, e.g., " +
-                   "http://unxutils.sourceforge.net) is in your PATH"
-      end
-      raise RuntimeError, message
+      raise RuntimeError, "location #{the_place} not found"
     end
   end
 
@@ -106,4 +96,14 @@ private
     else         @accuracy
     end
   end
+
+  def Location.geowiki place
+    wiki = open("http://en.wikipedia.org/wiki/#{place}").read
+    geo  = open(wiki.tr("\"", "\n").split("\n").grep(/geohack/)
+                    .first.sub('&','&')).read \
+           .split("\n").grep(/<span class="geo"/).first
+    latitude  = geo.sub(/^.*"Latitude">/, '').sub(/<\/span>, .*/, '')
+    longitude = geo.sub(/.*"Longitude">/, '').sub(/<\/span>.*$/, '')
+    latitude + ", " + longitude
+  end
 end

data/lib/flickru/version.rb

@@ -1,5 +1,5 @@
 module Flickru
   unless defined? VERSION
-    VERSION = "0.0.13"
+    VERSION = "0.0.14"
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: flickru
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors: 
 - Jesus Pardillo
@@ -137,9 +137,11 @@ description: |
   Before uploading photos, please, make sure that you have correctly named each
   photos parent directory according to the name format 'TITLE[@LOCATION[#PRECISION]]',
   where:
-   (1) TITLE is the desired title for the photos stored in the directory
-   (2) LOCATION is the location of the photos. Flickru gets locations in two ways:
-     (a) the Wikipedia page name (whitespaces allowed) of the location (if exists) or
+   (1) TITLE is the desired title for the photos stored in the directory. If no
+       LOCATION is given, flickru tries to extract the location from Wikipedia
+       page TITLE.
+   (2) LOCATION is the location of the photos, specified as:
+     (a) the Wikipedia page name (whitespaces allowed) of the location or
      (b) its coordinates LATITUDE,LONGITUDE
    (3) PRECISION is the Flickr geolocation precision. Flickru sets it to one of
        the following case insentitive literals: 'street', 'city', 'region',