para-seo_tools 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7897b0a3299f5d4e457e8eba6b499c24e7a0b2c0
-  data.tar.gz: d5356532cdaeb00740c523d945665a5f945fcf56
+  metadata.gz: 643b353c0fa9c0e3131ddba099cd9a504c8c9ef0
+  data.tar.gz: f093c06c3e3d67ce755a466e6b1315c72e5bac84
 SHA512:
-  metadata.gz: 2f21f538ce3f45348d99cbc0936bda4f9699f8bf8bf137cffb368ccfb8b18aaedb3484e565a194ad03f09a2bfb0de4ea37dfce2b7527f8cf24cfe885006c2480
-  data.tar.gz: a79fb1e83edf1f3c587d109910ec1af1ffc8beabeb683ae3637139eb34da1c7c47f6133bc75d13668906e27f383b8b1375a22c41d04c1b20bc93e5cefc696f30
+  metadata.gz: fb81cfeecc187846a350ed8e969502b4acbd66e9d407c241343f19175f3e21ff45e655c442063ca7e9eea0288cf9a5e3f02a83b9b3c15de642da1b4c03abd666
+  data.tar.gz: 92d4e04d035aa5dabdf30f5481eab43e9668c59c46277c1e043e1fbd0383c0059e409338e6834324e13fb588ead3370185c95e8be4c41ed4dbce46d85504982f

data/app/views/admin/para/seo_tools/pages/_actions.html.haml

@@ -1,10 +1,10 @@
-%ul.actions-control
+%ul.panel-controls
   %li
-    = link_to run_admin_skeleton_refresh_path, class: 'btn btn-default btn-shadow', remote: true, data: { :'job-tracker-button' => true } do
+    = link_to run_admin_skeleton_refresh_path, class: 'btn btn-default', remote: true, data: { :'job-tracker-button' => true } do
       = fa_icon 'refresh'
       = t('para.seo_tools.pages.refresh_skeleton')
 
   %li
-    = link_to ping_admin_skeleton_refresh_path, class: 'btn btn-default btn-shadow', remote: true, data: { :'job-tracker-button' => true } do
+    = link_to ping_admin_skeleton_refresh_path, class: 'btn btn-default', remote: true, data: { :'job-tracker-button' => true } do
       = fa_icon 'cloud-upload'
       = t('para.seo_tools.pages.ping_search_engines')

data/app/views/admin/para/seo_tools/pages/_filters.html.haml

@@ -1,16 +1,18 @@
 = search_form_for @q, builder: SimpleForm::FormBuilder, url: @component.path, html: { data: { :'filters-form' => true } } do |form|
-
-  - if Para::SeoTools.handle_subdomain
-    .flextable-item
-      = form.input_field :subdomain_eq, as: :selectize, collection: Para::SeoTools::Page.available_subdomains, class: 'form-control', placeholder: t('para.seo_tools.pages.subdomain')
-
-  - if @available_locales.length > 1
-    .flextable-item
-      = form.input_field :locale_eq, as: :selectize, collection: @available_locales, class: 'form-control', placeholder: t('para.seo_tools.pages.choose_locale')
-      
-  .flextable-item.flextable-primary
-    .input-group.filter-form
-      = form.input_field :identifier_or_path_or_title_or_description_or_keywords_or_canonical_cont, as: :string, placeholder: t('para.shared.search'), class: 'form-control'
-      .input-group-btn
-        %button.btn{ type: 'submit' }
-          = fa_icon 'search'
+  %table
+    %tbody
+      %tr
+        - if Para::SeoTools.handle_subdomain
+          %td{ width: '15%', style: 'padding-right: 10px;' }
+            = form.input_field :subdomain_eq, as: :selectize, collection: Para::SeoTools::Page.available_subdomains, class: 'form-control', placeholder: t('para.seo_tools.pages.subdomain')
+        - if @available_locales.length > 1
+          %td{ width: '15%', style: 'padding-right: 10px;' }
+            = form.input_field :locale_eq, as: :selectize, collection: @available_locales, class: 'form-control', placeholder: t('para.seo_tools.pages.choose_locale')
+        %td{ width: '80%' }
+          .col-sm-12
+            .input-group
+              %span.input-group-addon
+                %i.fa.fa-search
+              = form.input_field :identifier_or_path_or_title_or_description_or_keywords_or_canonical_cont, as: :string, placeholder: t('para.shared.search'), class: 'form-control'
+        %td{ width: '20%' }
+          = form.submit t('para.shared.search'), class: 'btn btn-default btn-block'

data/app/views/admin/para/seo_tools/pages/_form.html.haml

@@ -1,14 +1,13 @@
 = para_form_for(resource) do |form|
-  = form.tabs do |tabs|
-    = tabs.tab :informations, icon: 'info-circle' do
-      = form.input :path, disabled: true
+  = form.fieldset do
+    = form.input :path, disabled: true
 
-      = meta_tag_input form, :title
-      = meta_tag_input form, :description
-      = meta_tag_input form, :keywords
+    = meta_tag_input form, :title
+    = meta_tag_input form, :description
+    = meta_tag_input form, :keywords
 
-    = tabs.tab :additional_meta_tags, icon: 'cog' do
-      = meta_tag_input form, :image, as: :image, hint: t('para.seo_tools.pages.image_hint')
-      = meta_tag_input form, :canonical, hint: t('para.seo_tools.pages.canonical_hint')
+  = form.fieldset title: t('para.seo_tools.pages.additional_meta_tags') do
+    = meta_tag_input form, :image, as: :image
+    = meta_tag_input form, :canonical
 
   = form.actions

data/app/views/admin/para/seo_tools/pages/_table.html.haml

@@ -5,7 +5,7 @@
     = table.header_for(:title)
     = table.header_for(:description)
     = table.header_for(:locale) if @available_locales.length > 1
-    %th.table-row-actions
+    %th
 
   = table.rows(resources) do |resource|
     = table.data_for(resource.subdomain) if Para::SeoTools.handle_subdomain
@@ -14,8 +14,9 @@
     = table.data_for(resource.meta_tag(:description))
     = table.data_for(resource, :locale) if @available_locales.length > 1
 
-    %td.table-row-actions
-      = table.edit_button(resource)
+    %td
+      .pull-right.btn-group
+        = table.edit_button(resource)
 
-      = link_to resource.path, target: '_blank', class: 'btn btn-sm btn-icon-default btn-shadow hint--left', aria: { label: t('para.seo_tools.pages.see_in_app') } do
-        = fa_icon 'eye'
+        = link_to resource.path, target: '_blank', class: 'btn btn-default hint--left', data: { hint: t('para.seo_tools.pages.see_in_app') } do
+          = fa_icon 'eye'

data/config/locales/para-seo_tools.fr.yml

@@ -4,16 +4,11 @@ fr:
       pages:
         see_in_app: "Voir la page"
         default_meta_tag_value: "Valeur par défaut : <b>%{value}</b>"
+        additional_meta_tags: "Meta-données avancées"
         refresh_skeleton: "Mettre à jour"
         ping_search_engines: "Envoyer le sitemap aux moteurs de recherche"
         choose_locale: "Choisissez une langue"
         subdomain: Sous-domaine
-        image_hint: |
-          Cette image sera utilisée par défaut comme prévisualisation de la page
-          lors de son partage sur les réseaux sociaux.
-        canonical_hint: |
-          Si la page ne doit pas être référencée au profit d'une autre page,
-          collez ici l'adresse de la page à référencer à la place.
 
     jobs:
       para/seo_tools/skeleton/job:
@@ -23,16 +18,6 @@ fr:
         progressing: "Le plan du site est actuellement envoyé aux différents moteurs de recherche ..."
         success: "Le plan du site a bien été transmis aux moteurs de recherche !"
 
-  components:
-    component:
-      sitemap: "Gestion SEO / Plan du site"
-
-  forms:
-    tabs:
-      para/seo_tools/page:
-        informations: "Informations"
-        additional_meta_tags: "Meta-données avancées"
-
   activemodel:
     models:
       para/seo_tools/skeleton/job: "Mise à jour du plan du site"
@@ -46,8 +31,8 @@ fr:
         title: "Titre"
         description: "Description"
         keywords: "Mots-clés de la page"
-        image: "Image pour le partage"
-        canonical: "URL canonique (Canonical)"
+        image: "Image pour le partage sur les réseaux sociaux"
+        canonical: "URL canonique"
         locale: "Langue"
         subdomain: "Sous-domaine"
 

data/lib/generators/para/seo_tools/install/templates/skeleton.rb

@@ -1,11 +1,11 @@
 # Use `lazy: true` to avoid generating the pages skeleton on server run
 #
-# You'll then have to run `rake para:seo_tools:skeleton:build` to refresh it or
-# use the `Para::SeoTools::Skeleton::Job.perform` method in some worker to
+# You'll then have to run `rake seo_tools:skeleton:build` to refresh it or use
+# the `Para::SeoTools::Skeleton::Job.perform` method in some worker to
 # refresh it periodically
 #
 # Note that you also have to always refresh the sitemap manually with the
-# following task : `rake para:seo_tools:sitemap:generate`
+# following task : `rake seo_tools:sitemap:generate`
 #
 Para::SeoTools::Skeleton.draw(lazy: false) do
   # Define your website SEO targetted structure here.
@@ -16,13 +16,11 @@ Para::SeoTools::Skeleton.draw(lazy: false) do
   #
   #   page :posts
   #
-  #
   # If you want to define the page path yourself, just add the `:path` option
   # to the `page` call
   #
   #   page :home, path: root_path
   #
-  #
   # When the page is linked to a resource : often, a #show page, you'll need to
   # pass the `:resource` option
   #
@@ -30,36 +28,10 @@ Para::SeoTools::Skeleton.draw(lazy: false) do
   #     page :post, resource: post
   #   end
   #
-  #
   # Also, you can pass options for the sitemap generation tool.
   # The options are `:priority`, `:change_frequency` which are left blank
   # by default.
   #
   #   page :posts, priority: 1, change_frequency: 'weekly'
   #
-  #
-  # By default, when you pass a resource to a route, it will try to find
-  # default a title and description from your resource, using the method
-  # configured in the seo_tools.rb initializer at `config.title_methods` and
-  # `config.description_methods`.
-  #
-  # For non-resource pages or if you need to add your own defaults, you can
-  # pass them to the `#page` method the following way :
-  #
-  #   page :posts, defaults: { title: 'Blog index', description: 'Read our blog ...' }
-  #   page :post, resource: post, defaults: { description: post.excerpt }
-  #
-  #
-  # By default, every page that is not referenced in the skeleton will not be
-  # indexed by search engines.
-  #
-  # But if some of your skeleton pages shouldn't be
-  # indexed or links shouldn't be followed on that page, you can explicitly pass
-  # the `:noindex` and `:nofollow` options to the `#page` method.
-  #
-  # It allows to let the admins edit the page title but avoids it to be indexed.
-  #
-  #   page :posts, noindex: true
-  #   page :report_abuse, noindex: true, nofollow: true
-  #
 end

data/lib/para/seo_tools/controller.rb

@@ -16,7 +16,7 @@ module Para
       protected
 
       def meta_tags_from(resource)
-        @resource = resource
+        @instance = resource
       end
 
       def set_meta_tags_from_page(page)

data/lib/para/seo_tools/helpers.rb

@@ -5,7 +5,6 @@ module Para
 
       autoload :PageHelper
       autoload :ViewHelper
-      autoload :DefaultDataMethodsHelper
     end
   end
 end

data/lib/para/seo_tools/meta_tags/tags/base.rb

@@ -34,9 +34,9 @@ module Para
             key.join(".")
           end
 
-          # TODO : Define if we'll still support resource meta tags and refactor
+          # TODO : Define if we'll still support instance meta tags and refactor
           #        accordingly
-          def resource
+          def instance
           end
 
           def model_name

data/lib/para/seo_tools/meta_tags/tags/description.rb

@@ -3,11 +3,9 @@ module Para
     module MetaTags
       module Tags
         class Description < Base
-          include Para::SeoTools::Helpers::DefaultDataMethodsHelper
-
           def value
             self.class.process(
-              meta_taggable_description || resource_description || action_name
+              meta_taggable_description || instance_description || action_name
             )
           end
 
@@ -18,12 +16,22 @@ module Para
           private
 
           def meta_taggable_description
-            resource && resource.meta_tagged? &&
-              resource.meta_tags_list.meta_description.presence
+            instance && instance.meta_tagged? &&
+              instance.meta_tags_list.meta_description.presence
           end
 
-          def resource_description
-            default_description_for(resource)
+          def instance_description
+            if instance
+              Para::SeoTools.description_methods.each do |method|
+                if instance.respond_to?(method)
+                  if (description = instance.send(method).presence)
+                    return description
+                  end
+                end
+              end
+
+              return nil
+            end
           end
 
           def action_name

data/lib/para/seo_tools/meta_tags/tags/image.rb

@@ -4,7 +4,7 @@ module Para
       module Tags
         class Image < Base
           def value
-            self.class.process(resource_image)
+            self.class.process(instance_image)
           end
 
           def self.process(value)
@@ -23,8 +23,16 @@ module Para
 
           private
 
-          def resource_image
-            default_image_for(resource).try(:url)
+          def instance_image
+            if member_action?
+              Para::SeoTools.image_methods.each do |method|
+                if instance.respond_to?(method) && instance.send(method)
+                  return instance.send(method).url
+                end
+              end
+
+              nil
+            end
           end
 
           def self.url_from(value)

data/lib/para/seo_tools/meta_tags/tags/keywords.rb

@@ -10,8 +10,8 @@ module Para
           private
 
           def meta_taggable_keywords
-            resource && resource.meta_tagged? &&
-              resource.meta_tags_list.meta_keywords.presence
+            instance && instance.meta_tagged? &&
+              instance.meta_tags_list.meta_keywords.presence
           end
         end
       end

data/lib/para/seo_tools/meta_tags/tags/title.rb

@@ -3,21 +3,26 @@ module Para
     module MetaTags
       module Tags
         class Title < Base
-          include Para::SeoTools::Helpers::DefaultDataMethodsHelper
-
           def value
-            meta_taggable_title || resource_title || action_name || model_name_translation
+            meta_taggable_title || instance_title || action_name || model_name_translation
           end
 
           private
 
           def meta_taggable_title
-            resource && resource.meta_tagged? &&
-              resource.meta_tags_list.meta_title.presence
+            instance && instance.meta_tagged? &&
+              instance.meta_tags_list.meta_title.presence
           end
 
-          def resource_title
-            default_title_for(resource)
+          def instance_title
+            if instance
+              Para::SeoTools.title_methods.each do |method|
+                if instance.respond_to?(method) && (title = instance.send(method)).presence
+                  return title
+                end
+              end
+              return nil
+            end
           end
 
           def action_name

data/lib/para/seo_tools/skeleton.rb

@@ -54,8 +54,13 @@ module Para
         end
       end
 
+      # Handle Rails 4 and 5
       def self.migrating?
-        ActiveRecord::Migrator.needs_migration?
+        if ActiveRecord::Migrator.respond_to?(:needs_migration?)
+          ActiveRecord::Migrator.needs_migration?
+        else
+          ActiveRecord::Base.connection.migration_context.needs_migration?
+        end
       end
 
       def self.destroy_deleted_pages!

data/lib/para/seo_tools/skeleton/page_builder.rb

@@ -5,7 +5,6 @@ module Para
 
       class PageBuilder
         include Rails.application.routes.url_helpers
-        include Para::SeoTools::Helpers::DefaultDataMethodsHelper
 
         attr_reader :name, :resource, :locale, :defaults, :config
 
@@ -61,7 +60,7 @@ module Para
             page.locale = locale
 
             # Do not override meta tags if already present
-            page.defaults = process_defaults
+            page.defaults = defaults
             page.config = config
           end
         end
@@ -76,15 +75,6 @@ module Para
           end
         end
 
-        def process_defaults
-          return {} if defaults == false
-
-          defaults[:title] ||= default_title_for(resource)
-          defaults[:description] ||= default_description_for(resource)
-
-          defaults
-        end
-
         def self.model_for(page)
           models[unique_identifier_for(page)] ||= ::Para::SeoTools::Page.new(
             identifier: page.identifier

data/lib/para/seo_tools/version.rb

@@ -1,5 +1,5 @@
 module Para
   module SeoTools
-    VERSION = "0.5.0"
+    VERSION = "0.5.1"
   end
 end

data/lib/tasks/para_seo_tools_tasks.rake

@@ -3,7 +3,6 @@ namespace :para do
     namespace :skeleton do
       desc "Builds or refreshes the app skeleton."
       task build: :environment do
-        puts "  * Build app skeleton ..."
         Para::SeoTools::Skeleton.build(load_skeleton: true)
       end
     end
@@ -11,9 +10,6 @@ namespace :para do
     namespace :sitemap do
       desc "Generates a new sitemap."
       task generate: :environment do
-        Rake.application.invoke_task('para:seo_tools:skeleton:build')
-
-        puts "  * Generate sitemap ..."
         Para::SeoTools::Sitemap.generate!
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: para-seo_tools
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Valentin Ballestrino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-21 00:00:00.000000000 Z
+date: 2018-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -125,7 +125,6 @@ files:
 - lib/para/seo_tools/controller.rb
 - lib/para/seo_tools/engine.rb
 - lib/para/seo_tools/helpers.rb
-- lib/para/seo_tools/helpers/default_data_methods_helper.rb
 - lib/para/seo_tools/helpers/page_helper.rb
 - lib/para/seo_tools/helpers/view_helper.rb
 - lib/para/seo_tools/meta_tags.rb
@@ -176,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: SEO tools for the Para CMS

data/lib/para/seo_tools/helpers/default_data_methods_helper.rb

@@ -1,31 +0,0 @@
-module Para
-  module SeoTools
-    module Helpers
-      module DefaultDataMethodsHelper
-        def default_title_for(resource)
-          default_data_from_method_for(:title, resource)
-        end
-
-        def default_description_for(resource)
-          default_data_from_method_for(:description, resource)
-        end
-
-        def default_image_for(resource)
-          default_data_from_method_for(:image, resource)
-        end
-
-        # Try all default methods on resource
-        def default_data_from_method_for(method, resource)
-          return unless resource
-
-          Para::SeoTools.send(:"#{ method }_methods").each do |method|
-            data = resource.try(method)
-            return data if data.present?
-          end
-          # Avoid returning the methods enumerable returned by the #each call
-          nil
-        end
-      end
-    end
-  end
-end