dronejob 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f5e9e2f89bca4a32b5c4d2e22355dd8119a1e35
-  data.tar.gz: efe88d06655a102c61f49ed16e14c9f93372753b
+  metadata.gz: 7535e1f622ba59d4768130550558e57c02efad5e
+  data.tar.gz: b658855bb26b80dbdf3c8c127f170a30dfb440c3
 SHA512:
-  metadata.gz: cb7465f7d2a81c1a8c515164bcb0a7588f3edd9d91ac594b13b31a1579c1e5f02dee99f729639024feda35b07844a75abe6611b0faa951dd2b26100bc358e807
-  data.tar.gz: 60f63fd603c97fbfd8122c6179f4959f87cdd910c16acc2aa411bd753d50e1d158f2f17c663f580581a5b96727d11ff9eb91e76556456963f633261b214dd4e8
+  metadata.gz: 5bb4eb0f05a5ade24c4c20afedaa20576d951fc7ffa471713abdc1ee5b27f0997fabc1a26af14166dd3e24174b6d0478736b1cf6f58fb13bc163aa9975d70b01
+  data.tar.gz: 56faebec1f89774cffcbdf7e69dde7cbf13cbb4c4da41426889cced857beb4803433dc9ea08b18cf4c19e8d51be3e37dfd690e570f86bb96734801f148be413a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dronejob (1.3.0)
+    dronejob (1.3.1)
       actionpack (>= 4.0)
       activejob (~> 4.2)
       bundler (>= 1.3.0, < 2.0)
@@ -10,6 +10,7 @@ PATH
       google-cloud-storage (~> 0.23)
       haml (~> 4.0)
       open_uri_redirections (~> 0.2)
+      piet (~> 0.2)
       pusher (~> 1.3)
       rubyzip (~> 1.1)
       sidekiq (~> 4.1)
@@ -59,7 +60,7 @@ GEM
     git (1.3.0)
     globalid (0.4.0)
       activesupport (>= 4.2.0)
-    google-api-client (0.10.2)
+    google-api-client (0.10.3)
       addressable (~> 2.3)
       googleauth (~> 0.5)
       httpclient (~> 2.7)
@@ -78,13 +79,13 @@ GEM
       digest-crc (~> 0.4)
       google-api-client (~> 0.10.0)
       google-cloud-core (~> 0.21.0)
-    google-gax (0.8.2)
+    google-gax (0.8.3)
       google-protobuf (~> 3.2)
       googleapis-common-protos (~> 1.3.5)
       googleauth (~> 0.5.1)
       grpc (~> 1.0)
       rly (~> 0.2.3)
-    google-protobuf (3.2.0.2-universal-darwin)
+    google-protobuf (3.3.0-universal-darwin)
     googleapis-common-protos (1.3.5)
       google-protobuf (~> 3.2)
       grpc (~> 1.0)
@@ -96,14 +97,14 @@ GEM
       multi_json (~> 1.11)
       os (~> 0.9)
       signet (~> 0.7)
-    grpc (1.2.5-universal-darwin)
+    grpc (1.3.4-universal-darwin)
       google-protobuf (~> 3.1)
       googleauth (~> 0.5.1)
     haml (4.0.7)
       tilt
     httpclient (2.8.3)
     hurley (0.2)
-    i18n (0.8.1)
+    i18n (0.8.4)
     jwt (1.5.6)
     little-plugger (1.1.4)
     logging (2.2.2)
@@ -116,14 +117,17 @@ GEM
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
-    mini_portile2 (2.1.0)
-    minitest (5.10.1)
+    mini_portile2 (2.2.0)
+    minitest (5.10.2)
     multi_json (1.12.1)
     multipart-post (2.0.0)
-    nokogiri (1.7.1)
-      mini_portile2 (~> 2.1.0)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
     open_uri_redirections (0.2.1)
     os (0.9.6)
+    piet (0.2.5)
+      png_quantizator
+    png_quantizator (0.2.1)
     pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -134,8 +138,8 @@ GEM
       multi_json (~> 1.0)
       pusher-signature (~> 0.1.8)
     pusher-signature (0.1.8)
-    rack (1.6.5)
-    rack-protection (1.5.3)
+    rack (1.6.8)
+    rack-protection (2.0.0)
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -152,7 +156,7 @@ GEM
       declarative (< 0.1.0)
       declarative-option (< 0.2.0)
       uber (< 0.2.0)
-    retriable (3.0.1)
+    retriable (3.0.2)
     rly (0.2.3)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)

data/dronejob.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "google-cloud-storage", "~> 0.23"
   s.add_runtime_dependency "google-cloud-logging", "~> 0.23"
   s.add_runtime_dependency "pusher", "~> 1.3"
+  s.add_runtime_dependency "piet", "~> 0.2"
   s.add_development_dependency "rspec", "~> 3.3"
   s.add_development_dependency "pry", "~> 0.10"
   s.files        = `git ls-files`.split("\n")

data/lib/dronejob/version.rb

@@ -1,3 +1,3 @@
 module Dronejob
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

data/lib/dronejob/workspace_file/archive.rb

@@ -6,10 +6,10 @@ module Dronejob
     
       def extract(target_dir)
         target_dir.create
-        if extension == "zip"
-          extract_zip(target_dir)
-        elsif extension == "gz"
+        if extension == "gz"
           extract_gz(target_dir)
+        else
+          extract_zip(target_dir)
         end
         self
       end
@@ -20,6 +20,8 @@ module Dronejob
           require "zip"
           Zip::File.open(to_s) do |archive|
             archive.each do |entry|
+              extract_dir = target_dir.file(entry.name).dir
+              extract_dir.create unless extract_dir.exists?
               entry.extract(File.join(target_dir.to_s, entry.name))
             end
           end

data/lib/dronejob/workspace_file/media.rb

@@ -1,3 +1,5 @@
+require "piet"
+
 module Dronejob
   class WorkspaceFile
     module Media
@@ -48,11 +50,24 @@ module Dronejob
         self
       end
       
+      def fit(width, height)
+        require "rmagick"
+        image = Magick::Image.read(to_s).first
+        image.change_geometry!("#{width}x^#{height}") { |cols, rows| image.thumbnail!(cols, rows) }
+        image.crop!(0, 0, width, height)
+        image.write(to_s) { self.quality = Dronejob::Base.option(:image_quality) }
+        image.destroy!
+      end
+      
       def optimize!
-        return false if !exists?
-        return optimize_jpg! if image? and ["jpg", "jpeg"].include?(extension)
-        return optimize_png! if image? and ["png"].include?(extension)
-        false
+        return false if !exists? or !image?
+        optimize_png! if ["png"].include?(extension)
+        optimize_jpg! if ["jpg", "jpeg"].include?(extension)
+        
+        # optimize
+        Piet.optimize(to_s, verbose: false)
+        
+        true
       end
     
       private

data/lib/dronejob/workspace_file.rb

@@ -48,8 +48,15 @@ module Dronejob
       File.join(@workspace, @path)
     end
   
-    def relative_path
-      @path.gsub(/^\//, "")
+    def relative_path(relative_dir=nil)
+      if relative_dir
+        relative_dir = relative_dir.dir if relative_dir.class == WorkspaceFile
+        first = Pathname.new(relative_dir.path)
+        second = Pathname.new(path)
+        second.relative_path_from(first).to_s
+      else
+        @path.gsub(/^\//, "")
+      end
     end
     
     def absolute_path
@@ -71,6 +78,10 @@ module Dronejob
     def delete!
       FileUtils.rm_f(to_s)
     end
+    
+    def name
+      "#{basename}.#{extension}"
+    end
   
     def basename
        File.basename(path, ".*")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dronejob
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Tobias Strebitzer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-27 00:00:00.000000000 Z
+date: 2017-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -198,6 +198,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: piet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement