tenon 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebfefe28a3d84c277cbce78c07136e2b0f96f7ce
-  data.tar.gz: 7802803e83e6f4869767d49eb4907e4bf36ac9df
+  metadata.gz: d34a3218e16002fa3558faafa070b8771aed3d3c
+  data.tar.gz: d778a556210f9411ba8d2144ebc9a7c652cf5e17
 SHA512:
-  metadata.gz: c0be445e70e961789bf939ba50d32772891d6d5673018421422166ed5f42d07b289bbce9548690e4626a8044e72c62d37f3d79cd2a8f75a1d7f02b5530db641e
-  data.tar.gz: 28e83e79e1a7cd17011f3c7db1ec079ddc4fc962ca20d6cf508a77489fdc0d563cb935d9b06565881ba614da55ded4c49fbdc5d40805410870a0261454a73f9d
+  metadata.gz: 63a37b5e5bf36ab1d51ad3f6663fe01e76ff65b56d862006a71794f230f52ed5568f044316c67d843fa012725f1417b9367a4d863caac4151d5b90d1263c60c6
+  data.tar.gz: 5df5c24f57a4d5defeec5fb1db7bba8648aefd891b99d52dc6cf9625ddbeb8e8690b118c6ce8bfe70023051356f361d4e8946126210fb33848b8aab9275105aa

data/app/assets/javascripts/tenon/features/item_version_autosave.js.coffee

@@ -1,10 +1,9 @@
 class Tenon.features.ItemVersionAutosave
   constructor: ->
     @$form = $('form[data-autosave="true"]')
-    @$form.on('keyup change cocoon:after-insert cocoon:after-remove', $.debounce(6000, @autosave))
+    @$form.on('keyup change cocoon:after-insert cocoon:after-remove', $.debounce(3000, @autosave))
 
   autosave: =>
-    console.log('saved')
     jqxhr = $.ajax
       url: @$form.data('version-create-path')
       data: @_formData()

data/app/assets/stylesheets/tenon/colors-custom.css.scss

@@ -4,7 +4,7 @@
 $tn-client-color: #9c0f17;
 $tn-primary: #ff6a00;
 $tn-comp: #978fcc;
-$tn-highlight: $tn-comp;
+$tn-highlight: $tn-med-grey;
 $tn-nav: #12111a;
 $tn-sidebar: #242133;
 $tn-sidebar-highlight: #3a3848;

data/app/assets/stylesheets/tenon/layout/util-nav.css.scss

@@ -27,8 +27,5 @@ util-nav {
     display: block;
     width: 60px;
     height: 50px;
-    &:hover {
-      background-color: $tn-highlight;
-    }
   }
 }

data/app/assets/stylesheets/tenon/ui/header-tools.css.scss

@@ -92,6 +92,20 @@ util-nav {
   .header-menu ul {
     border-top: 0;
   }
+
+  .tools {
+    .header-menu.active, .header-menu > a:hover, .header-button > a:hover, .header-button.active {
+      background-color: transparent;
+    }
+
+    .header-menu > a:hover {
+      text-decoration: underline;
+    }
+
+    .header-menu ul {
+      border-top: 0;
+    }
+  }
 }
 
 header {

data/app/controllers/tenon/resources_controller.rb

@@ -37,6 +37,7 @@ module Tenon
     end
 
     def update
+      authorize!(:publish, resource)
       if resource.update_attributes(resource_params)
         save_item_version if resource.respond_to?(:versions)
         flash[:notice] = "#{human_name} saved successfully." unless request.xhr?
@@ -48,6 +49,7 @@ module Tenon
 
     def create
       self.resource = klass.new(resource_params).decorate
+      authorize!(:publish, resource)
       if resource.save && !request.xhr?
         flash[:notice] = "#{human_name} saved successfully."
         save_item_version if resource.respond_to?(:versions)
@@ -134,11 +136,6 @@ module Tenon
       fail 'Define strong paramaters in controller method resource_params'
     end
 
-    def sidebar
-      partial = "tenon/#{controller_name.pluralize}/sidebar"
-      partial if File.exist? File.join(Rails.root, 'app', 'views', partial)
-    end
-
     helper_method :sidebar
   end
 end

data/app/views/tenon/events/_form.html.haml

@@ -27,9 +27,11 @@
         = f.text_field :publish_at, label: "Publish Date", data: {behaviour: 'datetime-picker'}, placeholder: '--'
 
       .row.content
-        %button.btn.btn-comp.btn-block.submit Save
-        = save_draft_button(@event)
-        .last-autosave
+        - if can?(:publish, @event)
+          %button.btn.btn-comp.btn-block.submit Save
+        - if can?(:create, Tenon::ItemVersion)
+          = save_draft_button(@event)
+          .last-autosave
 
       %hr
       .content

data/app/views/tenon/galleries/_form.html.haml

@@ -23,9 +23,12 @@
     %h4.box-label Publish
     .box
       .content
-        = f.submit 'Save', class: 'btn btn-block btn-comp'
-        = save_draft_button(@gallery)
-        .last-autosave
+        - if can?(:publish, @gallery)
+          = f.submit 'Save', class: 'btn btn-block btn-comp'
+
+        - if can?(:create, Tenon::ItemVersion)
+          = save_draft_button(@gallery)
+          .last-autosave
 
       %hr
       .content

data/app/views/tenon/pages/_form.html.haml

@@ -6,25 +6,25 @@
     %h4 Edit Options
     %nav
       %ul
-        %li.active= link_to "Page Content", '#details', data: {toggle: 'tab'}
-        %li= link_to "Search Optimization", '#seo', data: {toggle: 'tab'}
+        %li.active= link_to 'Page Content', '#details', data: {toggle: 'tab'}
+        %li= link_to 'Search Optimization', '#seo', data: {toggle: 'tab'}
 
 = autosaving_form_for @page do |f|
   = error_messages_for :page
   .fields.large.tabs
     .tab-pane.active#details
       .form-group
-        = f.text_field :title, :explanation => "This is the title that shows up at the top of your page."
+        = f.text_field :title, explanation: 'This is the title that shows up at the top of your page.'
 
       .form-group= f.tenon_content :content
 
-    .tab-pane#seo= render "tenon/shared/seo_fields", :f => f
+    .tab-pane#seo= render 'tenon/shared/seo_fields', f: f
 
   .fields.small
     %h4.box-label Details
     .box
       .form-group.bordered
-        = f.super_label :parent_id, "Parent Page"
+        = f.super_label :parent_id, 'Parent Page'
         = f.collection_select :parent_id, @potential_parents, :id, :option_title, {:include_blank => "(No Parent)"}
 
       .form-group.inline.bordered
@@ -41,13 +41,16 @@
         = f.text_field :publish_at, label: "Publish Date", data: {behaviour: 'datetime-picker'}, placeholder: '--'
 
       .row.content
-        %button.btn.btn-comp.btn-block.submit Save
-        = save_draft_button(@page)
-        .last-autosave
+        - if can?(:publish, @page)
+          %button.btn.btn-comp.btn-block.submit Save
+
+        - if can?(:create, Tenon::ItemVersion)
+          = save_draft_button(@page)
+          .last-autosave
 
       %hr
       .content
         = clear_draft_link if params[:version]
         = load_draft_link(@page)
         - if @page.persisted?
-          = link_to "Delete", @page, :data => {:method => :delete, :confirm => "Are you sure you want to delete this?"}, :class => 'delete-link'
+          = link_to "Delete", @page, data: {method: :delete, confirm: 'Are you sure you want to delete this?'}, class: 'delete-link'

data/app/views/tenon/posts/_form.html.haml

@@ -51,9 +51,12 @@
         = f.text_field :publish_at, label: "Publish Date", data: {behaviour: 'datetime-picker'}, placeholder: '--'
 
       .row.content
-        %button.btn.btn-comp.btn-block.submit Save
-        = save_draft_button(@post)
-        .last-autosave
+        - if can?(:publish, @post)
+          %button.btn.btn-comp.btn-block.submit Save
+
+        - if can?(:create, Tenon::ItemVersion)
+          = save_draft_button(@post)
+          .last-autosave
 
       %hr
       .content

data/app/views/tenon/settings/_contact.html.haml

@@ -0,0 +1,19 @@
+%h4.box-label Contact Details
+.box
+  .form-group.bordered
+    %label Contact Email
+    .explanation Destination email address for alerts.  Separate multiple email addresses with commas.
+    = text_field_tag "settings[contact_email]", Tenon::MySettings.contact_email, :placeholder => "--"
+
+  .form-group.bordered
+    %label Sender Email
+    .explanation "From" email address for alerts.
+    = text_field_tag "settings[from_email]", Tenon::MySettings.from_email, :placeholder => "--"
+
+%h4.box-label Comment Notifications
+.box
+  .form-group.inline.bordered
+    = check_box_tag "settings[comment_email]", 1, Tenon::MySettings.comment_email, class: 'tn-checkbox-right'
+    %label{for: 'settings_comment_email'} Comment Email
+    .explanation Do you want to receive an email when someone posts a comment?
+

data/app/views/tenon/settings/_general.html.haml

@@ -1,40 +1,12 @@
-.fields.large
-  .form-group
-    %label Site Name
-    = text_field_tag "settings[site_title]", Tenon::MySettings.site_title
-
-  .form-group
-    %label Site Domain
-    = text_field_tag "settings[site_url]", Tenon::MySettings.site_url
-
-  .form-group
-    %label Google Analytics Code
-    .explanation= link_to "Create a New Profile Here", "https://www.google.com/analytics/settings/add_profile?scid=16153080", :target => "_"
-    = text_area_tag "settings[google_analytics]", Tenon::MySettings.google_analytics, :style => "height: 180px;"
-
-.fields.small
-  %h4.box-label Details
-  .box
-    .form-group.inline.bordered
-      = check_box_tag "settings[comment_email]", 1, Tenon::MySettings.comment_email, class: 'tn-checkbox-right'
-      %label{for: 'settings_comment_email'} Comment Email
-      .explanation Do you want to receive an email when someone posts a comment?
-
-    .form-group.bordered
-      %label Contact Email
-      .explanation Destination email address for alerts.  Separate multiple email addresses with commas.
-      = text_field_tag "settings[contact_email]", Tenon::MySettings.contact_email, :placeholder => "--"
-
-
-
-    .form-group.bordered
-      %label Sender Email
-      .explanation "From" email address for alerts.
-      = text_field_tag "settings[from_email]", Tenon::MySettings.from_email, :placeholder => "--"
-
-  %h4.box-label Actions
-  .box
-    .content
-      %button.btn.btn-comp.btn-block.submit Save
-
-  .spacer
+.form-group
+  %label Site Name
+  = text_field_tag 'settings[site_title]', Tenon::MySettings.site_title
+
+.form-group
+  %label Site Domain
+  = text_field_tag 'settings[site_url]', Tenon::MySettings.site_url
+
+.form-group
+  %label Google Analytics Code
+  .explanation= link_to 'Create a New Profile Here', 'https://www.google.com/analytics/settings/add_profile?scid=16153080', target: '_'
+  = text_area_tag 'settings[google_analytics]', Tenon::MySettings.google_analytics, style: 'height: 180px;'

data/app/views/tenon/settings/_seo.html.haml

@@ -0,0 +1,10 @@
+.form-group
+  %label META Keywords
+  .explanation These META keywords will be used by some search engines when crawling your site.  Separate keywords with a comma.  Note: Google does not factor in keywords when calculating your rank.  Other search engines may or may not.
+  = text_area_tag "settings[seo_keywords]", Tenon::MySettings.seo_keywords
+
+.form-group
+  %label META Description
+  .explanation This description will show up on search engines and in some cases will affect your rank.  It should be no longer than 150-160 characters (about the length of a tweet.)
+  = text_area_tag "settings[seo_description]", Tenon::MySettings.seo_description
+

data/app/views/tenon/settings/show.html.haml

@@ -7,6 +7,8 @@
     %nav
       %ul
         %li.active= link_to "General Settings", '#general', data: {toggle: 'tab'}
+        %li= link_to 'Contact Management', '#contact', data: {toggle: 'tab'}
+        %li= link_to 'Search Optimization', '#seo', data: {toggle: 'tab'}
 
 %header
   %h1 Site Settings
@@ -16,5 +18,14 @@
 
 .main-content
   = form_tag({:action => :update}, :method => "PUT") do
-    .tabs
-      #general.tab-pane.active= render :partial => "general"
+    .fields.large.tabs
+      #general.tab-pane.active= render :partial => 'general'
+      #contact.tab-pane= render :partial => 'contact'
+      #seo.tab-pane= render :partial => 'seo'
+
+    .fields.small
+      %h4.box-label Actions
+      .box
+        .content
+          %button.btn.btn-primary.btn-block.submit Save
+

data/app/views/tenon/shared/_posts_nav.html.haml

@@ -1,5 +1,8 @@
 %h4 Posts
 %nav
   %ul
-    %li{class: ('active' if controller_name == 'posts')}= link_to "Posts", posts_path
-    %li{class: ('active' if controller_name == 'post_categories')}= link_to "Post Categories", post_categories_path
+    - if can?(:manage, Tenon::Post)
+      %li{class: ('active' if controller_name == 'posts')}= link_to "Posts", posts_path
+
+    - if can?(:manage, Tenon::PostCategory)
+      %li{class: ('active' if controller_name == 'post_categories')}= link_to "Post Categories", post_categories_path

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

@@ -63,15 +63,16 @@
         = f.text_field :publish_at, label: 'Publish Date', data: {behaviour: 'datetime-picker'}, placeholder: '--'
 <% end -%>
       .content
-        %button.btn.btn-block.btn-comp Save
-        = save_draft_button(@<%= singular_name %>)
-        .last-autosave
+        - if can?(:publish, @<%= singular_name %>)
+          %button.btn.btn-block.btn-comp Save
+        - if can?(:create, Tenon::ItemVersion)
+          = save_draft_button(@<%= singular_name %>)
+          .last-autosave
 
-
-        %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'
+      %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'
     .spacer

data/lib/tenon/i18n_lookup.rb

@@ -13,10 +13,12 @@ module Tenon
     end
 
     def self.set_fields
+      default = { tables: {} }
       if File.exist?(config_file)
-        YAML.load(File.open(config_file)).recursive_symbolize_keys!
+        result = YAML.load(File.open(config_file)).recursive_symbolize_keys!
+        result || default
       else
-        { tables: {} }
+        default
       end
     end
 

data/lib/tenon/version.rb

@@ -1,3 +1,3 @@
 module Tenon
-  VERSION = '1.0.5'
+  VERSION = '1.0.6'
 end

data/spec/features/settings_spec.rb

@@ -14,9 +14,13 @@ describe 'An admin', js: true do
         Tenon::MySettings.site_title = 'Site Title'
         Tenon::MySettings.site_url = 'http://google.com'
         Tenon::MySettings.google_analytics = '<script></script>'
+
         Tenon::MySettings.comment_email = true
         Tenon::MySettings.contact_email = 'info@factore.ca'
         Tenon::MySettings.from_email = 'noreply@factore.ca'
+
+        Tenon::MySettings.seo_keywords = 'keywords'
+        Tenon::MySettings.seo_description = 'description'
       end
 
       it 'should see all the settings in the form' do
@@ -24,9 +28,15 @@ describe 'An admin', js: true do
         expect(page.find('#settings_site_title').value).to eq(Tenon::MySettings.site_title)
         expect(page.find('#settings_site_url').value).to eq(Tenon::MySettings.site_url)
         expect(page.find('#settings_google_analytics').value).to eq(Tenon::MySettings.google_analytics)
+
+        click_on 'Contact Management'
         expect(page.find('#settings_contact_email').value).to eq(Tenon::MySettings.contact_email)
         expect(page.find('#settings_from_email').value).to eq(Tenon::MySettings.from_email)
         expect(page.find('#settings_comment_email')).to be_checked
+
+        click_on 'Search Optimization'
+        expect(page.find('#settings_seo_keywords').value).to eq(Tenon::MySettings.seo_keywords)
+        expect(page.find('#settings_seo_description').value).to eq(Tenon::MySettings.seo_description)
       end
     end
 
@@ -36,17 +46,29 @@ describe 'An admin', js: true do
         fill_in 'settings[site_title]', with: 'New Site Title'
         fill_in 'settings[site_url]', with: 'http://factore.ca'
         fill_in 'settings[google_analytics]', with: 'analytics'
+
+        click_on 'Contact Management'
         fill_in 'settings[contact_email]', with: 'contact@factore.ca'
         fill_in 'settings[from_email]', with: 'reply@factore.ca'
+
+        click_on 'Search Optimization'
+        fill_in 'settings[seo_keywords]', with: 'more, keyword'
+        fill_in 'settings[seo_description]', with: 'the description'
         click_button 'Save'
 
         visit settings_path
         expect(page.find('#settings_site_title').value).to eq('New Site Title')
         expect(page.find('#settings_site_url').value).to eq('http://factore.ca')
         expect(page.find('#settings_google_analytics').value).to eq('analytics')
+
+        click_on 'Contact Management'
         expect(page.find('#settings_contact_email').value).to eq('contact@factore.ca')
         expect(page.find('#settings_from_email').value).to eq('reply@factore.ca')
         expect(page.find('#settings_comment_email')).not_to be_checked
+
+        click_on 'Search Optimization'
+        expect(page.find('#settings_seo_keywords').value).to eq('more, keyword')
+        expect(page.find('#settings_seo_description').value).to eq('the description')
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tenon
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - factor[e] design initiative
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-23 00:00:00.000000000 Z
+date: 2014-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: better_errors
@@ -1183,7 +1183,9 @@ files:
 - app/views/tenon/posts/index.html.haml
 - app/views/tenon/posts/index.json.jbuilder
 - app/views/tenon/posts/new.html.haml
+- app/views/tenon/settings/_contact.html.haml
 - app/views/tenon/settings/_general.html.haml
+- app/views/tenon/settings/_seo.html.haml
 - app/views/tenon/settings/show.html.haml
 - app/views/tenon/shared/_asset_field.html.haml
 - app/views/tenon/shared/_main_nav.html.haml