maglove 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba272d7f5bbb561afb0f11895cb453e5b4d57d59
-  data.tar.gz: 05a7b2259684673d40c685a4b6658a14f2626940
+  metadata.gz: d03f49f976b135dca9ed23f2ea614b5a2a6c876c
+  data.tar.gz: 0ca45fd7c19b37c84f85e1db4eabab05c0e34152
 SHA512:
-  metadata.gz: a73eac01829081e36ae03bde5f01c932a804446b9a3b9c3951842d15d131345e544f6a06ad72f07400cbf99f737fc7782586890eb3c6e11646661691d49433e8
-  data.tar.gz: 1dd43fa97def50820dbed7745d7aaffecd107bf3bcd46f4b461a1f136bfc2a1b9aa4c92f5be4f89a1c0c23d1495ea10895118d3bf340a71c7acead15995646d3
+  metadata.gz: d941d6beeadb0023f4fdaf48d4ca2b5455445fbe8d86f64f6fef8a1c4c70883753ffa839c2df1fed94d451e8c288d96ed1a6e2d08602f312b6b2ae69cf2656c0
+  data.tar.gz: 129e6ca7bfc95d9cfa40e9133c71d23164324caa7566bed6712fa8d6e80814b8ae591562b645fdce214842537f8e33b5794802d9db1e701fb082d77d96415ba4

data/Gemfile.lock

@@ -1,13 +1,12 @@
 PATH
   remote: .
   specs:
-    maglove (1.0.3)
+    maglove (1.0.4)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       bundler (~> 1.10)
       coffee-script (~> 2.4)
       dialers (~> 0.2)
-      faraday (~> 0.9)
       faye (~> 1.2)
       filewatcher (~> 0.5)
       haml (~> 4.0)
@@ -24,6 +23,7 @@ PATH
       therubyracer (~> 0.12)
       thor (~> 0.19)
       tilt (~> 1.4)
+      typhoeus (~> 1.1)
 
 GEM
   remote: https://rubygems.org/
@@ -69,6 +69,8 @@ GEM
     em-socksify (0.3.1)
       eventmachine (>= 1.0.0.beta.4)
     erubis (2.7.0)
+    ethon (0.9.1)
+      ffi (>= 1.3.0)
     eventmachine (1.2.0.1)
     execjs (2.7.0)
     exifr (1.2.5)
@@ -89,6 +91,7 @@ GEM
     faye-websocket (0.10.4)
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.5.1)
+    ffi (1.9.14)
     filewatcher (0.5.3)
       trollop (~> 2.0)
     fspath (3.0.1)
@@ -119,7 +122,7 @@ GEM
       multi_json (~> 1.10)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    maglove-widgets (1.0.0)
+    maglove-widgets (1.0.1)
       bundler (~> 1.10)
       haml (~> 4.0)
       hamloft (~> 0.2.4)
@@ -161,6 +164,8 @@ GEM
     thread_safe (0.3.5)
     tilt (1.4.1)
     trollop (2.1.2)
+    typhoeus (1.1.0)
+      ethon (>= 0.9.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     unicode-display_width (1.1.0)

data/bin/maglove

@@ -6,6 +6,7 @@ require 'coffee_script'
 require "active_support/all"
 require "hamloft"
 require "workspace"
+require "typhoeus"
 require "maglove"
 require "action_dispatch/http/mime_type"
 

data/lib/magloft/typeloft_block.rb

@@ -14,5 +14,12 @@ module MagLoft
       response = conn.put(nil, File.read(file_path))
       return (response.status == 200)
     end
+    
+    def queue_upload_thumbnail(file_path, &block)
+      return false if thumbnail_policy.nil?
+      request = Typhoeus::Request.new(thumbnail_policy["url"], method: :put, headers: thumbnail_policy["headers"], body: File.read(file_path), timeout: 200000)
+      request.on_complete(&block) if block
+      request
+    end
   end
 end

data/lib/magloft/typeloft_image.rb

@@ -14,5 +14,12 @@ module MagLoft
       response = conn.put(nil, File.read(file_path))
       return (response.status == 200)
     end
+    
+    def queue_upload(file_path, &block)
+      return false if policy.nil?
+      request = Typhoeus::Request.new(policy["url"], method: :put, headers: policy["headers"], body: File.read(file_path), timeout: 200000)
+      request.on_complete(&block) if block
+      request
+    end
   end
 end

data/lib/magloft/typeloft_template.rb

@@ -14,5 +14,12 @@ module MagLoft
       response = conn.put(nil, File.read(file_path))
       return (response.status == 200)
     end
+    
+    def queue_upload_thumbnail(file_path, &block)
+      return false if thumbnail_policy.nil?
+      request = Typhoeus::Request.new(thumbnail_policy["url"], method: :put, headers: thumbnail_policy["headers"], body: File.read(file_path), timeout: 200000)
+      request.on_complete(&block) if block
+      request
+    end
   end
 end

data/lib/maglove/commands/theme.rb

@@ -90,21 +90,23 @@ module MagLove
         info("▸ Synchronizing Images")
         theme_images = theme.typeloft_images.all
         theme_images_map = Hash[theme_images.map { |image| [image.remote_file, image] }]
+        hydra = Typhoeus::Hydra.new
         theme_dir(root: "dist").files("images/**/*.{jpg,png,gif,svg}").each do |image_file|
           remote_file = "themes/#{options.theme}/#{image_file.relative_path}"
           if (existing_image = theme_images_map[remote_file])
             if image_file.md5 != existing_image.md5
               info("▸ Updating Image '#{remote_file}'")
               existing_image.md5 = image_file.md5
-              existing_image.upload(image_file.to_s)
+              hydra.queue(existing_image.queue_upload(image_file.to_s) {debug("▸ Finished updating Image '#{remote_file}'")})
               existing_image.save
             end
           else
             info("▸ Creating Image '#{remote_file}'")
             new_image = theme.typeloft_images.create(remote_file: remote_file, title: image_file.basename.titlecase, md5: image_file.md5)
-            new_image.upload(image_file.to_s)
+            hydra.queue(new_image.upload(image_file.to_s) {info("▸ Finished creating Image '#{remote_file}'")})
           end
         end
+        hydra.run
 
         # upload css/js
         info("▸ Synchronizing JavaScript and Stylesheet")
@@ -136,13 +138,14 @@ module MagLove
         # update thumbnails
         if options.thumbnails
           invoke(:thumbnails, [], { theme: options.theme })
-
+          hydra = Typhoeus::Hydra.new
+          
           info("▸ Synchronizing Template Thumbnails")
           theme.typeloft_templates.all.each do |template|
             thumbnail_file = theme_dir(root: "dist").dir("templates").file("#{template.identifier}.png")
             if thumbnail_file.exists?
               info("~> Uploading Thumbnail for '#{template.identifier}'")
-              template.upload_thumbnail(thumbnail_file.to_s)
+              hydra.queue(template.queue_upload_thumbnail(thumbnail_file.to_s) {info("▸ Finished uploading Thumbnail for '#{template.identifier}'")})
             end
           end
 
@@ -151,9 +154,10 @@ module MagLove
             thumbnail_file = theme_dir(root: "dist").dir("blocks").file("#{block.identifier}.png")
             if thumbnail_file.exists?
               info("~> Uploading Thumbnail for '#{block.identifier}'")
-              block.upload_thumbnail(thumbnail_file.to_s)
+              hydra.queue(block.queue_upload_thumbnail(thumbnail_file.to_s) {info("▸ Finished uploading Thumbnail for '#{block.identifier}'")})
             end
           end
+          hydra.run
         end
 
         info("▸ Successfully Pushed Theme")

data/lib/maglove/version.rb

@@ -1,3 +1,3 @@
 module MagLove
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/maglove.gemspec

@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "puma", "~> 3.6"
   s.add_runtime_dependency "filewatcher", "~> 0.5"
   s.add_runtime_dependency "faye", "~> 1.2"
-  s.add_runtime_dependency "faraday", "~> 0.9"
+  s.add_runtime_dependency "typhoeus", "~> 1.1"
   s.add_development_dependency "rubocop", "~> 0.32"
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maglove
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Tobias Strebitzer
@@ -305,19 +305,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: faraday
+  name: typhoeus
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement