comfortable_mexican_loveseat 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7011356faee82e6d507029e20ffc3bdfd20eefbe
-  data.tar.gz: 2857d123f1141141ff40ea0d7b996e423ddc430f
+  metadata.gz: 2dacd4340b4edb5eea86fe479d7ed3d1453fe25e
+  data.tar.gz: 70e7544283d51ec39493d9845208392f84c8edcd
 SHA512:
-  metadata.gz: f528dff25eff29484514dd4d506545290415bab8f3f2c757110bced3605163e819aadcf84faac1a68542b13133d13cbc4064db99bd1f8a4f6b5749c7c85b8e74
-  data.tar.gz: 48608f9dc027dba2f3a3ef8d112802588af16a12f2691d43c9084a2de7779f745524a81dbe3df79e0e8b383e4882e0300253798326ab57024f420055c6b45faf
+  metadata.gz: 0b68a5a575364a64b35cb81ac9312f1b76066b6017412963b9a677237dbf52f38fe2d99cc979a202c8257c000149df88bdc4d83c1926b5f63515e2c7ca52a246
+  data.tar.gz: 7697d2bf048b31eb383cf3a70f5add0aeea954f8d031ce299d023dfb25956b2b8bd2cdb42a5bfadaa348e163354a780e087c8c5cbd31061b83726fa9803d4899

data/app/controllers/comfy/admin/cms/layouts_controller.rb

@@ -56,8 +56,8 @@ protected
     @layout.app_layout  ||= @layout.parent.try(:app_layout)
     @layout.content     ||= "{{ cms:field:seo.old_page_url:string }}\n{{ cms:field:seo.meta_description:string }}\n{{ cms:field:seo.page_title:string }}\n{{ cms:field:seo.canonical_href:string }}\n{{ cms:field:seo.meta_index:string }}\n" +
                             "{{ cms:field:google_plus.name }}\n{{ cms:field:google_plus.description }}\n{{ cms:field:google_plus.image }}\n" + 
-                            "{{ cms:field:twitter.card }}\n{{ cms:field:twitter.site }}\n{{ cms:field:twitter.title }}\n{{ cms:field:twitter.description }}\n{{ cms:field:twitter.creator }}\n{{ cms:field:twitter.image_src }}\n" + 
-                            "{{ cms:field:facebook.title }}\n{{ cms:field:facebook.type }}\n{{ cms:field:facebook.url }}\n{{ cms:field:facebook.image }}\n{{ cms:field:facebook.description }}\n{{ cms:field:facebook.site_name }}\n{{ cms:field:facebook.published_time }}\n{{ cms:field:facebook.modified_time }}\n{{ cms:field:facebook.section }}\n{{ cms:field:facebook.tag }}\n{{ cms:field:facebook.admins }}\n{{ cms:page:content:rich_text }}"
+                            "{{ cms:field:twitter.site }}\n{{ cms:field:twitter.title }}\n{{ cms:field:twitter.description }}\n{{ cms:field:twitter.creator }}\n{{ cms:field:twitter.image_src }}\n" + 
+                            "{{ cms:field:facebook.title }}\n{{ cms:field:facebook.type }}\n{{ cms:field:facebook.image }}\n{{ cms:field:facebook.description }}\n{{ cms:field:facebook.admins }}\n{{ cms:page:content:rich_text }}"
   end
 
   def load_layout

data/app/helpers/comfy/cms_helper.rb

@@ -1,42 +1,86 @@
 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')
+    parent_page = @cms_page.parent_id.present? ? @cms_page.parent_id : false
     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: 'NOINDEX, FOLLOW') if cms_block_content('seo.meta_index').present? && cms_block_content('seo.meta_index')
+    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 = cms_block_content('seo.canonical_href').present? ? cms_block_content('seo.canonical_href') : request.url.split('?').first
+    href = pluck_page_block_content('seo.canonical_href')
+    href = href.present? ? 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?
-    tags << tag('meta', itemprop: "image", content: cms_block_content('google_plus.image')) if cms_block_content('google_plus.image').present?
-    #Twitter Card
-    tags << tag('meta', name: 'twitter:card', content: cms_block_content('twitter.card')) if cms_block_content('twitter.card').present?
-    tags << tag('meta', name: 'twitter:site', content: cms_block_content('twitter.site')) if cms_block_content('twitter.site').present?
-    tags << tag('meta', name: 'twitter:title', content: cms_block_content('twitter.title')) if cms_block_content('twitter.title').present?
-    tags << tag('meta', name: 'twitter:description', content: cms_block_content('twitter.description')) if cms_block_content('twitter.description').present?
-    tags << tag('meta', name: 'twitter:creator', content: cms_block_content('twitter.creator')) if cms_block_content('twitter.creator').present?
-    tags << tag('meta', name: 'twitter:image:src', content: cms_block_content('twitter.image_src')) if cms_block_content('twitter.image_src').present?
-    #Facebook
-    tags << tag('meta', property: 'og:title', content: cms_block_content('facebook.title')) if cms_block_content('facebook.title').present?
-    tags << tag('meta', property: 'og:type', content: cms_block_content('facebook.type')) if cms_block_content('facebook.type').present?
-    tags << tag('meta', property: 'og:url', content: cms_block_content('facebook.url')) if cms_block_content('facebook.url').present?
-    tags << tag('meta', property: 'og:image', content: cms_block_content('facebook.image')) if cms_block_content('facebook.image').present?
-    tags << tag('meta', property: 'og:description', content: cms_block_content('facebook.description')) if cms_block_content('facebook.description').present?
-    tags << tag('meta', property: 'og:site_name', content: cms_block_content('facebook.site_name')) if cms_block_content('facebook.site_name').present?
-    tags << tag('meta', property: 'article:published_time', content: cms_block_content('facebook.published_time')) if cms_block_content('facebook.published_time').present?
-    tags << tag('meta', property: 'article:modified_time', content: cms_block_content('facebook.modified_time')) if cms_block_content('facebook.modified_time').present?
-    tags << tag('meta', property: 'article:section', content: cms_block_content('facebook.section')) if cms_block_content('facebook.section').present?
-    tags << tag('meta', property: 'article:tag', content: cms_block_content('facebook.tag')) if cms_block_content('facebook.tag').present?
-    tags << tag('meta', property: 'fb:admins', content: cms_block_content('facebook.admins')) if cms_block_content('facebook.admins').present?
+
+    ### 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')
+    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)
+    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?
+    tags << tag('meta', name: 'twitter:image:src', content: twitter_image_src) if twitter_image_src.present?
+    tags << tag('meta', name: 'twitter:title', content: twitter_title) if twitter_title.present?
+    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')
+    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?
+    tags << tag('meta', property: 'og:image', content: fb_image) if fb_image.present?
+    tags << tag('meta', property: 'fb:admins', content: fb_admins) if fb_admins.present?
+
+    site_name = Comfy::Cms::Block.where(blockable_id: @cms_site.pages.first.id, blockable_type: 'Comfy::Cms::Page', identifier: 'seo.page_title').pluck(:content)
+    tags << tag('meta', property: 'og:site_name', content: site_name) if site_name.present?
+    tags << tag('meta', property: 'og:url', content: request.url.split('?').first)
 
     return tags.join("\n").html_safe
   end
 
   def comfy_page_title
-    cms_block_content('seo.page_title')
+    pluck_page_block_content('seo.page_title')
+  end
+
+  def self_or_inherit_metadata(block_identifier, metadata)
+    content = pluck_page_block_content(block_identifier)
+    if content.present?
+      return content
+    else
+      return metadata
+    end
+  end
+
+  def self_or_parent_metafield(block_identifier, page = @cms_page)
+    content = pluck_page_block_content(block_identifier)
+    if content.present?
+      return content
+    else
+      if page.present?
+        return Comfy::Cms::Block.where(identifier: block_identifier, blockable_type: 'Comfy::Cms::Page', blockable_id: page.parent_id).pluck(:content).first
+      end
+    end
+  end
+
+  def pluck_page_block_content(tag)
+    content = Comfy::Cms::Block.where(identifier: tag, blockable_type: 'Comfy::Cms::Page', blockable_id: @cms_page.id).pluck(:content).first
+    return (content.present?) ? content : ''
   end
 
   def flash_css_class(type)

data/config/locales/de.yml

@@ -5,28 +5,22 @@ de:
     page_title: Seiten Titel
     canonical_href: kanonischer Link
   google_plus:
-    name: Name
-    description: Beschreibung
-    image: Bild
+    name: Name (erbt von Seiten Title wenn leer)
+    description: Beschreibung (erbt vom SEO tab wenn leer)
+    image: Bild (erbt von der Übergestufte Seite wenn leer)
   twitter:
-    card: Card
-    site: Seite
-    title: Titel
-    description: Beschreibung
-    creator: Autor
-    image_src: Bildquelle
+    site: Seite (erbt von der Übergestufte Seite wenn leer)
+    title: Titel (erbt vom SEO tab wenn leer)
+    description: Beschreibung (erbt vom SEO tab wenn leer)
+    creator: Autor (erbt von der Übergestufte Seite wenn leer)
+    image_src: Bildquelle (erbt von der Übergestufte Seite wenn leer)
   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
+    title: Titel (erbt vom SEO tab wenn leer)
+    type: Art (erbt von der Übergestufte Seite wenn leer)
+    image: Bild (erbt von der Übergestufte Seite wenn leer)
+    description: Beschreibung (erbt vom SEO tab wenn leer)
+    site_name: Seiten Name (erbt von Rootseite tab wenn leer)
+    admins: Admins (erbt von der Übergestufte Seite wenn leer)
   devise:
     signin: Login
   admin:

data/config/locales/en.yml

@@ -4,6 +4,23 @@ en:
     meta_description: Meta Description
     page_title: Page Title
     canonical_href: Canonical link
+  google_plus:
+    name: Name (inherits from page title if blank)
+    description: Description (inherits from SEO tab if blank)
+    image: Image (inherits from parent page if blank)
+  twitter:
+    site: Site (inherits from parent page if blank)
+    title: Title (inherits from SEO tab if blank)
+    description: Description (inherits from SEO tab if blank)
+    creator: Creator (inherits from parent page if blank)
+    image_src: Image Source (inherits from parent page if blank)
+  facebook:
+    title: Title (inherits from SEO tab if blank)
+    type: Type (inherits from parent page if blank)
+    image: Image (inherits from parent page if blank)
+    description: Description (inherits from SEO tab if blank)
+    site_name: Site Name (inherits from root)
+    admins: Admins (inherits from parent page if blank)
   devise:
     signin: Login
   admin:

data/test/dummy/app/assets/javascripts/comfy/admin/cms/custom.js.coffee

@@ -0,0 +1 @@
+# Custom JS for the admin area

data/test/dummy/app/assets/stylesheets/comfy/admin/cms/custom.sass

@@ -0,0 +1 @@
+// custom CSS for admin area

data/test/dummy/config/initializers/comfortable_mexican_sofa.rb

@@ -0,0 +1,121 @@
+# encoding: utf-8
+
+ComfortableMexicanSofa.configure do |config|
+  # Title of the admin area
+  #   config.cms_title = 'ComfortableMexicanSofa CMS Engine'
+
+  # Controller that is inherited from CmsAdmin::BaseController
+  #   config.base_controller = 'ApplicationController'
+
+  # Module responsible for authentication. You can replace it with your own.
+  # It simply needs to have #authenticate method. See http_auth.rb for reference.
+  #   config.admin_auth = 'ComfyAdminAuthentication'
+
+  # Module responsible for authorization on admin side. It should have #authorize
+  # method that returns true or false based on params and loaded instance
+  # variables available for a given controller.
+  #   config.admin_authorization = 'ComfyAdminAuthorization'
+
+  # Module responsible for public authentication. Similar to the above. You also
+  # will have access to @cms_site, @cms_layout, @cms_page so you can use them in
+  # your logic. Default module doesn't do anything.
+  #   config.public_auth = 'ComfyPublicAuthentication'
+
+  # When arriving at /cms-admin you may chose to redirect to arbirtary path,
+  # for example '/cms-admin/users'
+  #   config.admin_route_redirect = ''
+
+  # File uploads use Paperclip and can support filesystem or s3 uploads.  Override
+  # the upload method and appropriate settings based on Paperclip.  For S3 see:
+  # http://rdoc.info/gems/paperclip/2.3.8/Paperclip/Storage/S3, and for
+  # filesystem see: http://rdoc.info/gems/paperclip/2.3.8/Paperclip/Storage/Filesystem
+  # If you are using S3 and HTTPS, pass :s3_protocol => '' to have URLs that use the protocol of the page
+  #   config.upload_file_options = {:url => '/system/:class/:id/:attachment/:style/:filename'}
+
+  # Sofa allows you to setup entire site from files. Database is updated with each
+  # request (if necessary). Please note that database entries are destroyed if there's
+  # no corresponding file. Fixtures are disabled by default.
+  #   config.enable_fixtures = false
+
+  # Path where fixtures can be located.
+  #   config.fixtures_path = File.expand_path('db/cms_fixtures', Rails.root)
+
+  # Importing fixtures into Database
+  # To load fixtures into the database just run this rake task:
+  #   local: $ rake comfortable_mexican_sofa:fixtures:import FROM=example.local TO=localhost
+  #   Heroku: $ heroku run rake comfortable_mexican_sofa:fixtures:import FROM=example.local TO=yourapp.herokuapp.com
+  # From indicates folder the fixtures are in and to is the Site hostname you have defined in the database.
+
+  # Exporting fixtures into Files
+  # If you need to dump database contents into fixture files run:
+  #   local: $ rake comfortable_mexican_sofa:fixtures:export FROM=localhost TO=example.local
+  #   Heroku: $ heroku run rake comfortable_mexican_sofa:fixtures:export FROM=yourapp.herokuapp.com TO=example.local
+  # This will create example.local folder and dump all content from example.com Site.
+
+  # Content for Layouts, Pages and Snippets has a revision history. You can revert
+  # a previous version using this system. You can control how many revisions per
+  # object you want to keep. Set it to 0 if you wish to turn this feature off.
+  #   config.revisions_limit = 25
+
+  # Locale definitions. If you want to define your own locale merge
+  # {:locale => 'Locale Title'} with this.
+  #   config.locales = {:en => 'English', :es => 'Español'}
+
+  # Admin interface will respect the locale of the site being managed. However you can
+  # force it to English by setting this to `:en`
+  #   config.admin_locale = nil
+
+  # A class that is included as a sweeper to admin base controller if it's set
+  #   config.admin_cache_sweeper = nil
+
+  # By default you cannot have irb code inside your layouts/pages/snippets.
+  # Generally this is to prevent putting something like this:
+  # <% User.delete_all %> but if you really want to allow it...
+  #   config.allow_irb = false
+
+  # Whitelist of all helper methods that can be used via {{cms:helper}} tag. By default
+  # all helpers are allowed except `eval`, `send`, `call` and few others. Empty array
+  # will prevent rendering of all helpers.
+  #   config.allowed_helpers = nil
+
+  # Whitelist of partials paths that can be used via {{cms:partial}} tag. All partials
+  # are accessible by default. Empty array will prevent rendering of all partials.
+  #   config.allowed_partials = nil
+
+  # Site aliases, if you want to have aliases for your site. Good for harmonizing
+  # production env with dev/testing envs.
+  # e.g. config.hostname_aliases = {'host.com' => 'host.inv', 'host_a.com' => ['host.lvh.me', 'host.dev']}
+  # Default is nil (not used)
+  #   config.hostname_aliases = nil
+
+  # Reveal partials that can be overwritten in the admin area.
+  # Default is false.
+  #   config.reveal_cms_partials = false
+
+end
+
+# Default credentials for ComfortableMexicanSofa::AccessControl::AdminAuthentication
+# YOU REALLY WANT TO CHANGE THIS BEFORE PUTTING YOUR SITE LIVE
+ComfortableMexicanSofa::AccessControl::AdminAuthentication.username = 'username'
+ComfortableMexicanSofa::AccessControl::AdminAuthentication.password = 'password'
+
+# Uncomment this module and `config.admin_auth` above to use custom admin authentication
+# module ComfyAdminAuthentication
+#   def authenticate
+#     return true
+#   end
+# end
+
+# Uncomment this module and `config.admin_authorization` above to use custom admin authorization
+# module ComfyAdminAuthorization
+#   def authorize
+#     return true
+#   end
+# end
+
+# Uncomment this module and `config.public_auth` above to use custom public authentication
+# module ComfyPublicAuthentication
+#   def authenticate
+#     return true
+#   end
+# end

data/test/dummy/config/routes.rb

@@ -1,4 +1,9 @@
 Rails.application.routes.draw do
+  comfy_route :cms_admin, :path => '/admin'
+
+  # Make sure this routeset is defined last
+  comfy_route :cms, :path => '/', :sitemap => true
+
   # The priority is based upon order of creation: first created -> highest priority.
   # See how all your routes lay out with "rake routes".
 

data/test/dummy/db/cms_fixtures/default/layouts/main/attributes.yml

@@ -0,0 +1,4 @@
+---
+label: main
+app_layout: application
+position: 0

data/test/dummy/db/cms_fixtures/default/layouts/main/content.html

@@ -0,0 +1,19 @@
+{{ cms:field:seo.old_page_url:string }}
+{{ cms:field:seo.meta_description:string }}
+{{ cms:field:seo.page_title:string }}
+{{ cms:field:seo.canonical_href:string }}
+{{ cms:field:seo.meta_index:string }}
+{{ cms:field:google_plus.name }}
+{{ cms:field:google_plus.description }}
+{{ cms:field:google_plus.image }}
+{{ cms:field:twitter.site }}
+{{ cms:field:twitter.title }}
+{{ cms:field:twitter.description }}
+{{ cms:field:twitter.creator }}
+{{ cms:field:twitter.image_src }}
+{{ cms:field:facebook.title }}
+{{ cms:field:facebook.type }}
+{{ cms:field:facebook.image }}
+{{ cms:field:facebook.description }}
+{{ cms:field:facebook.admins }}
+{{ cms:page:content:rich_text }}

data/test/dummy/db/cms_fixtures/default/pages/index/attributes.yml

@@ -0,0 +1,8 @@
+---
+label: root
+layout: main
+parent: 
+target_page: 
+categories: []
+is_published: true
+position: 0

data/test/dummy/db/cms_fixtures/default/pages/index/content.html

@@ -0,0 +1 @@
+<p>Hello world!</p>

data/test/dummy/db/cms_fixtures/default/pages/index/seo.canonical_href.html

@@ -0,0 +1 @@
+localhost:3000

data/test/dummy/db/cms_fixtures/default/pages/index/seo.meta_description.html

@@ -0,0 +1 @@
+Test description

data/test/dummy/db/cms_fixtures/default/pages/index/seo.old_page_url.html

@@ -0,0 +1 @@
+blah

data/test/dummy/db/cms_fixtures/default/pages/index/seo.page_title.html

@@ -0,0 +1 @@
+Test Home

data/test/dummy/db/cms_fixtures/sample-site/categories/files.yml

@@ -0,0 +1 @@
+- File Category

data/test/dummy/db/cms_fixtures/sample-site/categories/pages.yml

@@ -0,0 +1 @@
+- Page Category