comfortable_mexican_loveseat 0.0.20 → 0.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97771fb4fb8a050fe53a43bf55299c91778051cb
-  data.tar.gz: 5a333d0f257fc6c19f3b7783ecfab97e2ba908c8
+  metadata.gz: 332bc3120460c5f93d0e97d867e3fcc6c87c3a15
+  data.tar.gz: 432d34365de812dc8e5b3cb3d0d70a9dc7c82a6d
 SHA512:
-  metadata.gz: 88ab506863654118d8990d71ba831f67a6997b9c71e164c1793ef0f8a28eeaf54632ee084e82d3e9fe5ded195bdd6ea1278774398aeac3ba3cc8438bc54ae9ea
-  data.tar.gz: 7e5159b924934d915c3e509bf1d2d6e8e4e57a5f6f4757908a5039cf2d59ceaa57d8b37e21ce246025a05f3ab185532f412251cf03cd82df00476d9ef08ee322
+  metadata.gz: cf7ec2cc026c81b0e0a16830e69d97749c30e6f85702b2701a669dd697fe564b08087c7223c648932ff8c255fd16f177d1baa8c363cbaf986126a1d5a2140fdb
+  data.tar.gz: e16edba7286c3a9cf6905570b0952dee933def012a2f8214fff7e64ff652028b0d8f7b179b6f400699d2859aed7363a15d2f23789105c73517f81a84638e0550

data/README.rdoc

@@ -1,14 +1,26 @@
+{HitFox Logo}[http://www.hitfoxgroup.com/downloads/hitfox_logo_with_tag_two_colors_WEB.png]
+
 = ComfortableMexicanLoveseat
 
 The Comfortable Mexican Loveseat is an expansion pack to the Comfortable Mexican Sofa. It currently contains minor modifications to the <tt>snippet.rb</tt> and <tt>base_controller.rb</tt> files, improved sitemap functionality, and SEO-enhancing modifications.
 
 The Loveseat references a fixed version of the CMS (currently 1.12.8) and latest releases are pulled in occasionally.
 
-== CMS Usage Notes
-====== When you are adding new models and/or controllers and links are not showing up, do not forget to click the "Sync" button!
+== Installation
+
+The Loveseat is currently installed through the {foxinator-generator}[https://github.com/HitFox/foxinator-generator]
+
+== Features
+====== NOTE: When you are adding new models and/or controllers and links are not showing up, do not forget to click the "Sync" button!
+
+=== Comment Mailer
 
+To configure the comment mailer, add this line to <tt>config/initializers/comfortable_mexican_sofa.rb</tt>
 
-== Simplified Fixture Import/Export
+  config.from_email = an@example.com
+
+
+=== Simplified Fixture Import/Export
 
 When you want to import fixtures you can now use the following commands:
 
@@ -20,9 +32,9 @@ When you want to import fixtures you can now use the following commands:
   rake cms:export FROM=somewhere
   rake cms:export FROM=somewhere TO=something LOCALE=de
 
-== SEO Features
+=== SEO Features
 
-=== Custom Sitemaps
+==== Custom Sitemaps
 
 Building on the Sofa's sitemap functionality, the Loveseat lets you add Rails model show pages and custom routes to the sitemap.
 
@@ -32,11 +44,11 @@ To use it, please copy and customize the demo initializer located in <tt>templat
 
 Then replace your <tt>robots.txt</tt> file with the one in the templates folder.
 
-=== URL Redirection
+==== URL Redirection
 
 By default when using the Loveseat, all trailing slash URLs ('myapp.com/example/') are redirected to a non-trailing slash URL.
 
-=== Page Meta Tags
+==== Page Meta Tags
 
 By default when you create an application, it comes with meta description; page title; index; canonical link; and Social Media (Google+, Facebook, and Twitter) fields that can be filled in on a per-page basis. To display these tags, add this to your <tt>application.html.erb</tt>:
 
@@ -56,3 +68,7 @@ The Loveseat provides some helpful hints to admins when they're uploading images
 
 There is a more styled version of the CMS login page in the templates/devise folder.
 
+= Changelog
+
+- 01/12/2016 - Updated cms_block_content() to be faster. You can still use the old code (which can have slightly different functionality) by passing in an overwrite flag. See the <tt>cms_helper.rb</tt> for source code. Improved the speed with which SEO tags get loaded in the header.
+

data/app/helpers/comfy/cms_helper.rb

@@ -1,33 +1,34 @@
 module Comfy::CmsHelper
 
   def comfy_seo_tags
-    meta_description = pluck_page_block_content('seo.meta_description')
-    meta_index = pluck_page_block_content('seo.meta_index')
-    page_title = pluck_page_block_content('seo.page_title')
+    page_block_contents = Comfy::Cms::Block.where(blockable_type: 'Comfy::Cms::Page', blockable_id: @cms_page.id).pluck(:identifier, :content)
+    meta_description = search_page_block_contents('seo.meta_description', page_block_contents)
+    meta_index = search_page_block_contents('seo.meta_index', page_block_contents)
+    page_title = search_page_block_contents('seo.page_title', page_block_contents)
     parent_page = @cms_page.parent_id.present? ? @cms_page.parent_id : false
     tags = []
     tags << tag('meta', name: 'description', content: meta_description) if meta_description.present?
     tags << tag('meta', name: 'robots', content: 'NOINDEX, FOLLOW') if meta_index.present? && meta_index
 
     # if no canonical is set, default to URL without any parameters
-    href = pluck_page_block_content('seo.canonical_href')
+    href = search_page_block_contents('seo.canonical_href')
     href = href.present? ? href : request.url.split('?').first
     tags << tag('link', rel: 'canonical', href: href)
 
     ### Google plus: use meta_description and page title as defaults
-    gplus_name = self_or_inherit_metadata('google_plus.name', page_title)
-    gplus_description = self_or_inherit_metadata('google_plus.description', meta_description)
-    gplus_image = self_or_parent_metafield('google_plus.image')
+    gplus_name = self_or_inherit_metadata('google_plus.name', page_title, page_block_contents)
+    gplus_description = self_or_inherit_metadata('google_plus.description', meta_description, page_block_contents)
+    gplus_image = self_or_parent_metafield('google_plus.image', @cms_page, page_block_contents)
     tags << tag('meta', itemprop: "name", content: gplus_name) if gplus_name.present?
     tags << tag('meta', itemprop: "description", content: gplus_description) if gplus_description.present?
     tags << tag('meta', itemprop: "image", content: gplus_image) if gplus_image.present?
 
     ### Twitter Card
-    twitter_site = self_or_parent_metafield('twitter.site')
-    twitter_creator = self_or_parent_metafield('twitter.creator')
-    twitter_image_src = self_or_parent_metafield('twitter.image_src')
-    twitter_title = self_or_inherit_metadata('twitter.title', page_title)
-    twitter_description = self_or_inherit_metadata('twitter.description', meta_description)
+    twitter_site = self_or_parent_metafield('twitter.site', @cms_page, page_block_contents)
+    twitter_creator = self_or_parent_metafield('twitter.creator', @cms_page, page_block_contents)
+    twitter_image_src = self_or_parent_metafield('twitter.image_src', @cms_page, page_block_contents)
+    twitter_title = self_or_inherit_metadata('twitter.title', page_title, page_block_contents)
+    twitter_description = self_or_inherit_metadata('twitter.description', meta_description, page_block_contents)
     tags << tag('meta', name: 'twitter:card', content: 'summary_large_image')
     tags << tag('meta', name: 'twitter:site', content: twitter_site) if twitter_site.present?
     tags << tag('meta', name: 'twitter:creator', content: twitter_creator) if twitter_creator.present?
@@ -36,11 +37,11 @@ module Comfy::CmsHelper
     tags << tag('meta', name: 'twitter:description', content: twitter_description) if twitter_description.present?
 
     ### Facebook
-    fb_description = self_or_inherit_metadata('facebook.description', meta_description)
-    fb_title = self_or_inherit_metadata('facebook.title', page_title)
-    fb_type = self_or_parent_metafield('facebook.type')
-    fb_image = self_or_parent_metafield('facebook.image')
-    fb_admins = self_or_parent_metafield('facebook.admins')
+    fb_description = self_or_inherit_metadata('facebook.description', meta_description, page_block_contents)
+    fb_title = self_or_inherit_metadata('facebook.title', page_title, page_block_contents)
+    fb_type = self_or_parent_metafield('facebook.type', @cms_page, page_block_contents)
+    fb_image = self_or_parent_metafield('facebook.image', @cms_page, page_block_contents)
+    fb_admins = self_or_parent_metafield('facebook.admins', @cms_page, page_block_contents)
     tags << tag('meta', property: 'og:description', content: fb_description) if fb_description.present?
     tags << tag('meta', property: 'og:title', content: fb_title) if fb_title.present?
     tags << tag('meta', property: 'og:type', content: fb_type) if fb_type.present?
@@ -58,8 +59,8 @@ module Comfy::CmsHelper
     pluck_page_block_content('seo.page_title')
   end
 
-  def self_or_inherit_metadata(block_identifier, metadata)
-    content = pluck_page_block_content(block_identifier)
+  def self_or_inherit_metadata(block_identifier, metadata, page_block_contents = [])
+    content = search_page_block_contents(block_identifier, page_block_contents)
     if content.present?
       return content
     else
@@ -67,8 +68,8 @@ module Comfy::CmsHelper
     end
   end
 
-  def self_or_parent_metafield(block_identifier, page = @cms_page)
-    content = pluck_page_block_content(block_identifier, page)
+  def self_or_parent_metafield(block_identifier, page = @cms_page, page_block_contents = [])
+    content = search_page_block_contents(block_identifier, page_block_contents)
     if content.present?
       return content
     else
@@ -78,6 +79,11 @@ module Comfy::CmsHelper
     end
   end
 
+  def search_page_block_contents(identifier, page_block_contents = [])
+    result = page_block_contents.select { |a| a.first == identifier }
+    result.empty? ? '' : result.first.last
+  end
+
   def pluck_page_block_content(tag, page = @cms_page)
     content = Comfy::Cms::Block.where(identifier: tag, blockable_type: 'Comfy::Cms::Page', blockable_id: page.id).pluck(:content).first
     return (content.present?) ? content : ''
@@ -140,10 +146,14 @@ module Comfy::CmsHelper
   # Example:
   #   cms_block_content(:left_column, CmsPage.first)
   #   cms_block_content(:left_column) # if @cms_page is present
-  def cms_block_content(identifier, blockable = @cms_page)
-    tag = blockable && (block = blockable.blocks.find_by_identifier(identifier)) && block.tag
-    return '' unless tag
-    tag.content
+  def cms_block_content(identifier, blockable = @cms_page, use_old_code = false)
+    if use_old_code
+      tag = blockable && (block = blockable.blocks.find_by_identifier(identifier)) && block.tag
+      return '' unless tag
+      tag.content
+    else
+      pluck_page_block_content(identifier, blockable)
+    end
   end
 
   # For those times when we need to render content that shouldn't be renderable

data/app/mailers/comment_mailer.rb

@@ -1,4 +1,5 @@
-class CommentMailer < ApplicationMailer
+class CommentMailer < ActionMailer::Base
+  default from: ComfortableMexicanSofa.config.from_email
 
  def admin_mention(comment)
    @comment = comment

data/app/views/comment_mailer/admin_mention.html.haml

@@ -0,0 +1,3 @@
+%pre= @comment.message.html_safe
+%br
+= link_to t('.comment_link'), admin_admin_url(@comment.commentable, locale: I18n.locale), target: :blank

data/config/locales/en.yml

@@ -1,4 +1,8 @@
 en:
+ comment_mailer:
+    admin_mention:
+      comment_link: Take me to the comment
+      subject: You were mentioned in a comment
   seo:
     old_page_url: URLs that redirect here (takes slugs in a comma-separated list)
     meta_description: Meta Description

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_loveseat
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.21
 platform: ruby
 authors:
 - Adam Bahlke
@@ -9,104 +9,104 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-03 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: comfortable_mexican_sofa
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.12.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.12.8
 - !ruby/object:Gem::Dependency
   name: rack-rewrite
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 description: Comfortable Mexican Loveseat expands the Comfortable Mexican Sofa with
@@ -137,6 +137,7 @@ files:
 - app/views/comfy/admin/cms/files/index.html.haml
 - app/views/comfy/admin/cms/pages/_form_blocks.html.haml
 - app/views/comfy/cms/content/render_sitemap.xml.builder
+- app/views/comment_mailer/admin_mention.html.haml
 - app/views/layouts/comfy/admin/cms/_flash.html.haml
 - app/views/layouts/devise.html.haml
 - config/locales/de.yml
@@ -971,17 +972,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: An expansion of the Comfortable Mexican Sofa, to make your living room comfier.