attachs 0.4.0 → 0.4.1

data/test/dummy/public/original/file.txt

@@ -0,0 +1 @@
+1234567890

data/test/dummy/public/storage/text/11/original/11/file.txt

@@ -0,0 +1 @@
+1234567890

data/test/dummy/public/storage/text/11/original/9/file.txt

@@ -0,0 +1 @@
+1234567890

data/test/local_storage_test.rb

@@ -4,32 +4,32 @@ class LocalStorageTest < ActiveSupport::TestCase
 
   test 'file url' do
     medium = Medium.create(local_attach: file_upload)
-    assert_equal file_url, medium.local_attach.url
+    assert_equal file_url(:original, medium), medium.local_attach.url
   end
 
   test 'image url' do
     medium = Medium.create(local_attach: image_upload)
-    assert_equal image_url, medium.local_attach.url
-    assert_equal image_url(:small), medium.local_attach.url(:small)
+    assert_equal image_url(:original, medium), medium.local_attach.url
+    assert_equal image_url(:small, medium), medium.local_attach.url(:small)
   end
 
   test 'crud' do
     medium = Medium.create(local_attach: file_upload)
-    assert File.exist?(file_path)
+    assert File.exist?(file_path(:original))
     medium.update_attributes! local_attach: image_upload
-    assert !File.exist?(file_path)
-    assert File.exist?(image_path)
+    assert !File.exist?(file_path(:original))
+    assert File.exist?(image_path(:original))
     assert File.exist?(image_path(:small))
     medium.destroy
-    assert !File.exist?(image_path)
+    assert !File.exist?(image_path(:original))
     assert !File.exist?(image_path(:small))
   end
 
   test 'detroy attr' do
     medium = Medium.create(local_attach: file_upload, destroy_attach: true)
-    assert File.exist?(file_path)
+    assert File.exist?(file_path(:original))
     medium.update_attributes! destroy_local_attach: true
-    assert !File.exist?(file_path)
+    assert !File.exist?(file_path(:original))
   end
 
   private
@@ -38,19 +38,19 @@ class LocalStorageTest < ActiveSupport::TestCase
     Time.zone.now.month
   end
 
-  def file_url(style=:original)
-    "/storage/text/11/#{style}/#{month}/file.txt"
+  def file_url(style, record)
+    "/storage/text/11/#{style}/#{month}/file.txt?#{record.local_attach_updated_at.to_i}"
   end
 
-  def image_url(style=:original)
-    "/storage/image/5461/#{style}/#{month}/180x150.gif"
+  def image_url(style, record)
+    "/storage/image/5461/#{style}/#{month}/180x150.gif?#{record.local_attach_updated_at.to_i}"
   end
 
-  def file_path(style=:original)
+  def file_path(style)
     Rails.root.join("public/storage/text/11/#{style}/#{month}/file.txt")
   end
 
-  def image_path(style=:original)
+  def image_path(style)
     Rails.root.join("public/storage/image/5461/#{style}/#{month}/180x150.gif")
   end
 

data/test/processor_test.rb

@@ -0,0 +1,46 @@
+require 'test_helper'
+
+class ProcessorTest < ActiveSupport::TestCase
+
+  teardown do
+    Dir[Rails.root.join('tmp', '*')].each do |file|
+      File.delete file
+    end
+  end
+
+  test 'force resize' do
+    Attachs::Processors::Thumbnail.new(nil, source).process(:big_force, resized)
+    assert_equal [160,130], dimensions(resized)
+    Attachs::Processors::Thumbnail.new(nil, source).process(:small_force, resized)
+    assert_equal [140,110], dimensions(resized)
+  end
+
+  test 'cover resize' do
+    Attachs::Processors::Thumbnail.new(nil, source).process(:big_cover, resized)
+    assert_equal [160,130], dimensions(resized)
+    Attachs::Processors::Thumbnail.new(nil, source).process(:small_cover, resized)
+    assert_equal [140,110], dimensions(resized)
+  end
+
+  test 'contain resize' do
+    Attachs::Processors::Thumbnail.new(nil, source).process(:big_contain, resized)
+    assert_equal [156,130], dimensions(resized)
+    Attachs::Processors::Thumbnail.new(nil, source).process(:small_contain, resized)
+    assert_equal [132,110], dimensions(resized)
+  end
+
+  private
+
+  def source
+    image_upload.path
+  end
+
+  def resized
+    Rails.root.join('public', 'resized.gif')
+  end
+
+  def dimensions(source)
+    `identify -format %wx%h '#{source}'`.split('x').map(&:to_i)
+  end
+
+end

data/test/s3_storage_tes.rb

@@ -4,35 +4,35 @@ class S3StorageTest < ActiveSupport::TestCase
 
   test 'file url' do
     medium = Medium.create(s3_attach: file_upload)
-    assert_equal file_url, medium.s3_attach.url
-    assert_equal file_url(ssl: true), medium.s3_attach.url(ssl: true)
+    assert_equal file_url(:original, medium, false), medium.s3_attach.url
+    assert_equal file_url(:original, medium, true), medium.s3_attach.url(ssl: true)
   end
 
   test 'image url' do
     medium = Medium.create(s3_attach: image_upload)
-    assert_equal image_url, medium.s3_attach.url
-    assert_equal image_url(ssl: true), medium.s3_attach.url(ssl: true)
-    assert_equal image_url(:small), medium.s3_attach.url(:small)
-    assert_equal image_url(:small, ssl: true), medium.s3_attach.url(:small, ssl: true)
+    assert_equal image_url(:original, medium, false), medium.s3_attach.url
+    assert_equal image_url(:original, medium, true), medium.s3_attach.url(ssl: true)
+    assert_equal image_url(:small, medium, false), medium.s3_attach.url(:small)
+    assert_equal image_url(:small, medium, true), medium.s3_attach.url(:small, ssl: true)
   end
 
   test 'storage' do
     medium = Medium.create(s3_attach: file_upload)
-    assert_url file_url
+    assert_url file_url(:original, medium, false)
     medium.update_attributes! s3_attach: image_upload
-    assert_not_url file_url
-    assert_url image_url
-    assert_url image_url(:small)
+    assert_not_url file_url(:original, medium, false)
+    assert_url image_url(:original, medium, false)
+    assert_url image_url(:small, medium, false)
     medium.destroy
-    assert_not_url image_url
-    assert_not_url image_url(:small)
+    assert_not_url image_url(:original, medium, false)
+    assert_not_url image_url(:small, medium, false)
   end
 
   test 'detroy attr' do
     medium = Medium.create(s3_attach: file_upload, destroy_s3_attach: true)
-    assert_url file_url
+    assert_url file_url(:original, medium, false)
     medium.update_attributes! destroy_s3_attach: true
-    assert_not_url file_url
+    assert_not_url file_url(:original, medium, false)
   end
 
   private
@@ -41,16 +41,12 @@ class S3StorageTest < ActiveSupport::TestCase
     Time.zone.now.month
   end
 
-  def file_url(*args)
-    options = args.extract_options!
-    style = (args.first || :original)
-    "http#{'s' if options[:ssl]}://attachs-test.s3.amazonaws.com/storage/text/11/#{style}/#{month}/file.txt"
+  def file_url(style, record, ssl)
+    "http#{'s' if ssl}://attachs-test.s3.amazonaws.com/storage/text/11/#{style}/#{month}/file.txt?#{record.s3_attach_updated_at.to_i}"
   end
 
-  def image_url(*args)
-    options = args.extract_options!
-    style = (args.first || :original)
-    "http#{'s' if options[:ssl]}://attachs-test.s3.amazonaws.com/storage/image/5461/#{style}/#{month}/180x150.gif"
+  def image_url(style, record, ssl)
+    "http#{'s' if ssl}://attachs-test.s3.amazonaws.com/storage/image/5461/#{style}/#{month}/180x150.gif?#{record.s3_attach_updated_at.to_i}"
   end
 
 end

data/test/tasks_test.rb

@@ -38,24 +38,16 @@ class TasksTest < ActiveSupport::TestCase
 
   private
 
-  def image_path(style=:original)
+  def image_path(style)
     Rails.root.join("public/#{style}/180x150.gif")
   end
 
-  def small_path
-    image_path(:small)
-  end
-
-  def big_path
-    image_path(:big)
-  end
-
   def small_time
-    File.mtime(small_path)
+    File.mtime(image_path(:small))
   end
 
   def big_time
-    File.mtime(big_path)
+    File.mtime(image_path(:big))
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attachs
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Museways
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-21 00:00:00.000000000 Z
+date: 2014-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -79,11 +79,12 @@ files:
 - lib/attachs/attachment.rb
 - lib/attachs/locales/en.yml
 - lib/attachs/locales/es.yml
+- lib/attachs/processors/base.rb
+- lib/attachs/processors/thumbnail.rb
 - lib/attachs/railtie.rb
 - lib/attachs/storages/base.rb
 - lib/attachs/storages/local.rb
 - lib/attachs/storages/s3.rb
-- lib/attachs/tools/magick.rb
 - lib/attachs/types/base.rb
 - lib/attachs/types/default.rb
 - lib/attachs/types/regular.rb
@@ -129,13 +130,29 @@ files:
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
+- test/dummy/public/big/180x150.gif
 - test/dummy/public/favicon.ico
+- test/dummy/public/medium/180x150.gif
+- test/dummy/public/original/180x150.gif
+- test/dummy/public/original/file.txt
+- test/dummy/public/resized.gif
+- test/dummy/public/small/180x150.gif
+- test/dummy/public/storage/image/5461/big/11/180x150.gif
+- test/dummy/public/storage/image/5461/big/9/180x150.gif
+- test/dummy/public/storage/image/5461/medium/11/180x150.gif
+- test/dummy/public/storage/image/5461/medium/9/180x150.gif
+- test/dummy/public/storage/image/5461/original/11/180x150.gif
+- test/dummy/public/storage/image/5461/original/9/180x150.gif
+- test/dummy/public/storage/image/5461/small/11/180x150.gif
+- test/dummy/public/storage/image/5461/small/9/180x150.gif
+- test/dummy/public/storage/text/11/original/11/file.txt
+- test/dummy/public/storage/text/11/original/9/file.txt
 - test/dummy/test/fixtures/180x150.gif
 - test/dummy/test/fixtures/file.txt
 - test/generator_test.rb
 - test/local_storage_test.rb
-- test/magick_tool_test.rb
 - test/migration_test.rb
+- test/processor_test.rb
 - test/s3_storage_tes.rb
 - test/tasks_test.rb
 - test/test_helper.rb
@@ -202,15 +219,31 @@ test_files:
 - test/dummy/public/404.html
 - test/dummy/public/422.html
 - test/dummy/public/500.html
+- test/dummy/public/big/180x150.gif
 - test/dummy/public/favicon.ico
+- test/dummy/public/medium/180x150.gif
+- test/dummy/public/original/180x150.gif
+- test/dummy/public/original/file.txt
+- test/dummy/public/resized.gif
+- test/dummy/public/small/180x150.gif
+- test/dummy/public/storage/image/5461/big/11/180x150.gif
+- test/dummy/public/storage/image/5461/big/9/180x150.gif
+- test/dummy/public/storage/image/5461/medium/11/180x150.gif
+- test/dummy/public/storage/image/5461/medium/9/180x150.gif
+- test/dummy/public/storage/image/5461/original/11/180x150.gif
+- test/dummy/public/storage/image/5461/original/9/180x150.gif
+- test/dummy/public/storage/image/5461/small/11/180x150.gif
+- test/dummy/public/storage/image/5461/small/9/180x150.gif
+- test/dummy/public/storage/text/11/original/11/file.txt
+- test/dummy/public/storage/text/11/original/9/file.txt
 - test/dummy/Rakefile
 - test/dummy/README.rdoc
 - test/dummy/test/fixtures/180x150.gif
 - test/dummy/test/fixtures/file.txt
 - test/generator_test.rb
 - test/local_storage_test.rb
-- test/magick_tool_test.rb
 - test/migration_test.rb
+- test/processor_test.rb
 - test/s3_storage_tes.rb
 - test/tasks_test.rb
 - test/test_helper.rb

data/lib/attachs/tools/magick.rb

@@ -1,52 +0,0 @@
-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/test/magick_tool_test.rb

@@ -1,42 +0,0 @@
-require 'test_helper'
-
-class MagickToolTest < ActiveSupport::TestCase
-
-  teardown do
-    Dir[Rails.root.join('tmp', '*')].each do |file|
-      File.delete file
-    end
-  end
-
-  test 'force resize' do
-    Attachs::Tools::Magick.resize(source, :big_force, resized)
-    assert_equal [160,130], Attachs::Tools::Magick.dimensions(resized)
-    Attachs::Tools::Magick.resize(resized, :small_force)
-    assert_equal [140,110], Attachs::Tools::Magick.dimensions(resized)
-  end
-
-  test 'cover resize' do
-    Attachs::Tools::Magick.resize(source, :big_cover, resized)
-    assert_equal [160, 130], Attachs::Tools::Magick.dimensions(resized)
-    Attachs::Tools::Magick.resize(resized, :small_cover)
-    assert_equal [140,110], Attachs::Tools::Magick.dimensions(resized)
-  end
-
-  test 'contain resize' do
-    Attachs::Tools::Magick.resize(source, :big_contain, resized)
-    assert_equal [156, 130], Attachs::Tools::Magick.dimensions(resized)
-    Attachs::Tools::Magick.resize(resized, :small_contain)
-    assert_equal [132,110], Attachs::Tools::Magick.dimensions(resized)
-  end
-
-  private
-
-  def source
-    image_upload.path
-  end
-
-  def resized
-    Rails.root.join('public', 'resized.gif')
-  end
-
-end