pushfile 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 672a79ecf90538535f66127795c40bfc277ce9d2
-  data.tar.gz: 186e1726fc0884f7986d0314133039a967e7c07c
+  metadata.gz: 08dd069e3ed633b00723ff573b347a12a4ec013c
+  data.tar.gz: 57b936ba1c94284fb8c3840b62f94497bdfc2ed8
 SHA512:
-  metadata.gz: 6bb10f4c496d31fee90cdae4c186bacd3b67cd707e047797fb84fc642c11e5d9901e37c3f5651d13dc87c980a790326820945d05da9b9424a0768a15fff3471f
-  data.tar.gz: 1c0532d6422f9bc7d53f05efa2082db6a3d967b1bb4d03f0b29599b939fd98f7b81797413f73294d5eadb29d50174ab9cd206d59a0b2a52290a931f66818f37e
+  metadata.gz: c1240765b5250ec9965b96f56681bfc85f9bc110e368c8bcd78ed66b43017430480df1e3bf9723a0c9e536e469bc93fb492c208fefa6657a83ac1dfe971b0bc0
+  data.tar.gz: 621a21483ec85a6b993d92a4ae51da33729b6c6f47ad8ae7f36f47bc45d1a4e0cae8219387a7b79304815cf0b4f5a106990aef318b4b87f9c3bc93793ab4d577

data/CHANGELOG.md

@@ -1,4 +1,9 @@
 **Version 0.0.2** - *2017-01-05*
 
+- Added support for datafile params (dropzone.js)
+- Fixed a merge option issue
+
+**Version 0.0.2** - *2017-01-05*
+
 - Default mime type if not set
 - Symbols instead of string

data/README.md

@@ -1,5 +1,5 @@
 # Pushfile Cloud File Uploader
-Upload files to Rackspace Cloud or Amazon S3 by URL or file with automatic image resizing.
+Upload files to Rackspace Cloud or Amazon S3 by URL or file, with automatic image resizing and thumbnails.
 
 ### Installation
 ```
@@ -25,7 +25,7 @@ Create a config/pushfile.yml for your settings.
 
 See [the example pushfile.yml](https://github.com/fugroup/pushfile/blob/master/config/pushfile.yml) for an example.
 
-If you define an image config, any images you upload will be automatically resized before uploading. You can define both the desired max height and width.
+If you define an image config, any images you upload will be automatically resized before uploading. You can define both the desired max height and width. All images will also be thumbnailed.
 
 ### Usage
 For more examples have a look at [the tests for Pushfile.](https://github.com/fugroup/pushfile/blob/master/test/upload_test.rb)
@@ -52,6 +52,21 @@ u.create
 # Get uploaded url with data
 u.status # => Hash with urls and data
 
+# Example response hash
+{
+  # The file URL
+  :url => "http://f.7i.no/1484109810_fugroup_avatar.jpg",
+
+  # The thumbnail URL (only for images)
+  :thumb_url => "http://f.7i.no/1484109810_fugroup_avatar_thumb.jpg",
+
+  # The size of the file after resizing
+  :size => 40288,
+
+  # The file's mime type
+  :mimetype => "image/jpeg"
+}
+
 # Remove file from CDN
 u.destroy(url)
 ```

data/lib/pushfile/data.rb

@@ -13,9 +13,9 @@ module Pushfile
       elsif @options[:filename]
         ajax_upload
 
-      # Do the froala file uploads
-      elsif @options[:file]
-        froala_upload
+      # Do Froala or Dropzone file uploads
+      elsif @options[:file] || @options[:datafile]
+        file_upload
 
       end
     end
@@ -39,11 +39,11 @@ module Pushfile
       {:filename => filename, :tempfile => File.new(file), :type => type}
     end
 
-    # Froala upload
-    def froala_upload
-      tmpfile = @options[:file][:tempfile]
-      filename = @options[:file][:filename]
-      type = @options[:file][:type] || mimetype(filename)
+    # File upload
+    def file_upload
+      o = @options[:file] || @options[:datafile]
+      tmpfile, filename = o[:tempfile], o[:filename]
+      type = o[:type] || mimetype(filename)
 
       {:filename => filename, :tempfile => tmpfile, :type => type}
     end

data/lib/pushfile/resize.rb

@@ -8,8 +8,6 @@ module Pushfile
       begin
         image = MiniMagick::Image.open(@file.path)
         image.resize("#{@width}x#{@height}")
-      rescue MiniMagick::Invalid
-        # Skip if file type can't be resized
       rescue
         # Pass on any error
       else
@@ -22,18 +20,11 @@ module Pushfile
       begin
         image = MiniMagick::Image.open(@file.path)
         image.resize("#{Pushfile.settings[:images][:thumb][:width]}x")
-      rescue MiniMagick::Invalid
-        # Skip if file type can't be resized
-        @thumb = nil
-        Mailer.new.system_message("#{@file.path} #{@file.size}", "Can't resize").deliver rescue nil
       rescue
         @thumb = nil
-        Mailer.new.system_message("#{@file.path} #{@file.size}", "File not found or something else").deliver rescue nil
       else
-        t = @name.split('.')
-        ext = t.pop
+        t = @name.split('.'); ext = t.pop
         @thumb = t.join(".").concat("_thumb.#{ext}")
-
         image.write("/tmp/#{@thumb}") rescue @thumb = nil
       end
     end

data/lib/pushfile/upload.rb

@@ -25,11 +25,11 @@ module Pushfile
         :container => send("#{@provider}_container"),
         :max => Pushfile.settings[:upload_limit],
         :snet => Pushfile.mode == 'production',
-        :provider => @provider,
+        :provider => @provider
       }.merge(o)
 
       # Merge image config
-      o.merge!(Pushfile.settings[:images][config]) rescue nil
+      o = Pushfile.settings[:images][config].merge(o) rescue o
 
       # Storing options
       @options = o
@@ -50,18 +50,11 @@ module Pushfile
 
     # Create upload
     def create
-      if @data.is_a?(String)
-        @file = File.open(@data)
-        @name = filename(@data)
-      else
-        @file = @data[:tempfile]
-        @name = filename(@data[:filename])
-      end
+      @file = @data.is_a?(String) ? File.open(@data) : @data[:tempfile]
+      @name = filename(@data.is_a?(String) ? @data : @data[:filename])
 
       # Check if it's more than max or return error
-      if @max and @file.size > @max
-        return (@status = {:error => 'upload_file_size_is_too_big'})
-      end
+      return (@status = {:error => 'upload_file_size_is_too_big'}) if @max and @file.size > @max
 
       # Resize file and create thumbnail for image
       if @name =~ IMAGE_REGEX

data/pushfile.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'pushfile'
-  s.version     = '0.0.2'
-  s.date        = '2017-01-11'
+  s.version     = '0.1.0'
+  s.date        = '2017-01-22'
   s.summary     = "Pushfile Cloud File Uploader"
   s.description = "Upload files to Rackspace Cloud or Amazon S3 by URL or file with automatic image resizing."
   s.authors     = ["Fugroup Limited"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pushfile
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Fugroup Limited
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-11 00:00:00.000000000 Z
+date: 2017-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport