flickru 0.1.2 → 0.2.0

data/lib/flickru.rb

@@ -71,7 +71,7 @@ def self.flickru photo_dir
   Printer.info "#{File.human_readable_size total_size} to upload"
   journey      = Journey.new total_size
   photoset_ids = Set.new
-  photos.each do |photo|
+  photos.sort.each do |photo|
       Printer.info "file '#{File.join File.basename(File.dirname(photo)), File.basename(photo)}' under process"
     begin
       photo_id = Flickr.upload_photo photo

data/lib/flickru/flickr.rb

@@ -1,5 +1,5 @@
 # gems
-require 'flickraw'
+require 'flickraw-cached'
 require 'unicode_utils'
 # flickru
 require 'flickru/file'

data/lib/flickru/location.rb

@@ -1,7 +1,6 @@
 # ruby
 require 'rbconfig'
 # gems
-require 'cache'
 require 'colorize'
 require 'escape'
 require 'open-uri'
@@ -49,8 +48,6 @@ class Location
 
 private
 
-  @@cache = Cache.new
-
   def Location.parse location
 # TODO special characters MAY be escaped
     idx_accuracy = location.index('#') ? location.index('#') : location.length
@@ -102,15 +99,12 @@ private
   end
 
   def Location.geowiki place
-    if not @@cache[place].nil? then
-      return @@cache[place]
-    end
-    wiki = open("http://en.wikipedia.org/wiki/#{place}").read
+    wiki = open("http://en.wikipedia.org/wiki/#{URI::encode(place)}").read
     tool = open(wiki.tr("\"", "\n").split("\n").grep(/geohack/) \
                     .first.sub(/^\/\//,'http://').sub('&','&')).read
     geo  = tool.split("\n").grep(/<span class="geo"/).first
     latitude  = geo.sub(/^.*"Latitude">/, '').sub(/<\/span>, .*/, '')
     longitude = geo.sub(/.*"Longitude">/, '').sub(/<\/span>.*$/, '')
-    @@cache[place] = latitude + ", " + longitude
+    latitude + ", " + longitude
   end
 end

data/lib/flickru/version.rb

@@ -1,5 +1,5 @@
 module Flickru
   unless defined? VERSION
-    VERSION = "0.1.2"
+    VERSION = "0.2.0"
   end
 end

data/spec/flickru_spec.rb

@@ -1,7 +1,7 @@
 # gems
 require 'colorize'
 require 'simplecov'
-SimpleCov.coverage_dir(File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'var', 'cov')))
+SimpleCov.coverage_dir(File.join('var', 'cov'))
 SimpleCov.start # should be before loading flickru code!
 # flickru
 require 'flickru'
@@ -43,6 +43,10 @@ describe Flickru do
     Flickru.flickru "var/ts/tc_whitespaces"
   end
 
+  it "processing by alphabetical order (by filename)" do
+    Flickru.flickru "var/ts/tc_sorting"
+  end
+
   after(:all) do
     puts "\nRemember to delete the testing files that have been just uploaded to your Flickr's collection 'Testing Collection*'.".red
   end

metadata

@@ -1,172 +1,196 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: flickru
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.0
   prerelease: 
-  version: 0.1.2
 platform: ruby
-authors: 
+authors:
 - Jesus Pardillo
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-05-14 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-08-16 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: bundler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 1.3.5
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: colorize
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.5
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.5.8
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: escape
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.8
+- !ruby/object:Gem::Dependency
+  name: escape
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 0.0.4
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: exifr
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.1.1
-  type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: flickraw
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+      - !ruby/object:Gem::Version
+        version: 0.0.4
+- !ruby/object:Gem::Dependency
+  name: exifr
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.9.4
+      - !ruby/object:Gem::Version
+        version: 1.1.3
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rubygems-update
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.3
+- !ruby/object:Gem::Dependency
+  name: flickraw-cached
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.8.11
+      - !ruby/object:Gem::Version
+        version: '20120701'
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: unicode_utils
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.1.2
+      - !ruby/object:Gem::Version
+        version: '20120701'
+- !ruby/object:Gem::Dependency
+  name: rubygems-update
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.7
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: simplecov
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 0.5.4
-  type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: 2.0.7
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.14.1
+  type: :development
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.14.1
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.7.0
+      - !ruby/object:Gem::Version
+        version: 0.7.1
   type: :development
-  version_requirements: *id009
-description: |
-  Command-line tool that automatises photo/video uploads to Flickr.
-  
-  Entering 'flickru <directory>' in your command line, any photos under 'directory' (and subdirs)
-  are uploaded to your Flickr account (interactively entered the first time you start flickru).
-  
-  Photos are identified by case-insensitive extensions: GIF, JPEG, JPG, PNG, and TIFF.
-  Videos are identified by case-insensitive extensions: AVI, MPEG, and MPG.
-  
-  flickru automatically sets the following Flickr metadata:
-   (1) date taken: file last-modification time, unless JPEG/TIFF Exif metadatum
-       'date_time_original' is found (Flickr understands it natively).
-   (2) privacy policy: private, visible by friends & family, hidden for public
-       searches
-   (3) safety level: safe
-   (4) permissions: friends & family can add comments to the photo and its notes;
-       nobody can add notes and tags to the photo
-   (5) description: for videos longer than 90s (Flickr's longest allowed duration)
-       but shorter than 500MB (Flickr's maximum permisible size), it will contain
-       an annotation about its large duration.
-   (6) title: extracted from the parent directory name
-   (7) geolocation & accuracy: extracted from the parent directory name, unless
-       JPEG/TIFF Exif GPS metadata is found (Flickr understands them natively).
-  
-  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. 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',
-       'country', 'world'.
-  
-  Photos are classified into photosets. If the photoset does not exist, flickru
-  creates it. This photoset is named after its grandparent directory. The
-  photoset is arranged by 'date taken' (older first).
-  
-  To see some examples on the directory structure recognised by flickru, please
-  explore the subdirectories under 'var/ts'.
-  
-  GitHub  : http://github.com/jesuspv/flickru
-  RubyGems: http://rubygems.org/gems/flickru
-
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+- !ruby/object:Gem::Dependency
+  name: unicode_utils
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.4.0
+description: ! "Command-line tool that automatises photo/video uploads to Flickr.\n\nEntering
+  'flickru <directory>' in your command line, any photos under 'directory' (and subdirs)\nare
+  uploaded to your Flickr account (interactively entered the first time you start
+  flickru).\n\nPhotos are identified by case-insensitive extensions: GIF, JPEG, JPG,
+  PNG, and TIFF.\nVideos are identified by case-insensitive extensions: AVI, MPEG,
+  and MPG.\n\nflickru automatically sets the following Flickr metadata:\n (1) date
+  taken: file last-modification time, unless JPEG/TIFF Exif metadatum\n     'date_time_original'
+  is found (Flickr understands it natively).\n (2) privacy policy: private, visible
+  by friends & family, hidden for public\n     searches\n (3) safety level: safe\n
+  (4) permissions: friends & family can add comments to the photo and its notes;\n
+  \    nobody can add notes and tags to the photo\n (5) description: for videos longer
+  than 90s (Flickr's longest allowed duration)\n     but shorter than 500MB (Flickr's
+  maximum permisible size), it will contain\n     an annotation about its large duration.\n
+  (6) title: extracted from the parent directory name\n (7) geolocation & accuracy:
+  extracted from the parent directory name, unless\n     JPEG/TIFF Exif GPS metadata
+  is found (Flickr understands them natively).\n\nBefore uploading photos, please,
+  make sure that you have correctly named each\nphotos parent directory according
+  to the name format 'TITLE[@LOCATION[#PRECISION]]',\nwhere:\n (1) TITLE is the desired
+  title for the photos stored in the directory. If no\n     LOCATION is given, flickru
+  tries to extract the location from Wikipedia\n     page TITLE.\n (2) LOCATION is
+  the location of the photos, specified as:\n   (a) the Wikipedia page name (whitespaces
+  allowed) of the location or\n   (b) its coordinates LATITUDE,LONGITUDE\n (3) PRECISION
+  is the Flickr geolocation precision. Flickru sets it to one of\n     the following
+  case insentitive literals: 'street', 'city', 'region',\n     'country', 'world'.\n\nPhotos
+  are classified into photosets. If the photoset does not exist, flickru\ncreates
+  it. This photoset is named after its grandparent directory. The\nphotoset is arranged
+  by 'date taken' (older first).\n\nTo see some examples on the directory structure
+  recognised by flickru, please\nexplore the subdirectories under 'var/ts'.\n\nGitHub
+  \ : http://github.com/jesuspv/flickru\nRubyGems: http://rubygems.org/gems/flickru\n"
+email:
 - dev@jesuspardillo.com
-executables: 
+executables:
 - flickru
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README
 - bin/flickru
 - bin/geowiki
@@ -220,38 +244,41 @@ files:
 - var/ts/tc_large_files/Testing Collection/Too Large!/80MB-of-zeros.mpg.zip
 - var/ts/tc_locations/Testing Collection/Quebec#region/Quebec#region.jpg
 - var/ts/tc_locations/Testing Collection/Troll Face/Troll Face.jpg
-- var/ts/tc_locations/Testing Collection/Troll Face@38.356797,-0.474376#world/Troll Face@38.356797,-0.474376#world.jpg
+- var/ts/tc_locations/Testing Collection/Troll Face@38.356797,-0.474376#world/Troll
+  Face@38.356797,-0.474376#world.jpg
 - var/ts/tc_locations/Testing Collection/Troll Face@38.356797,-0.474376/Troll Face@38.356797,-0.474376.jpg
 - var/ts/tc_locations/Testing Collection/Troll Face@Montreal/Troll Face@Montreal.jpg
 - var/ts/tc_locations/Testing Collection/Troll Face@Quebec#region/Troll Face@Quebec#region.jpg
+- var/ts/tc_sorting/Testing Collection/a.jpg
+- var/ts/tc_sorting/Testing Collection/b.jpg
+- var/ts/tc_sorting/Testing Collection/c.jpg
+- var/ts/tc_sorting/Testing Collection/d.jpg
+- var/ts/tc_sorting/Testing Collection/e.jpg
 homepage: http://github.com/jesuspv/flickru
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Command-line Flickr upload automator
-test_files: 
+test_files:
 - spec/flickru_spec.rb
 - var/ts/tc_accuracies/Testing Collection/Troll Face@Spain#Country/Troll Face@Spain#Country.jpg
 - var/ts/tc_accuracies/Testing Collection/Troll Face@Spain#ReGiOn/Troll Face@Spain#ReGiOn.jpg
@@ -293,7 +320,13 @@ test_files:
 - var/ts/tc_large_files/Testing Collection/Too Large!/80MB-of-zeros.mpg.zip
 - var/ts/tc_locations/Testing Collection/Quebec#region/Quebec#region.jpg
 - var/ts/tc_locations/Testing Collection/Troll Face/Troll Face.jpg
-- var/ts/tc_locations/Testing Collection/Troll Face@38.356797,-0.474376#world/Troll Face@38.356797,-0.474376#world.jpg
+- var/ts/tc_locations/Testing Collection/Troll Face@38.356797,-0.474376#world/Troll
+  Face@38.356797,-0.474376#world.jpg
 - var/ts/tc_locations/Testing Collection/Troll Face@38.356797,-0.474376/Troll Face@38.356797,-0.474376.jpg
 - var/ts/tc_locations/Testing Collection/Troll Face@Montreal/Troll Face@Montreal.jpg
 - var/ts/tc_locations/Testing Collection/Troll Face@Quebec#region/Troll Face@Quebec#region.jpg
+- var/ts/tc_sorting/Testing Collection/a.jpg
+- var/ts/tc_sorting/Testing Collection/b.jpg
+- var/ts/tc_sorting/Testing Collection/c.jpg
+- var/ts/tc_sorting/Testing Collection/d.jpg
+- var/ts/tc_sorting/Testing Collection/e.jpg