dynamic_paperclip 0.0.3 → 0.0.4

data/app/controllers/dynamic_paperclip/attachment_styles_controller.rb

@@ -19,7 +19,11 @@ module DynamicPaperclip
         id = params[:id] || id_from_partition(params[:id_partition])
 
         attachment = klass.find(id).send(attachment_name)
-        style_name = StyleNaming.dynamic_style_name_from_definition(params[:definition])
+
+        # The definition will be escaped twice in the URL, Rails will unescape it once for us,
+        # so it will already be escaped once, so we don't need to escape it again. We should always
+        # reference dynamic style names after escaping once - that's how they reside on the FS.
+        style_name = StyleNaming.dynamic_style_name_from_definition(params[:definition], false)
 
         # Validate URL hash against requested style name
         raise Errors::InvalidHash unless DynamicPaperclip::UrlSecurity.valid_hash?(params[:s], style_name)
@@ -27,7 +31,7 @@ module DynamicPaperclip
         # Only process style if it doesn't exist,
         # otherwise we may just be fielding a request for
         # an existing style (i.e. serve_static_assets is true)
-        attachment.process_dynamic_style params[:definition] unless attachment.exists?(style_name)
+        attachment.process_dynamic_style style_name unless attachment.exists?(style_name)
 
         send_file attachment.path(style_name), :disposition => 'inline', :type => attachment.content_type
       end

data/lib/dynamic_paperclip/attachment.rb

@@ -22,9 +22,7 @@ module DynamicPaperclip
       super.merge dynamic_styles
     end
 
-    def process_dynamic_style(definition)
-      style_name = StyleNaming.dynamic_style_name_from_definition(definition)
-
+    def process_dynamic_style(style_name)
       add_dynamic_style! style_name
       reprocess! style_name
     end
@@ -32,14 +30,13 @@ 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?
 
-      escaped_style_name = StyleNaming.dynamic_style_name_from_definition(definition)
-      unescaped_style_name = StyleNaming.dynamic_style_name_from_definition(definition, false)
+      style_name = StyleNaming.dynamic_style_name_from_definition(definition)
 
-      url = url(unescaped_style_name)
+      url = url(style_name)
 
       delimiter_char = url.match(/\?.+=/) ? '&' : '?'
 
-      "#{url}#{delimiter_char}s=#{UrlSecurity.generate_hash(escaped_style_name)}"
+      "#{url}#{delimiter_char}s=#{UrlSecurity.generate_hash(style_name)}"
     end
 
     private

data/lib/dynamic_paperclip/version.rb

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

metadata

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