attachs 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 174763ef00e837f637a02dadcf2c6e732304c911
-  data.tar.gz: 543f20a4cfbc0097daa613ec66bf31459191c260
+  metadata.gz: 393185c42c0aec2c323f8d958fa832825ab2b931
+  data.tar.gz: 3d7edbd5e15fbd5ee1eba21bbf9563f345d94fb1
 SHA512:
-  metadata.gz: 5fc324cf2d3df019d8d37501e9af50eb1169d3e88b6ba11c6be97afdfd22377d3dd8391e03fb170d051f852b1116da68ce195de93d22bab1f98edf5986bee561
-  data.tar.gz: a57ec77ecc61acebed6512bce22a18c0152fc26b9f488f86daeed88f055e44b4284388644bba3ef7500eeecb7f99469e86f94435a356c627b1f77f99800f4c94
+  metadata.gz: 2c2d7d87ff89da949369dad068fde6a325fc386eb64f84d839a7f5e09f2fd35fbec582491e905bca766e5979422cef1e67a43c073f907a19889892ad5400e444
+  data.tar.gz: 3696bfd7933332c93cf6747fb1b6600f3e7e1b1a2072be2f625279e1e2a289a9bd0dd523ea0d8785d28483fa5d15b335a54647d016d87210135da8ed9b4fc810

data/README.md

@@ -1,4 +1,4 @@
-[![Gem Version](https://badge.fury.io/rb/attachs.svg)](http://badge.fury.io/rb/attachs) [![Code Climate](https://codeclimate.com/github/museways/attachs/badges/gpa.svg)](https://codeclimate.com/github/museways/attachs) [![Build Status](https://travis-ci.org/museways/attachs.svg?branch=master)](https://travis-ci.org/museways/attachs)
+[![Gem Version](https://badge.fury.io/rb/attachs.svg)](http://badge.fury.io/rb/attachs) [![Code Climate](https://codeclimate.com/github/museways/attachs/badges/gpa.svg)](https://codeclimate.com/github/museways/attachs) [![Build Status](https://travis-ci.org/museways/attachs.svg?branch=master)](https://travis-ci.org/museways/attachs) [![Dependency Status](https://gemnasium.com/museways/attachs.svg)](https://gemnasium.com/museways/attachs)
 
 # Attachs
 
@@ -33,6 +33,7 @@ Attachs.configure do |config|
   config.global_styles = []
   config.global_convert_options= ''
   config.convert_options = {}
+  config.default_processors = [:thumbnail]
   config.default_storage = :local
   config.default_path = '/:timestamp-:filename'
   config.base_url = ''
@@ -224,6 +225,37 @@ Attachs.configure do |config|
 end
 ```
 
+## Processors
+
+To create a custom processor:
+```ruby
+class Attachs::Processors::CustomThumbnail
+
+  def initialize(attachment, source)
+    # Custom initialization
+  end
+
+  def process(style, destination)
+    # Custom logic
+  end
+
+end
+```
+
+To change the processors in the model:
+```ruby
+class User < ActiveRecord::Base
+  has_attached_file :avatar, processors: [:custom_thumbnail]
+end
+```
+
+To change the default processors:
+```ruby
+Attachs.configure do |config|
+  config.default_processors = [:custom_thumbnail]
+end
+```
+
 ## CDN
 
 To configure a cdn:
@@ -237,12 +269,12 @@ end
 
 To refresh all the styles of some attachment:
 ```
-bundle exec rake attachs:refresh:all CLASS=User ATTACHMENT=avatar
+bundle exec rake attachs:refresh:all class=user attachment=avatar
 ```
 
 To refresh missing styles of some attachment:
 ```
-bundle exec rake attachs:refresh:missing CLASS=User ATTACHMENT=avatar
+bundle exec rake attachs:refresh:missing class=user attachment=avatar
 ```
 
 ## Credits

data/lib/attachs/attachment.rb

@@ -38,6 +38,12 @@ module Attachs
       @private ||= options[:private] == true
     end
 
+    def processors
+      @processors ||= (options[:processors] || Attachs.config.default_processors).map do |processor|
+        "Attachs::Processors::#{processor.to_s.classify}".constantize
+      end
+    end
+
     def public?
       !private?
     end

data/lib/attachs/processors/base.rb

@@ -0,0 +1,25 @@
+module Attachs
+  module Processors
+    class Base
+
+      def initialize(attachment, source)
+        @attachment = attachment
+        @source = source
+      end
+
+      protected
+
+      attr_reader :attachment, :source
+
+      def run(cmd)
+        stdout, stderr, status = Open3.capture3(cmd)
+        if status.success?
+          stdout.strip
+        else
+          false
+        end
+      end
+
+    end
+  end
+end

data/lib/attachs/processors/thumbnail.rb

@@ -0,0 +1,69 @@
+module Attachs
+  module Processors
+    class Thumbnail < Base
+
+      def initialize(attachment, source)
+        super
+        @width, @height = dimensions(source)
+      end
+
+      def process(style, destination)
+        new_width, new_height, strategy, options = geometry(style)
+        resize source, width, height, new_width, new_height, strategy, options, destination
+      end
+
+      protected
+
+      attr_reader :width, :height
+
+      def geometry(style)
+        geometry = Attachs.config.styles[style]
+        width, height = geometry.scan(/[^x]+/).map(&:to_i)
+        case geometry[/!|#/]
+        when '#'
+          strategy = 'cover'
+        when '!'
+          strategy = 'force'
+        else
+          strategy = 'contain'
+        end
+        options = Attachs.config.convert_options[style]
+        [width, height, strategy, options]
+      end
+
+      def resize(source, width, height, new_width, new_height, strategy, custom_options, destination)
+        case strategy
+        when 'cover'
+          ratio = [new_width.to_f/width, new_height.to_f/height].max
+          options = "-resize #{(ratio*width).ceil}x#{(ratio*height).ceil} -gravity center -crop #{new_width}x#{new_height}+0+0"
+        when 'force'
+          options = "-resize #{new_width}x#{new_height}\!"
+        when 'contain'
+          options = "-resize #{new_width}x#{new_height}"
+        end
+        if global_options = Attachs.config.global_convert_options
+          options << " #{global_options}"
+        end
+        if custom_options
+          options << " #{custom_options}"
+        end
+        convert source, options, destination
+      end
+
+      def dimensions(source)
+        if output = identify(source, '-format %wx%h')
+          output.split('x').map(&:to_i)
+        end
+      end
+
+      def convert(source, options, destination)
+        run "convert '#{source}' #{options} '#{destination}'"
+      end
+
+      def identify(source, options)
+        run "identify #{options} '#{source}'"
+      end
+
+    end
+  end
+end

data/lib/attachs/storages/base.rb

@@ -10,12 +10,8 @@ module Attachs
 
       attr_reader :attachment
 
-      def resize(*args)
-        Attachs::Tools::Magick.resize(*args)
-      end
-
       def template
-        @template = begin
+        @template ||= begin
           if attachment.exists?
             (attachment.options[:path] || Attachs.config.default_path).dup
           else
@@ -52,13 +48,13 @@ module Attachs
           when :type
             attachment.content_type.split('/').first.parameterize
           when :timestamp
-            (attachment.updated_at.to_f * 10000000000).to_i
+            attachment.updated_at.to_i
           when :class
             attachment.record.class.name.parameterize
           when :id
             attachment.record.id
-          when :param
-            attachment.record.to_param
+          when :attribute
+            attachment.attribute.to_s.parameterize
           end.to_s
         end
       end

data/lib/attachs/storages/local.rb

@@ -4,7 +4,7 @@ module Attachs
 
       def url(style=:original)
         if attachment.url?
-          base_url.join(path(style)).to_s
+          "#{base_url.join(path(style))}?#{attachment.updated_at.to_i}"
         end
       end
 
@@ -24,13 +24,16 @@ module Attachs
 
       def process_styles(force=false)
         if attachment.image?
-          attachment.styles.each do |style|
-            if force == true
-              delete realpath(style)
-            end
-            unless File.exist? realpath(style)
-              FileUtils.mkdir_p realpath(style).dirname
-              resize realpath, style, realpath(style)
+          attachment.processors.each do |klass|
+            processor = klass.new(attachment, realpath)
+            attachment.styles.each do |style|
+              if force == true
+                delete realpath(style)
+              end
+              unless File.exist? realpath(style)
+                FileUtils.mkdir_p realpath(style).dirname
+                processor.process style, realpath(style)
+              end
             end
           end
         end
@@ -51,10 +54,6 @@ module Attachs
 
       protected
 
-      def move(origin, destination)
-        FileUtils.mv base_path.join(origin), base_path.join(destination)
-      end
-
       def delete(realpath)
         if File.exist? realpath
           File.delete realpath

data/lib/attachs/storages/s3.rb

@@ -7,7 +7,7 @@ module Attachs
           options = args.extract_options!
           style = (args[0] || :original)
           if Attachs.config.base_url.present?
-            Pathname.new(Attachs.config.base_url, path(style)).to_s
+            Pathname.new(Attachs.config.base_url).join(path(style)).to_s
           else
             if options[:ssl].present?
               secure = options[:ssl]
@@ -17,6 +17,8 @@ module Attachs
               secure = Attachs.config.s3[:ssl]
             end
             object(style).public_url(secure: secure).to_s
+          end.tap do |url|
+            url << "?#{attachment.updated_at.to_i}"
           end
         end
       end
@@ -38,14 +40,17 @@ module Attachs
             end
             cache[path] = download
           end
-          attachment.styles.each do |style|
-            if force == true
-              object(style).delete
-            end
-            unless object(style).exists?
-              tmp = Tempfile.new('s3')
-              resize cache[path].path, style, tmp.path
-              stream tmp, path(style)
+          attachment.processors.each do |klass|
+            processor = klass.new(attachment, cache[path].path)
+            attachment.styles.each do |style|
+              if force == true
+                object(style).delete
+              end
+              unless object(style).exists?
+                tmp = Tempfile.new('s3')
+                processor.process style, tmp.path
+                stream tmp, path(style)
+              end
             end
           end
         end
@@ -66,10 +71,6 @@ module Attachs
 
       protected
 
-      def move(origin, destination)
-        bucket.objects[origin].move_to(destination)
-      end
-
       def cache
         @cache ||= {}
       end

data/lib/attachs/version.rb

@@ -1,5 +1,5 @@
 module Attachs
 
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 
 end

data/lib/attachs.rb

@@ -1,6 +1,7 @@
 require 'open3'
 require 'attachs/attachment'
-require 'attachs/tools/magick'
+require 'attachs/processors/base'
+require 'attachs/processors/thumbnail'
 require 'attachs/storages/base'
 require 'attachs/storages/local'
 require 'attachs/storages/s3'
@@ -26,15 +27,16 @@ module Attachs
     def config
       @config ||= begin
         ActiveSupport::OrderedOptions.new.tap do |config|
+          config.s3 = { ssl: false }
+          config.base_url = ''
           config.styles = {}
           config.interpolations = {}
+          config.convert_options = {}
           config.global_styles = []
           config.global_convert_options= ''
-          config.convert_options = {}
           config.default_storage = :local
+          config.default_processors = [:thumbnail]
           config.default_path = '/:timestamp-:filename'
-          config.base_url = ''
-          config.s3 = { ssl: false }
         end
       end
     end

data/lib/tasks/attachs.rake

@@ -1,8 +1,8 @@
 module Attachs
   module Task
     def self.process(force)
-      model = ENV['CLASS'].classify.constantize
-      attachment = ENV['ATTACHMENT'].to_sym
+      model = (ENV['class'] || ENV['CLASS']).classify.constantize
+      attachment = (ENV['attachment'] || ENV['ATTACHMENT']).to_sym
       model.find_each do |record|
         model.attachments.each do |attr, options|
           if attr == attachment