smithycms 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc00eaebe1ef8d662fd4dbaae75f25ab02127b0b
-  data.tar.gz: 5cf96f60b15a40ecb5c383582e4d48e5fb02b7bc
+  metadata.gz: aadc29031beec8515e3d69eb3f75db5790617e71
+  data.tar.gz: 656013c9a4e9ffd3cdd3452d9284e87b00ebc727
 SHA512:
-  metadata.gz: 04a08fea2940abbd1c6e1a99772e26a76a99158c3e4fad9512f2c940215bf97263a501e6775fec00e285c9b2c6cac1fc89483f1c1fa9cba23a8754ea4a96c187
-  data.tar.gz: ad030d0871a974a5adbe400ce16ca5bed5815d2648756b7596286ddfeb47a4460ce4540f36cce9916848e3a4e733ebd17da39ba67489bc9e854d90e79229e967
+  metadata.gz: eea557bbd85a451c81753bcde2c9a9da07d6eea16be5f660c58bea628f55ac94fd156a07f8dfc3adb4bce6e9403bdb1c366d46fe27b521b700bd6aa51635ff4f
+  data.tar.gz: 1029c52c582830bd96aecb665526b9e206b52ffe6772816930433c157ce815328bfb8a19ca47ec13b0b95b2453897a97ddd3ccd5b54ac30257b1e746ad2c701c

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

@@ -2,13 +2,15 @@ window.ace_edit = (id, template_type, name) ->
   name = 'template_content' if !name
   textarea_id = name + '-' + id
   editor_id = name + '_editor-' + id
-  $('#'+editor_id).show()
-  editor = ace.edit(editor_id)
-  $textarea = $('#'+textarea_id)
+  $editor = $("##{editor_id}")
+  $textarea = $("##{textarea_id}")
+  $editor.show();
   $textarea.hide()
-  create_ace_toolbar(editor, $textarea.attr('data-assets-url'), $textarea.attr('data-pages-url'))
+  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'
   session.setValue($textarea.val())
   session.setTabSize(2)
   session.setUseSoftTabs(true)
@@ -144,4 +146,9 @@ edit_selection = (editor, command) ->
       session.insert({ row: current_row, column: 0 }, '### ')
     when 'h4'
       session.insert({ row: current_row, column: 0 }, '#### ')
-  editor.focus()
+  editor.focus()
+
+$ ->
+  $('.ace_editor').each ->
+    return unless $(this).data('id') && $(this).data('type') && $(this).data('name')
+    ace_edit($(this).data('id'), $(this).data('type'), $(this).data('name'))

data/app/assets/stylesheets/smithy/application.scss

@@ -9,14 +9,14 @@
  * compiled file, but it's generally better to create a new file per style scope.
  *
  *= require_self
- *= depend_on smithy/bootstrap_and_overrides.css.scss
- *= depend_on smithy/assets.css.scss
- *= depend_on smithy/content_blocks.css.scss
- *= depend_on smithy/layout.css.scss
- *= depend_on smithy/forms.css.scss
- *= depend_on smithy/guides.css.scss
- *= depend_on smithy/pages.css.scss
- *= depend_on smithy/templates.css.scss
+ *= depend_on smithy/bootstrap_and_overrides.scss
+ *= depend_on smithy/assets.scss
+ *= depend_on smithy/content_blocks.scss
+ *= depend_on smithy/layout.scss
+ *= depend_on smithy/forms.scss
+ *= depend_on smithy/guides.scss
+ *= depend_on smithy/pages.scss
+ *= depend_on smithy/templates.scss
  */
 
 @import 'bootstrap_and_overrides';

data/app/helpers/smithy/application_helper.rb

@@ -15,16 +15,7 @@ module Smithy
     end
 
     def render_markdown_input(fieldname, editor_name, form_builder)
-      content_for(:javascript) do
-        javascript_tag do
-          raw("var editor = ace_edit('#{form_builder.object.id || 'new'}', 'markdown', '#{editor_name}');\n") +
-          raw("editor.renderer.setShowGutter(false);")
-        end
-      end
-      hint = "Use markdown syntax for formatting. You can also use HTML directly. <a href=\"#{guide_path('markdown')}\" data-toggle=\"remote-load\" data-target=\"#content-guide\">See our markdown syntax reference</a>".html_safe
-      form_builder.input(fieldname, :as => :text, :input_html => { :class => "span12", :id => "#{editor_name}-#{form_builder.object.id || 'new'}" }, :hint => hint) +
-      content_tag(:div, nil, :id => "#{editor_name}_editor-#{form_builder.object.id || 'new'}", :class => "#{editor_name}_editor ace_editor") +
-      content_tag(:div, nil, :id => 'content-guide')
+      form_builder.input fieldname, as: 'markdown'
     end
 
     private

data/app/inputs/markdown_input.rb

@@ -0,0 +1,33 @@
+require 'formtastic-bootstrap/inputs/text_input'
+class MarkdownInput < FormtasticBootstrap::Inputs::TextInput
+  def to_html
+    self.options[:hint] = markdown_hint if self.options[:hint].blank?
+    bootstrap_wrapping do
+      builder.text_area(method, form_control_input_html_options) +
+      builder.template.content_tag(:div, nil, id: editor_id, class: 'ace_editor', data: { id: id, type: :markdown, name: dom_id, assets_url: builder.template.selector_modal_assets_path, pages_url: builder.template.selector_modal_pages_path }) +
+      builder.template.content_tag(:div, nil, id: 'content-guide')
+    end
+  end
+
+  def id
+    builder.object.id || 'new'
+  end
+
+  def textarea_id
+    "#{dom_id}-#{id}"
+  end
+
+  def editor_id
+    "#{dom_id}_editor-#{id}"
+  end
+
+  def input_html_options
+    {
+      class: "col-md-12",
+    }.merge(super).merge(id: textarea_id)
+  end
+
+  def markdown_hint
+    "Use markdown syntax for formatting. You can also use HTML directly. <a href=\"#{builder.template.guide_path('markdown')}\" data-toggle=\"remote-load\" data-target=\"#content-guide\">See our markdown syntax reference</a>".html_safe
+  end
+end

data/app/models/smithy/assets_datatable.rb

@@ -63,7 +63,7 @@ module Smithy
       assets = assets.page(page).per(per_page)
       # TODO: need to check for regex flag
       if params[:search][:value].present?
-        assets = assets.where("name like :search or content_type like :search", search: "%#{params[:search][:value]}%")
+        assets = assets.where("LOWER(name) LIKE LOWER(:search) or LOWER(content_type) LIKE LOWER(:search)", search: "%#{params[:search][:value]}%")
       end
       assets
     end
@@ -89,4 +89,4 @@ module Smithy
       params[:order][:"0"][:dir] == "desc" ? "desc" : "asc"
     end
   end
-end
+end

data/app/views/smithy/contents/_form_fields.html.erb

@@ -1,12 +1,3 @@
 <%= f.inputs do %>
-  <%= f.input :content, :as => :text, :input_html => { :class => "col-md-12", :id => "template_content-#{f.object.id || 'new'}", data: { assets_url: selector_modal_assets_path, pages_url: selector_modal_pages_path } }, :hint => "Use markdown syntax for formatting. You can also use HTML directly. <a href=\"#{guide_path('markdown')}\" data-toggle=\"remote-load\" data-target=\"#content-guide\">See our markdown syntax reference</a>".html_safe %>
-  <div id="template_content_editor-<%= f.object.id || 'new' %>" class="template_content_editor"></div>
-  <div id="content-guide"></div>
-<% end %>
-
-<% content_for :javascript do %>
-  <%= javascript_tag do %>
-    var editor = ace_edit('<%= f.object.id || 'new' %>', 'markdown', '');
-    editor.renderer.setShowGutter(false);
-  <% end %>
+  <%= f.input :content, as: :markdown %>
 <% end %>

data/app/views/smithy/images/_form_fields.html.erb

@@ -6,16 +6,7 @@
   <%= f.input :link_url %>
 <% end %>
 <%= f.inputs "Content (optional)" do %>
-  <%= f.input :content, :as => :text, :input_html => { :class => "col-md-12", :id => "image_content-#{f.object.id || 'new'}" }, :hint => "Use markdown syntax for formatting. You can also use HTML directly. <a href=\"#{guide_path('markdown')}\" data-toggle=\"remote-load\" data-target=\"#content-guide\">See our markdown syntax reference</a>".html_safe %>
-  <div id="image_content_editor-<%= f.object.id || 'new' %>" class="ace_editor"></div>
-  <div id="content-guide"></div>
-<% end %>
-
-<% content_for :javascript do %>
-  <%= javascript_tag do %>
-    var editor = ace_edit('<%= f.object.id || 'new' %>', 'markdown');
-    editor.renderer.setShowGutter(false);
-  <% end %>
+  <%= f.input :content, as: :markdown %>
 <% end %>
 
 <%= f.inputs "Image Sizing (optional)" do %>

data/config/initializers/refile.rb

@@ -7,16 +7,6 @@ Rails.application.routes.prepend do
   mount Refile.app, at: Refile.mount_point, as: :refile_app
 end
 
-# aws = {
-#   access_key_id: 'AKIAJTMAZVFVSBOL6AKQ',
-#   secret_access_key: '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',
-#   region: 'us-west-2',
-#   bucket: 'testsmithy',
-# }
-
-# Refile.cache = Refile::S3.new(prefix: "cache", **aws)
-# Refile.store = Refile::S3.new(prefix: "store", **aws)
-
 if ENV['AWS_ACCESS_KEY_ID'].present? && ENV['AWS_SECRET_ACCESS_KEY'].present? && ENV['AWS_S3_BUCKET'].present?
   aws = {
     access_key_id: ENV['AWS_ACCESS_KEY_ID'],

data/db/migrate/20150427185319_migrate_dragonfly_images.rb

@@ -3,7 +3,7 @@ class MigrateDragonflyImages < ActiveRecord::Migration
     if Refile.store.is_a? Refile::S3
       prefix = Refile.store.instance_variable_get(:@prefix)
       bucket = Refile.store.instance_variable_get(:@bucket)
-      Smithy::Asset.where('file_id LIKE ?', 'uploads/%').each do |asset|
+      Smithy::Asset.where('file_id LIKE ? OR file_id ~ ?', 'uploads/%', '\d{4}\/\d{2}\/\d{2}\/').each do |asset|
         new_file_id = asset.file_id.gsub(/([^a-z0-9]|(uploads\/)|(assets\/))/i, '')
         s3_object = bucket.object(asset.file_id)
         new_s3_object = bucket.object([*prefix, new_file_id].join('/'))
@@ -25,4 +25,4 @@ class MigrateDragonflyImages < ActiveRecord::Migration
       asset.update_column(:file_content_type, asset.content_type)
     end
   end
-end
+end

data/lib/smithy/engine.rb

@@ -9,7 +9,8 @@ module Smithy
       end
     end
 
-    config.autoload_paths += %W(#{config.root}/lib)
+    # app/inputs for formtastic
+    config.autoload_paths += %W(#{config.root}/lib #{config.root}/app/inputs)
 
     config.to_prepare do
       # include the Smithy helpers in the host application

data/lib/smithy/version.rb

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

data/lib/smithy.rb

@@ -1,4 +1,4 @@
-require "smithy/engine"
+require 'smithy/engine'
 # libraries
 require 'smithy/dependencies'
 # config

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smithycms
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Tim Glen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-03 00:00:00.000000000 Z
+date: 2016-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -134,28 +134,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: 3.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.3.1
+        version: 3.1.3
 - !ruby/object:Gem::Dependency
   name: formtastic-bootstrap
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.1
 - !ruby/object:Gem::Dependency
   name: friendly_id
   requirement: !ruby/object:Gem::Requirement
@@ -750,6 +750,7 @@ files:
 - app/helpers/smithy/pages_helper.rb
 - app/helpers/smithy/settings_helper.rb
 - app/helpers/smithy/templates_helper.rb
+- app/inputs/markdown_input.rb
 - app/models/smithy/asset.rb
 - app/models/smithy/asset_source.rb
 - app/models/smithy/assets_datatable.rb
@@ -857,7 +858,6 @@ files:
 - db/migrate/20150420145923_update_to_refile.rb
 - db/migrate/20150427185319_migrate_dragonfly_images.rb
 - 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

data/db/migrate/20160127160513_look_for_direct_asset_links.rb

@@ -1,13 +0,0 @@
-class LookForDirectAssetLinks < ActiveRecord::Migration
-  def change
-    Smithy::Content.where("content LIKE '%s3.amazonaws.com%' OR content LIKE '%/uploads/assets/%'").each do |content|
-      content.page_contents.each do |page_content|
-        say "[WARNING] Direct Link found in the Page: #{page_content.page.title} - #{page_content.page.url}"
-        say "Content Block(s): #{page_content.label}", true
-        say content.content.scan(/(?:[^\s]*s3\.amazonaws\.com|\/uploads\/assets)[^\s]*/).join('/n'), true
-        say "You can find the new asset url on the smithy/assets page", true
-      end
-    end
-  end
-end
-