Merge branch 'blazer' into panel.sutty.nl

app/jobs/uri_collection_job.rb

@@ -58,12 +58,20 @@ class UriCollectionJob < PeriodicJob
       # Acumular por mes y año
       reduce_rollup('host', beginning, **dimensions)
 
-      # Obtener orígenes de visitas por host
-      AccessLog.where(host: host).distinct(:http_referer).pluck(:http_referer).each do |http_referer|
-        dimensions[:http_referer] = http_referer
+      columns = %i[http_referer geoip2_data_country_name]
+      columns.each do |column|
+        # Obtener orígenes de visitas por host
+        AccessLog.where(host: host).distinct(column).pluck(column).each do |value|
+          dimensions.delete_if do |k, _|
+            columns.include? k
+          end
 
-        rollup('host|referer', beginning, **dimensions)
-        reduce_rollup('host|referer', beginning, **dimensions)
+          name = "host|#{column}"
+          dimensions[column] = value
+
+          rollup(name, beginning, **dimensions)
+          reduce_rollup(name, beginning, **dimensions)
+        end
       end
     end
 
@@ -115,11 +123,17 @@ class UriCollectionJob < PeriodicJob
     STAT_NAME
   end
 
+  # Obtiene todas las ubicaciones de archivos
+  #
   # @return [String]
   #
   # TODO: Cambiar al mergear origin-referer
-  def destination
-    @destination ||= site.deploys.find_by(type: 'DeployLocal').destination
+  def destinations
+    @destinations ||= site.deploys.map(&:destination).select do |d|
+      File.directory?(d)
+    end.map do |d|
+      File.realpath(d)
+    end.uniq
   end
 
   # Recolecta todas las URIs menos imágenes
@@ -127,14 +141,16 @@ class UriCollectionJob < PeriodicJob
   # @return [Array]
   def uris
     @uris ||=
-      locales.map do |locale|
-        uri = "/#{locale}/".squeeze('/')
-        dir = File.join(destination, locale)
+      destinations.map do |destination|
+        locales.map do |locale|
+          uri = "/#{locale}/".squeeze('/')
+          dir = File.join(destination, locale)
 
-        files(dir).map do |f|
-          uri + f
+          files(dir).map do |f|
+            uri + f
+          end
         end
-      end.flatten(2)
+      end.flatten(3)
   end
 
   # @return [Array]