wovnrb 3.5.0 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13d349b3045beb3370a29aca8ebe22f93fdcdeb143a7fefe0f4ecb031b8ffda9
-  data.tar.gz: da704d4f640423bc7a5c85151d3e531e95d564949812a032a925326b3a278219
+  metadata.gz: 29bd88528d91b54ec9a05a04618c94466ecc514b32964c6a771a4a8b3f2e5578
+  data.tar.gz: aa3c23a353b77ccb3abc93036e88b42f4794d1ea983af8b6b36a0287f2665c6a
 SHA512:
-  metadata.gz: de57bbecbd55635636928d9de85a7e3e196098476684cdac3cc1f6f399434543dfd7cc7afa0cb947676cd9403c37d9122d82fa1c60dd20a304cf4cb3e5481ad4
-  data.tar.gz: aa54a84bb9b8a4d42126283ba7ca17c00214c6daf745132c1f7a4c4b50407772e8b6c8bd141f483e8d1b95b02ba3181e047a6ee51b0898daec75b688ed32881a
+  metadata.gz: 391f38b423bc709f052a33515452a04202c507060d7fb24fe202d3eb7788fb646a114b5258065f896bbd540d4e3187ccc29510f1b6b0744ceea45f6372e8b533
+  data.tar.gz: 43175960da9790a1ced786d357469f2c590b530add67b4e8a938deacbf9be45b70f917c1ef26279432e6dbb9ad7b99cc889aa07ebe5ece177e7c30bc1677727f

data/README.en.md

@@ -74,19 +74,22 @@ After completing setup, start the Ruby Application, and make sure the WOVN.io li
 
 The following is a list of the WOVN.io Ruby Library's valid parameters.
 
-Parameter Name        | Required | Default Setting
-----------------------| -------- | ----------------
-project_token         | yes      | ''
-default_lang          | yes      | 'ja'
-supported_langs       | yes      | ['ja', 'en']
-url_pattern           | yes      | 'path'
-lang_param_name       |          | 'wovn'
-query                 |          | []
-ignore_class          |          | []
-translate_fragment    |          | true
-ignore_paths          |          | []
-install_middleware    |          | true
-compress_api_requests |          | true
+Parameter Name                 | Required | Default Setting
+-------------------------------| -------- | ----------------
+project_token                  | yes      | ''
+default_lang                   | yes      | 'ja'
+supported_langs                | yes      | ['ja', 'en']
+url_pattern                    | yes      | 'path'
+lang_param_name                |          | 'wovn'
+query                          |          | []
+ignore_class                   |          | []
+translate_fragment             |          | true
+ignore_paths                   |          | []
+install_middleware             |          | true
+compress_api_requests          |          | true
+api_timeout_seconds            |          | 1.0
+api_timeout_search_engine_bots |          | 5.0
+translate_canonical_tag        |          | true
 
 ### 2.1. project_token
 
@@ -201,3 +204,17 @@ WOVN.rb needs to be added after any compression middleware.
 ### 2.11 compress_api_requests
 
 By default, requests to the translation API will be sent with gzip compression. Set to false to disable compression.
+
+### 2.12 api_timeout_seconds
+Configures the amount of time in seconds wovnrb will wait for the translation API for a response before the 
+request is considered timed-out. This setting defaults to `1.0`.
+
+### 2.13 api_timeout_search_engine_bots
+Similar to `api_timeout_seconds`, this timeout setting is applied when handling requests made by search engine bots.
+Currently, bots from Google, Yahoo, Bing, Yandex, DuckDuckGo and Baidu are supported. This setting
+defaults to `5.0`.
+
+### 2.14 translate_canonical_tag
+Configures if wovnrb should automatically translate existing canonical tag in the HTML. When set to `true`, wovnrb
+will translate the canonical URL with the current language code according to your `url_pattern` setting.
+This setting defaults to `true`.

data/build.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+set -eux
+
+TAG=$1
+cd $(dirname $0)
+docker build -t "${TAG}" -f docker/rails/Dockerfile.ECS .
+cd -

data/docker/nginx/Dockerfile

@@ -0,0 +1,18 @@
+FROM nginx:stable
+
+WORKDIR /var/tmp/nginx
+
+ADD wovnrb.conf .
+ADD scripts/startup.sh .
+ADD scripts/configure_sshd.sh .
+
+RUN apt-get update --allow-releaseinfo-change \
+    && apt install --no-install-recommends -y \
+      vim \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+# Setup sshd
+RUN ./configure_sshd.sh
+
+CMD ["/var/tmp/nginx/startup.sh"]

data/docker/nginx/README.md

@@ -0,0 +1,13 @@
+Update `nginx/{ENV_ID}/config`.
+And build new image.
+
+
+## How to Build
+
+*Notice*
+You need aws credentials `wovn-code-pipeline` for building image.
+If you need it, please contact to Infrastructure Team.
+
+```
+./build.sh
+```

data/docker/nginx/build.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+set -eux
+
+TAG="${1}"
+cd $(dirname $0)
+docker build -t ${TAG} .
+
+cd -

data/docker/nginx/scripts/configure_sshd.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+set -eu
+
+# Install openssh-server
+apt-get update --allow-releaseinfo-change \
+ && apt install --no-install-recommends -y \
+    openssh-server \
+ && apt-get clean \
+ && rm -rf /var/lib/apt/lists/*
+
+# Update sshd_config
+echo -e "Port 22\n" >> /etc/ssh/sshd_config
+echo -e "AllowUsers ec2-user\n" >> /etc/ssh/sshd_config
+echo -e "AuthorizedKeysFile .ssh/authorized_keys .ssh/authorized_keys2 /etc/authorized_keys/%u\n" >> /etc/ssh/sshd_config
+mkdir /etc/authorized_keys
+
+# Setup user and authorized_keys
+useradd -m -d /home/ec2-user -s /bin/bash ec2-user
+echo "ec2-user:$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 64 | head -n 1)" | chpasswd
+echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCp1wkFbEfS2CuUwSMJy5zx3SenZF6WOL0o60ngHYJ0bHWEe7e7KCdwkyKkgF8A57in2faI+nKO0ScnAYcuwEy5BJNh6789TEdNtC4mpKr7A5x0MEkAdWyjjQu/upsaDASSEmJO8dFV/xu/IEUticxA960Rz2ncOPRHFubnbFkCOUg2vy8dfZybx1d9bZWEdDrcnPFjhhxeti+Cq/OdwtTlteffUKhi7qcDKHZEGi3zHzrvXiSwKJHgyMdUNf/PzIV+9Z0G0XwrnZ/q6WQNESNaEra7Iwvl921hzlxP8RKDCaxsryAHR67BCJjqhok7qtnujQYWMNc40z1ewC0o+oat" > /etc/authorized_keys/ec2-user
+
+# Add ec2-user to wheel group
+groupadd -g 999 wheel
+sed -i -e 's/wheel:x:999:/wheel:x:999:root,ec2-user/g' /etc/group
+sed -i -e 's/^# auth       required   pam_wheel.so/auth sufficient pam_wheel.so trust/g' /etc/pam.d/su

data/docker/nginx/scripts/startup.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+set -e
+
+# Add port for sshd
+echo "Port 40022" >> /etc/ssh/sshd_config
+service ssh restart
+
+cp -a /var/tmp/nginx/wovnrb.conf /etc/nginx/conf.d/
+
+nginx -g 'daemon off;'

data/docker/nginx/wovnrb.conf

@@ -0,0 +1,19 @@
+map $http_user_agent $check_ua {
+  ~ELB-HealthChecker/ 0;
+  default 1;
+}
+
+server {
+  listen 80 default_server;
+  server_name wovn.io;
+
+  location / {
+    proxy_pass http://localhost:4000;
+    proxy_http_version 1.1;
+    proxy_set_header Upgrade $http_upgrade;
+    proxy_set_header Connection 'upgrade';
+    proxy_set_header Host $host;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+    proxy_cache_bypass $http_upgrade;
+  }
+}

data/docker/rails/Dockerfile

@@ -3,4 +3,13 @@ FROM ruby:2.6.5
 WORKDIR /usr/src/app
 
 COPY ./TestSite/ .
+
+RUN gem update --system
+RUN gem uninstall bundler && rm /usr/local/bin/bundle && rm /usr/local/bin/bundler
+RUN gem install bundler:2.1.4
+RUN apt update && apt install npm -y
+RUN npm install --global yarn
+RUN yarn install --check-files
+RUN bundle install
+
 CMD ["/bin/bash", "start.sh"]

data/docker/rails/Dockerfile.ECS

@@ -0,0 +1,17 @@
+FROM ruby:2.6.5
+
+WORKDIR /usr/src/app
+
+COPY docker/rails/TestSite .
+COPY lib ./wovnrb/lib
+COPY Gemfile ./wovnrb/
+COPY wovnrb.gemspec ./wovnrb/
+
+RUN gem update --system && gem uninstall bundler && \
+    rm /usr/local/bin/bundle && rm /usr/local/bin/bundler
+RUN gem install bundler:2.1.4 && bundle install
+RUN apt update -y && apt install npm -y && apt-get install openssh-server -y && apt-get install vim -y
+RUN npm install --global yarn
+RUN yarn install --check-files
+
+CMD ["/bin/bash", "start_rails.sh"]

data/docker/rails/TestSite/Gemfile

@@ -52,5 +52,3 @@ end
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
-
-gem 'wovnrb', path: './wovnrb'

data/docker/rails/TestSite/app/controllers/custom_response_controller.rb

@@ -1,5 +1,5 @@
 class CustomResponseController < ApplicationController
-  skip_before_action :verify_authenticity_token2
+  skip_before_action :verify_authenticity_token
 
   def make_response
     response_args_json = params[:response]

data/docker/rails/TestSite/config/environments/development.rb

@@ -59,4 +59,6 @@ Rails.application.configure do
   # Use an evented file watcher to asynchronously detect changes in source code,
   # routes, locales, etc. This feature depends on the listen gem.
   config.file_watcher = ActiveSupport::EventedFileUpdateChecker
+
+  config.hosts << "example.com"
 end

data/docker/rails/TestSite/config/environments/production.rb

@@ -109,4 +109,6 @@ Rails.application.configure do
   # config.active_record.database_selector = { delay: 2.seconds }
   # config.active_record.database_resolver = ActiveRecord::Middleware::DatabaseSelector::Resolver
   # config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session
+
+  config.hosts << "example.com"
 end

data/docker/rails/TestSite/config/environments/test.rb

@@ -46,4 +46,6 @@ Rails.application.configure do
 
   # Raises error for missing translations.
   # config.action_view.raise_on_missing_translations = true
+
+  config.hosts << "example.com"
 end

data/docker/rails/TestSite/public/index.html

@@ -4,6 +4,6 @@
     <title>test</title>
 </head>
 <body>
-<h1>Hello WOVN.php world!</h1>
+<h1>Hello WOVN.rb world!</h1>
 </body>
 </html>

data/docker/rails/TestSite/start.sh

@@ -1,13 +1,4 @@
-cd /usr/src/app
-gem update --system
-gem uninstall bundler
-rm /usr/local/bin/bundle
-rm /usr/local/bin/bundler
-gem install bundler:2.1.4
-update --bundler
+# ./wovnrb should not be cached
+echo "gem 'wovnrb', path: './wovnrb'" >> Gemfile
 bundle install
-apt update
-apt install npm -y
-npm install --global yarn
-yarn install --check-files
 bin/rails server -b 0.0.0.0 -e development -p 4000

data/docker/rails/TestSite/start_rails.sh

@@ -0,0 +1,9 @@
+mkdir /root/.ssh
+touch /root/.ssh/authorized_keys
+echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCp1wkFbEfS2CuUwSMJy5zx3SenZF6WOL0o60ngHYJ0bHWEe7e7KCdwkyKkgF8A57in2faI+nKO0ScnAYcuwEy5BJNh6789TEdNtC4mpKr7A5x0MEkAdWyjjQu/upsaDASSEmJO8dFV/xu/IEUticxA960Rz2ncOPRHFubnbFkCOUg2vy8dfZybx1d9bZWEdDrcnPFjhhxeti+Cq/OdwtTlteffUKhi7qcDKHZEGi3zHzrvXiSwKJHgyMdUNf/PzIV+9Z0G0XwrnZ/q6WQNESNaEra7Iwvl921hzlxP8RKDCaxsryAHR67BCJjqhok7qtnujQYWMNc40z1ewC0o+oat" > /root/.ssh/authorized_keys
+echo "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK8M0XAzp2KYW6pA4dmoRmC5jpfGqotxMTUXuUVTyCBc" >> /root/.ssh/authorized_keys
+echo "AuthorizedKeysFile .ssh/authorized_keys" >> /etc/ssh/sshd_config
+echo "PermitRootLogin yes" >> /etc/ssh/sshd_config
+echo "PubkeyAuthentication yes" >> /etc/ssh/sshd_config
+service ssh start
+bin/rails server -b 0.0.0.0 -e development -p 4000

data/docker/rails/TestSite/yarn.lock

@@ -3094,9 +3094,9 @@ flush-write-stream@^1.0.0:
     readable-stream "^2.3.6"
 
 follow-redirects@^1.0.0:
-  version "1.14.0"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.0.tgz#f5d260f95c5f8c105894491feee5dc8993b402fe"
-  integrity sha512-0vRwd7RKQBTt+mgu87mtYeofLFZpTas2S9zY+jIeuLJMNvudIgF52nr19q40HOwH5RrhWIPuj9puybzSJiRrVg==
+  version "1.14.7"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.7.tgz#2004c02eb9436eee9a21446a6477debf17e81685"
+  integrity sha512-+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ==
 
 for-in@^1.0.2:
   version "1.0.2"

data/docker/scripts/jenkins/build.sh

@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+set -eux
+export AWS_PROFILE="wovn-code-staging-pipeline"
+export AWS_REGION="us-west-2"
+export ECR_HOST="257024234524.dkr.ecr.us-west-2.amazonaws.com"
+REPO_NAME_WOVNRB="wovnrb"
+REPO_NAME_NGINX="wovnrb-nginx"
+CLUSTER_NAME="wovn-library-testing"
+TASKDEF_FAMILY_NAME="wovnrb"
+ECS_SERVICE_NAME="wovnrb"
+PROJECT_DIR=$(dirname "$0")/../../..
+
+commit_hash=$(git rev-parse --short HEAD)
+image_tag="${commit_hash}"
+
+sh ${PROJECT_DIR}/build.sh "${REPO_NAME_WOVNRB}":"${image_tag}"
+sh ${PROJECT_DIR}/docker/nginx/build.sh "${REPO_NAME_NGINX}":"${image_tag}"
+
+source ${PROJECT_DIR}/docker/scripts/jenkins/tag_and_push_image.sh
+
+set +x
+$(aws ecr get-login --no-include-email --region "${AWS_REGION}" --profile "${AWS_PROFILE}")
+set -x
+
+tag_and_push_image "${AWS_REGION}" "${REPO_NAME_WOVNRB}" "${image_tag}" "staging"
+tag_and_push_image "${AWS_REGION}" "${REPO_NAME_NGINX}" "${image_tag}" "staging"
+
+sed -i "s#wovnrb:latest#"${REPO_NAME_WOVNRB}":"${image_tag}"#g" ${PROJECT_DIR}/docker/scripts/jenkins/taskdef.json
+sed -i "s#wovnrb-nginx:latest#"${REPO_NAME_NGINX}":"${image_tag}"#g" ${PROJECT_DIR}/docker/scripts/jenkins/taskdef.json
+
+cd ${PROJECT_DIR}/docker/scripts/jenkins/
+TASKDEF_REVISION=$(aws ecs register-task-definition \
+                         --profile "${AWS_PROFILE}" --region "${AWS_REGION}" \
+                         --cli-input-json file://$(pwd)/taskdef.json \
+                      | jq ."taskDefinition.revision")
+echo "${TASKDEF_REVISION}"
+
+echo "Start ECS Rolling deploy. Update ${ECS_SERVICE_NAME} by ${TASKDEF_FAMILY_NAME}:${TASKDEF_REVISION}"
+    aws ecs update-service \
+      --profile "${AWS_PROFILE}" --region "${AWS_REGION}" \
+      --cluster "${CLUSTER_NAME}" \
+      --service "${ECS_SERVICE_NAME}" \
+      --task-definition "${TASKDEF_FAMILY_NAME}:${TASKDEF_REVISION}"
+
+cd -

data/docker/scripts/jenkins/tag_and_push_image.sh

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+# Tag to docker image and push it to specified ECR
+#
+# Required environment variables:
+#  - AWS_PROFILE (AWS profile authorized for ECR login and S3 release)
+#
+# Args:
+#  - region: ECR region (e.g. us-west-1 | us-west-2 )
+#  - image-name: docker image name (e.g. equalizer-nginx)
+#  - tag: docker image tag. we use git commit hash ordinary (git rev-parse --short HEAD)
+
+tag_and_push_image() {
+  local aws_region="${1}"
+  local image_name="${2}"
+  local tag="${3}"
+  local account="${4}"
+
+  if [ ${account} == "production" ]; then
+    local ecr_host="140249473629.dkr.ecr.${aws_region}.amazonaws.com"
+  elif [ ${account} == "staging" ]; then
+    local ecr_host="257024234524.dkr.ecr.${aws_region}.amazonaws.com"
+  else
+    echo "Passed account not recognized"
+    local ecr_host=""
+  fi
+
+  docker tag ${image_name}:${tag} ${ecr_host}/${image_name}:${tag}
+  docker push ${ecr_host}/${image_name}:${tag}
+}

data/docker/scripts/jenkins/taskdef.json

@@ -0,0 +1,104 @@
+{
+  "executionRoleArn": "arn:aws:iam::257024234524:role/ecsTaskExecutionRole",
+  "containerDefinitions": [
+    {
+      "name": "wovnrb-nginx",
+      "cpu": 0,
+      "image": "257024234524.dkr.ecr.us-west-2.amazonaws.com/wovnrb-nginx:latest",
+      "mountPoints": [],
+      "ulimits": [
+        {
+          "name": "nofile",
+          "softLimit": 65535,
+          "hardLimit": 65535
+        }
+      ],
+      "logConfiguration": {
+        "logDriver": "awslogs",
+        "options": {
+          "awslogs-group": "/ecs/wovnrb",
+          "awslogs-region": "us-west-2",
+          "awslogs-stream-prefix": "ecs"
+        }
+      },
+      "essential": true,
+      "portMappings": [
+        {
+          "hostPort": 80,
+          "protocol": "tcp",
+          "containerPort": 80
+        },
+        {
+          "hostPort": 40022,
+          "protocol": "tcp",
+          "containerPort": 40022
+        }
+      ],
+      "stopTimeout": 120,
+      "dependsOn": [
+        {
+          "containerName": "wovnrb",
+          "condition": "HEALTHY"
+        }
+      ]
+    },
+    {
+      "name": "wovnrb",
+      "cpu": 0,
+      "image": "257024234524.dkr.ecr.us-west-2.amazonaws.com/wovnrb:latest",
+      "mountPoints": [],
+      "workingDirectory": "/usr/src/app",
+      "linuxParameters": {
+        "initProcessEnabled": true
+      },
+      "environment": [],
+      "ulimits": [
+        {
+          "name": "nofile",
+          "softLimit": 65535,
+          "hardLimit": 65535
+        }
+      ],
+      "logConfiguration": {
+        "logDriver": "awslogs",
+        "options": {
+          "awslogs-group": "/ecs/wovnrb",
+          "awslogs-region": "us-west-2",
+          "awslogs-stream-prefix": "ecs"
+        }
+      },
+      "portMappings": [
+        {
+          "hostPort": 4000,
+          "protocol": "tcp",
+          "containerPort": 4000
+        },
+        {
+          "hostPort": 22,
+          "protocol": "tcp",
+          "containerPort": 22
+        }
+      ],
+      "volumesFrom": [],
+      "stopTimeout": 120,
+      "healthCheck": {
+        "retries": 3,
+        "command": [
+          "CMD-SHELL",
+          "curl -f http://localhost:4000/ || exit 1"
+        ],
+        "timeout": 20,
+        "interval": 60,
+        "startPeriod": 180
+      },
+      "essential": true
+    }
+  ],
+  "placementConstraints": [],
+  "cpu": "1024",
+  "memory": "2048",
+  "requiresCompatibilities": [ "FARGATE" ],
+  "family": "wovnrb",
+  "networkMode": "awsvpc",
+  "volumes": []
+}

data/docker/scripts/jenkins/taskdef.json.bak

@@ -0,0 +1,99 @@
+{
+  "executionRoleArn": "arn:aws:iam::257024234524:role/ecsTaskExecutionRole",
+  "containerDefinitions": [
+    {
+      "name": "wovnrb-nginx",
+      "cpu": 0,
+      "image": "257024234524.dkr.ecr.us-west-2.amazonaws.com/wovnrb-nginx:latest",
+      "mountPoints": [],
+      "ulimits": [
+        {
+          "name": "nofile",
+          "softLimit": 65535,
+          "hardLimit": 65535
+        }
+      ],
+      "logConfiguration": {
+        "logDriver": "awslogs",
+        "options": {
+          "awslogs-group": "/ecs/wovnrb",
+          "awslogs-region": "us-west-2",
+          "awslogs-stream-prefix": "ecs"
+        }
+      },
+      "essential": true,
+      "portMappings": [
+        {
+          "hostPort": 80,
+          "protocol": "tcp",
+          "containerPort": 80
+        },
+        {
+          "hostPort": 40022,
+          "protocol": "tcp",
+          "containerPort": 40022
+        }
+      ],
+      "stopTimeout": 120,
+      "dependsOn": [
+        {
+          "containerName": "wovnrb",
+          "condition": "HEALTHY"
+        }
+      ]
+    },
+    {
+      "name": "wovnrb",
+      "cpu": 0,
+      "image": "257024234524.dkr.ecr.us-west-2.amazonaws.com/wovnrb:36d9648",
+      "mountPoints": [],
+      "workingDirectory": "/usr/src/app",
+      "linuxParameters": {
+        "initProcessEnabled": true
+      },
+      "environment": [],
+      "ulimits": [
+        {
+          "name": "nofile",
+          "softLimit": 65535,
+          "hardLimit": 65535
+        }
+      ],
+      "logConfiguration": {
+        "logDriver": "awslogs",
+        "options": {
+          "awslogs-group": "/ecs/wovnrb",
+          "awslogs-region": "us-west-2",
+          "awslogs-stream-prefix": "ecs"
+        }
+      },
+      "portMappings": [
+        {
+          "hostPort": 4000,
+          "protocol": "tcp",
+          "containerPort": 4000
+        }
+      ],
+      "volumesFrom": [],
+      "stopTimeout": 120,
+      "healthCheck": {
+        "retries": 3,
+        "command": [
+          "CMD-SHELL",
+          "curl -f http://localhost:4000/ || exit 1"
+        ],
+        "timeout": 20,
+        "interval": 60,
+        "startPeriod": 180
+      },
+      "essential": true
+    }
+  ],
+  "placementConstraints": [],
+  "cpu": "1024",
+  "memory": "2048",
+  "requiresCompatibilities": [ "FARGATE" ],
+  "family": "wovnrb",
+  "networkMode": "awsvpc",
+  "volumes": []
+}

data/lib/wovnrb/api_translator.rb

@@ -111,6 +111,7 @@ module Wovnrb
         'lang_code' => lang_code,
         'url_pattern' => url_pattern,
         'lang_param_name' => lang_param_name,
+        'translate_canonical_tag' => translate_canonical_tag,
         'product' => 'WOVN.rb',
         'version' => VERSION,
         'body' => body
@@ -130,7 +131,7 @@ module Wovnrb
     end
 
     def api_timeout
-      @store.settings['api_timeout_seconds']
+      @headers.search_engine_bot? ? @store.settings['api_timeout_search_engine_bots'] : @store.settings['api_timeout_seconds']
     end
 
     def settings_hash
@@ -157,6 +158,10 @@ module Wovnrb
       @store.settings['custom_lang_aliases']
     end
 
+    def translate_canonical_tag
+      @store.settings['translate_canonical_tag']
+    end
+
     def page_url
       "#{@headers.protocol}://#{@headers.url}"
     end

data/lib/wovnrb/headers.rb

@@ -56,6 +56,10 @@ module Wovnrb
       @pathname = @pathname.gsub(/\/$/, '')
     end
 
+    def url_with_scheme
+      "#{@protocol}://#{@url}"
+    end
+
     def unmasked_pathname_without_trailing_slash
       @unmasked_pathname.chomp('/')
     end
@@ -197,11 +201,24 @@ module Wovnrb
     end
 
     def dirname
-      if pathname.include?('/')
-        pathname.end_with?('/') ? pathname : pathname[0, pathname.rindex('/') + 1]
+      if pathname_with_trailing_slash_if_present.include?('/')
+        pathname_with_trailing_slash_if_present.end_with?('/') ? pathname_with_trailing_slash_if_present : pathname_with_trailing_slash_if_present[0, pathname_with_trailing_slash_if_present.rindex('/') + 1]
       else
         '/'
       end
     end
+
+    def search_engine_bot?
+      return false unless @env.key?('HTTP_USER_AGENT')
+
+      bots = %w[Googlebot/ bingbot/ YandexBot/ YandexWebmaster/ DuckDuckBot-Https/ Baiduspider/ Slurp Yahoo]
+      bots.any? { |bot| @env['HTTP_USER_AGENT'].include?(bot) }
+    end
+
+    def to_absolute_path(path)
+      absolute_path = path.blank? ? '/' : path
+      absolute_path = absolute_path.starts_with?('/') ? absolute_path : URL.join_paths(dirname, absolute_path)
+      URL.normalize_path_slash(path, absolute_path)
+    end
   end
 end