comfortable_mexican_loveseat 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 15b3119762be0e76fcddd50c19d3f28b0eed88bb
-  data.tar.gz: 9c519962fae4a23c4c14cb104ce0b61135b832cb
+  metadata.gz: ecc16467331f51889d0f6b7d64863f17b5f5b09e
+  data.tar.gz: 9c77cefafe59c0d1d5ea37d8152b3e520db07f4e
 SHA512:
-  metadata.gz: ac08c834572f0c10708f227f911c296f3a394f594dc6b4df49878fb36f929db486ee5e8e359ec9cd2e1a2d026c7a1be2b82c8a0e4fbfb507c3e328dc93f1e331
-  data.tar.gz: 4e4e7bf33c72a5b66c38702ac27d36076818eb59b0b8264d0cea863e79dbc914232e75daf4a31c0d442a8646fd2278f14c15e4afdead035531c0871c9f940212
+  metadata.gz: 5e5e71a3474bcb3bd081afe6de9295bef193c4bff4a293240790e761225f16c1c272f62d587a9635b2b491b0d755037daafa8b21e66a4add3de1b7b6b70c6ad1
+  data.tar.gz: c0fa3ccfb753a5ddd44cdcf6136e4697c332834a661342b3fb5d3c590aa27aeb8dc714618a5fe696e2927a9a042992794122ef9101a07f0702c6761fd60b6bb7

data/README.rdoc

@@ -4,9 +4,7 @@ The Comfortable Mexican Loveseat is an expansion pack to the Comfortable Mexican
 
 The Loveseat references a fixed version of the CMS (currently 1.12.8) and latest releases are pulled in occasionally.
 
-== SEO Features
-
-=== Simplified Fixture Import/Export
+== Simplified Fixture Import/Export
 
 When you want to import fixtures you can now use the following commands:
 
@@ -18,6 +16,8 @@ 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
+
 === Custom Sitemaps
 
 Building on the Sofa's sitemap functionality, the Loveseat lets you add Rails model show pages and custom routes to the sitemap.
@@ -39,6 +39,8 @@ By default when you create an application, it comes with meta description; page
   <title><%= comfy_page_title %></title>
   <%= comfy_seo_tags %>
 
+Tags are set on a per-page basis, except for canonical links, which default to the page URL if none has been entered manually.
+
 === File Upload helper text
 
 The Loveseat provides some helpful hints to admins when they're uploading images (choose an SEO-friendly name, add an alt-tag), which you can add to your locale files.

data/app/controllers/comfy/cms/content_controller.rb

@@ -58,7 +58,8 @@ protected
     if page.present?
       @cms_page = page
     else
-      old_page = Comfy::Cms::Block.where(identifier: "seo.old_page_url", content: params[:cms_path].to_s).pluck(:content, :blockable_id, :blockable_type).first
+
+      old_page = Comfy::Cms::Block.where(identifier: 'seo.old_page_url').where('content LIKE ?', "%#{params[:cms_path].to_s}%").pluck(:content, :blockable_id, :blockable_type).first
 
       if old_page.present?
         if old_page.last == "Comfy::Cms::Page"

data/app/helpers/comfy/cms_helper.rb

@@ -3,8 +3,11 @@ module Comfy::CmsHelper
   def comfy_seo_tags
     tags = []
     tags << tag('meta', name: 'description', content: cms_block_content('seo.meta_description')) if cms_block_content('seo.meta_description').present?
-    tags << tag('meta', name: 'robots', content: cms_block_content('seo.meta_index')) if cms_block_content('seo.meta_index').present?
-    tags << tag('link', rel: 'canonical', href: cms_block_content('seo.canonical_href')) if cms_block_content('seo.canonical_href').present?
+    tags << tag('meta', name: 'robots', content: 'NOINDEX, FOLLOW') if cms_block_content('seo.meta_index').present? && cms_block_content('seo.meta_index')
+
+    # if no canonical is set, default to URL without any parameters
+    href = cms_block_content('seo.canonical_href').present? ? cms_block_content('seo.canonical_href') : request.url.split('?').first
+    tags << tag('link', rel: 'canonical', href: href)
     #Google plus
     tags << tag('meta', itemprop: "name", content: cms_block_content('google_plus.name')) if cms_block_content('google_plus.name').present?
     tags << tag('meta', itemprop: "description", content: cms_block_content('google_plus.description')) if cms_block_content('google_plus.description').present?

data/app/views/comfy/admin/cms/pages/_form_blocks.html.haml

@@ -0,0 +1,32 @@
+- namespace = { }
+- cms_object = @page || cms_object
+- tags = cms_object.tags(true).select{|t| t.is_cms_block?}.uniq{|t| t.identifier}
+- tags.each do |tag|
+  - namespace[tag.namespace || 'default'] ||= []
+  - namespace[tag.namespace || 'default'] << tag
+
+#form-blocks
+  - if tags.empty?
+    .no-tags
+      = link_to cms_object.layout.label, edit_comfy_admin_cms_site_layout_path(@site, cms_object.layout)
+      = t('.no_tags').html_safe
+
+  - else
+    = fields_for :blocks, nil, :builder => ComfortableMexicanLoveseat::FormBuilder, :layout => :horizontal do |cms_blocks|
+
+      .tabbable
+        - if namespace.size > 1
+          %ul.nav.nav-tabs
+            - namespace.each_with_index do |(name, tags), index|
+              %li{:class => index == 0 ? 'active' : nil}
+                = link_to name.humanize, "#ns-#{name}", :data => {:toggle => 'tab'}
+        .tab-content
+          - block_index = 0
+          - namespace.each_with_index do |(name, tags), index|
+            .tab-pane{:id => "ns-#{name}", :class => index == 0 ? 'active' : nil}
+              - tags.each do |tag|
+                - begin
+                  = cms_blocks.send(tag.class.to_s.demodulize.underscore, tag, block_index)
+                - rescue
+                  - Rails.env.production?? nil : raise
+                - block_index += 1

data/config/locales/de.yml

@@ -0,0 +1,29 @@
+de:
+  seo:
+    old_page_url: URLs die auf dieser Seite gehen
+    meta_description: Meta Beschreibung
+    page_title: Seiten Titel
+    canonical_href: kanonischer Link
+  google_plus:
+    name: Name
+    description: Beschreibung
+    image: Bild
+  twitter:
+    card: Card
+    site: Seite
+    title: Titel
+    description: Beschreibung
+    creator: Autor
+    image_src: Bildquelle
+  facebook:
+    title: Titel
+    type: Art
+    url: URL
+    image: Bild
+    description: Beschreibung
+    site_name: Seiten Name
+    published_time: Veröffentlicht Zeit
+    modified_time: Änderungszeit
+    section: Abteilung
+    tag: Tag
+    admins: Admins

data/config/locales/en.yml

@@ -0,0 +1,6 @@
+en:
+  seo:
+    old_page_url: URLs that redirect here (takes slugs in a comma-separated list)
+    meta_description: Meta Description
+    page_title: Page Title
+    canonical_href: Canonical link

data/lib/comfortable_mexican_loveseat/form_builder.rb

@@ -0,0 +1,118 @@
+# class ComfortableMexicanSofa::FormBuilder < BootstrapForm::FormBuilder
+module ComfortableMexicanLoveseat
+  class FormBuilder < ComfortableMexicanSofa::FormBuilder
+
+    def field_name_for(tag)
+      tag.blockable.class.name.demodulize.underscore.gsub(/\//,'_')
+    end
+
+    # -- Tag Field Fields -----------------------------------------------------
+    def default_tag_field(tag, index, method = :text_field_tag, options = {})
+      label       = I18n.t(tag.identifier.to_s).include?(tag.identifier.to_s) ? tag.blockable.class.human_attribute_name(tag.identifier.to_s) : I18n.t(tag.identifier.to_s)
+      css_class   = tag.class.to_s.demodulize.underscore
+      content     = ''
+      fieldname   = field_name_for(tag)
+      case method
+      when :file_field_tag
+        input_params = {:id => nil}
+        name = "#{fieldname}[blocks_attributes][#{index}][content]"
+
+        if options.delete(:multiple)
+          input_params.merge!(:multiple => true)
+          name << '[]'
+        end
+
+        content << @template.send(method, name, input_params)
+        content << @template.render(:partial => 'comfy/admin/cms/files/page_form', :object => tag.block)
+      else
+        options[:class] = ' form-control'
+        content << @template.send(method, "#{fieldname}[blocks_attributes][#{index}][content]", tag.content, options)
+      end
+      content << @template.hidden_field_tag("#{fieldname}[blocks_attributes][#{index}][identifier]", tag.identifier, :id => nil)
+
+      form_group :label => {:text => label} do 
+        content.html_safe
+      end
+    end
+
+    def field_date_time(tag, index)
+      default_tag_field(tag, index, :text_field_tag, :data => {'cms-datetime' => true})
+    end
+
+    def field_integer(tag, index)
+      default_tag_field(tag, index, :number_field_tag)
+    end
+
+    def field_string(tag, index)
+      default_tag_field(tag, index)
+    end
+
+    def field_text(tag, index)
+      default_tag_field(tag, index, :text_area_tag, :data => {'cms-cm-mode' => 'text/html'})
+    end
+
+    def field_rich_text(tag, index)
+      default_tag_field(tag, index, :text_area_tag, :data => {'cms-rich-text' => true})
+    end
+
+    def field_boolean(tag, index)
+      fieldname = field_name_for(tag)
+      content = @template.hidden_field_tag("#{fieldname}[blocks_attributes][#{index}][content]", '', :id => nil)
+      content << @template.check_box_tag("#{fieldname}[blocks_attributes][#{index}][content]", '1', tag.content.present?, :id => nil)
+      content << @template.hidden_field_tag("#{fieldname}[blocks_attributes][#{index}][identifier]", tag.identifier, :id => nil)
+      form_group :label => {:text => (tag.blockable.class.human_attribute_name(tag.identifier.to_s) || tag.identifier.titleize + "?")} do 
+        content
+      end
+    end
+
+    def page_date_time(tag, index)
+      default_tag_field(tag, index, :text_field_tag, :data => {'cms-datetime' => true})
+    end
+
+    def page_integer(tag, index)
+      default_tag_field(tag, index, :number_field_tag)
+    end
+
+    def page_string(tag, index)
+      default_tag_field(tag, index)
+    end
+
+    def page_text(tag, index)
+      default_tag_field(tag, index, :text_area_tag, :data => {'cms-cm-mode' => 'text/html'})
+    end
+
+    def page_rich_text(tag, index)
+      default_tag_field(tag, index, :text_area_tag, :data => {'cms-rich-text' => true})
+    end
+
+    def page_file(tag, index)
+      default_tag_field(tag, index, :file_field_tag)
+    end
+
+    def page_files(tag, index)
+      default_tag_field(tag, index, :file_field_tag, :multiple => true)
+    end
+
+    def page_markdown(tag, index)
+      default_tag_field(tag, index, :text_area_tag, :data => {'cms-cm-mode' => 'text/x-markdown'})
+    end
+
+    def collection(tag, index)
+      options = [["---- Select #{tag.collection_class.titleize} ----", nil]] +
+        tag.collection_objects.collect do |m|
+          [m.send(tag.collection_title), m.send(tag.collection_identifier)]
+        end
+
+      fieldname = field_name_for(tag)
+      content = @template.select_tag(
+        "#{fieldname}[blocks_attributes][#{index}][content]",
+        @template.options_for_select(options, :selected => tag.content),
+        :id => nil
+      )
+      content << @template.hidden_field_tag("#{fieldname}[blocks_attributes][#{index}][identifier]", tag.identifier, :id => nil)
+      form_group :label => {:text => tag.identifier.titleize}, :class => tag.class.to_s.demodulize.underscore do
+        content
+      end
+    end
+  end
+end

data/lib/comfortable_mexican_loveseat.rb

@@ -2,6 +2,7 @@ require 'comfortable_mexican_sofa'
 require 'rack-rewrite'
 require 'comfortable_mexican_loveseat/engine'
 require 'comfortable_mexican_loveseat/fixture'
+require 'comfortable_mexican_loveseat/form_builder'
 
 module ComfortableMexicanLoveseat
   mattr_accessor :seo_custom_paths

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_loveseat
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Adam Bahlke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-18 00:00:00.000000000 Z
+date: 2015-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -119,11 +119,15 @@ files:
 - app/models/comfy/cms/snippet.rb
 - app/views/comfy/admin/cms/files/_form.html.haml
 - 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/layouts/comfy/admin/cms/_flash.html.haml
+- config/locales/de.yml
+- config/locales/en.yml
 - lib/comfortable_mexican_loveseat.rb
 - lib/comfortable_mexican_loveseat/engine.rb
 - lib/comfortable_mexican_loveseat/fixture.rb
+- lib/comfortable_mexican_loveseat/form_builder.rb
 - lib/tasks/comfortable_mexican_loveseat.rake
 - test/comfortable_mexican_loveseat_test.rb
 - test/dummy/README.rdoc