dynamic_paperclip 1.0.0a.2 → 1.0.0a.3

data/lib/dynamic_paperclip/attachment.rb

@@ -43,6 +43,17 @@ module DynamicPaperclip
       "#{url}#{delimiter_char}s=#{UrlSecurity.generate_hash(style_name)}"
     end
 
+    # Immediately deletes given styles without impacting existing delete queue
+    def delete_styles(*styles)
+      old_delete_queue = @queued_for_delete
+
+      @queued_for_delete = []
+      queue_some_for_delete *styles
+      flush_deletes
+
+      @queued_for_delete = old_delete_queue
+    end
+
     private
 
       def add_dynamic_style!(name)

data/lib/dynamic_paperclip/version.rb

@@ -1,3 +1,3 @@
 module DynamicPaperclip
-  VERSION = "1.0.0a.2"
+  VERSION = "1.0.0a.3"
 end

data/lib/tasks/dynamic_paperclip.rake

@@ -23,8 +23,7 @@ namespace :dynamic_paperclip do
 
         puts "Deleting: #{attachment.path(style_name)}"
 
-        attachment.send :queue_some_for_delete, style_name
-        attachment.flush_deletes
+        attachment.delete_styles style_name
       end
     end
 

data/test/dummy/log/test.log

@@ -23397,3 +23397,147 @@ Command :: file -b --mime '/var/folders/sd/669fr45168q7jsmsp132kqfr0000gn/T/rail
    (0.0ms)  rollback transaction
    (0.0ms)  begin transaction
    (0.0ms)  rollback transaction
+Connecting to database specified by database.yml
+   (11.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+Migrating to CreatePhotos (20131102002336)
+Connecting to database specified by database.yml
+   (1.2ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+Migrating to CreatePhotos (20131102002336)
+Connecting to database specified by database.yml
+   (1.3ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+Migrating to CreatePhotos (20131102002336)
+Connecting to database specified by database.yml
+   (1.2ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+Migrating to CreatePhotos (20131102002336)
+   (0.1ms)  begin transaction
+  Fixture Delete (0.2ms)  DELETE FROM "photos"
+  Fixture Insert (0.1ms)  INSERT INTO "photos" ("id", "image_file_name", "image_content_type", "created_at", "updated_at") VALUES (1, 'rails.png', 'image/png', '2014-08-14 19:14:46', '2014-08-14 19:14:46')
+   (0.6ms)  commit transaction
+   (0.0ms)  begin transaction
+  Photo Load (0.2ms)  SELECT "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT 1  [["id", 1]]
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+  Photo Load (0.1ms)  SELECT "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT 1  [["id", 1]]
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  Photo Load (0.1ms)  SELECT "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT 1  [["id", 1]]
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  Photo Load (0.1ms)  SELECT "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT 1  [["id", 1]]
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  Photo Load (0.1ms)  SELECT "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT 1  [["id", 1]]
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  Photo Load (0.1ms)  SELECT "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT 1  [["id", 1]]
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  Photo Load (0.1ms)  SELECT "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT 1  [["id", 1]]
+Started GET "/system/photos/images/000/000/001/dynamic_100x100/rails.png?s=d2dcb69d514d1030ce01404ebc422423eccf1b02" for 127.0.0.1 at 2014-08-14 15:14:47 -0400
+  Photo Load (0.1ms)  SELECT "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT 1  [["id", 1]]
+Command :: identify -format '%wx%h,%[exif:orientation]' '/var/folders/sd/669fr45168q7jsmsp132kqfr0000gn/T/rails20140814-94331-1v62tr8.png[0]'
+Command :: identify -format %m '/var/folders/sd/669fr45168q7jsmsp132kqfr0000gn/T/rails20140814-94331-1v62tr8.png[0]'
+Command :: identify -format %m '/var/folders/sd/669fr45168q7jsmsp132kqfr0000gn/T/rails20140814-94331-1v62tr8.png[0]'
+Command :: identify -format %m '/var/folders/sd/669fr45168q7jsmsp132kqfr0000gn/T/rails20140814-94331-1v62tr8.png[0]'
+Command :: convert '/var/folders/sd/669fr45168q7jsmsp132kqfr0000gn/T/rails20140814-94331-1v62tr8.png[0]' -auto-orient -resize "100x100" '/var/folders/sd/669fr45168q7jsmsp132kqfr0000gn/T/rails20140814-94331-1v62tr820140814-94331-572yd5'
+Command :: file -b --mime '/var/folders/sd/669fr45168q7jsmsp132kqfr0000gn/T/rails20140814-94331-1v62tr820140814-94331-572yd5'
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.3ms)  UPDATE "photos" SET "image_file_size" = 6646, "image_updated_at" = '2014-08-14 19:14:47.051994', "image_file_name" = 'rails.png', "updated_at" = '2014-08-14 19:14:47.372748' WHERE "photos"."id" = 1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.3ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+Connecting to database specified by database.yml
+   (1.7ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+Migrating to CreatePhotos (20131102002336)
+   (0.1ms)  begin transaction
+  Fixture Delete (0.4ms)  DELETE FROM "photos"
+  Fixture Insert (0.1ms)  INSERT INTO "photos" ("id", "image_file_name", "image_content_type", "created_at", "updated_at") VALUES (1, 'rails.png', 'image/png', '2014-08-14 19:15:12', '2014-08-14 19:15:12')
+   (0.5ms)  commit transaction
+   (0.0ms)  begin transaction
+  Photo Load (0.2ms)  SELECT "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT 1  [["id", 1]]
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+  Photo Load (0.1ms)  SELECT "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT 1  [["id", 1]]
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  Photo Load (0.1ms)  SELECT "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT 1  [["id", 1]]
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  Photo Load (0.1ms)  SELECT "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT 1  [["id", 1]]
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  Photo Load (0.1ms)  SELECT "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT 1  [["id", 1]]
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  Photo Load (0.1ms)  SELECT "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT 1  [["id", 1]]
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  Photo Load (0.1ms)  SELECT "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT 1  [["id", 1]]
+Started GET "/system/photos/images/000/000/001/dynamic_100x100/rails.png?s=d2dcb69d514d1030ce01404ebc422423eccf1b02" for 127.0.0.1 at 2014-08-14 15:15:12 -0400
+  Photo Load (0.1ms)  SELECT "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT 1  [["id", 1]]
+Command :: identify -format '%wx%h,%[exif:orientation]' '/var/folders/sd/669fr45168q7jsmsp132kqfr0000gn/T/rails20140814-94412-1l84rag.png[0]'
+Command :: identify -format %m '/var/folders/sd/669fr45168q7jsmsp132kqfr0000gn/T/rails20140814-94412-1l84rag.png[0]'
+Command :: identify -format %m '/var/folders/sd/669fr45168q7jsmsp132kqfr0000gn/T/rails20140814-94412-1l84rag.png[0]'
+Command :: identify -format %m '/var/folders/sd/669fr45168q7jsmsp132kqfr0000gn/T/rails20140814-94412-1l84rag.png[0]'
+Command :: convert '/var/folders/sd/669fr45168q7jsmsp132kqfr0000gn/T/rails20140814-94412-1l84rag.png[0]' -auto-orient -resize "100x100" '/var/folders/sd/669fr45168q7jsmsp132kqfr0000gn/T/rails20140814-94412-1l84rag20140814-94412-m02l5u'
+Command :: file -b --mime '/var/folders/sd/669fr45168q7jsmsp132kqfr0000gn/T/rails20140814-94412-1l84rag20140814-94412-m02l5u'
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.4ms)  UPDATE "photos" SET "image_file_size" = 6646, "image_updated_at" = '2014-08-14 19:15:12.677592', "image_file_name" = 'rails.png', "updated_at" = '2014-08-14 19:15:12.768101' WHERE "photos"."id" = 1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.3ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+Connecting to database specified by database.yml
+   (1.4ms)  SELECT "schema_migrations"."version" FROM "schema_migrations" 
+Migrating to CreatePhotos (20131102002336)
+   (0.1ms)  begin transaction
+  Fixture Delete (0.3ms)  DELETE FROM "photos"
+  Fixture Insert (0.1ms)  INSERT INTO "photos" ("id", "image_file_name", "image_content_type", "created_at", "updated_at") VALUES (1, 'rails.png', 'image/png', '2014-08-14 19:16:10', '2014-08-14 19:16:10')
+   (0.5ms)  commit transaction
+   (0.0ms)  begin transaction
+  Photo Load (0.2ms)  SELECT "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT 1  [["id", 1]]
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+  Photo Load (0.1ms)  SELECT "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT 1  [["id", 1]]
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  Photo Load (0.1ms)  SELECT "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT 1  [["id", 1]]
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  Photo Load (0.1ms)  SELECT "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT 1  [["id", 1]]
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  Photo Load (0.1ms)  SELECT "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT 1  [["id", 1]]
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  Photo Load (0.1ms)  SELECT "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT 1  [["id", 1]]
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+  Photo Load (0.1ms)  SELECT "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT 1  [["id", 1]]
+Started GET "/system/photos/images/000/000/001/dynamic_100x100/rails.png?s=d2dcb69d514d1030ce01404ebc422423eccf1b02" for 127.0.0.1 at 2014-08-14 15:16:10 -0400
+  Photo Load (0.1ms)  SELECT "photos".* FROM "photos" WHERE "photos"."id" = ? LIMIT 1  [["id", 1]]
+Command :: identify -format '%wx%h,%[exif:orientation]' '/var/folders/sd/669fr45168q7jsmsp132kqfr0000gn/T/rails20140814-94730-1fp83ta.png[0]'
+Command :: identify -format %m '/var/folders/sd/669fr45168q7jsmsp132kqfr0000gn/T/rails20140814-94730-1fp83ta.png[0]'
+Command :: identify -format %m '/var/folders/sd/669fr45168q7jsmsp132kqfr0000gn/T/rails20140814-94730-1fp83ta.png[0]'
+Command :: identify -format %m '/var/folders/sd/669fr45168q7jsmsp132kqfr0000gn/T/rails20140814-94730-1fp83ta.png[0]'
+Command :: convert '/var/folders/sd/669fr45168q7jsmsp132kqfr0000gn/T/rails20140814-94730-1fp83ta.png[0]' -auto-orient -resize "100x100" '/var/folders/sd/669fr45168q7jsmsp132kqfr0000gn/T/rails20140814-94730-1fp83ta20140814-94730-1uedefb'
+Command :: file -b --mime '/var/folders/sd/669fr45168q7jsmsp132kqfr0000gn/T/rails20140814-94730-1fp83ta20140814-94730-1uedefb'
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.3ms)  UPDATE "photos" SET "image_file_size" = 6646, "image_updated_at" = '2014-08-14 19:16:10.801089', "image_file_name" = 'rails.png', "updated_at" = '2014-08-14 19:16:10.891646' WHERE "photos"."id" = 1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+   (0.3ms)  rollback transaction
+   (0.1ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction

data/test/unit/attachment_test.rb

@@ -38,4 +38,17 @@ class AttachmentTest < ActiveSupport::TestCase
 
     assert_equal '42x42', attachment.styles[:dynamic_42x42].geometry
   end
+
+  should 'delete styles passed to #delete_styles and maintain existing delete queued' do
+    attachment = photos(:rails).image
+
+    attachment.instance_variable_set :@queued_for_delete, [:thumb]
+
+    attachment.expects(:queue_some_for_delete).with(:foo, :bar)
+    attachment.expects(:flush_deletes)
+
+    attachment.delete_styles :foo, :bar
+
+    assert_equal [:thumb], attachment.instance_variable_get(:@queued_for_delete)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_paperclip
 version: !ruby/object:Gem::Version
-  version: 1.0.0a.2
+  version: 1.0.0a.3
   prerelease: 5
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-13 00:00:00.000000000 Z
+date: 2014-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -217,7 +217,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3168233451025285427
+      hash: 2099875005983279561
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: