station 0.0.96 → 0.0.103

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a6afa3f7d7c40dc3822c7a5fab7c29a04ebb8f681055a4718a453fd0eea5ee5
-  data.tar.gz: 7b46e9ddd4841aae9a87637a2686757d71fb0c07ed2d3c502803785ac4702d8a
+  metadata.gz: 83274e9df9e58a2f14ad94ec74c5de0e94d0742d4d4766c816b16d380c2004fd
+  data.tar.gz: c190e452b0a4d33f4398233e970c1c014831683e973883ad16e4cc6454a7d74e
 SHA512:
-  metadata.gz: 5f20dba8010c8b024bcec15521b467a54635b4b3966182b29c995581db099fc70b448b439b8f1330df30886a16466e3711ff86e2db294f6b0b7257d7b7811f9e
-  data.tar.gz: c4b374a0246a0f932586e2d61ba1fc0c45c50427d04a76d7e9d4b10efc81454cdafb9f0eb90860f7b2e0fff196416d19bb7c72f66352102ef95c26f0d8e00202
+  metadata.gz: 6595905dc9ef4194076d6e83e53bd6eb61ca1ed6d9dda1631c83681cc76803c2b85753a4612974995da1fb33cc3b6d9051567aefddd90381f7f7c8b9cbc0467b
+  data.tar.gz: 65bc330edcbd32286fcc85ab8614ced827418852380aa21a44b0286f8b565db310ca9feb72f1b525297f56e38c731f56ee3f12a3e65f581a73e9749f49d5194d

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.5.8-alpine AS build-env
+FROM ruby:2.7.2-alpine AS build-env
 ARG RAILS_ROOT=/station
 ARG BUILD_PACKAGES="build-base curl-dev git"
 ARG DEV_PACKAGES="postgresql-dev yaml-dev zlib-dev nodejs yarn"
@@ -19,11 +19,12 @@ COPY lib/nexmo_developer/Gemfile* package.json yarn.lock $RAILS_ROOT/
 RUN bundle config --global frozen 1 \
     && gem update --system \
     && gem install bundler
+
 RUN bundle install --without development:test:assets -j4 --retry 3 --path=vendor/bundle \
     # Remove unneeded files (cached *.gem, *.o, *.c)
-    && rm -rf vendor/bundle/ruby/2.5.0/cache/*.gem \
-    && find vendor/bundle/ruby/2.5.0/gems/ -name "*.c" -delete \
-    && find vendor/bundle/ruby/2.5.0/gems/ -name "*.o" -delete
+    && rm -rf vendor/bundle/ruby/2.7.0/cache/*.gem \
+    && find vendor/bundle/ruby/2.7.0/gems/ -name "*.c" -delete \
+    && find vendor/bundle/ruby/2.7.0/gems/ -name "*.o" -delete
 
 # Install node dependencies
 RUN yarn install --frozen-lockfile
@@ -36,7 +37,7 @@ RUN bundle exec rake assets:precompile
 RUN rm -rf node_modules tmp/cache vendor/assets spec
 
 ################ Build step done ###############
-FROM ruby:2.5.8-alpine
+FROM ruby:2.7.2-alpine
 ARG RAILS_ROOT=/station
 
 ENV RACK_ENV production

data/Gemfile

@@ -1,2 +1,2 @@
 source 'https://rubygems.org'
-ruby '2.5.8'
+ruby '2.7.2'

data/Gemfile.lock

@@ -8,7 +8,7 @@ PLATFORMS
 DEPENDENCIES
 
 RUBY VERSION
-   ruby 2.5.8p224
+   ruby 2.7.2p137
 
 BUNDLED WITH
    2.1.4

data/bin/nexmo-developer

@@ -44,50 +44,7 @@ end.parse!
 $LOAD_PATH.unshift(File.expand_path('../lib/nexmo_developer', __dir__))
 APP_PATH = File.expand_path('../lib/nexmo_developer/config/application', __dir__)
 
-require 'rails/all'
-require 'activeadmin'
-require 'bootsnap'
-require 'bugsnag'
-require 'devise'
-require 'geocoder'
-require 'gravatar_image_tag'
-require 'greenhouse_io'
-require 'recaptcha'
-require 'split/dashboard'
-require 'listen'
-require 'inherited_resources'
-require 'msgpack'
-require 'pg'
-require 'coffee-rails'
-require 'octokit'
-require 'webpacker'
-require 'clipboard/rails'
-require 'gmaps4rails'
-require 'nexmo_markdown_renderer'
-require 'truncato'
-require 'puma'
-require 'barnes'
-require 'woothee'
-require 'algoliasearch'
-require 'rest-client'
-require 'chartkick'
-require 'groupdate'
-require 'terminal-table'
-require 'lograge'
-require 'jbuilder'
-require 'nokogiri'
-require 'colorize'
-require 'neatjson'
-require 'slack-notifier'
-require 'autoprefixer-rails'
-require 'titleize'
-require 'countries'
-require 'country_select'
-require 'smartling'
-require 'newrelic_rpm'
-require 'redis'
-require 'rake'
-
+require_relative '../lib/nexmo_developer/nexmo_developer'
 require 'config/application'
 require 'rails/command'
 

data/lib/nexmo_developer/.rubocop.yml

@@ -271,3 +271,6 @@ Rails/SquishedSQLHeredocs:
 
 Rails/WhereNot:
   Enabled: true
+
+Lint/DuplicateBranch:
+  Enabled: false

data/lib/nexmo_developer/.ruby-version

@@ -1 +1 @@
-2.5.8
+2.7.2

data/lib/nexmo_developer/Dockerfile

@@ -1,5 +1,5 @@
 # Base image:
-FROM ruby:2.5.8
+FROM ruby:2.7.2
 
 # Install dependencies
 RUN apt-get update -qq && apt-get install -y build-essential libpq-dev lsof

data/lib/nexmo_developer/Gemfile

@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
-ruby '2.5.8'
+ruby '2.7.2'
 
 git_source(:github) do |repo_name|
   repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?('/')
@@ -74,7 +74,7 @@ gem 'icalendar', require: false
 gem 'neatjson'
 
 # Faker, a port of Data::Faker from Perl, is used to easily generate fake data: names, addresses, phone numbers, etc.
-gem 'faker', '2.14.0', require: false
+gem 'faker', '2.15.1', require: false
 
 # factory_girl_rails provides integration between factory_girl and rails 3 or newer (currently just automatic factory definition loading)
 gem 'factory_bot_rails', '6.1.0', require: false
@@ -110,7 +110,7 @@ gem 'bootsnap', require: false
 gem 'diffy', require: false
 
 # Automatic Ruby code style checking tool. Aims to enforce the community-driven Ruby Style Guide.
-gem 'rubocop', '~> 1.2.0', require: false
+gem 'rubocop', '~> 1.4.2', require: false
 gem 'rubocop-rails', '~> 2.8', require: false
 
 # Volta needs a CSS autoprefixer
@@ -129,9 +129,9 @@ gem 'lograge'
 gem 'countries'
 gem 'country_select', '~> 4.0'
 
-gem 'nexmo-oas-renderer', '~> 2.4.0', require: false
+gem 'nexmo-oas-renderer', '~> 2.4.1', require: false
 
-gem 'nexmo_markdown_renderer', '~> 0.5'
+gem 'nexmo_markdown_renderer', '~> 0.7'
 
 gem 'smartling'
 

data/lib/nexmo_developer/Gemfile.lock

@@ -93,7 +93,7 @@ GEM
       activesupport (>= 3.0.0, < 6.1)
       ruby2_keywords (>= 0.0.2, < 1.0)
     ast (2.4.1)
-    autoprefixer-rails (10.0.2.0)
+    autoprefixer-rails (10.0.3.0)
       execjs
     awesome_print (1.8.0)
     banzai (0.1.3)
@@ -114,7 +114,7 @@ GEM
       concurrent-ruby (~> 1.0)
     builder (3.2.4)
     byebug (11.1.3)
-    capybara (3.33.0)
+    capybara (3.34.0)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
@@ -163,7 +163,7 @@ GEM
     em-websocket (0.5.2)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
-    erubi (1.9.0)
+    erubi (1.10.0)
     eventmachine (1.2.7)
     execjs (2.7.0)
     factory_bot (6.1.0)
@@ -171,7 +171,7 @@ GEM
     factory_bot_rails (6.1.0)
       factory_bot (~> 6.1.0)
       railties (>= 5.0.0)
-    faker (2.14.0)
+    faker (2.15.1)
       i18n (>= 1.6, < 2)
     faraday (1.1.0)
       multipart-post (>= 1.2, < 3)
@@ -258,7 +258,7 @@ GEM
       activerecord
       kaminari-core (= 1.2.1)
     kaminari-core (1.2.1)
-    listen (3.3.0)
+    listen (3.3.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     lograge (0.11.2)
@@ -266,7 +266,7 @@ GEM
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.7.0)
+    loofah (2.8.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     lumberjack (1.2.8)
@@ -294,8 +294,8 @@ GEM
     neatjson (0.9)
     nenv (0.3.0)
     netrc (0.11.0)
-    newrelic_rpm (6.13.1)
-    nexmo-oas-renderer (2.4.0)
+    newrelic_rpm (6.14.0)
+    nexmo-oas-renderer (2.4.1)
       activemodel (~> 6.0)
       activesupport (~> 6.0)
       banzai (~> 0.1.2)
@@ -308,7 +308,7 @@ GEM
       sass (~> 3.1)
       shotgun (~> 0.9)
       sinatra (~> 2.0)
-    nexmo_markdown_renderer (0.5.0)
+    nexmo_markdown_renderer (0.7.0)
       activemodel (~> 6.0)
       banzai (~> 0.1.2)
       i18n (~> 1.7)
@@ -340,7 +340,7 @@ GEM
       sawyer (~> 0.8.0, >= 0.5.3)
     oj (3.10.15)
     orm_adapter (0.5.0)
-    parallel (1.19.2)
+    parallel (1.20.1)
     parser (2.7.2.0)
       ast (~> 2.4.1)
     pg (1.2.3)
@@ -398,7 +398,7 @@ GEM
     recaptcha (5.6.0)
       json
     redcarpet (3.4.0)
-    redis (4.2.2)
+    redis (4.2.5)
     regexp_parser (1.8.2)
     request_store (1.5.0)
       rack (>= 1.4)
@@ -437,16 +437,16 @@ GEM
     rspec-snapshot (0.1.2)
       rspec (> 3.0.0)
     rspec-support (3.10.0)
-    rubocop (1.2.0)
+    rubocop (1.4.2)
       parallel (~> 1.10)
       parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8)
       rexml
-      rubocop-ast (>= 1.0.1)
+      rubocop-ast (>= 1.1.1)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.1.1)
+    rubocop-ast (1.2.0)
       parser (>= 2.7.1.5)
     rubocop-rails (2.8.1)
       activesupport (>= 4.2.0)
@@ -529,7 +529,7 @@ GEM
       activemodel (>= 6.0.0)
       bindex (>= 0.4.0)
       railties (>= 6.0.0)
-    webmock (3.9.5)
+    webmock (3.10.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
@@ -573,7 +573,7 @@ DEPENDENCIES
   diffy
   dotenv-rails
   factory_bot_rails (= 6.1.0)
-  faker (= 2.14.0)
+  faker (= 2.15.1)
   ffi (>= 1.9.24)
   geocoder
   gmaps4rails
@@ -589,8 +589,8 @@ DEPENDENCIES
   lograge
   neatjson
   newrelic_rpm
-  nexmo-oas-renderer (~> 2.4.0)
-  nexmo_markdown_renderer (~> 0.5)
+  nexmo-oas-renderer (~> 2.4.1)
+  nexmo_markdown_renderer (~> 0.7)
   nokogiri (~> 1.10.9)
   octokit
   pg (~> 1.2)
@@ -605,7 +605,7 @@ DEPENDENCIES
   rspec-collection_matchers
   rspec-rails (~> 4.0)
   rspec-snapshot (~> 0.1.2)
-  rubocop (~> 1.2.0)
+  rubocop (~> 1.4.2)
   rubocop-rails (~> 2.8)
   ruby-progressbar
   sassc-rails (~> 2.1)
@@ -624,7 +624,7 @@ DEPENDENCIES
   woothee
 
 RUBY VERSION
-   ruby 2.5.8p224
+   ruby 2.7.2p137
 
 BUNDLED WITH
    2.1.4

data/lib/nexmo_developer/Guardfile

@@ -5,7 +5,7 @@
 # directories %w(app lib config test spec features) \
 #  .select{|d| Dir.exists?(d) ? d : UI.warning("Directory #{d} does not exist")}
 
-## Note: if you are using the `directories` clause above and you are not
+## NOTE: if you are using the `directories` clause above and you are not
 ## watching the project directory ('.'), then you will want to move
 ## the Guardfile to a watched dir and symlink it back, e.g.
 #
@@ -54,7 +54,7 @@ guard 'livereload' do
   watch(%r{config/locales/.+\.yml})
 end
 
-# Note: The cmd option is now required due to the increasing number of ways
+# NOTE: The cmd option is now required due to the increasing number of ways
 #       rspec may be run, below are examples of the most common uses.
 #  * bundler: 'bundle exec rspec'
 #  * bundler binstubs: 'bin/rspec'

data/lib/nexmo_developer/app/controllers/dashboard_controller.rb

@@ -197,7 +197,7 @@ class DashboardController < ApplicationController
 
       parts.insert(1, 'top-level') if parts.count < 3
 
-      parts = [parts[0], parts[1], parts[2..-1].join('/')] if parts.count > 3
+      parts = [parts[0], parts[1], parts[2..].join('/')] if parts.count > 3
       next if parts[0] == 'migrate'
 
       x = @complete_coverage

data/lib/nexmo_developer/app/presenters/sidenav_item.rb

@@ -38,8 +38,8 @@ class SidenavItem
 
   def css_classes
     classes = ['Nxd-sidenav-badge Vlt-badge Vlt-badge--margin-left Vlt-badge--small']
-    classes << 'Vlt-bg-green-lighter Vlt-green' if label.casecmp('beta').zero?
-    classes << 'Vlt-bg-blue-lighter Vlt-blue' if label.casecmp('dev preview').zero?
+    classes << 'Vlt-badge--transparent Vlt-badge--green' if label.casecmp('beta').zero?
+    classes << 'Vlt-badge--transparent Vlt-badge--blue' if label.casecmp('dev preview').zero?
 
     classes.join(' ')
   end

data/lib/nexmo_developer/app/presenters/tutorial_list_item.rb

@@ -62,11 +62,11 @@ class TutorialListItem
   end
 
   def product_url
-    "/#{I18n.locale}/#{products.join('')}/tutorials"
+    "/#{I18n.locale}/#{products.join}/tutorials"
   end
 
   def url
-    external_link || "/#{I18n.locale}/#{products.join('')}/tutorials/#{filename}/#{first_step}"
+    external_link || "/#{I18n.locale}/#{products.join}/tutorials/#{filename}/#{first_step}"
   end
 
   def available_languages
@@ -74,7 +74,7 @@ class TutorialListItem
       OpenStruct.new(
         language: language,
         label: Nexmo::Markdown::CodeLanguage.find(language).label,
-        url: external_link || "/#{products.join('')}/tutorials/#{filename}/#{first_step}/#{language}"
+        url: external_link || "/#{products.join}/tutorials/#{filename}/#{first_step}/#{language}"
       )
     end
   end

data/lib/nexmo_developer/app/services/translator/file_translator.rb

@@ -1,5 +1,7 @@
 module Translator
   class FileTranslator
+    include Utils
+
     attr_reader :doc_path
 
     def initialize(doc_path)
@@ -12,41 +14,45 @@ module Translator
           Translator::TranslationRequest.new(
             locale: locale_with_region(locale),
             frequency: frequency,
-            file_uri: doc_path
+            file_uri: uri,
+            file_path: full_path
           )
         end
       end
     end
 
+    def uri
+      @uri ||= file_uri(doc_path)
+    end
+
     def frontmatter
       @frontmatter ||= YAML.safe_load(File.read(full_path))
     end
 
     def full_path
-      @full_path ||= "#{Rails.configuration.docs_base_path}/_documentation/en/#{doc_path}"
+      @full_path ||= "#{Rails.configuration.docs_base_path}/#{doc_path}"
     end
 
     def frequency
       @frequency ||= frontmatter['translation_frequency'] || product_translation_frequency
     end
 
-    def locale_with_region(locale)
-      case locale.to_s
-      when 'ja', 'ja-JP'
-        'ja-JP'
-      when 'cn', 'zh-CN'
-        'zh-CN'
-      else
-        locale.to_s
+    def product_from_path
+      @product_from_path ||= begin
+        Pathname.new(
+          doc_path.gsub(%r{(_documentation|_tutorials|_use_cases)/#{I18n.default_locale}/}, '')
+        ).dirname.to_s
       end
     end
 
     def product
       @product ||= begin
         products = YAML.safe_load(File.open("#{Rails.configuration.docs_base_path}/config/products.yml"))
-        product = products['products'].detect { |p| doc_path.starts_with? p['path'] }
+        product = products['products'].detect do |p|
+          product_from_path.starts_with?(p['path']) || frontmatter['products']&.include?(p['path'])
+        end
 
-        raise ArgumentError, 'Unable to match document with products list in config/products.yml' unless product
+        raise ArgumentError, "Unable to match document with products list in config/products.yml for #{full_path}" unless product
 
         product
       end

data/lib/nexmo_developer/app/services/translator/smartling/api/upload_file.rb

@@ -53,8 +53,10 @@ module Translator
         def file
           @file ||= begin
             file = Tempfile.new
-            file.write Nexmo::Markdown::Pipelines::Smartling::Preprocessor.new.call(
-              File.read("#{Rails.configuration.docs_base_path}/_documentation/#{I18n.default_locale}/#{@translation_request.file_uri}")
+            file.write(
+              Nexmo::Markdown::Pipelines::Smartling::Preprocessor.new.call(
+                File.read(@translation_request.file_path)
+              )
             )
             file.rewind
             file.close