station 0.0.95 → 0.0.102

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 520397b9e9df2b23552ddacfa1db890c4e64e2d529139da92b27fb69e831127e
-  data.tar.gz: 359d5422ca1cf98cad2fdd7a6cf4ed20b545c9da4456db451d91445079cca258
+  metadata.gz: 731c9ae04b6db8aabd750d8a19a35f6c7a561fa1ef1dfebeaa4038b182c288f2
+  data.tar.gz: 80ebc07b60b8757bbcca9469fe64d5fdc7c123cf84e20fc9ffedd912570d07de
 SHA512:
-  metadata.gz: 72292c8918fa473782a711990aa5964f29824fe81a0372db5cf7fec53515f1edc153fcd40cf54e3e774eefca1a46ea283f633086f05ce71e96dc0ad5f408fb06
-  data.tar.gz: '04206032797fa2819f545cf74a5f72b2761da4fd419cba0afa8c588745786332ed87ab76328d524ab75853d5af9bb1c35771805b53a0650d7fb4421c7a079bff'
+  metadata.gz: 41c85d4da7b9c1546150b05dcd717a8ce2b5bfc52d92cef4741858d07b58f79995a782aea88e904109b0c5978f390d0962d5789becca2a9cf216e8297f3ead86
+  data.tar.gz: ac8d0143cc76403a1138663d7a3120d0a3b292a7ecfff5aca371d7aef01dc99750961a2786a23deb47f02922c81772cbb53803703d55e5bb868065b6312b7e1f

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

@@ -3,6 +3,7 @@ require 'optparse'
 
 clear_cache = false
 rake_ci = false
+run_migrations = false
 rake_smartling_download = false
 rake_smartling_upload = false
 
@@ -26,6 +27,9 @@ docs_path = OptionParser.new do |opts|
   opts.on("--clear-cache", "Clear Rails cache") do
     clear_cache = true
   end
+  opts.on("--run-migrations", "Runs db migrations") do
+    run_migrations = true
+  end
   opts.on("--rake-ci", "Runs ci tasks") do
     rake_ci = true
   end
@@ -87,23 +91,27 @@ require 'rake'
 require 'config/application'
 require 'rails/command'
 
+Rails.application.load_tasks
+
 if clear_cache
   puts "Clearing Rails cache..."
   Rails::Command.invoke 'runner', ['Rails.cache.clear']
 end
 
+if run_migrations
+  puts "Running migrations..."
+  Rails::Command.invoke 'runner', ["Rake::Task['db:migrate'].invoke"]
+end
+
 if rake_ci
   puts 'Running Rake tasks...'
-  Rails.application.load_tasks
   Rails::Command.invoke 'runner', ["Rake::Task['db:setup'].invoke"]
   Rails::Command.invoke 'runner', ["Rake::Task['ci:all'].invoke"]
 elsif rake_smartling_download
   puts 'Running Smartling download check...'
-  Rails.application.load_tasks
   Rails::Command.invoke 'runner', ["Rake::Task['smartling:download'].invoke"]
 elsif rake_smartling_upload
   puts 'Running Smartling upload process...'
-  Rails.application.load_tasks
 
   frequency, *paths = ARGV
   Rails::Command.invoke 'runner', ["Rake::Task['smartling:upload'].invoke(#{paths}, #{frequency})"]

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

@@ -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/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

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

@@ -1,11 +1,12 @@
 module Translator
   class TranslationRequest
-    attr_reader :locale, :frequency, :file_uri
+    attr_reader :locale, :frequency, :file_uri, :file_path
 
-    def initialize(locale:, frequency:, file_uri:)
+    def initialize(locale:, frequency:, file_uri:, file_path:)
       @locale    = locale
       @frequency = frequency
       @file_uri  = file_uri
+      @file_path = file_path
     end
   end
 end

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

@@ -11,12 +11,33 @@ module Translator
       end
     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
+      end
+    end
+
     def storage_folder(filename, locale)
       if filename.starts_with? '_documentation'
         dir_path = Pathname.new(file_uri(filename)).dirname.to_s
         "#{Rails.configuration.docs_base_path}/_documentation/#{locale}/#{dir_path}"
+      elsif filename.starts_with? '_use_cases'
+        "#{Rails.configuration.docs_base_path}/_use_cases/#{locale}"
       elsif filename.starts_with? 'config/locales'
         Pathname.new(file_uri(filename)).dirname.to_s
+      elsif filename.starts_with? 'config/tutorials'
+        pathname = Pathname.new(filename.gsub("config/tutorials/#{I18n.default_locale}/", ''))
+        dir_path = pathname.dirname.to_s == '.' ? '' : "/#{pathname.dirname}"
+        "#{Rails.configuration.docs_base_path}/config/tutorials/#{locale}#{dir_path}"
+      elsif filename.starts_with? '_tutorials'
+        pathname = Pathname.new(filename.gsub("_tutorials/#{I18n.default_locale}/", ''))
+        dir_path = pathname.dirname.to_s == '.' ? '' : "/#{pathname.dirname}"
+        "#{Rails.configuration.docs_base_path}/_tutorials/#{locale}#{dir_path}"
       else
         dir_path = Pathname.new(file_uri(filename)).dirname.to_s
         "#{Rails.configuration.docs_base_path}/_documentation/#{locale}/#{dir_path}"
@@ -36,7 +57,13 @@ module Translator
     end
 
     def file_uri(filename)
-      filename.gsub(%r{_documentation/[a-z]{2}/}, '')
+      if filename.starts_with? '_documentation'
+        filename.gsub(%r{_documentation/[a-z]{2}/}, '')
+      else
+        filename.gsub(%r{(_use_cases|_tutorials|config/tutorials)/#{I18n.default_locale}/(.*)}) do |_|
+          "#{$1}/#{$2}"
+        end
+      end
     end
   end
 end