dynamic_paperclip 0.0.2 → 0.0.3

data/lib/dynamic_paperclip/attachment.rb

@@ -32,13 +32,14 @@ module DynamicPaperclip
     def dynamic_url(definition)
       raise DynamicPaperclip::Errors::SecretNotSet, "No secret has been configured. Please run the dynamic_paperclip:install generator." unless DynamicPaperclip.config.secret.present?
 
-      style_name = StyleNaming.dynamic_style_name_from_definition(definition)
+      escaped_style_name = StyleNaming.dynamic_style_name_from_definition(definition)
+      unescaped_style_name = StyleNaming.dynamic_style_name_from_definition(definition, false)
 
-      url = url(style_name)
+      url = url(unescaped_style_name)
 
       delimiter_char = url.match(/\?.+=/) ? '&' : '?'
 
-      "#{url}#{delimiter_char}s=#{UrlSecurity.generate_hash(style_name)}".html_safe
+      "#{url}#{delimiter_char}s=#{UrlSecurity.generate_hash(escaped_style_name)}"
     end
 
     private

data/lib/dynamic_paperclip/style_naming.rb

@@ -2,9 +2,9 @@ module DynamicPaperclip
   module StyleNaming
     # Generate style name from style definition,
     # only supports strings at the moment
-    def self.dynamic_style_name_from_definition(options)
+    def self.dynamic_style_name_from_definition(options, uri_escape=true)
       if options.is_a?(String)
-        "dynamic_#{URI.escape(options)}".to_sym
+        "dynamic_#{uri_escape ? URI.escape(options) : options}".to_sym
       else
         raise 'Only String options are supported with dynamic attachments'
       end

data/lib/dynamic_paperclip/version.rb

@@ -1,3 +1,3 @@
 module DynamicPaperclip
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/dummy/log/test.log

@@ -17557,3 +17557,195 @@ Completed 200 OK in 0.4ms (ActiveRecord: 0.0ms)
    (0.0ms)  rollback transaction
    (0.0ms)  begin transaction
    (0.0ms)  rollback transaction
+Connecting to database specified by database.yml
+   (20.7ms)  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', '2013-11-04 20:12:05', '2013-11-04 20:12:05')
+   (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.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 2013-11-04 15:12:06 -0500
+Processing by DynamicPaperclip::AttachmentStylesController#generate_photo as PNG
+  Parameters: {"s"=>"d2dcb69d514d1030ce01404ebc422423eccf1b02", "attachment"=>"images", "id_partition"=>"000/000/001", "definition"=>"100x100", "filename"=>"rails"}
+  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/rails20131104-21282-5a7lc0.png[0]'
+Command :: identify -format %m '/var/folders/sd/669fr45168q7jsmsp132kqfr0000gn/T/rails20131104-21282-5a7lc0.png[0]'
+Command :: identify -format %m '/var/folders/sd/669fr45168q7jsmsp132kqfr0000gn/T/rails20131104-21282-5a7lc0.png[0]'
+Command :: identify -format %m '/var/folders/sd/669fr45168q7jsmsp132kqfr0000gn/T/rails20131104-21282-5a7lc0.png[0]'
+Command :: convert '/var/folders/sd/669fr45168q7jsmsp132kqfr0000gn/T/rails20131104-21282-5a7lc0.png[0]' -auto-orient -resize "100x100" '/var/folders/sd/669fr45168q7jsmsp132kqfr0000gn/T/rails20131104-21282-5a7lc020131104-21282-3pqm6l'
+Command :: file -b --mime '/var/folders/sd/669fr45168q7jsmsp132kqfr0000gn/T/rails20131104-21282-5a7lc020131104-21282-3pqm6l'
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.3ms)  UPDATE "photos" SET "image_file_size" = 6646, "image_updated_at" = '2013-11-04 20:12:06.144999', "image_file_name" = 'rails.png', "updated_at" = '2013-11-04 20:12:06.261596' WHERE "photos"."id" = 1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+Sent file /Users/jimbo/OSS/dynamic_paperclip/test/dummy/public/system/photos/images/000/000/001/dynamic_100x100/rails.png (0.1ms)
+Completed 200 OK in 127.7ms (ActiveRecord: 0.5ms)
+   (0.4ms)  rollback transaction
+   (0.1ms)  begin transaction
+Processing by DynamicPaperclip::AttachmentStylesController#generate_foo as HTML
+  Parameters: {"attachment"=>"images", "id"=>"1", "definition"=>"42x42", "filename"=>"file", "s"=>"a9009b02490c94166d05d0df83e572e8e0bacc92"}
+Sent file /Users/jimbo/OSS/dynamic_paperclip/test/fixtures/rails.png (0.1ms)
+Completed 200 OK in 1.3ms (ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by DynamicPaperclip::AttachmentStylesController#generate_foo as HTML
+  Parameters: {"attachment"=>"image_with_id_partition_in_urls", "id_partition"=>"000/010/042", "definition"=>"42x42", "filename"=>"file", "s"=>"a9009b02490c94166d05d0df83e572e8e0bacc92"}
+Sent file /Users/jimbo/OSS/dynamic_paperclip/test/fixtures/rails.png (0.1ms)
+Completed 200 OK in 0.6ms (ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by DynamicPaperclip::AttachmentStylesController#generate_foo as HTML
+  Parameters: {"attachment"=>"images", "id"=>"1", "definition"=>"42x42", "filename"=>"file", "s"=>"a9009b02490c94166d05d0df83e572e8e0bacc92"}
+Sent file /Users/jimbo/OSS/dynamic_paperclip/test/fixtures/rails.png (0.1ms)
+Completed 200 OK in 0.6ms (ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by DynamicPaperclip::AttachmentStylesController#generate_foo as HTML
+  Parameters: {"attachment"=>"images", "id"=>"1", "definition"=>"42x42", "filename"=>"file", "s"=>"a9009b02490c94166d05d0df83e572e8e0bacc92"}
+Sent file /Users/jimbo/OSS/dynamic_paperclip/test/fixtures/rails.png (0.1ms)
+Completed 200 OK in 0.6ms (ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by DynamicPaperclip::AttachmentStylesController#generate_foo as HTML
+  Parameters: {"attachment"=>"bars", "id"=>"1", "style"=>"style", "filename"=>"file"}
+Completed 500 Internal Server Error in 0.4ms
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by DynamicPaperclip::AttachmentStylesController#generate_foo as HTML
+  Parameters: {"attachment"=>"images", "id"=>"1", "definition"=>"42x42", "filename"=>"file", "s"=>"this is an invalid hash"}
+Completed 500 Internal Server Error in 0.5ms
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by DynamicPaperclip::AttachmentStylesController#generate_foo as HTML
+  Parameters: {"attachment"=>"images", "style"=>"style", "filename"=>"file"}
+Completed 500 Internal Server Error in 0.4ms
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by DynamicPaperclip::AttachmentStylesController#generate_foo as HTML
+  Parameters: {"attachment"=>"images", "id"=>"1", "definition"=>"42x42", "filename"=>"file", "s"=>"a9009b02490c94166d05d0df83e572e8e0bacc92"}
+Sent file /Users/jimbo/OSS/dynamic_paperclip/test/fixtures/rails.png (0.1ms)
+Completed 200 OK in 0.5ms (ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by DynamicPaperclip::AttachmentStylesController#generate_foo as HTML
+  Parameters: {"attachment"=>"images", "id"=>"1", "definition"=>"42x42", "filename"=>"file", "s"=>"a9009b02490c94166d05d0df83e572e8e0bacc92"}
+Completed 200 OK in 0.4ms (ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+Connecting to database specified by database.yml
+   (15.9ms)  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', '2013-11-04 20:12:18', '2013-11-04 20:12:18')
+   (0.9ms)  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.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 2013-11-04 15:12:19 -0500
+Processing by DynamicPaperclip::AttachmentStylesController#generate_photo as PNG
+  Parameters: {"s"=>"d2dcb69d514d1030ce01404ebc422423eccf1b02", "attachment"=>"images", "id_partition"=>"000/000/001", "definition"=>"100x100", "filename"=>"rails"}
+  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/rails20131104-21351-1vyc03p.png[0]'
+Command :: identify -format %m '/var/folders/sd/669fr45168q7jsmsp132kqfr0000gn/T/rails20131104-21351-1vyc03p.png[0]'
+Command :: identify -format %m '/var/folders/sd/669fr45168q7jsmsp132kqfr0000gn/T/rails20131104-21351-1vyc03p.png[0]'
+Command :: identify -format %m '/var/folders/sd/669fr45168q7jsmsp132kqfr0000gn/T/rails20131104-21351-1vyc03p.png[0]'
+Command :: convert '/var/folders/sd/669fr45168q7jsmsp132kqfr0000gn/T/rails20131104-21351-1vyc03p.png[0]' -auto-orient -resize "100x100" '/var/folders/sd/669fr45168q7jsmsp132kqfr0000gn/T/rails20131104-21351-1vyc03p20131104-21351-1jbznws'
+Command :: file -b --mime '/var/folders/sd/669fr45168q7jsmsp132kqfr0000gn/T/rails20131104-21351-1vyc03p20131104-21351-1jbznws'
+   (0.1ms)  SAVEPOINT active_record_1
+   (0.3ms)  UPDATE "photos" SET "image_file_size" = 6646, "image_updated_at" = '2013-11-04 20:12:19.111059', "image_file_name" = 'rails.png', "updated_at" = '2013-11-04 20:12:19.216641' WHERE "photos"."id" = 1
+   (0.0ms)  RELEASE SAVEPOINT active_record_1
+Sent file /Users/jimbo/OSS/dynamic_paperclip/test/dummy/public/system/photos/images/000/000/001/dynamic_100x100/rails.png (0.1ms)
+Completed 200 OK in 115.6ms (ActiveRecord: 0.5ms)
+   (0.4ms)  rollback transaction
+   (0.1ms)  begin transaction
+Processing by DynamicPaperclip::AttachmentStylesController#generate_foo as HTML
+  Parameters: {"attachment"=>"images", "id"=>"1", "definition"=>"42x42", "filename"=>"file", "s"=>"a9009b02490c94166d05d0df83e572e8e0bacc92"}
+Sent file /Users/jimbo/OSS/dynamic_paperclip/test/fixtures/rails.png (0.1ms)
+Completed 200 OK in 1.1ms (ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by DynamicPaperclip::AttachmentStylesController#generate_foo as HTML
+  Parameters: {"attachment"=>"image_with_id_partition_in_urls", "id_partition"=>"000/010/042", "definition"=>"42x42", "filename"=>"file", "s"=>"a9009b02490c94166d05d0df83e572e8e0bacc92"}
+Sent file /Users/jimbo/OSS/dynamic_paperclip/test/fixtures/rails.png (0.1ms)
+Completed 200 OK in 0.6ms (ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by DynamicPaperclip::AttachmentStylesController#generate_foo as HTML
+  Parameters: {"attachment"=>"images", "id"=>"1", "definition"=>"42x42", "filename"=>"file", "s"=>"a9009b02490c94166d05d0df83e572e8e0bacc92"}
+Sent file /Users/jimbo/OSS/dynamic_paperclip/test/fixtures/rails.png (0.1ms)
+Completed 200 OK in 0.6ms (ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by DynamicPaperclip::AttachmentStylesController#generate_foo as HTML
+  Parameters: {"attachment"=>"images", "id"=>"1", "definition"=>"42x42", "filename"=>"file", "s"=>"a9009b02490c94166d05d0df83e572e8e0bacc92"}
+Sent file /Users/jimbo/OSS/dynamic_paperclip/test/fixtures/rails.png (0.1ms)
+Completed 200 OK in 0.7ms (ActiveRecord: 0.0ms)
+   (0.1ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by DynamicPaperclip::AttachmentStylesController#generate_foo as HTML
+  Parameters: {"attachment"=>"bars", "id"=>"1", "style"=>"style", "filename"=>"file"}
+Completed 500 Internal Server Error in 0.4ms
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by DynamicPaperclip::AttachmentStylesController#generate_foo as HTML
+  Parameters: {"attachment"=>"images", "id"=>"1", "definition"=>"42x42", "filename"=>"file", "s"=>"this is an invalid hash"}
+Completed 500 Internal Server Error in 0.5ms
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by DynamicPaperclip::AttachmentStylesController#generate_foo as HTML
+  Parameters: {"attachment"=>"images", "style"=>"style", "filename"=>"file"}
+Completed 500 Internal Server Error in 0.4ms
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by DynamicPaperclip::AttachmentStylesController#generate_foo as HTML
+  Parameters: {"attachment"=>"images", "id"=>"1", "definition"=>"42x42", "filename"=>"file", "s"=>"a9009b02490c94166d05d0df83e572e8e0bacc92"}
+Sent file /Users/jimbo/OSS/dynamic_paperclip/test/fixtures/rails.png (0.1ms)
+Completed 200 OK in 0.6ms (ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+Processing by DynamicPaperclip::AttachmentStylesController#generate_foo as HTML
+  Parameters: {"attachment"=>"images", "id"=>"1", "definition"=>"42x42", "filename"=>"file", "s"=>"a9009b02490c94166d05d0df83e572e8e0bacc92"}
+Completed 200 OK in 0.4ms (ActiveRecord: 0.0ms)
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction
+   (0.0ms)  begin transaction
+   (0.0ms)  rollback transaction

data/test/unit/attachment_test.rb

@@ -10,7 +10,7 @@ class AttachmentTest < ActiveSupport::TestCase
   should 'generate correct secure attachment URL when given a style definition' do
     DynamicPaperclip::Config.any_instance.stubs(:secret).returns('abc123')
 
-    assert_equal "/system/photos/images/000/000/001/dynamic_50x50%2523/rails.png?s=#{Digest::SHA1.hexdigest("abc123dynamic_50x50%23")}", photos(:rails).image.dynamic_url('50x50#')
+    assert_equal "/system/photos/images/000/000/001/dynamic_50x50%23/rails.png?s=#{Digest::SHA1.hexdigest("abc123dynamic_50x50%23")}", photos(:rails).image.dynamic_url('50x50#')
   end
 
   should 'raise error if no secret has been configured' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dynamic_paperclip
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors: