para-seo_tools 0.4.3 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e220801b91af4f208d0699b1ad222e6da70a14a
-  data.tar.gz: 038f5d4d193c3dc4cf4b28d4952075e814e2c83c
+  metadata.gz: 963b8c1e96cb711ed75e3331dc352557be853672
+  data.tar.gz: b22ecd8d54cf19e155e598eaafded1204292e664
 SHA512:
-  metadata.gz: e5eae100d8ef70eb4cf1527b523a2390f0b0c797ba4c6a311dbcb20d12a592ea2f636148cc2913a6025aeca2633da888e43f926a0576a1ef461232850e96e38a
-  data.tar.gz: 2b4f5c397b6638653c7ddc7526aed32ff9b01b723540093fbcddc49d0abcad40024d65359f07aa5764af95afc72de32a17d24663f3b64e63dcbc7aa2f36ab726
+  metadata.gz: ec6e122729a5b47932f5659c5a53e11b04360b97819efc6e93939216cab0b412b3bebd4c57aff4913cbfeb74a4c366c34198b9b8f7270fee69f51b5dbfac6bb4
+  data.tar.gz: 94f0d7408d3a93399a80e248d84d7947cb300f0cdc97f897a5a55f16b283e630f57b954e8d583ca16652ee5ac7ff3413ac1af8d94569d91a00195c6478c7820f

data/app/models/para/seo_tools/page.rb

@@ -53,6 +53,12 @@ module Para
         Arel::Nodes::SqlLiteral.new(expr.to_sql)
       end
 
+      ransacker :subdomain do |parent|
+        expr = Arel::Nodes::InfixOperation.new('->>', parent.table[:config], Arel::Nodes.build_quoted('subdomain'))
+
+        Arel::Nodes::SqlLiteral.new(expr.to_sql)
+      end
+
       def scope_attributes
         scope.each_with_object({}) do |attribute, hash|
           hash[attribute] = if self.class.column_names.include?(attribute.to_s)
@@ -84,7 +90,7 @@ module Para
           host << Para::SeoTools.host
         end
 
-        host.compact.join('.')
+        host = host.compact.join('.')
 
         [Para::SeoTools.protocol, host].join('://')
       end
@@ -112,6 +118,12 @@ module Para
         end
       end
 
+      def self.available_subdomains
+        select("DISTINCT(config->>'subdomain') AS subdomain").map do |page| 
+          page.read_attribute(:subdomain) 
+        end
+      end
+
       def method_missing(method_name, *args, &block)
         if config.key?(method_name.to_s)
           config[method_name.to_s]

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

@@ -1,25 +1,18 @@
 = search_form_for @q, builder: SimpleForm::FormBuilder, url: @component.path, html: { data: { :'filters-form' => true } } do |form|
-  - if @available_locales.length > 1
-    .row
-      .col-md-3
-        = form.input_field :locale_eq, as: :selectize, collection: @available_locales, class: 'form-control', placeholder: t('para.seo_tools.pages.choose_locale')
-
-      .col-md-7
-        .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'
-
-      .col-md-2
-        = form.submit t('para.shared.search'), class: 'btn btn-default btn-block'
-
-  - else
-    .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'
-
-      %span.input-group-btn
-        = form.submit t('para.shared.search'), class: 'btn btn-default'
+  %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/_table.html.haml

@@ -1,5 +1,6 @@
 = resources_table(model: model, component: component, actions: false) do |table|
   = table.header do
+    = table.header_for(:subdomain, sort: :subdomain) if Para::SeoTools.handle_subdomain
     = table.header_for(:path)
     = table.header_for(:title)
     = table.header_for(:description)
@@ -7,6 +8,7 @@
     %th
 
   = table.rows(resources) do |resource|
+    = table.data_for(resource.subdomain) if Para::SeoTools.handle_subdomain
     = table.data_for(resource, :path)
     = table.data_for(resource.meta_tag(:title))
     = table.data_for(resource.meta_tag(:description))

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

@@ -8,6 +8,7 @@ fr:
         refresh_skeleton: "Mettre à jour"
         ping_search_engines: "Envoyer le sitemap aux moteurs de recherche"
         choose_locale: "Choisissez une langue"
+        subdomain: Sous-domaine
 
     jobs:
       para/seo_tools/skeleton/job:
@@ -33,4 +34,5 @@ fr:
         image: "Image pour le partage sur les réseaux sociaux"
         canonical: "URL canonique"
         locale: "Langue"
+        subdomain: "Sous-domaine"
 

data/db/migrate/20150601085253_create_seo_tools_pages.rb

@@ -3,7 +3,7 @@ class CreateSeoToolsPages < ActiveRecord::Migration
     create_table :seo_tools_pages do |t|
       t.string :identifier
       t.string :path
-      t.references :meta_tags_list, index: true, foreign_key: true
+      t.references :meta_tags_list, index: true
 
       t.timestamps null: false
     end

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

@@ -5,6 +5,12 @@ Para::SeoTools.configure do |config|
   #
   # config.host = ENV['APP_DOMAIN']
 
+  # Set a regexp to filter path from skeleton
+  #
+  # Defaults to '.*', matching all path
+  #
+  # config.sitemap_path_regexp = '.*'
+
   # Default title methods to be checked for title
   #
   # config.title_methods = %w(title name)

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

@@ -18,7 +18,7 @@ module Para
 
         def current_seo_tools_page
           RequestStore.store['para.seo_tools.current_seo_tools_page'] ||=
-            seo_tools_page_for({ path: request.path }.merge(seo_tools_scope_for(request)))
+            seo_tools_page_for({ path: request.path }.reverse_merge(seo_tools_scope_for(request)))
         end
 
         # Retrieve the first page that matches the given scope conditions
@@ -48,7 +48,7 @@ module Para
 
           return Para::SeoTools::Page.none unless source_page
 
-          scope_hash = scope_hash.merge(seo_tools_scope_for(request))
+          scope_hash = scope_hash.reverse_merge(seo_tools_scope_for(request))
           source_page.siblings.scope_with(scope_hash)
         end
 

data/lib/para/seo_tools/sitemap.rb

@@ -10,7 +10,7 @@ module Para
         prepare
 
         SitemapGenerator::Sitemap.create do
-          Para::SeoTools::Page.find_each do |page|
+          Para::SeoTools::Page.where('path ~* ?', Para::SeoTools.sitemap_path_regexp).find_each do |page|
             add page.path, host: page.host
           end
         end

data/lib/para/seo_tools/version.rb

@@ -1,5 +1,5 @@
 module Para
   module SeoTools
-    VERSION = "0.4.3"
+    VERSION = "0.4.6"
   end
 end

data/lib/para/seo_tools.rb

@@ -52,6 +52,9 @@ module Para
     mattr_accessor :sitemaps_path
     @@sitemaps_path = 'system/'
 
+    mattr_accessor :sitemap_path_regexp
+    @@sitemap_path_regexp = '.*'
+
     def self.configure
       block_given? ? yield(self) : self
     end

data/para-seo_tools.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'rails', '>= 4.0', '< 5.0'
+  spec.add_dependency 'rails', '>= 4.0', '< 6.0'
   spec.add_dependency 'sitemap_generator'
   spec.add_dependency 'request_store'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: para-seo_tools
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.6
 platform: ruby
 authors:
 - Valentin Ballestrino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-07 00:00:00.000000000 Z
+date: 2017-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,7 +19,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: sitemap_generator
   requirement: !ruby/object:Gem::Requirement
@@ -89,8 +89,7 @@ dependencies:
 description: SEO tools for the Para CMS
 email:
 - vala@glyph.fr
-executables:
-- rails
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -114,7 +113,6 @@ files:
 - app/views/admin/para/seo_tools/pages/_form.html.haml
 - app/views/admin/para/seo_tools/pages/_table.html.haml
 - app/views/admin/para/seo_tools/skeleton_resources/index.html.haml
-- bin/rails
 - config/locales/para-seo_tools.fr.yml
 - db/migrate/20150601085253_create_seo_tools_pages.rb
 - db/migrate/20160610094032_add_meta_tags_to_seo_tools_pages.rb
@@ -177,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.7
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: SEO tools for the Para CMS

data/bin/rails

@@ -1,12 +0,0 @@
-#!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails 4 gems installed from the root of your application.
-
-ENGINE_ROOT = File.expand_path('../..', __FILE__)
-ENGINE_PATH = File.expand_path('../../lib/para/seo_tools/engine', __FILE__)
-
-# Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
-
-require 'rails/all'
-require 'rails/engine/commands'