smithycms 0.5.2 → 0.5.99

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39561e91c08df383f68cdd2ab7ff4696f4ece727
-  data.tar.gz: ab0a854d38401f183bec49e954983aac63967480
+  metadata.gz: 50a9ee949cfb2971b60f14b209dd95c3beec69de
+  data.tar.gz: a200f12370e77bb8bea791e11869d87bfd3f6d79
 SHA512:
-  metadata.gz: 31cd8bf890e4e25f63b3f57d03ad46c7fa5ee7d9da10959b9ee16cda5d2296a71982540c015b8188b4dbc909e814e1051e570f1b7b4394b132d807a67cad36ef
-  data.tar.gz: badd9f440124104d63627981895dc5828621ca9804ee47ef04b4bdbe2579e68d78a78d8a4bfc1c635661a72e08a2f39ae55fd0edfcb6bc2fac5d60566e25cc4d
+  metadata.gz: 06d59457aabae1d90fa979d84a88a1b0f906928b0ee812c5d911443519a51acd0c0d383bd58c55bb595ac24a08abb6adf81037c1996cf3f0db9f5bfc5a8303a1
+  data.tar.gz: c9a7ab5481b04448a95180de110624c45a364bf5b9a073a828750251bba8789767b9d125020c5c05262cf0d74ef4d4a95624931618a3a92a43dcd066526f7199

data/app/controllers/smithy/assets_controller.rb

@@ -14,6 +14,13 @@ module Smithy
       respond_with @asset
     end
 
+    def show
+      @asset = Asset.find(params[:id])
+      respond_with @asset do |format|
+        format.html { redirect_to @asset.url }
+      end
+    end
+
     def create
       @asset = Asset.new(filtered_params)
       @asset.save

data/app/models/smithy/asset.rb

@@ -59,10 +59,14 @@ module Smithy
         'file_height' => self.file_height,
         'file_size' => self.file_size,
         'remote_url' => self.file.remote_url,
-        'url' => self.file.url
+        'url' => self.url
       }
     end
 
+    def url
+      self.file.url
+    end
+
     private
       def set_content_types
         set_content_type(self.file, :content_type)

data/app/models/smithy/content_block_template.rb

@@ -12,10 +12,14 @@ module Smithy
     default_scope -> { order(:name) }
 
     def liquid_template
-      @liquid_template ||= ::Liquid::Template.parse(self.content)
+      @liquid_template ||= ::Liquid::Template.parse(content_with_fixed_asset_links)
     end
 
     private
+      def content_with_fixed_asset_links
+        content.gsub(/\/smithy\/assets\/([0-9]+)/) { Smithy::Asset.find($1).url }
+      end
+
       def touch_page_contents
         self.page_contents.each(&:touch)
       end

data/app/models/smithy/template.rb

@@ -26,10 +26,14 @@ module Smithy
 
     def liquid_template
       @liquid_template ||= Rails.cache.fetch("#{self.cache_key}-liquid_template") do
-        ::Liquid::Template.parse(self.content)
+        ::Liquid::Template.parse(self.content_with_fixed_asset_links)
       end
     end
 
+    def content_with_fixed_asset_links
+      content.gsub(/\/smithy\/assets\/([0-9]+)/) { Smithy::Asset.find($1).url }
+    end
+
     private
       def load_containers
         return unless self.template_type == 'template'

data/lib/smithy/formatter.rb

@@ -2,10 +2,15 @@ module Smithy
   class Formatter < ::Slodown::Formatter
 
     def render
-      self.complete.to_s
+      fix_asset_links.complete.to_s
     end
 
     private
+      def fix_asset_links
+        @current = @current.gsub(/\/smithy\/assets\/([0-9]+)/) { Smithy::Asset.find($1).url }
+        self
+      end
+
       def kramdown_options
         { coderay_css: 'style' }
       end

data/lib/smithy/liquid/database.rb

@@ -5,7 +5,7 @@ module Smithy
         _include = Smithy::Template.partials.where(:name => template_path).first
         raise ActiveRecord::RecordNotFound, "No such template '#{template_path}'" unless _include.present?
 
-        _include.content
+        _include.content_with_fixed_asset_links
       end
     end
   end

data/lib/smithy/liquid/tags/asset.rb

@@ -15,7 +15,7 @@ module Smithy
                 @alt = ''
               end
             else
-              raise ::Liquid::SyntaxError.new("Syntax Error in '#{@tag_name}' - Valid syntax: image_tag <asset_id|path>")
+              raise ::Liquid::SyntaxError.new("Syntax Error in '#{@tag_name}' - Valid syntax: asset_image_tag <asset_id|path>")
             end
             super
           end
@@ -31,12 +31,12 @@ module Smithy
             if markup =~ Syntax
               @asset_id = $1.gsub('\'', '')
               if @asset = ::Smithy::Asset.find_by_id(@asset_id)
-                @url = @asset.file.url
+                @url = @asset.url
               else
-                @url = @asset_id
+                @url = controller.smithy_asset_path(@asset_id)
               end
             else
-              raise ::Liquid::SyntaxError.new("Syntax Error in '#{@tag_name}' - Valid syntax: file_path <asset_id|path>")
+              raise ::Liquid::SyntaxError.new("Syntax Error in '#{@tag_name}' - Valid syntax: asset_file_path <asset_id|path>")
             end
             super
           end

data/lib/smithy/version.rb

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

data/lib/tasks/smithy_tasks.rake

@@ -1,4 +1,32 @@
-# desc "Explaining what the task does"
-# task :smithy do
-#   # Task goes here
-# end
+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
+    Smithy::Template.where('content LIKE ? OR content LIKE ?', '%s3.amazonaws.com%', '%/uploads/assets/%').each do |template|
+      puts "[WARNING] Direct Link found in the Template: #{template.name}"
+      find_and_print_matches(template.content)
+    end
+
+    Smithy::Content.where('content LIKE ? OR content LIKE ?', '%s3.amazonaws.com%', '%/uploads/assets/%').each do |content|
+      content.page_contents.each do |page_content|
+        puts "[WARNING] Direct Link found in the Page: #{page_content.page.title} - #{page_content.page.url}"
+        puts "  Content Block(s): #{page_content.label}"
+        find_and_print_matches(content.content)
+      end
+    end
+  end
+
+  def find_and_print_matches(content)
+    asset_regex = /(?:https?:\/\/.*s3\.amazonaws\.com|\/uploads\/assets)[a-z0-9\/\._-]+/i
+    content.scan(asset_regex) do |match|
+      puts "  #{match}\n"
+      if Smithy::Asset.where("file_name LIKE ?", "%#{File.basename(match)}%").size > 0
+        puts "    Possible Match(es):"
+        Smithy::Asset.where("file_name LIKE ?", "%#{File.basename(match)}%").map{|a| "/smithy/assets/#{a.id}"}.each do |link|
+          puts "    #{link}"
+        end
+      end
+    end
+    puts "\n"
+  end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smithycms
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.99
 platform: ruby
 authors:
 - Tim Glen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-29 00:00:00.000000000 Z
+date: 2016-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails