smithycms 0.5.99 → 0.5.99.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50a9ee949cfb2971b60f14b209dd95c3beec69de
-  data.tar.gz: a200f12370e77bb8bea791e11869d87bfd3f6d79
+  metadata.gz: 6aa6991d1a7a02eb63f32a65fd22084a89d4b9ac
+  data.tar.gz: 3a578a8ce850fa4f192290918e0fb0791049fb58
 SHA512:
-  metadata.gz: 06d59457aabae1d90fa979d84a88a1b0f906928b0ee812c5d911443519a51acd0c0d383bd58c55bb595ac24a08abb6adf81037c1996cf3f0db9f5bfc5a8303a1
-  data.tar.gz: c9a7ab5481b04448a95180de110624c45a364bf5b9a073a828750251bba8789767b9d125020c5c05262cf0d74ef4d4a95624931618a3a92a43dcd066526f7199
+  metadata.gz: b4f8f24794428b031d516e8e7a3a8d05da81840d2a436479d669b8a736ad808fdec1ec93c5ed0280e7c7a008aa247aa099e740c15e0ac84c450ec28f18ec4874
+  data.tar.gz: efb6655edd7625a0a2376207a9045158bcbda560373c9cd913b3fa3548b1b6b8a73f0966b59d2a86a615b8428008f915a3c180e4ac3b7f2a58d071c93e841210

data/app/models/smithy/content.rb

@@ -19,7 +19,7 @@ module Smithy
     def to_liquid
       {
         'id' => self.id,
-        'content' => self.content,
+        'content' => Smithy::AssetLink.fix(self.content),
         'formatted_content' => self.formatted_content
       }
     end

data/app/models/smithy/content_block_template.rb

@@ -17,7 +17,7 @@ module Smithy
 
     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

data/app/models/smithy/template.rb

@@ -31,7 +31,7 @@ module Smithy
     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

data/lib/smithy/asset_link.rb

@@ -0,0 +1,7 @@
+module Smithy
+  class AssetLink
+    def self.fix(content)
+      content.gsub(/\/smithy\/assets\/([0-9]+)/) { Smithy::Asset.find($1).url }
+    end
+  end
+end

data/lib/smithy/formatter.rb

@@ -7,7 +7,7 @@ module Smithy
 
     private
       def fix_asset_links
-        @current = @current.gsub(/\/smithy\/assets\/([0-9]+)/) { Smithy::Asset.find($1).url }
+        @current = Smithy::AssetLink.fix(@current)
         self
       end
 

data/lib/smithy/version.rb

@@ -1,3 +1,3 @@
 module Smithy
-  VERSION = "0.5.99"
+  VERSION = "0.5.99.1"
 end

data/lib/smithy.rb

@@ -6,6 +6,7 @@ require 'smithy/logger'
 require 'smithy/dragonfly'
 require 'smithy/liquid'
 # content formatting
+require 'smithy/asset_link'
 require 'smithy/formatter'
 #
 require 'smithy/content_blocks'

data/lib/tasks/smithy_tasks.rake

@@ -1,3 +1,6 @@
+require 'smithycms'
+require 'smithy/content'
+require 'smithy/template'
 namespace :smithy do
   desc "Track down any usage of linking directly to Smithy Assets. Use /smithy/assets/1 instead"
   task :find_direct_asset_links do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smithycms
 version: !ruby/object:Gem::Version
-  version: 0.5.99
+  version: 0.5.99.1
 platform: ruby
 authors:
 - Tim Glen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-02 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -794,6 +794,7 @@ files:
 - db/migrate/20131223145710_add_position_to_smithy_template_containers.rb
 - db/migrate/20141113220013_change_page_keywords_to_text.rb
 - lib/smithy.rb
+- lib/smithy/asset_link.rb
 - lib/smithy/content_blocks.rb
 - lib/smithy/content_blocks/model.rb
 - lib/smithy/content_blocks/registry.rb