tumblr-sync 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c7ca6b3b3e4b62a67f38becef728495e1669df1
-  data.tar.gz: a559f845a2bebabeec7efaadb019300ddf642f1d
+  metadata.gz: a2edebfa1352fb0b59d5bd7d2303511cfd92fc44
+  data.tar.gz: 9d035dba102a1d72c8d638ae8a04dd120ccba82f
 SHA512:
-  metadata.gz: 5e3eb49cc10633af64c5b1425ff2a04c5c3d0872efbbfb241d31f290221802d1678dd7d76c123eff344f47f6cdcd4d8cf2e5e0b60c8c6169f5deaa479138328c
-  data.tar.gz: 13b4a9f16319db3406525bc31b584008fee41c8b2ac96a36415c3c62e76c5a82a8d16106b8f30fa41466db8210b8108aedf738a57b52fca24d1a5a6dc3e7f6f7
+  metadata.gz: 016d7bc3325a367056f86140198dfa4adadb8bfddb07593826dd78779446d99ea3650ecffa447d367e9366b487e1057e262303c6ab88332a8cab2f4f1d724138
+  data.tar.gz: a78b6d9a55a200f6d9dfb0d3252da6494bbbfd7947fcc877385ba60cec04b3121fe90d2e95f3bb84e6339ec57f8d331b1a7a3b7ef3ad7bb9dc7b945148820693

data/.travis.yml

@@ -1,4 +1,4 @@
 language: ruby
 rvm:
-  - 1.9.3
   - 2.0.0
+  - 2.3.0

data/README.md

@@ -1,5 +1,8 @@
 # TumblrSync
 
+[![Build Status](https://travis-ci.org/madwork/tumblr-sync.png)](https://travis-ci.org/madwork/tumblr-sync)
+[![Gem Version](https://badge.fury.io/rb/tumblr-sync.png)](http://badge.fury.io/rb/tumblr-sync)
+
 MultiThread Tumblr Synchronization
 
 You like download and fill your hard drive with tons of funny pictures, this tool is for you!

data/lib/tumblr-sync/runner.rb

@@ -29,15 +29,18 @@ module TumblrSync
           images = queue.pop
           images.each_slice(10).each do |group|
             threads = []
-            group.each do |url|
-              threads << Thread.new {
-                begin
-                  photo_fetcher.fetch url
-                rescue Mechanize::ResponseCodeError
-                ensure
-                  progress_bar.increment
-                end
-              }
+            group.each do |urls|
+              progress_bar.total += (urls.size - 1)
+              urls.each do |url|
+                threads << Thread.new {
+                  begin
+                    photo_fetcher.fetch url
+                  rescue Mechanize::ResponseCodeError
+                  ensure
+                    progress_bar.increment
+                  end
+                }
+              end
             end
             threads.each(&:join)
           end

data/lib/tumblr-sync/tumblr.rb

@@ -16,7 +16,7 @@ module TumblrSync
     def images(start, number = MAX)
       response = Net::HTTP.get_response uri_endpoint(type: :photo, start: start, num: number)
       doc = Nokogiri::XML.parse response.body
-      doc.xpath("//posts/post/photo-url[@max-width='1280']").map { |url| url.text.strip }
+      doc.xpath("//posts/post").map{|post| post.xpath(".//photo-url[@max-width='1280']").map { |url| url.text.strip }.uniq }
     end
 
     def total

data/lib/tumblr-sync/version.rb

@@ -1,3 +1,3 @@
 module TumblrSync
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/test/fixtures/api.xml

@@ -59,5 +59,43 @@ http://24.media.tumblr.com/tumblr_mebojvwCIb1rjwt7po1_75sq.jpg
 <tag>look</tag>
 <tag>clothes</tag>
 </post>
+<post id="114776082263" url="http://steveargyle.tumblr.com/post/114776082263" url-with-slug="http://steveargyle.tumblr.com/post/114776082263/thalia-guardian-of-thraben-world-magic-cup-promo" type="photo" date-gmt="2015-03-27 19:35:35 GMT" date="Fri, 27 Mar 2015 13:35:35" unix-timestamp="1427484935" format="html" reblog-key="yPypkR39" slug="thalia-guardian-of-thraben-world-magic-cup-promo" width="900" height="657">
+  <photo-caption>&lt;h2&gt;Thalia, Guardian of Thraben World Magic Cup promo card has finally spoiled!&lt;/h2&gt;&lt;p&gt;Creating artwork for a promotional version of a character is an interesting challenge of balance.  You need the work to stay true to the original, but offer some new insight, story, or perspective.  It&amp;rsquo;s also really intimidating to be following artwork that is already incredible, such as the original by Jana Schirmer and Johannes Voss.&lt;/p&gt;&lt;p&gt;As shown in the sketches, a few of the approaches considered were to show her in front of, or in, a vibrant, thriving city of Thraben.  Or perhaps commanding her armies, or admiring a statue of Avacyn.  While you only get one piece in the end, between me, the art directors, and the concept teams, a whole lot of ideas are explored.  In the end, we settled on one with subtlety.  Instead of a more typical Magic high-action, or epic hero shot, we see this fearsome commander in a moment of humility, saluting another mighty guardian, Avacyn.&lt;/p&gt;&lt;p&gt;And that part is pretty subtle, no?  Avacyn is portrayed here almost entirely as a light source.  And while you&amp;rsquo;ll never-never-never-ever-ever see it on the card, Avacyn is there, a tiny little reflection of her in Thalia&amp;rsquo;s eyes.  I am relentlessly detail obsessed, if you hadn&amp;rsquo;t already noticed.  (Such as the basket hilt design, which if you haven&amp;rsquo;t caught it, is a heron of Innistrad.)&lt;/p&gt;&lt;p&gt;For Magic the Gathering. Copyright Wizards of the Coast. Art directed by Jeremy Jarvis.&lt;/p&gt;&lt;p&gt;&lt;a href="http://www.steveargyle.com/#!thalia-guardian-of-thraben/c9g5"&gt;http://www.steveargyle.com/#!thalia-guardian-of-thraben/c9g5&lt;/a&gt;&lt;br/&gt;&lt;/p&gt;</photo-caption>
+  <photo-url max-width="1280">http://40.media.tumblr.com/7bf3bc523a3c0f99ad095bb048ec7f05/tumblr_nlvyfb7Fm41r3bmeoo1_1280.jpg</photo-url>
+  <photo-url max-width="500">http://40.media.tumblr.com/7bf3bc523a3c0f99ad095bb048ec7f05/tumblr_nlvyfb7Fm41r3bmeoo1_500.jpg</photo-url>
+  <photo-url max-width="400">http://40.media.tumblr.com/7bf3bc523a3c0f99ad095bb048ec7f05/tumblr_nlvyfb7Fm41r3bmeoo1_400.jpg</photo-url>
+  <photo-url max-width="250">http://40.media.tumblr.com/7bf3bc523a3c0f99ad095bb048ec7f05/tumblr_nlvyfb7Fm41r3bmeoo1_250.jpg</photo-url>
+  <photo-url max-width="100">http://41.media.tumblr.com/7bf3bc523a3c0f99ad095bb048ec7f05/tumblr_nlvyfb7Fm41r3bmeoo1_100.jpg</photo-url>
+  <photo-url max-width="75">http://40.media.tumblr.com/7bf3bc523a3c0f99ad095bb048ec7f05/tumblr_nlvyfb7Fm41r3bmeoo1_75sq.jpg</photo-url>
+  <photoset>
+    <photo offset="o1" caption="Saluting Avacyn" width="900" height="657">
+      <photo-url max-width="1280">http://40.media.tumblr.com/7bf3bc523a3c0f99ad095bb048ec7f05/tumblr_nlvyfb7Fm41r3bmeoo1_1280.jpg</photo-url>
+      <photo-url max-width="500">http://40.media.tumblr.com/7bf3bc523a3c0f99ad095bb048ec7f05/tumblr_nlvyfb7Fm41r3bmeoo1_500.jpg</photo-url>
+      <photo-url max-width="400">http://40.media.tumblr.com/7bf3bc523a3c0f99ad095bb048ec7f05/tumblr_nlvyfb7Fm41r3bmeoo1_400.jpg</photo-url>
+      <photo-url max-width="250">http://40.media.tumblr.com/7bf3bc523a3c0f99ad095bb048ec7f05/tumblr_nlvyfb7Fm41r3bmeoo1_250.jpg</photo-url>
+      <photo-url max-width="100">http://41.media.tumblr.com/7bf3bc523a3c0f99ad095bb048ec7f05/tumblr_nlvyfb7Fm41r3bmeoo1_100.jpg</photo-url>
+      <photo-url max-width="75">http://40.media.tumblr.com/7bf3bc523a3c0f99ad095bb048ec7f05/tumblr_nlvyfb7Fm41r3bmeoo1_75sq.jpg</photo-url>
+    </photo>
+    <photo offset="o3" caption="Lots of ideas were discussed" width="800" height="584">
+      <photo-url max-width="1280">http://36.media.tumblr.com/4904f4db02d987c12b215a2845a7294b/tumblr_nlvyfb7Fm41r3bmeoo3_1280.jpg</photo-url>
+      <photo-url max-width="500">http://36.media.tumblr.com/4904f4db02d987c12b215a2845a7294b/tumblr_nlvyfb7Fm41r3bmeoo3_500.jpg</photo-url>
+      <photo-url max-width="400">http://40.media.tumblr.com/4904f4db02d987c12b215a2845a7294b/tumblr_nlvyfb7Fm41r3bmeoo3_400.jpg</photo-url>
+      <photo-url max-width="250">http://40.media.tumblr.com/4904f4db02d987c12b215a2845a7294b/tumblr_nlvyfb7Fm41r3bmeoo3_250.jpg</photo-url>
+      <photo-url max-width="100">http://40.media.tumblr.com/4904f4db02d987c12b215a2845a7294b/tumblr_nlvyfb7Fm41r3bmeoo3_100.jpg</photo-url>
+      <photo-url max-width="75">http://40.media.tumblr.com/4904f4db02d987c12b215a2845a7294b/tumblr_nlvyfb7Fm41r3bmeoo3_75sq.jpg</photo-url>
+    </photo>
+    <photo offset="o2" caption="They opted not to go for this one, sadly." width="800" height="1118">
+      <photo-url max-width="1280">http://40.media.tumblr.com/24070cfbdeed18e81b025b1fa76c5ccd/tumblr_nlvyfb7Fm41r3bmeoo2_1280.jpg</photo-url>
+      <photo-url max-width="500">http://40.media.tumblr.com/24070cfbdeed18e81b025b1fa76c5ccd/tumblr_nlvyfb7Fm41r3bmeoo2_500.jpg</photo-url>
+      <photo-url max-width="400">http://41.media.tumblr.com/24070cfbdeed18e81b025b1fa76c5ccd/tumblr_nlvyfb7Fm41r3bmeoo2_400.jpg</photo-url>
+      <photo-url max-width="250">http://40.media.tumblr.com/24070cfbdeed18e81b025b1fa76c5ccd/tumblr_nlvyfb7Fm41r3bmeoo2_250.jpg</photo-url>
+      <photo-url max-width="100">http://36.media.tumblr.com/24070cfbdeed18e81b025b1fa76c5ccd/tumblr_nlvyfb7Fm41r3bmeoo2_100.jpg</photo-url>
+      <photo-url max-width="75">http://41.media.tumblr.com/24070cfbdeed18e81b025b1fa76c5ccd/tumblr_nlvyfb7Fm41r3bmeoo2_75sq.jpg</photo-url>
+    </photo>
+  </photoset>
+  <tag>thalia</tag>
+  <tag>world magic cup</tag>
+  <tag>mtg promo</tag>
+</post>
 </posts>
-</tumblr>
+</tumblr>

data/test/test_tumblr.rb

@@ -24,8 +24,14 @@ describe TumblrSync::Tumblr do
   end
 
   it "should get array of images" do
-    stub_request(:get, "foo.tumblr.com/api/read").with(query: { type: :photo, start: 0, num: 2 }).to_return(body: File.new('test/fixtures/api.xml'), status: 200)
-    tumblr.images(0, 2).must_equal ["http://24.media.tumblr.com/tumblr_mebokdGrmq1rjwt7po1_500.jpg", "http://25.media.tumblr.com/tumblr_mebojvwCIb1rjwt7po1_500.jpg"]
+    stub_request(:get, "foo.tumblr.com/api/read").with(query: { type: :photo, start: 0, num: 10 }).to_return(body: File.new('test/fixtures/api.xml'), status: 200)
+    tumblr.images(0, 10).must_equal [
+      ["http://24.media.tumblr.com/tumblr_mebokdGrmq1rjwt7po1_500.jpg"],
+      ["http://25.media.tumblr.com/tumblr_mebojvwCIb1rjwt7po1_500.jpg"],
+      ["http://40.media.tumblr.com/7bf3bc523a3c0f99ad095bb048ec7f05/tumblr_nlvyfb7Fm41r3bmeoo1_1280.jpg",
+       "http://36.media.tumblr.com/4904f4db02d987c12b215a2845a7294b/tumblr_nlvyfb7Fm41r3bmeoo3_1280.jpg",
+       "http://40.media.tumblr.com/24070cfbdeed18e81b025b1fa76c5ccd/tumblr_nlvyfb7Fm41r3bmeoo2_1280.jpg"],
+    ]
   end
 
   it "should get total of images" do

metadata

@@ -1,134 +1,111 @@
 --- !ruby/object:Gem::Specification
 name: tumblr-sync
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Vincent Durand
 autorequire: 
 bindir: bin
-cert_chain:
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDkjCCAnqgAwIBAgIBATANBgkqhkiG9w0BAQUFADBHMRcwFQYDVQQDDA52aW5j
-  ZW50LmR1cmFuZDEXMBUGCgmSJomT8ixkARkWB21hZHdvcmsxEzARBgoJkiaJk/Is
-  ZAEZFgNvcmcwHhcNMTMwOTE4MTY0MDEwWhcNMTQwOTE4MTY0MDEwWjBHMRcwFQYD
-  VQQDDA52aW5jZW50LmR1cmFuZDEXMBUGCgmSJomT8ixkARkWB21hZHdvcmsxEzAR
-  BgoJkiaJk/IsZAEZFgNvcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-  AQDzlsghBvfbH4yPzi3dXyfkmxjy/uksOkYwzqwbZ6z/TvJdIjY9Xqi/gLe2AxGF
-  kuVxDuxih84WDG8qxCnAfUxt2nDGAVEspmTXHBAsyZqLLDRiP5LvmH/eAKsJY+rU
-  ERSJOaLAotMqHHqXiWnpRgFnzE6RM3Cnqq8LH0jIGF9F8gZVLZeRD+VXK4IX1Vyd
-  HgZKgTPL15k92u7bzqBw7niPCBa9LfYxID6E1bnSHw/kb+7hWarVd/sxpgeH0jgb
-  f8ieDs8S9+bL/TfzEDAOALAqMDgPXPX1mDKESDZ/wBGW/tP3NSbVKsSZFK8b0e00
-  Au/fVbAe+P7+T8po/a5UhjMbAgMBAAGjgYgwgYUwCQYDVR0TBAIwADALBgNVHQ8E
-  BAMCBLAwHQYDVR0OBBYEFKne49vGKR3nRMYhyEbJDI2BVQikMCUGA1UdEQQeMByB
-  GnZpbmNlbnQuZHVyYW5kQG1hZHdvcmsub3JnMCUGA1UdEgQeMByBGnZpbmNlbnQu
-  ZHVyYW5kQG1hZHdvcmsub3JnMA0GCSqGSIb3DQEBBQUAA4IBAQB0EDvvwy8uol26
-  Xm4O1iYcfgkTTX11UwgI6XIbS+1AzUwhl4BdWWFFxcy7v2/UMcx4QaJm+tL2B05V
-  CcVFS8tOMaGk6s7fPdhFswRp+HE9Ex5aiCMAhoIdUbrR5LCJTWyiEBLJhforT+3R
-  RARQ4FabsVVHevPHxzEAUGGGdWzbG4BcvKpWxbsOz/6yVgy3dpscmanMPH6pBpNH
-  XD6+HDD0HP0RBeQtHV2LIhLpiJLmNWRmJ9/Cfry72diEnM7173RAelpJNj0kRYjJ
-  xDr7hfCTJQsNosd7V5q7Uz+SYPK9ALyONt5t3KKYEWS/mBCStEuQXwjIsWG/bqwr
-  vqfQstIS
-  -----END CERTIFICATE-----
-date: 2013-12-17 00:00:00.000000000 Z
+cert_chain: []
+date: 2016-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: mechanize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
 description: Synchronize pictures from a Tumblr blog with ease and faster than ever!
@@ -138,8 +115,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -166,17 +143,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Synchronize pictures from a Tumblr blog

checksums.yaml.gz.sig

@@ -1,2 +0,0 @@
-8�ŭO�)fz�c[��\���\uw�ƕ�e���_l�H�5��5��ӗ�,�
�.�*0�q33&�\ �}aH��u�^�jQ�ó��O�&���#L#�j~�_��XG���ά�
-?�()��RK/�	����

metadata.gz.sig

@@ -1 +0,0 @@
-<1?��~6