sape 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32375f833f6695fe42316ad9bc8588222d986294
-  data.tar.gz: e9d69ad7470915fa431ebbea8d95d7b0aff464ed
+  metadata.gz: 7c2e3d6a413fd885c2e7b07e3586b12e766f6d09
+  data.tar.gz: d56a3e37b0c91600f3b6809a71a349657d213671
 SHA512:
-  metadata.gz: 2e5eed516e19f9938677740bd824ceee03102d89657aa800010de39cff0f3642cec623c3a5d5642ab2b5a6d74bd8a6c9be29fb82aa3a3ab43578178515877b1e
-  data.tar.gz: 3441f604c712fe027455d1b2e211286cb61c8041e0da30342ab4e335811aa8c5448d175e8ab44faaaa33f22eb058404323c50c53a832ecc33781f986997e506e
+  metadata.gz: ea0e5439ff1fdff78682c156d36b9e277359424bb7e84169ec98c2f8a6ef735c872b7b555643b2da6c447766f4492f465be400d9cae5f788f6b4ba9fc4b891a6
+  data.tar.gz: 74463b54fb74fa34083dd17fdfb381ba6cbdc56c59582bd1371d29b18b29f271232311457d3bb32cb5abe2dbe2f44e4e481c30847a7ab32a0840acf18d3ecce9

data/lib/app/helpers/sape_helper.rb

@@ -2,8 +2,8 @@ module SapeHelper
   def sape_links_block(site_host = request.host)
     request.original_fullpath.chomp!("/") if request.original_fullpath.last == "/" && request.original_fullpath != '/'
     options = { links: SapeLink.where(page: request.original_fullpath, link_type: "simple", site_host: site_host) }
-    if SapeConfig.bot_ips.include?(request.remote_addr)
-      options.merge!(check_code: SapeConfig.check_code)
+    if SapeConfig.bot_ips(site_host).include?(request.remote_addr)
+      options.merge!(check_code: SapeConfig.check_code(site_host))
     end
 
     render template: 'sape/links', locals: options
@@ -15,9 +15,9 @@ module SapeHelper
     request.original_fullpath.chomp!("/") if request.original_fullpath.last == "/" && request.original_fullpath != '/'
     links = SapeLink.where(page: request.original_fullpath, link_type: "simple", site_host: site_host).
              pluck(:raw_link).
-             join(SapeConfig.delimiter)
+             join(SapeConfig.delimiter(site_host))
 
-    (SapeConfig.bot_ips.include?(request.remote_addr) ? (links + SapeConfig.check_code) : links).html_safe
+    (SapeConfig.bot_ips(site_host).include?(request.remote_addr) ? (links + SapeConfig.check_code(site_host)) : links).html_safe
   rescue Exception => e
     "<!-- ERROR: #{e.message} -->".html_safe
   end
@@ -28,8 +28,8 @@ module SapeHelper
       text.sub!(link.anchor, link.raw_link)
     end
 
-    if SapeConfig.bot_ips.include?(request.remote_addr)
-      "<sape_index>" + text + "</sape_index>" + SapeConfig.check_code
+    if SapeConfig.bot_ips(site_host).include?(request.remote_addr)
+      "<sape_index>" + text + "</sape_index>" + SapeConfig.check_code(site_host)
     else
       text
     end.html_safe

data/lib/app/models/sape_config.rb

@@ -1,15 +1,15 @@
 class SapeConfig < ActiveRecord::Base
   class << self
-    def bot_ips
-      where(name: 'ip', site_host: request.host).pluck(:value)
+    def bot_ips(site_host)
+      where(name: 'ip', site_host: site_host.host).pluck(:value)
     end
 
-    def check_code
-      where(name: 'sape_new_url', site_host: request.host).first.try(:value) || " "
+    def check_code(site_host)
+      where(name: 'sape_new_url', site_host: site_host).first.try(:value) || " "
     end
 
-    def delimiter
-      where(name: 'sape_delimiter', site_host: request.host).first.try(:value) || " "
+    def delimiter(site_host)
+      where(name: 'sape_delimiter', site_host: site_host).first.try(:value) || " "
     end
   end
 end

data/lib/sape/version.rb

@@ -1,3 +1,3 @@
 module Sape
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sape
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Pavel Rodionov