Implement the Smithy::AssetLink.fix method everywhere it is needed

sterrym · Feb 3, 2016 · 40b2453 · 40b2453
1 parent 3c547f8
commit 40b2453
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/app/models/smithy/content.rb b/app/models/smithy/content.rb
@@ -19,7 +19,7 @@ def formatted_content
     def to_liquid
       {
         'id' => self.id,
-        'content' => self.content,
+        'content' => Smithy::AssetLink.fix(self.content),
         'formatted_content' => self.formatted_content
       }
     end

diff --git a/app/models/smithy/content_block_template.rb b/app/models/smithy/content_block_template.rb
@@ -17,7 +17,7 @@ def liquid_template
 
     private
       def content_with_fixed_asset_links
-        content.gsub(/\/smithy\/assets\/([0-9]+)/) { Smithy::Asset.find($1).url }
+        Smithy::AssetLink.fix(self.content)
       end
 
       def touch_page_contents

diff --git a/app/models/smithy/template.rb b/app/models/smithy/template.rb
@@ -31,7 +31,7 @@ def liquid_template
     end
 
     def content_with_fixed_asset_links
-      content.gsub(/\/smithy\/assets\/([0-9]+)/) { Smithy::Asset.find($1).url }
+      Smithy::AssetLink.fix(self.content)
     end
 
     private

diff --git a/lib/smithy/formatter.rb b/lib/smithy/formatter.rb
@@ -7,7 +7,7 @@ def render
 
     private
       def fix_asset_links
-        @current = @current.gsub(/\/smithy\/assets\/([0-9]+)/) { Smithy::Asset.find($1).url }
+        @current = Smithy::AssetLink.fix(@current)
         self
       end