smithycms 0.6.7 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 552984f1c430881076771d934c8b307ceadfc16f
-  data.tar.gz: 1722271656227e502772af42be4991e8fd0c4249
+  metadata.gz: 18f30ee1469803f9bc78f1b895b531b5e3dee0ac
+  data.tar.gz: e87dcbafe887b63b8f79c14f16630f7459f85dcf
 SHA512:
-  metadata.gz: 38761044569b71490a8d99651eb6267134388ce1c8b1ec92c74cfd0e2e3ce80f72180ba069bffcd883d9b761791f31761270a376d346850a38a0108460a8bd8f
-  data.tar.gz: db5412d3fcf623865904a46fbcb0bb6d2ffe67f7d68244acd69b5d753761980dc0c902a7e2138973f1ae6226f70b1a9ef360c2f9e1f8b9e8e6a0d08600deb413
+  metadata.gz: ea95ab274715989fbc54567e8f76f6f70b0e7a8929798965ab4485434bfbefb09853b0a2223a39e90135d443bd0a128861a06ca7120cc7c41da192e816cfc82d
+  data.tar.gz: 7e3eb0df350a62edf63d408ba8ee1b9691de75a19baef04564efc37211db2b9854e0548bdd9008897d80d32fbb1e724926f8a190846d8d315fa75d50464005fd

data/app/assets/javascripts/smithy/application.js

@@ -16,6 +16,7 @@
 //= require ace-1.1.3/ext-language_tools
 //= require ace-1.1.3/snippets/snippets
 //= require ace-1.1.3/snippets/markdown
+//= require ace-1.1.3/snippets/liquid
 //= require zeroclipboard-2.2.0/ZeroClipboard.min.js
 //= require refile
 //= require smithy/smithy_editor

data/app/assets/javascripts/smithy/editor.coffee

@@ -7,10 +7,11 @@ window.ace_edit = (id, template_type, name) ->
   $editor.show();
   $textarea.hide()
   editor = ace.edit(editor_id)
-  create_ace_toolbar(editor, $editor.attr('data-assets-url'), $editor.attr('data-pages-url'))
   session = editor.getSession()
   session.setMode("ace/mode/" + template_type)
-  editor.renderer.setShowGutter(false) if template_type == 'markdown'
+  if template_type == 'markdown'
+    create_ace_toolbar(editor, $editor.attr('data-assets-url'), $editor.attr('data-pages-url'))
+    editor.renderer.setShowGutter(false)
   session.setValue($textarea.val())
   session.setTabSize(2)
   session.setUseSoftTabs(true)

data/lib/smithy/asset_link.rb

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

data/lib/smithy/version.rb

@@ -1,3 +1,3 @@
 module Smithy
-  VERSION = "0.6.7"
+  VERSION = "0.6.9"
 end

data/lib/tasks/smithy_tasks.rake

@@ -19,9 +19,10 @@ namespace :smithy do
     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
+      file_column = Smithy::Asset.column_names.include?('file_filename') ? 'file_filename' : 'file_name'
+      if Smithy::Asset.where("#{file_column} 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|
+        Smithy::Asset.where("#{file_column} LIKE ?", "%#{File.basename(match)}%").map{|a| "/smithy/assets/#{a.id}"}.each do |link|
           puts "    #{link}"
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smithycms
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.9
 platform: ruby
 authors:
 - Tim Glen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2016-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -649,7 +649,7 @@ dependencies:
 description: Smithy CMS is a Rails Engine built to manage your content easily and
   play nicely with other parts of your app.
 email:
-- tim@tag.ca
+- tim@tagstudios.io
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -1169,7 +1169,175 @@ files:
 - vendor/assets/stylesheets/datatables/dataTables.jqueryui.scss
 - vendor/assets/stylesheets/datatables/jquery.dataTables.scss
 - vendor/assets/stylesheets/datatables/jquery.dataTables_themeroller.scss
-homepage: http://tag.ca/
+- 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.5.gem
+- vendor/cache/awesome_nested_set-3.0.3.gem
+- vendor/cache/aws-sdk-2.2.31.gem
+- vendor/cache/aws-sdk-core-2.2.31.gem
+- vendor/cache/aws-sdk-resources-2.2.31.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.1.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.49.0.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.38.0.gem
+- vendor/cache/fog-aliyun-0.1.0.gem
+- vendor/cache/fog-atmos-0.1.0.gem
+- vendor/cache/fog-aws-0.9.2.gem
+- vendor/cache/fog-brightbox-0.10.1.gem
+- vendor/cache/fog-cloudatcost-0.1.2.gem
+- vendor/cache/fog-core-1.36.0.gem
+- vendor/cache/fog-dynect-0.0.3.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.3.0.gem
+- vendor/cache/fog-openstack-0.1.2.gem
+- vendor/cache/fog-powerdns-0.1.1.gem
+- vendor/cache/fog-profitbricks-0.0.5.gem
+- vendor/cache/fog-rackspace-0.1.1.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.1.0.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.6.3.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-3.1.4.gem
+- vendor/cache/formtastic-bootstrap-3.1.1.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.3.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.10.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.4.gem
+- vendor/cache/method_source-0.8.2.gem
+- vendor/cache/mime-types-2.4.3.gem
+- vendor/cache/mini_magick-4.5.1.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.6.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/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.22.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://tagstudios.io/
 licenses: []
 metadata: {}
 post_install_message: 
@@ -1189,7 +1357,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A good CMS written in Rails.