attachs 0.3.5 → 0.4.0

data/lib/attachs/storages/s3.rb

@@ -1,86 +1,95 @@
 module Attachs
   module Storages
-    class S3
-      
-      cattr_accessor :config
+    class S3 < Base
 
-      def initialize(default, private)
-        if (Rails.env.test? and !default)
-          env = 'test'
-        elsif default
-          env = 'production'
-        else
-          env = Rails.env
+      def url(*args)
+        if attachment.url?
+          options = args.extract_options!
+          style = (args[0] || :original)
+          if Attachs.config.base_url.present?
+            Pathname.new(Attachs.config.base_url, path(style)).to_s
+          else
+            if options[:ssl].present?
+              secure = options[:ssl]
+            elsif attachment.options[:ssl].present?
+              secure = attachment.options[:ssl]
+            else
+              secure = Attachs.config.s3[:ssl]
+            end
+            object(style).public_url(secure: secure).to_s
+          end
         end
-        AWS.config access_key_id: config[env]['access_key_id'], secret_access_key: config[env]['secret_access_key']
-        @bucket = AWS::S3.new.buckets[config[env]['bucket']]
-        @private = private
-      end
-
-      def exists?(path)
-        object(path).exists?
       end
 
-      def size(path)
-        object(path).content_length
+      def process(force=false)
+        if attachment.upload?
+          stream attachment.upload, path
+          attachment.uploaded!
+        end
+        process_styles force
       end
 
-      def url(path)
-        base_url.present? ? ::File.join(base_url, path) : object(path).public_url(secure: false)
+      def process_styles(force=false)
+        if attachment.image?
+          unless cache[path]
+            download = Tempfile.new('s3')
+            object.read do |chunk|
+              download.write chunk
+            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)
+            end
+          end
+        end
       end
 
-      def store(upload, path)
-        bucket.objects.create(path, Pathname.new(upload.path)).acl = private? ? :private : :public_read
-      end
-      
-      def delete(path)
-        object(path).delete
+      def destroy
+        object.delete
+        destroy_styles
       end
 
-      def magick(source, output, upload)
-        if cache[source].blank?
-          if upload.present?
-            cache[source] = upload.path
-          else
-            remote = create_tmp
-            remote.binmode
-            object(source).read { |chunk| remote.write(chunk) }
-            remote.close
-            remote.open
-            cache[source] = remote.path
+      def destroy_styles
+        if attachment.image?
+          attachment.styles.each do |style|
+            object(style).delete
           end
         end
-        tmp = create_tmp
-        yield Attachs::Magick::Image.new(cache[source], tmp.path)
-        store tmp, output
       end
 
       protected
 
-      attr_reader :bucket
-
-      def config
-        self.class.config
+      def move(origin, destination)
+        bucket.objects[origin].move_to(destination)
       end
 
-      def base_url
-        Rails.application.config.attachs.base_url
+      def cache
+        @cache ||= {}
       end
 
-      def private?
-        @private
-      end
-      
-      def create_tmp
-        Tempfile.new 's3'
+      def bucket
+        @bucket ||= AWS::S3.new.buckets[Attachs.config.s3[:bucket]]
       end
 
-      def cache
-        @cache ||= {}
+      def object(style=:original)
+        bucket.objects[path(style)]
       end
 
-      def object(path)
-        bucket.objects[path]
+      def stream(file, path)
+        object = bucket.objects.create(path, File.open(file.path, 'rb'))
+        if attachment.private?
+          object.acl = :private
+        else
+          object.acl = :public_read
+        end
+        cache[path] = file
       end
 
     end

data/lib/attachs/tools/magick.rb

@@ -0,0 +1,52 @@
+module Attachs
+  module Tools
+    module Magick
+      class << self
+
+        def dimensions(source)
+          if output = run("identify -format %wx%h '#{source}'")
+            output.split('x').map(&:to_i)
+          end
+        end
+
+        def resize(source, style, destination=nil)
+          size = Attachs.config.styles[style]
+          new_width, new_height = size.scan(/[^x]+/).map(&:to_i)
+          case strategy = size[/!|#/]
+          when '#'
+            width, height = dimensions(source)
+            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 '!'
+            options = "-resize #{new_width}x#{new_height}\!"
+          else
+            options = "-resize #{new_width}x#{new_height}"
+          end
+          if global_options = Attachs.config.global_convert_options
+            options << " #{global_options}"
+          end
+          if style_options = Attachs.config.convert_options[style]
+            options << " #{style_options}"
+          end
+          if destination
+            run "convert '#{source}' #{options} '#{destination}'"
+          else
+            run "mogrify #{options} '#{source}'"
+          end
+        end
+
+        protected
+
+        def run(cmd)
+          stdout, stderr, status = Open3.capture3(cmd)
+          if status.success?
+            stdout.strip
+          else
+            false
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/attachs/types/base.rb

@@ -0,0 +1,22 @@
+module Attachs
+  module Types
+    class Base
+
+      def initialize(attachment)
+        @attachment = attachment
+      end
+
+      protected
+
+      attr_reader :attachment
+
+      def storage
+        @storage ||= begin
+          klass = (attachment.options[:storage] || Attachs.config.default_storage).to_s.classify
+          Attachs::Storages.const_get(klass).new(attachment)
+        end
+      end
+
+    end
+  end
+end

data/lib/attachs/types/default.rb

@@ -0,0 +1,21 @@
+module Attachs
+  module Types
+    class Default < Base
+
+      %w(basename extension process process_styles destroy destroy_styles update).each do |name|
+        define_method(name) {}
+      end
+
+      def image?
+        false
+      end
+
+      def url(*args)
+        if attachment.default?
+          storage.url *args
+        end
+      end
+
+    end
+  end
+end

data/lib/attachs/types/regular.rb

@@ -0,0 +1,21 @@
+module Attachs
+  module Types
+    class Regular < Base
+
+      delegate :url, :process, :process_styles, :destroy, :destroy_styles, :update, to: :storage
+
+      def basename
+        @basename ||= File.basename(attachment.filename, ".#{extension}")
+      end
+
+      def extension
+        @extension ||= File.extname(attachment.filename).from(1)
+      end
+
+      def image?
+        @image ||= attachment.content_type.start_with?('image')
+      end
+
+    end
+  end
+end

data/lib/attachs/version.rb

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

data/lib/generators/attachs/install_generator.rb

@@ -0,0 +1,13 @@
+require 'rails/generators'
+
+module Attachs
+  class InstallGenerator < Rails::Generators::Base
+
+    source_root File.expand_path('../templates', __FILE__)
+
+    def create_initializer
+      copy_file 'attachs.rb', 'config/initializers/attachs.rb'
+    end
+
+  end
+end

data/lib/generators/attachs/templates/attachs.rb

@@ -0,0 +1,2 @@
+Attachs.configure do |config|
+end

data/lib/tasks/attachs.rake

@@ -0,0 +1,30 @@
+module Attachs
+  module Task
+    def self.process(force)
+      model = ENV['CLASS'].classify.constantize
+      attachment = ENV['ATTACHMENT'].to_sym
+      model.find_each do |record|
+        model.attachments.each do |attr, options|
+          if attr == attachment
+            record.send(attr).process(force)
+          end
+        end
+      end
+    end
+  end
+end
+
+namespace :attachs do
+  namespace :refresh do
+    desc 'Refreshs all styles.'
+    task all: :environment do
+      Attachs::Task.process true
+      Rails.logger.info 'All styles regenerated successfully.'
+    end
+    desc 'Refreshs missing styles.'
+    task missing: :environment do
+      Attachs::Task.process false
+      Rails.logger.info 'Missing styles regenerated successfully.'
+    end
+  end
+end

data/test/attachment_test.rb

@@ -0,0 +1,19 @@
+require 'test_helper'
+
+class AttachmentTest < ActiveSupport::TestCase
+
+  test 'attachment source' do
+    original_medium = Medium.create(attach: file_upload)
+    copied_medium = Medium.create(attach: original_medium.attach)
+    %w(filename content_type size updated_at).each do |attr|
+      assert_equal original_medium.attach.send(attr), copied_medium.attach.send(attr)
+    end
+  end
+
+  test 'uri source' do
+    medium = Medium.create(attach: URI('https://s3.amazonaws.com/attachs-test/file.txt'))
+    file_path = Rails.root.join('public/original/file.txt')
+    assert File.exist?(file_path)
+  end
+
+end

data/test/dummy/app/models/medium.rb

@@ -0,0 +1,5 @@
+class Medium < ActiveRecord::Base
+  has_attached_file :attach, path: '/:style/:filename'
+  has_attached_file :local_attach, storage: 'local', path: '/storage/:type/:size/:style/:month/:basename.:extension', styles: [:small]
+  has_attached_file :s3_attach, storage: 's3', path: '/storage/:type/:size/:style/:month/:basename.:extension', styles: [:small]
+end

data/test/dummy/app/models/picture.rb

@@ -0,0 +1,2 @@
+class Picture < ActiveRecord::Base
+end

data/test/dummy/config/application.rb

@@ -18,13 +18,7 @@ module Dummy
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de
-    I18n.enforce_available_locales = false    
-
-    config.attachs.default_presets = :small
-    config.attachs.presets = {
-      small: { method: :fit, width: 120, height: 120 },
-      big: { method: :fill, width: 1024, height: 768 }
-    }
+    I18n.enforce_available_locales = false
   end
 end
 

data/test/dummy/config/initializers/attachs.rb

@@ -0,0 +1,25 @@
+Attachs.configure do |config|
+
+  config.global_styles = [:small, :medium, :big]
+  config.global_convert_options = '-quality 75'
+  config.styles = {
+    small: '120x120!',
+    medium: '300x250#',
+    big: '1024x768',
+    big_contain: '160x130',
+    small_contain: '140x110',
+    big_cover: '160x130#',
+    small_cover: '140x110#',
+    big_force: '160x130!',
+    small_force: '140x110!'
+  }
+  config.convert_options = {
+    big_contain: '-trim',
+    big_cover: '-trim',
+    big_force: '-trim'
+  }
+  config.interpolations = {
+    month: lambda { |attachment| attachment.updated_at.month }
+  }
+
+end

data/test/dummy/config/initializers/secret_token.rb

@@ -9,4 +9,5 @@
 
 # Make sure your secret_key_base is kept private
 # if you're sharing your code publicly.
+Dummy::Application.config.secret_token = '325198aee80c035ddba090e3307afe68ef17c12a25b60f987d673febf4164119cb1ce3772aa21fb6b16ede3b9362c0030f7d934f31f1f01f96dd61f289bc6f8c'
 Dummy::Application.config.secret_key_base = '325198aee80c035ddba090e3307afe68ef17c12a25b60f987d673febf4164119cb1ce3772aa21fb6b16ede3b9362c0030f7d934f31f1f01f96dd61f289bc6f8c'

data/test/dummy/config/routes.rb

@@ -1,3 +1,2 @@
 Rails.application.routes.draw do
-  mount Attachs::Engine => '/'
 end

data/test/dummy/db/migrate/20140808012639_create_media.rb

@@ -0,0 +1,11 @@
+class CreateMedia < ActiveRecord::Migration
+  def change
+    create_table :media do |t|
+      t.attachment :attach
+      t.attachment :local_attach
+      t.attachment :s3_attach
+
+      t.timestamps
+    end
+  end
+end

data/test/dummy/db/schema.rb

@@ -11,32 +11,21 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20130820222534) do
+ActiveRecord::Schema.define(version: 20140808012639) do
 
-  create_table "all_attacheds", force: true do |t|
-    t.string   "image"
-    t.string   "file_presence"
-    t.string   "file_content_type"
-    t.string   "file_size"
-    t.string   "file_all"
-    t.string   "file_default"
-    t.string   "image_presence"
-    t.string   "image_content_type"
-    t.string   "image_size"
-    t.string   "image_all"
-    t.string   "image_default"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "file_attacheds", force: true do |t|
-    t.string   "file"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-  end
-
-  create_table "image_attacheds", force: true do |t|
-    t.string   "image"
+  create_table "media", force: true do |t|
+    t.string   "attach_filename"
+    t.string   "attach_content_type"
+    t.integer  "attach_size"
+    t.datetime "attach_updated_at"
+    t.string   "local_attach_filename"
+    t.string   "local_attach_content_type"
+    t.integer  "local_attach_size"
+    t.datetime "local_attach_updated_at"
+    t.string   "s3_attach_filename"
+    t.string   "s3_attach_content_type"
+    t.integer  "s3_attach_size"
+    t.datetime "s3_attach_updated_at"
     t.datetime "created_at"
     t.datetime "updated_at"
   end