smithycms 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 018b01cf5ecc5da13736a8510d7b6f46896cbfd1
-  data.tar.gz: 64e2790ec5c0df3f046c09a6a590acdf6f2a0456
+  metadata.gz: fc00eaebe1ef8d662fd4dbaae75f25ab02127b0b
+  data.tar.gz: 5cf96f60b15a40ecb5c383582e4d48e5fb02b7bc
 SHA512:
-  metadata.gz: 3fd38664b501d9fb6d06ef918d25fc479507df000393a21f624d8f760dd7c167a6d5c83b55563e71ea4e2ba29325217639739d225ca7c25b0ab71e16ec6499e7
-  data.tar.gz: 4454069334657b4d12569529fd9a9e88884252786bf9a679d9434efcf70a4b7028130f52baab27600d48292d47ddea115d0a2dd5540a181b0cee65126add86f8
+  metadata.gz: 04a08fea2940abbd1c6e1a99772e26a76a99158c3e4fad9512f2c940215bf97263a501e6775fec00e285c9b2c6cac1fc89483f1c1fa9cba23a8754ea4a96c187
+  data.tar.gz: ad030d0871a974a5adbe400ce16ca5bed5815d2648756b7596286ddfeb47a4460ce4540f36cce9916848e3a4e733ebd17da39ba67489bc9e854d90e79229e967

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

@@ -12,7 +12,7 @@ module Smithy
     default_scope -> { order(:name) }
 
     def liquid_template
-      @liquid_template ||= ::Liquid::Template.parse(self.content)
+      @liquid_template ||= ::Liquid::Template.parse(Smithy::AssetLink.fix(self.content))
     end
 
     private

data/app/models/smithy/template.rb

@@ -26,7 +26,7 @@ module Smithy
 
     def liquid_template
       @liquid_template ||= Rails.cache.fetch("#{self.cache_key}-liquid_template") do
-        ::Liquid::Template.parse(self.content)
+        ::Liquid::Template.parse(Smithy::AssetLink.fix(self.content))
       end
     end
 

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

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

data/lib/smithy/liquid/database.rb

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

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

@@ -30,7 +30,12 @@ module Smithy
           Syntax = /(#{::Liquid::Expression}+)?/
           def initialize(tag_name, markup, tokens)
             if markup =~ Syntax
-              @variable = $1.gsub('\'', '')
+              @asset_id = $1.gsub('\'', '')
+              if @asset = ::Smithy::Asset.find_by_id(@asset_id)
+                @url = @asset.url
+              else
+                @url = controller.smithy_asset_path(@asset_id)
+              end
             else
               raise ::Liquid::SyntaxError.new("Syntax Error in '#{@tag_name}' - Valid syntax: asset_file_path <asset_id|path>")
             end

data/lib/smithy/version.rb

@@ -1,3 +1,3 @@
 module Smithy
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

data/lib/smithy.rb

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

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 => :environment 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.6.2
+  version: 0.6.3
 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
@@ -859,6 +859,7 @@ files:
 - db/migrate/20160122152402_create_smithy_asset_sources.rb
 - db/migrate/20160127160513_look_for_direct_asset_links.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
@@ -1174,175 +1175,6 @@ files:
 - vendor/assets/javascripts/zeroclipboard-2.2.0/ZeroClipboard.js
 - vendor/assets/javascripts/zeroclipboard-2.2.0/ZeroClipboard.min.js
 - vendor/assets/javascripts/zeroclipboard-2.2.0/ZeroClipboard.min.map
-- vendor/cache/CFPropertyList-2.3.2.gem
-- vendor/cache/actionmailer-4.1.10.gem
-- vendor/cache/actionpack-4.1.10.gem
-- vendor/cache/actionview-4.1.10.gem
-- vendor/cache/activemodel-4.1.10.gem
-- vendor/cache/activerecord-4.1.10.gem
-- vendor/cache/activesupport-4.1.10.gem
-- vendor/cache/addressable-2.3.8.gem
-- vendor/cache/arel-5.0.1.20140414130214.gem
-- vendor/cache/autoprefixer-rails-6.3.1.gem
-- vendor/cache/awesome_nested_set-3.0.3.gem
-- vendor/cache/aws-sdk-2.2.13.gem
-- vendor/cache/aws-sdk-core-2.2.13.gem
-- vendor/cache/aws-sdk-resources-2.2.13.gem
-- vendor/cache/bcrypt-3.1.10.gem
-- vendor/cache/bootstrap-sass-3.2.0.2.gem
-- vendor/cache/builder-3.2.2.gem
-- vendor/cache/byebug-4.0.5.gem
-- vendor/cache/capybara-2.4.4.gem
-- vendor/cache/celluloid-0.16.0.gem
-- vendor/cache/coderay-1.1.0.gem
-- vendor/cache/coffee-rails-4.1.1.gem
-- vendor/cache/coffee-script-2.4.1.gem
-- vendor/cache/coffee-script-source-1.10.0.gem
-- vendor/cache/columnize-0.9.0.gem
-- vendor/cache/concurrent-ruby-1.0.0.gem
-- vendor/cache/coveralls-0.7.12.gem
-- vendor/cache/crass-1.0.2.gem
-- vendor/cache/database_cleaner-1.4.1.gem
-- vendor/cache/diff-lcs-1.2.5.gem
-- vendor/cache/docile-1.1.5.gem
-- vendor/cache/domain_name-0.5.23.gem
-- vendor/cache/dotenv-2.0.1.gem
-- vendor/cache/dotenv-rails-2.0.1.gem
-- vendor/cache/em-websocket-0.5.1.gem
-- vendor/cache/erubis-2.7.0.gem
-- vendor/cache/eventmachine-1.0.7.gem
-- vendor/cache/excon-0.45.4.gem
-- vendor/cache/execjs-2.6.0.gem
-- vendor/cache/factory_girl-4.5.0.gem
-- vendor/cache/factory_girl_rails-4.5.0.gem
-- vendor/cache/fakeweb-1.3.0.gem
-- vendor/cache/ffaker-2.0.0.gem
-- vendor/cache/ffi-1.9.8.gem
-- vendor/cache/fission-0.5.0.gem
-- vendor/cache/fog-1.37.0.gem
-- vendor/cache/fog-aliyun-0.1.0.gem
-- vendor/cache/fog-atmos-0.1.0.gem
-- vendor/cache/fog-aws-0.8.1.gem
-- vendor/cache/fog-brightbox-0.10.1.gem
-- vendor/cache/fog-core-1.35.0.gem
-- vendor/cache/fog-dynect-0.0.2.gem
-- vendor/cache/fog-ecloud-0.3.0.gem
-- vendor/cache/fog-google-0.1.0.gem
-- vendor/cache/fog-json-1.0.2.gem
-- vendor/cache/fog-local-0.2.1.gem
-- vendor/cache/fog-powerdns-0.1.1.gem
-- vendor/cache/fog-profitbricks-0.0.5.gem
-- vendor/cache/fog-radosgw-0.0.5.gem
-- vendor/cache/fog-riakcs-0.1.0.gem
-- vendor/cache/fog-sakuracloud-1.7.5.gem
-- vendor/cache/fog-serverlove-0.1.2.gem
-- vendor/cache/fog-softlayer-1.0.3.gem
-- vendor/cache/fog-storm_on_demand-0.1.1.gem
-- vendor/cache/fog-terremark-0.1.0.gem
-- vendor/cache/fog-vmfusion-0.1.0.gem
-- vendor/cache/fog-voxel-0.1.0.gem
-- vendor/cache/fog-vsphere-0.5.0.gem
-- vendor/cache/fog-xenserver-0.2.3.gem
-- vendor/cache/fog-xml-0.1.2.gem
-- vendor/cache/font-awesome-sass-4.5.0.gem
-- vendor/cache/formatador-0.2.5.gem
-- vendor/cache/formtastic-2.3.1.gem
-- vendor/cache/formtastic-bootstrap-3.0.0.gem
-- vendor/cache/friendly_id-5.0.5.gem
-- vendor/cache/fuubar-2.0.0.gem
-- vendor/cache/guard-2.12.5.gem
-- vendor/cache/guard-compat-1.2.1.gem
-- vendor/cache/guard-livereload-2.4.0.gem
-- vendor/cache/guard-rspec-4.5.0.gem
-- vendor/cache/hitimes-1.2.2.gem
-- vendor/cache/http-cookie-1.0.2.gem
-- vendor/cache/http_parser.rb-0.6.0.gem
-- vendor/cache/httparty-0.13.7.gem
-- vendor/cache/i18n-0.7.0.gem
-- vendor/cache/inflecto-0.0.2.gem
-- vendor/cache/ipaddress-0.8.2.gem
-- vendor/cache/jmespath-1.1.3.gem
-- vendor/cache/jquery-rails-3.1.4.gem
-- vendor/cache/json-1.8.2.gem
-- vendor/cache/kaminari-0.16.3.gem
-- vendor/cache/kramdown-1.9.0.gem
-- vendor/cache/launchy-2.4.3.gem
-- vendor/cache/letter_opener-1.3.0.gem
-- vendor/cache/liquid-2.6.3.gem
-- vendor/cache/listen-2.10.0.gem
-- vendor/cache/lumberjack-1.0.9.gem
-- vendor/cache/mail-2.6.3.gem
-- vendor/cache/method_source-0.8.2.gem
-- vendor/cache/mime-types-2.4.3.gem
-- vendor/cache/mini_magick-4.3.6.gem
-- vendor/cache/mini_portile-0.6.2.gem
-- vendor/cache/minitest-5.5.1.gem
-- vendor/cache/multi_json-1.11.0.gem
-- vendor/cache/multi_xml-0.5.5.gem
-- vendor/cache/mysql2-0.3.18.gem
-- vendor/cache/nenv-0.2.0.gem
-- vendor/cache/netrc-0.10.3.gem
-- vendor/cache/nokogiri-1.6.6.2.gem
-- vendor/cache/nokogumbo-1.4.7.gem
-- vendor/cache/notiffany-0.0.6.gem
-- vendor/cache/pg-0.18.1.gem
-- vendor/cache/pry-0.10.1.gem
-- vendor/cache/rack-1.5.2.gem
-- vendor/cache/rack-cache-1.5.1.gem
-- vendor/cache/rack-livereload-0.3.15.gem
-- vendor/cache/rack-protection-1.5.3.gem
-- vendor/cache/rack-test-0.6.3.gem
-- vendor/cache/rails-4.1.10.gem
-- vendor/cache/rails-assets-datatables-1.10.10.gem
-- vendor/cache/rails-assets-datatables-responsive-2.0.1.gem
-- vendor/cache/rails-assets-datatables-select-1.1.0.gem
-- vendor/cache/rails-assets-jquery-2.2.0.gem
-- vendor/cache/railties-4.1.10.gem
-- vendor/cache/rake-10.4.2.gem
-- vendor/cache/rb-fsevent-0.9.4.gem
-- vendor/cache/rb-inotify-0.9.5.gem
-- vendor/cache/rbvmomi-1.8.2.gem
-- vendor/cache/refile-0.6.2.gem
-- vendor/cache/refile-mini_magick-0.2.0.gem
-- vendor/cache/refile-s3-0.2.0.gem
-- vendor/cache/remotipart-1.2.1.gem
-- vendor/cache/rest-client-1.8.0.gem
-- vendor/cache/rinku-1.7.3.gem
-- vendor/cache/rspec-3.2.0.gem
-- vendor/cache/rspec-core-3.2.2.gem
-- vendor/cache/rspec-expectations-3.2.0.gem
-- vendor/cache/rspec-mocks-3.2.1.gem
-- vendor/cache/rspec-rails-3.2.1.gem
-- vendor/cache/rspec-support-3.2.2.gem
-- vendor/cache/ruby-oembed-0.8.14.gem
-- vendor/cache/ruby-progressbar-1.7.5.gem
-- vendor/cache/sanitize-4.0.1.gem
-- vendor/cache/sass-3.4.21.gem
-- vendor/cache/sass-rails-5.0.4.gem
-- vendor/cache/shellany-0.0.1.gem
-- vendor/cache/shoulda-matchers-2.8.0.gem
-- vendor/cache/simplecov-0.9.2.gem
-- vendor/cache/simplecov-html-0.9.0.gem
-- vendor/cache/sinatra-1.4.7.gem
-- vendor/cache/slodown-0.1.3.gem
-- vendor/cache/slop-3.6.0.gem
-- vendor/cache/smithycms-auth-0.4.2.gem
-- vendor/cache/sprockets-3.5.2.gem
-- vendor/cache/sprockets-rails-2.3.3.gem
-- vendor/cache/sqlite3-1.3.10.gem
-- vendor/cache/term-ansicolor-1.3.0.gem
-- vendor/cache/terminal-notifier-guard-1.6.4.gem
-- vendor/cache/thor-0.19.1.gem
-- vendor/cache/thread_safe-0.3.5.gem
-- vendor/cache/tilt-2.0.2.gem
-- vendor/cache/timers-4.0.1.gem
-- vendor/cache/tins-1.3.5.gem
-- vendor/cache/trollop-2.1.2.gem
-- vendor/cache/tzinfo-1.2.2.gem
-- vendor/cache/unf-0.1.4.gem
-- vendor/cache/unf_ext-0.0.6.gem
-- vendor/cache/xml-simple-1.1.5.gem
-- vendor/cache/xpath-2.0.0.gem
 homepage: http://tag.ca/
 licenses: []
 metadata: {}
@@ -1363,7 +1195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A good CMS written in Rails.