para-seo_tools 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 221bb39c998483d4271625e92a0ae8a99e60892d
-  data.tar.gz: 1f98d09e9135f026442dbda3f64dfeb300c1abf8
+  metadata.gz: a34f864ccd5b3365f87eff521544ce23fe555c6a
+  data.tar.gz: 98b4747257ce0acd81643e9c0b101e9706fbadb5
 SHA512:
-  metadata.gz: 28d2a040ebdc391c3ae165489e2aa190560b43a84fa200bf689d6e1bcd511639762b7d59eb117828d0b5addfe6f06f355d01f07cc664353d1d336432d8ea14f0
-  data.tar.gz: 375e465165815264dc4b89a61afdc6097e7a6ba7941ff5173bf088f4e189b62f324cc38ae0f13712004b7d1d405b73529320fbb12570b21c7a602dcdffbeca6d
+  metadata.gz: bf073b75a0b537fef122a1cec5614505b1e6e0ca0288f417a917bf68ffe015fd663de442fcde4fdda9d7de28791524e8be8acea01a5f9e0b098f318a5a9a9883
+  data.tar.gz: 6660839f153d03a48b1957aef6dc1118e8456957d3fc00e8fb729ad015ac921074eaa7c0633fdb6bd9bdd78505e39f5994dec455033bfe38e554150aad3683f3

data/.gitignore

@@ -12,3 +12,4 @@
 *.o
 *.a
 mkmf.log
+*.gem

data/app/components/seo_tools_skeleton_component.rb

@@ -4,4 +4,8 @@ class SeoToolsSkeletonComponent < Para::Component::Crud
   def model_type
     '::Para::SeoTools::Page'
   end
+
+  def controller
+    :skeleton_resources
+  end
 end

data/app/controllers/{admin/para/seo_tools → para/seo_tools/admin}/skeleton_resources_controller.rb

@@ -1,6 +1,6 @@
-module Admin
-  module Para
-    module SeoTools
+module Para
+  module SeoTools
+    module Admin
       class SkeletonResourcesController < ::Para::Admin::CrudResourcesController
         def index
           super

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

@@ -7,7 +7,11 @@ module Para
       validates_attachment :image, content_type: { content_type: /\Aimage\/.*\Z/ }
 
       def meta_tag(name)
-        process(name, send(name)).presence || default(name)
+        if (value = send(name).presence) && (meta = process(name, value)).present?
+          return meta
+        end
+
+        default(name)
       end
 
       def defaults

data/lib/para/seo_tools/engine.rb

@@ -16,12 +16,6 @@ module Para
           include Para::SeoTools::ViewHelpers
         end
       end
-
-      rake_tasks do
-        Dir[File.expand_path('../../tasks/**/*.rake', __FILE__)].each do |path|
-          load(path)
-        end
-      end
     end
   end
 end

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

@@ -13,8 +13,11 @@ module Para
             if url.start_with?('http://')
               url
             else
-              request = RequestStore.store[:'para.seo_tools.request']
-              URI.join(request.url, url).to_s
+              if (request = RequestStore.store[:'para.seo_tools.request'])
+                URI.join(request.url, url).to_s
+              else
+                url
+              end
             end
           end
 

data/lib/para/seo_tools/routes.rb

@@ -3,7 +3,7 @@ module Para
     class Routes < Para::Plugins::Routes
       def draw
         plugin :seo_tools do
-          crud_component :skeleton, scope: ':model' do
+          crud_component :seo_tools_skeleton, scope: ':model', controller: :skeleton_resources do
             collection do
               get :refresh
             end

data/lib/para/seo_tools/sitemap.rb

@@ -2,9 +2,9 @@ module Para
   module SeoTools
     class Sitemap
       def self.build
-        ::Sitemap::Generator.instance.load :host => Para::SeoTools.host do
-          Para::SeoTools::Skeleton.site.pages.each do |page|
-            literal page.path, page.sitemap_options
+        ::Sitemap::Generator.instance.load host: Para::SeoTools.host do
+          Para::SeoTools::Page.find_each do |page|
+            literal page.path
           end
         end
       end

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

@@ -3,15 +3,53 @@ module Para
     module Skeleton
       class Site
         include Rails.application.routes.url_helpers
+        attr_reader :enable_logging
+
+        def initialize(options = {})
+          @enable_logging = options[:enable_logging]
+        end
 
         def page(name, options = {} , &block)
-          page = Skeleton::Page.new(name, options)
-          pages << page
+          Skeleton::Page.new(name, options).tap do |page|
+            pages << page
+            save if pages.length == max_pages_before_save
+          end
         end
 
         def pages
           @pages ||= []
         end
+
+        def save
+          log "   * Saving #{ pages.length } generated pages ..."
+
+          ActiveRecord::Base.transaction do
+            pages.each do |page|
+              page.model.save!
+              saved_pages_ids << page.model.id
+            end
+          end
+
+          pages.clear
+        end
+
+        def saved_pages_ids
+          @saved_pages_ids ||= []
+        end
+
+        # Log messages when you're not in rails
+        #
+        def log(message)
+          Rails.logger.info(message) if enable_logging || !$0.end_with?('rails')
+        end
+
+        def max_pages_before_save
+          @max_pages_before_save ||= if (param = ENV['SEO_TOOLS_MAX_PAGES_BEFORE_SAVE']).present?
+            para.to_i
+          else
+            500
+          end
+        end
       end
     end
   end

data/lib/para/seo_tools/skeleton.rb

@@ -36,19 +36,13 @@ module Para
 
         log "   * Building app skeleton pages ..."
 
-        self.site = Skeleton::Site.new
+        self.site = Skeleton::Site.new(enable_logging: enable_logging)
         # Evaluate the configuration block
         site.instance_exec(&config)
 
-        # Save all the pages to database
+        # Save remaining pages and remove old pages
         ActiveRecord::Base.transaction do
-          log "   * Saving generated pages ..."
-
-          site.pages.each do |page|
-            page.model.save!
-          end
-
-          log "   * Destroying old pages ..."
+          site.save
 
           # Delete pages not in skeleton
           destroy_deleted_pages!
@@ -60,13 +54,9 @@ module Para
       end
 
       def self.destroy_deleted_pages!
-        identifiers = site.pages.map(&:identifier)
-        pages = Para::SeoTools::Page.where.not(identifier: identifiers)
-
-        if (count = pages.count) > 0
-          log "Destroying #{ count } removed pages from Skeleton"
-          pages.destroy_all
-        end
+        pages = Para::SeoTools::Page.where.not(id: site.saved_pages_ids)
+        log "   * Destroying old pages ..."
+        pages.delete_all
       end
 
       # Log messages when you're not in rails

data/lib/para/seo_tools/version.rb

@@ -1,5 +1,5 @@
 module Para
   module SeoTools
-    VERSION = "0.2.1"
+    VERSION = "0.3.0"
   end
 end

data/lib/para/seo_tools.rb

@@ -17,7 +17,7 @@ module Para
     autoload :MetaTaggableMacro
     autoload :ViewHelpers
 
-    mattr_accessor :host
+    mattr_writer :host
     @@host = ENV['APP_DOMAIN']
 
     mattr_accessor :title_methods
@@ -39,5 +39,9 @@ module Para
     def self.table_name_prefix
       'seo_tools_'
     end
+
+    def self.host
+      @@host.presence && @@host.match(/[^:]+/)[0]
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: para-seo_tools
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Valentin Ballestrino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-14 00:00:00.000000000 Z
+date: 2016-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -102,7 +102,7 @@ files:
 - app/.DS_Store
 - app/components/seo_tools_skeleton_component.rb
 - app/controllers/.DS_Store
-- app/controllers/admin/para/seo_tools/skeleton_resources_controller.rb
+- app/controllers/para/seo_tools/admin/skeleton_resources_controller.rb
 - app/decorators/seo_tools_skeleton_component_decorator.rb
 - app/helpers/para/seo_tools/admin/fields_helper.rb
 - app/models/para/seo_tools/page.rb