tenon 1.1.8 → 2.0.0

data/app/views/tenon/tenon_content/row_types/form/_two_column_image_and_text.html.haml

@@ -2,12 +2,12 @@
   = f.hidden_field :row_type
   = f.hidden_field :list_order
   -[[0,1], [2,3]].each do |positions|
-    .six{class: cycle('', 'omega')}
-      = f.fields_for :pieces, f.object.pieces.select { |p| positions.include?(p.position) } do |piece|
+    .inner6{ class: cycle('', 'omega') }
+      = f.fields_for :pieces, f.object.pieces.select{ |p| positions.include?(p.position) } do |piece|
         = piece.hidden_field :piece_type
         - if piece.object.piece_type == 'Image'
           .tn-tc-piece.tn-tc-asset-field
-            = render "tenon/tenon_content/piece_types/form/image", f: piece, style: 'half'
+            = render 'tenon/tenon_content/piece_types/form/image', f: piece, style: 'half'
         - else
           .tn-tc-piece
             = render 'tenon/tenon_content/piece_types/form/text', f: piece

data/app/views/tenon/tenon_content/row_types/form/_two_column_text.html.haml

@@ -2,6 +2,6 @@
   = f.hidden_field :list_order
   = f.hidden_field :row_type
   = f.fields_for :pieces do |piece|
-    .tn-tc-piece.six{class: cycle('', 'omega')}
-      = render "tenon/tenon_content/piece_types/form/text", f: piece, position: piece.object.position
-  .spacer
+    .tn-tc-piece.inner6{ class: cycle('', 'omega') }
+      = render 'tenon/tenon_content/piece_types/form/text', f: piece, position: piece.object.position
+  .spacer

data/app/views/tenon/tenon_content/row_types/form/_two_column_with_background_image.html.haml

@@ -3,10 +3,10 @@
   = f.hidden_field :row_type
   = f.fields_for :pieces do |piece|
     - if piece.object.position == 0
-      .tn-tc-piece.tn-tc-background-image.tn-tc-asset-field.twelve
+      .tn-tc-piece.tn-tc-background-image.tn-tc-asset-field.inner12
         = render 'tenon/tenon_content/piece_types/form/background_image', f: piece, position: 0, style: 'full'
     - else
       .tn-tc-piece.tn-text-overlay{class: cycle('', 'omega')}
         = render 'tenon/tenon_content/piece_types/form/text', f: piece, position: piece.object.position
 
-  .spacer
+  .spacer

data/config/initializers/class_extensions/hash.rb

@@ -4,7 +4,7 @@ class Hash
     # symbolize each hash in .values
     values.each { |h| h.recursive_symbolize_keys! if h.is_a?(Hash) }
     # symbolize each hash inside an array in .values
-    values.select { |v| v.is_a?(Array) }.flatten.each { |h| h.recursive_symbolize_keys! if h.is_a?(Hash) }
+    values.select{ |v| v.is_a?(Array) }.flatten.each { |h| h.recursive_symbolize_keys! if h.is_a?(Hash) }
     self
   end
 

data/config/initializers/client_side_validations.rb

@@ -0,0 +1,27 @@
+# ClientSideValidations Initializer
+
+# Disabled validators. The uniqueness validator is disabled by default for security issues. Enable it on your own responsibility!
+# ClientSideValidations::Config.disabled_validators = [:uniqueness]
+
+# Uncomment to validate number format with current I18n locale
+# ClientSideValidations::Config.number_format_with_locale = true
+
+# Uncomment the following block if you want each input field to have the validation messages attached.
+#
+# Note: client_side_validation requires the error to be encapsulated within
+# <label for="#{instance.send(:tag_id)}" class="message"></label>
+#
+ActionView::Base.field_error_proc = Proc.new do |html_tag, instance|
+  if html_tag =~ /^<label/
+    html_tag.html_safe
+  else
+    %(
+      <div class="input-block__field-with-errors">
+        #{html_tag}
+        <label for="#{instance.send(:tag_id)}" class="input-block__error-message">
+          #{instance.error_message.first}
+        </label>
+      </div>
+    ).html_safe
+  end
+end

data/config/initializers/tenon.rb

@@ -73,18 +73,4 @@ Tenon.configure do |config|
   # If you need to add further config options you can add them
   # in lib/tenon.rb as attr_accessors to Tenon::Configuration
 
-  # config.front_end is DEPRECATED as of 1.0.57
-  config.front_end = {
-    breakpoints: {
-      desktop: 1400,
-      laptop: 960,
-      tablet: 768
-    },
-    columns: 24,
-    gutter: 20,
-
-    content_columns: {
-      default: 18
-    }
-  }
 end

data/config/routes.rb

@@ -1,54 +1,18 @@
 Tenon::Engine.routes.draw do
-  devise_for :users, class_name: "Tenon::User", module: :devise
-
-  resources :item_versions, only: [:create, :show, :new, :index]
+  resources :item_versions, only: [:create, :new, :index]
+  get 'item_versions/:item_type(/:item_id)',
+      controller: :item_versions,
+      action: :index,
+      as: :list_item_versions
 
   resources :assets, path: 'asset-library', except: [:show] do
-    post 'encode_notify', :on => :collection
-    get :crop, :on => :member
-  end
-
-  resources :comments, :only => [:index, :destroy] do
-    get 'toggle_approved', :on => :member
-  end
-
-  resources :contacts, :only => [:index, :destroy] do
-    get 'toggle_read', :on => :member
-    get 'toggle_replied', :on => :member
+    post 'encode_notify', on: :collection
+    get :crop, on: :member
   end
 
-  resources :events, :except => [:show]
-
-  resources :galleries, :except => [:show] do
-    post    'reorder', :on => :collection
-  end
-
-  resources :item_assets, :except => [:index, :show]
-
-  resources :pages do
-    post    'reorder', :on => :collection
-  end
+  resources :item_assets, except: [:index, :show]
 
-  resources :post_categories
-
-  resources :posts do
-    post :reorder, :on => :collection
-  end
-
-  resource :settings, :only => [:show, :update]
-
-  resources :tenon_callouts do
-    post    'reorder', :on => :collection
-  end
-
-  resources :redirects do
-    post    'reorder', :on => :collection
-    get 'toggle_active', :on => :member
-  end
-
-  resources :users, path: :user_management, :except => [:show] do
-    get 'approve', :on => :member
-  end
+  resources :styleguides, only: [:index]
 
-  root :to => Tenon.config.routing.root
+  root to: Tenon.config.routing.root
 end

data/db/migrate/20151117171000_drop_default_tenon_resources.rb

@@ -0,0 +1,15 @@
+class DropDefaultTenonResources < ActiveRecord::Migration
+  def change
+    drop_table :tenon_comment_subscribers
+    drop_table :tenon_comments
+    drop_table :tenon_contacts
+    drop_table :tenon_events
+    drop_table :tenon_galleries
+    drop_table :tenon_pages
+    drop_table :tenon_photos
+    drop_table :tenon_post_categories
+    drop_table :tenon_post_categories_posts
+    drop_table :tenon_posts
+    drop_table :tenon_redirects
+  end
+end

data/db/migrate/20160119185645_remove_tenon_users.rb

@@ -0,0 +1,7 @@
+class RemoveTenonUsers < ActiveRecord::Migration[5.0]
+  def change
+    drop_table :tenon_users
+    drop_table :tenon_roles
+    drop_table :tenon_role_assignments
+  end
+end

data/db/migrate/20160126123154_remove_tenon_callouts_subscribers.rb

@@ -0,0 +1,8 @@
+class RemoveTenonCalloutsSubscribers < ActiveRecord::Migration[5.0]
+  def change
+    drop_table :tenon_tenon_callouts
+    drop_table :tenon_subscribers
+    drop_table :tenon_subscriber_groups
+    drop_table :tenon_subscriber_group_members
+  end
+end

data/db/migrate/20160126194219_convert_piece_size_to_int.rb

@@ -0,0 +1,6 @@
+class ConvertPieceSizeToInt < ActiveRecord::Migration[5.0]
+  def change
+    remove_column :tenon_tenon_content_pieces, :size
+    add_column :tenon_tenon_content_pieces, :size, :integer
+  end
+end

data/lib/ckeditor/plugins/pastefromword/filter/default.js

@@ -29,4 +29,4 @@ null,function(a,b,c){if(b.name in{p:1,div:1}){b="ltr"==d.contentsLangDirection?"
 "transparent")}],[/^margin$/,G],["text-indent","0cm"],["page-break-before"],["tab-stops"],["display","none"],r?[/font-?/]:null],w),width:function(a,c){if(c.name in b.$tableContent)return!1},border:function(a,c){if(c.name in b.$tableContent)return!1},"class":function(a,b){return b.classWhiteList&&-1!=b.classWhiteList.indexOf(" "+a+" ")?a:!1},bgcolor:k,valign:w?k:function(a,b){b.addStyle("vertical-align",a);return!1}},comment:CKEDITOR.env.ie?k:function(a,b){var c=a.match(/<img.*?>/),d=a.match(/^\[if !supportLists\]([\s\S]*?)\[endif\]$/);
 return d?(d=(c=d[1]||c&&"l.")&&c.match(/>(?:[(]?)([^\s]+?)([.)]?)</),h(d,c)):CKEDITOR.env.gecko&&c?(c=CKEDITOR.htmlParser.fragment.fromHtml(c[0]).children[0],(d=(d=(d=b.previous)&&d.value.match(/<v:imagedata[^>]*o:href=['"](.*?)['"]/))&&d[1])&&(c.attributes.src=d),c):!1}}}},J=function(){this.dataFilter=new CKEDITOR.htmlParser.filter};J.prototype={toHtml:function(a){a=CKEDITOR.htmlParser.fragment.fromHtml(a);var c=new CKEDITOR.htmlParser.basicWriter;a.writeHtml(c,this.dataFilter);return c.getHtml(!0)}};
 CKEDITOR.cleanWord=function(a,c){a=a.replace(/<!\[([^\]]*?)\]>/g,"\x3c!--[$1]--\x3e");CKEDITOR.env.gecko&&(a=a.replace(/(\x3c!--\[if[^<]*?\])--\x3e([\S\s]*?)\x3c!--(\[endif\]--\x3e)/gi,"$1$2$3"));CKEDITOR.env.webkit&&(a=a.replace(/(class="MsoListParagraph[^>]+>\x3c!--\[if !supportLists\]--\x3e)([^<]+<span[^<]+<\/span>)(\x3c!--\[endif\]--\x3e)/gi,"$1\x3cspan\x3e$2\x3c/span\x3e$3"));var b=new J,f=b.dataFilter;f.addRules(CKEDITOR.plugins.pastefromword.getRules(c,f));c.fire("beforeCleanWord",{filter:f});
-try{a=b.toHtml(a)}catch(d){c.showNotification(c.lang.pastefromword.error)}a=a.replace(/cke:.*?".*?"/g,"");a=a.replace(/style=""/g,"");return a=a.replace(/<span>/g,"")}})();
+try{a=b.toHtml(a)}catch(d){c.showNotification(c.lang.pastefromword.error)}a=a.replace(/cke:.*?".*?"/g,"");a=a.replace(/style=""/g,"");return a=a.replace(/<span>/g,"")}})();

data/lib/generators/tenon/scaffold/scaffold_generator.rb

@@ -7,32 +7,38 @@ module Tenon
       invoke :model
 
       def copy_files
-        style = options.small? ? 'small' : 'full'
-
         # Controller, helper, views, test and stylesheets directories.
         empty_directory(File.join('app/views/tenon', plural_table_name))
-        empty_directory(File.join('app/assets/javascripts/tenon/templates', plural_table_name))
 
         actions = %w(
           index.html.haml new.html.haml edit.html.haml _form.html.haml
-          index.json.jbuilder create.json.jbuilder update.json.jbuilder
-)
+        )
+
         actions.each do |action|
           src_path = File.join(self.class.source_root, "view_#{action}")
-          if File.exist?(src_path)
-            template("view_#{action}", File.join('app/views/tenon', plural_table_name, "#{action}"))
-          end
+          next unless File.exist?(src_path)
+          template(
+            "view_#{action}",
+            File.join('app/views/tenon', plural_table_name, action)
+          )
         end
 
-        template('view_item_row.jst.eco', File.join('app/assets/javascripts/tenon/templates', plural_table_name, "#{file_name}_row.jst.eco"))
-        template('view__item.json.jbuilder', File.join('app/views/tenon', plural_table_name, "_#{file_name}.json.jbuilder"))
-
-        template(
-          'decorator.rb', File.join('app/decorators', "#{file_name}_decorator.rb")
-        )
+        %w( decorator policy serializer ).each do |file_type|
+          template(
+            "#{file_type}.rb",
+            File.join(
+              "app/#{file_type.pluralize}",
+              "#{file_name}_#{file_type}.rb"
+            )
+          )
+        end
 
         template(
-          'controller.rb', File.join('app/controllers/tenon', "#{file_name.pluralize}_controller.rb")
+          'controller.rb',
+          File.join(
+            'app/controllers/tenon',
+            "#{file_name.pluralize}_controller.rb"
+          )
         )
       end
 
@@ -42,7 +48,7 @@ module Tenon
           # Prepare the routes
           filename = File.join(Rails.root, 'config', 'routes.rb')
           pattern = 'Tenon::Engine.routes.draw do'
-          reorder = attributes.select { |a| a.name == 'list_order' }.empty? ? '' : "do \n    post    'reorder', :on => :collection \n    end"
+          reorder = attributes.select { |a| a.name == 'list_order' }.empty? ? '' : "do \n    post    'reorder', on: :collection \n    end"
           contents = File.read(filename)
 
           # Write the initial Tenon routes block if it's not there already
@@ -90,13 +96,22 @@ module Tenon
         end
       end
 
+      def add_menu_item
+        case behavior
+        when :invoke
+          say 'Add the following line to app/views/tenon/shared/_main_nav.html.haml:'
+          say " = nav_item '#{class_name.pluralize.titleize}', #{plural_name}_path, 'star'"
+        when :revoke
+          say %(Don't forget to remove the nav_item entry from app/views/tenon/shared/_main_nav.html.haml)
+        end
+      end
+
       no_tasks do
         def collections
-          @collections ||= attributes.select do |a|
-            a.name.match(/_id$/)
-          end.map do |a|
-            a.name.gsub(/_id$/, '')
-          end.uniq
+          return @collections if @collections
+          collections = attributes.select { |a| a.name.match(/_id$/) }
+          collections = collections.map { |a| a.name.gsub(/_id$/, '') }
+          @collections = collections.uniq
         end
 
         def assets
@@ -106,22 +121,26 @@ module Tenon
         def text_fields
           return @text_fields if @text_fields
           @text_fields = attributes.select { |a| a.type.to_s == 'string' }
-          @text_fields = @text_fields - seo_fields
+          @text_fields -= seo_fields
         end
 
         def text_areas
           return @text_areas if @text_areas
           @text_areas = attributes.select { |a| a.type.to_s == 'text' }
-          @text_areas = @text_areas - seo_fields
+          @text_areas -= seo_fields
         end
 
         def timestamps
           @timestamps ||= attributes.select do |a|
             %w(datetime timestamp).include?(a.type.to_s) &&
-            a.name != 'publish_at'
+              a.name != 'publish_at'
           end
         end
 
+        def dates
+          @dates ||= attributes.select { |a| a.type.to_s == 'date' }
+        end
+
         def booleans
           @booleans ||= attributes.select { |a| a.type.to_s == 'boolean' }
         end
@@ -129,7 +148,8 @@ module Tenon
         def numbers
           @numbers ||= attributes.select do |a|
             %w(float integer decimal).include?(a.type.to_s) &&
-            !a.name.match(/.*_id$/)
+              !a.name.match(/.*_id$/) &&
+              a.name != 'list_order'
           end
         end
 
@@ -139,8 +159,13 @@ module Tenon
           @seo_fields = attributes.select { |a| names.include?(a.name) }
         end
 
-        def has_seo?
-          !seo_fields.empty?
+        def tenon_contents
+          @tenon_contents ||= attributes.select { |a| a.type.to_s == 'content' }
+        end
+
+        def reorderable?
+          return @reorderable if @reorderable
+          @reorderable = attributes.any? { |a| a.name.to_s == 'list_order' }
         end
       end
     end

data/lib/generators/tenon/scaffold/templates/controller.rb

@@ -1,11 +1,13 @@
-<% collections = attributes.select {|a| a.name.match(/_id$/)}.map {|a| a.name.gsub(/_id$/, '')}.uniq -%>
-class Tenon::<%= class_name.pluralize %>Controller < Tenon::ResourcesController
+<% collections = attributes.select{|a| a.name.match(/_id$/)}.map{|a| a.name.gsub(/_id$/, '')}.uniq -%>
+module Tenon
+  class <%= class_name.pluralize %>Controller < ResourcesController # :nodoc:
 <% unless collections.blank? -%>
-  before_filter :get_collections, :only => [:index, :edit, :update, :new, :create]
+    before_filter :get_collections, only: [:edit, :update, :new, :create]
 <% end -%>
 
 <% unless collections.blank? -%>
-  private
+    private
+
     def get_collections
 <% collections.each do |c| -%>
       @<%= c.pluralize %> = <%= c.camelize %>.all
@@ -16,4 +18,5 @@ class Tenon::<%= class_name.pluralize %>Controller < Tenon::ResourcesController
     def resource_params
       params.require(:<%= singular_name %>).permit!
     end
+  end
 end

data/lib/generators/tenon/scaffold/templates/policy.rb

@@ -0,0 +1,2 @@
+class <%= class_name %>Policy < Tenon::ApplicationPolicy
+end

data/lib/generators/tenon/scaffold/templates/serializer.rb

@@ -0,0 +1,2 @@
+class <%= class_name %>Serializer < Tenon::ApplicationSerializer
+end

data/lib/generators/tenon/scaffold/templates/view__form.html.haml

@@ -1,80 +1,75 @@
-- content_for :sidebar do
-  .sidebar
-    .content
-      %h2 <%= plural_name.titleize %>
-      = link_to "New <%= singular_name.titleize %>", new_<%= singular_name %>_path, class: 'btn btn-block btn-primary'
+.drawer-pusher
+  = autosaving_form_for @<%= singular_name %> do |f|
+    = render 'tenon/shared/default_form_toolbar', obj: @<%= singular_name %>
 
-    = i18n_language_nav(:<%= plural_name %>)
+    %main
+<% if attributes.map(&:name).include? 'title' -%>
+      = f.title_text_field :title
 
-<% if has_seo? -%>
-    %h4 Edit Options
-    %nav
-      %ul
-        %li.active= link_to "Page Content", '#details', data: {toggle: 'tab'}
-        %li= link_to "Search Optimization", '#seo', data: {toggle: 'tab'}
-<% end -%>
-= autosaving_form_for @<%= singular_name %> do |f|
-  = error_messages_for :<%= singular_name %>
-  .fields.large.tabs
-    .tab-pane.active#details
-<% text_fields.each do |field| -%>
-      .form-group
+<% end -%>
+<% if text_fields.reject { |f| f.name == 'title' }.present? -%>
+      .panel-label Text Fields
+      .panel.panel--padded
+<% text_fields.reject { |f| f.name == 'title' }.each do |field| -%>
         = f.text_field :<%= field.name %>
 <% end -%>
+<% end -%>
+<% if assets.present? -%>
+      .panel-label Assets
 <% assets.each do |field| -%>
-      .form-group
-        = f.asset :<%= field.name %>
+      = f.asset :<%= field.name %>
+<% end -%>
+
 <% end -%>
+<% if text_areas.present? -%>
+      .panel-label Text Areas
+      .panel.panel--padded
 <% text_areas.each do |field| -%>
-      .form-group
         = f.text_area :<%= field.name %>
 <% end -%>
-<% if has_seo? -%>
-    .tab-pane#seo= render "tenon/shared/seo_fields", :f => f
+
+<% end -%>
+
+<% if tenon_contents.present? -%>
+      .panel-label Tenon Content Fields
+      .panel.panel--padded
+<% tenon_contents.each do |field| -%>
+        = f.tenon_content :<%= field.name %>
 <% end -%>
 
-  .fields.small
-<% unless [collections, booleans, timestamps].flatten.empty? -%>
-    %h4.box-label Details
-    .box
+<% end -%>
+<% unless [collections, booleans, dates, numbers, timestamps].flatten.empty? -%>
+      .panel-label Details
+      .panel.panel--padded
 <% collections.each do |c| %>
-      .form-group.bordered
-        = f.super_label :<%= c %>, '<%= c.titleize %>'
         = f.collection_select :<%= c %>_id, @<%= c.pluralize %>, :id, :title, prompt: '--'
+
+<% end -%>
+<% dates.each do |field| -%>
+        = f.date_picker :<%= field.name %>
 <% end -%>
 <% timestamps.each do |field| -%>
-      .form-group.bordered
-        = f.text_field :<%= field.name %>, data: {behaviour: 'datetime-picker'}, placeholder: '--'
+        = f.date_time_picker :<%= field.name %>
 <% end -%>
 <% booleans.each do |field| %>
-      .form-group.bordered.inline
-        = f.check_box :<%= field.name %>, class: 'tn-checkbox-right'
-        = f.super_label :<%= field.name %>
+        = f.check_box :<%= field.name %>
 <% end -%>
 <% numbers.each do |field| %>
-      .form-group.bordered.inline
-        = f.text_field :<%= field.name %>, placeholder: '--'
+        = f.number_field :<%= field.name %>
 <% end -%>
 
 <% end -%>
 
-    %h4.box-label Actions
-    .box
 <% if attributes.map(&:name).include? 'publish_at' -%>
-      .form-group
-        = f.text_field :publish_at, label: 'Publish Date', data: {behaviour: 'datetime-picker'}, placeholder: '--'
-<% end -%>
-      .content
-        - if can?(:publish, @<%= singular_name %>)
-          %button.btn.btn-block.btn-comp{ data: { disable_with: "Please wait..." } } Save
-        - if can?(:create, Tenon::ItemVersion)
-          = save_draft_button(@<%= singular_name %>)
-          .last-autosave
+      .panel-label Publishing
+      .panel.panel--padded
+        = f.date_time_picker :publish_at, label: 'Publish Date'
 
-      %hr
-      .content
-        = clear_draft_link if params[:version]
-        = load_draft_link(@<%= singular_name %>)
-        - if @<%= singular_name %>.persisted?
-          = link_to "Delete", @<%= singular_name %>, data: {method: :delete, confirm: 'Are you sure you want to delete this?'}, :class => 'delete-link'
+<% end -%>
+<% if seo_fields.present? -%>
+      .panel-label SEO
+      .panel.panel--padded
+        = render "tenon/shared/seo_fields", :f => f
+
+<% end -%>
     .spacer

data/lib/generators/tenon/scaffold/templates/view_edit.html.haml

@@ -1,8 +1 @@
-%header
-  %h1 Edit <%= singular_name.titleize %>
-
-  .tools
-    = render "tenon/shared/section_header/sidebar_toggle"
-
-.main-content
-  = render "form"
+= render "form"

data/lib/generators/tenon/scaffold/templates/view_index.html.haml

@@ -1,24 +1,8 @@
-- content_for :sidebar do
-  .sidebar
-    .content
-      %h2 <%= plural_name.titleize %>
-      = link_to "New <%= singular_name.titleize %>", new_<%= singular_name %>_path, class: 'btn btn-block btn-primary'
-
-%header
-  %h1 <%= plural_name.titleize %>
-
-  .tools
-    = render "tenon/shared/section_header/sidebar_toggle"
-
-    .header-button
-      = link_to '#', id: 'quick-search-toggle' do
-        .header-icon= fa_icon('fw search')
-
-.toolbox
-  = render "tenon/shared/section_header/quick_search", record_list: '#<%= plural_name %>'
-
-.main-content
-  = error_messages_for :<%= singular_name %>
-  %ul#<%= plural_name %>.record-list<% if attributes.map(&:name).include?('list_order') %>.sortable<% end -%>{data: {records: {url: <%= plural_name %>_path(format: 'json'), template: 'tenon/templates/<%= plural_name %>/<%= singular_name %>_row', name: '<%= singular_name %>'}<% if attributes.map(&:name).include?('list_order') %>, :'reorder-path' => reorder_<%= plural_name %>_path<% end %>}}
-
-  = link_to "Load More <%= plural_name.titleize %>", '#', :class => 'btn btn-comp infinite-loader', 'data-record-list' => '#<%= plural_name %>'
+= react_component 'ResourceIndexRoot',
+    title: '<%= plural_name.titleize %>',
+    breadcrumbs: breadcrumb_links,
+    recordsPath: <%= plural_name %>_path(format: 'json'),
+<% if reorderable? -%>
+    reorderPath: reorder_<%= plural_name %>_path,
+<% end -%>
+    newPath: new_<%= singular_name %>_path

data/lib/generators/tenon/scaffold/templates/view_new.html.haml

@@ -1,8 +1 @@
-%header
-  %h1 New <%= singular_name.titleize %>
-
-  .tools
-    = render "tenon/shared/section_header/sidebar_toggle"
-
-.main-content
-  = render "form"
+= render "form"

data/lib/tasks/tenon_tasks.rake

@@ -1,6 +1,6 @@
 namespace :tenon do
   desc "Generate Asset responsive styles"
-  task :generate_responsive_styles  => :environment do
+  task generate_responsive_styles: :environment do
     styles = [
       :tenon_tenon_content_piece_image_x2000,
       :tenon_tenon_content_piece_image_x1800,
@@ -30,7 +30,7 @@ namespace :tenon do
   end
 
   desc "Regenerate all Asset styles"
-  task :regenerate_asset_styles  => :environment do
+  task regenerate_asset_styles: :environment do
     total_assets = Tenon::Asset.all.count
 
     Tenon::Asset.all.each_with_index do |asset, i|

data/lib/templates/active_record/model/model.rb

@@ -1,23 +1,22 @@
-class <%= class_name %> < ActiveRecord::Base
-  # Scopes, attachments, etc.
+class <%= class_name %> < ApplicationRecord # :nodoc:
   has_history
-<% unless attributes.select{|a| a.name == 'list_order' }.empty? -%>
+<% unless attributes.select {|a| a.name == 'list_order' }.empty? -%>
   include Tenon::Reorderable
-  default_scope { order('<%= table_name %>.list_order') }
+  default_scope { order(:list_order) }
 <% end -%>
-<% attributes.select {|a| a.type.to_s == 'asset'}.each do |f| -%>
+<% attributes.select { |a| a.type.to_s == 'asset' }.each do |f| -%>
   has_asset :<%= f.name %>
 <% end -%>
-
-  # Validations
-
-  # Relationships
-<% attributes.select(&:reference?).each do |attribute| -%>
+<% if attributes.any? { |a| a.name.to_s == 'publish_at' } -%>
+  scope :published, -> { where('<%= table_name %>.publish_at < ?', Time.now) }
+<% end -%>
+<% attributes.select{ |a| a.type.to_s == 'content' }.each do |f| -%>
+  tenon_content :<%= f.name %>
+<% end -%>
+<% attributes.select { |a| a.type.to_s == 'reference' }.each do |attribute| -%>
   belongs_to :<%= attribute.name %>
 <% end -%>
-<% attributes.select {|a| a.name.match(/_id$/)}.each do |attribute| -%>
+<% attributes.select{|a| a.name.match(/_id$/)}.each do |attribute| -%>
   belongs_to :<%= attribute.name.gsub(/_id$/, '') %>
 <% end -%>
-
-  private
 end

data/lib/templates/migration/templates/create_table_migration.rb

@@ -4,7 +4,7 @@ class <%= migration_class_name %> < ActiveRecord::Migration
 <% attributes.each do |attribute| -%>
 <% if attribute.password_digest? -%>
       t.string :password_digest<%= attribute.inject_options %>
-<% elsif attribute.type.to_s != 'asset' -%>
+<% elsif !%w(asset content).include?(attribute.type.to_s) -%>
       t.<%= attribute.type %> :<%= attribute.name %><%= attribute.inject_options %>
 <% end -%>
 <% end -%>