moirai 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cd2eae769961645bc1baa4295ed58bf261beb38a48e934c1d3d38dd083f033a
-  data.tar.gz: fd3dddd2520c7f06987d814fec2986c5e02ac113748d39a1117315296cc0aaf3
+  metadata.gz: ecb41a395f21cd347b67e6e0233bd776a80493be4bf98d423077b7fd7cbe2005
+  data.tar.gz: 1335f5ca28ab8804459172894841f71cb8ac88740ce0b94d21096bc3a1713386
 SHA512:
-  metadata.gz: 5ae7c1af2f697ea2f7fad123f4c2451e3fa9ba86ffb048ae0b6846c2002bc532e50f762ecf000e32d76f6631d62ebd9f211288b4dca081e61e9d1bbcb05fd6ef
-  data.tar.gz: f113aa608adfe9b5fae4a073f2d23936bb30090b3fe9d544dfc7d9421663244a78e3350b7218f988fa9c413fe6aef6a6ab154dd79cb5d0160dd026205bdac30d
+  metadata.gz: 927bd40a31ce569fca7b6d6a68194106db7616bf3a733009dd84669a387450a4808bc650aeff8f7f1d6aefe630d859db0c0486972008189e183f957247fada80
+  data.tar.gz: c8a831cd233bf06ff6160acd096346afb3ab8b1209b3bda7a5a4c7ccbecffe263fadaffd4829508d5f13cb3f4201fdf3658ef46ddcb1ae14c16d46ca4c85c324

data/.ruby-version

@@ -0,0 +1 @@
+3.2.1

data/.semaphore/main-deploy.yml

@@ -0,0 +1,18 @@
+version: v1.0
+name: main-deploy
+agent:
+  machine:
+    type: e1-standard-2
+    os_image: ubuntu2004
+
+blocks:
+  - name: main-deploy
+    task:
+      secrets:
+        - name: rubygems-deploy
+      jobs:
+        - name: main-deploy
+          commands:
+            - checkout --use-cache
+            - gem build moirai
+            - gem push moirai-*.gem

data/.semaphore/semaphore.yml

@@ -0,0 +1,50 @@
+version: "v1.0"
+name: moirai
+agent:
+  machine:
+    type: e1-standard-2
+    os_image: ubuntu2004
+auto_cancel:
+  running:
+    when: "true"
+
+blocks:
+  - name: tests
+    execution_time_limit:
+      minutes: 10
+    task:
+      secrets:
+        - name: moirai
+      prologue:
+        commands:
+          - checkout --use-cache
+          - cache restore
+          - bundle config set path 'vendor/bundle'
+          - bundle install -j 4
+          - cache store
+      jobs:
+        - name: linter
+          commands:
+            - bundle exec standardrb
+        - name: tests sqlite
+          env_vars:
+            - name: TARGET_DB
+              value: sqlite
+            - name: RAILS_ENV
+              value: test
+          commands:
+            - bin/rails db:create db:schema:load
+            - bin/check
+        - name: tests postgres
+          env_vars:
+            - name: TARGET_DB
+              value: postgres
+            - name: RAILS_ENV
+              value: test
+          commands:
+            - sem-service start postgres 14 --username=semaphore
+            - bin/rails db:create db:schema:load
+            - bin/check
+promotions:
+  - name: main
+    pipeline_file: main-deploy.yml

data/CHANGELOG.md

@@ -1,5 +1,16 @@
-## Unreleased
+## 0.3.1
 
+* Fixes a problem when running a rake command and no database exists yet using postgres. ([@coorasse][])
+
+## 0.3.0
+
+* Added a method `I18n.translate_without_moirai` ([@oliveranthony17][])
+* Simplified stimulus setup ([@coorasse][])
+* Fixed some setup issues in test environments ([@oliveranthony17][])
+* Show original translation when deleting the whole inline editing content. ([@CuddlyBunion341][])
+
+* Support for html translations ([@CuddlyBunion341][])
+=======
 ## 0.2.0
 
 * Support for strings coming from gems ([@coorasse][])

data/Gemfile

@@ -12,6 +12,7 @@ gem "stimulus-rails"
 group :development, :test do
   gem "puma"
   gem "sqlite3"
+  gem "pg"
   gem "rake"
   gem "dotenv"
   gem "minitest"

data/README.md

@@ -5,12 +5,13 @@
 ### Manage translation strings in real time
 
 - Let your non-developer team members finally manage translations (yes, even Karen from marketing...).
-- See those translations live in your app, so you can make sure “Submit” isn’t overlapping the button where “**Do not press this button EVER” should be.
-- Automatically create Pull Requests based on these changes, saving your developers from yet another “small tweak” email request.
+- See those translations live in your app, so you can make sure “Submit” isn’t overlapping the button where “**Do not
+  press this button EVER” should be.
+- Automatically create Pull Requests based on these changes, saving your developers from yet another “small tweak” email
+  request.
 
 > Let the world be translated, one typo at a time.
 
-
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -20,11 +21,13 @@ gem "moirai"
 ```
 
 And then execute:
+
 ```bash
 bundle
 ```
 
-Next, you need to run the generator which will create the necessary files including the database migration, as well as inserting the engine in the `routes.rb` file:
+Next, you need to run the generator which will create the necessary files including the database migration,
+as well as inserting the engine in the `routes.rb` file, and importing the necessary javascript files:
 
 ```bash
 bin/rails g moirai:install
@@ -40,40 +43,51 @@ bin/rails db:migrate
 
 ### How to change translations
 
-If you mounted Moirai under "/moirai", head there and you will find a list of all the files containing texts that can be translated.
-Open a file, change the value of translations, and press ENTER to update the translation and see it immediately changed on the application.
+If you mounted Moirai under "/moirai", head there and you will find a list of all the files containing texts that can be
+translated.
+Open a file, change the value of translations, and press ENTER to update the translation and see it immediately changed
+on the application.
 
 ### Inline editing
 
 By default, inline editing is disabled. To enable it, set the `moirai=true` query parameter in the URL.
 
-If you want to only allow specific users to perform inline editing, you can override the `moirai_edit_enabled?` method in your application helper.
+If you want to only allow specific users to perform inline editing, you can override the `moirai_edit_enabled?` method
+in your application helper.
 
 ```ruby
+
 module ApplicationHelper
   def moirai_edit_enabled?
-    params[:moirai] == "true" || current_user&.admin?
+    params[:moirai] == "true" && current_user&.admin?
   end
 end
 ```
 
 You also need to have the moirai_translations_controller.js Stimulus Controller initialized.
 
-If you use importmaps:
+#### Importmap
 
-Pin the controller in `config/importmap.rb`
+The command `bin/rails g moirai:install` should have already pinned the necessary controller for you in importmap.rb, so
+no further steps are needed.
 
-```ruby
-pin "controllers/moirai_translation_controller", to: "moirai_translation_controller.js"
-```
+#### jsbulding
 
-If you’re unsure about all the possible configuration options, you can simply copy and paste the stimulus controller into your app as a fallback. 
+The command `bin/rails g moirai:install` should have already copied the necessary controller for you in
+`app/javascripts/controllers`, so no further steps are needed.
+
+#### More?
+
+If you’re unsure about all the possible configuration options, you can simply copy and paste the stimulus controller
+into your app as a fallback.
 
 ### Automatic PR creation with Octokit (**optional**)
 
-If you would like Moirai to automatically create a pull request on GitHub to keep translations synchronized with the codebase, 
+If you would like Moirai to automatically create a pull request on GitHub to keep translations synchronized with the
+codebase,
 you need to set up [Octokit](https://github.com/octokit/octokit.rb).
-You will also need to create a **Personal Access Token** on GitHub, and configure the access in the appropriate **environment variables** (this is explained below).
+You will also need to create a **Personal Access Token** on GitHub, and configure the access in the appropriate *
+*environment variables** (this is explained below).
 
 #### 1. Add Octokit to Your Gemfile
 
@@ -87,22 +101,23 @@ Then run `bundle install`.
 
 #### 2. Create a Personal Access Token (PAT) on GitHub
 
-You will need a Personal Access Token (PAT) with the `Content - Write` permission to allow Octokit to create branches and pull requests.
+You will need a Personal Access Token (PAT) with the `Content - Write` permission to allow Octokit to create branches
+and pull requests.
 
--	Go to GitHub Token Settings.
--	Click Generate New Token.
--	Give your token a name (e.g., “Moirai”).
--	Under Scopes, select:
-     -	repo (for full control of private repositories, including writing content).
-     -	content (for read/write access to code, commit statuses, and pull requests).
--	Generate the token and copy it immediately as it will be shown only once.
+- Go to GitHub Token Settings.
+- Click Generate New Token.
+- Give your token a name (e.g., “Moirai”).
+- Under Scopes, select:
+    - repo (for full control of private repositories, including writing content).
+    - content (for read/write access to code, commit statuses, and pull requests).
+- Generate the token and copy it immediately as it will be shown only once.
 
 #### 3. Set Up Environment Variables
 
 You need to configure the following environment variables in your application:
 
--	`MOIRAI_GITHUB_REPO_NAME`: The name of the repository where the pull request will be created.
--	`MOIRAI_GITHUB_ACCESS_TOKEN`: The Personal Access Token (PAT) you created earlier.
+- `MOIRAI_GITHUB_REPO_NAME`: The name of the repository where the pull request will be created.
+- `MOIRAI_GITHUB_ACCESS_TOKEN`: The Personal Access Token (PAT) you created earlier.
 
 For example, in your `.env` file:
 
@@ -111,7 +126,8 @@ MOIRAI_GITHUB_REPO_NAME=your-organization/your-repo
 MOIRAI_GITHUB_ACCESS_TOKEN=your-generated-token
 ```
 
-We also support Rails credentials. The environment variables need to be stored in a slightly different way to adhere to convention. For example:
+We also support Rails credentials. The environment variables need to be stored in a slightly different way to adhere to
+convention. For example:
 
 ```env
 moirai:
@@ -121,13 +137,14 @@ moirai:
 
 #### 4. Triggering the pull request creation
 
-Moirai will now be able to use this Personal Access Token to create a pull request on GitHub when a translation is updated.
+Moirai will now be able to use this Personal Access Token to create a pull request on GitHub when a translation is
+updated.
 
 To trigger this, you can press the `Create or update PR` button once you have made your changes.
 
 ### Authentication
 
-Moirai allows you to use basic HTTP authentication to protect the engine. 
+Moirai allows you to use basic HTTP authentication to protect the engine.
 To enable this, you need to set the following environment variables:
 
 ```env
@@ -137,11 +154,11 @@ MOIRAI_BASICAUTH_PASSWORD=moirai
 
 > ⚠️ Remember to protect Moirai. You don't want to give everyone the possibility to change strings in the application.
 
-If you have authenticated users, you can leverage the Rails Routes protection mechanism to protect the engine. 
+If you have authenticated users, you can leverage the Rails Routes protection mechanism to protect the engine.
 See the following example:
 
 ```ruby
-authenticated :user, lambda {|u| u.role == "admin"} do
+authenticated :user, lambda { |u| u.role == "admin" } do
   mount Moirai::Engine => '/moirai', as: 'moirai'
 end
 ```
@@ -166,12 +183,12 @@ end
 
 4. Set your environment variables using the newly created `.env` file.
 
-You will need a repository to test against and a token. Generate a new Fine-GRained Personal access token and give the necessary permissions to your repository.
+You will need a repository to test against and a token. Generate a new Fine-GRained Personal access token and give the
+necessary permissions to your repository.
 See the image below as an example:
 
 ![](docs/github_settings.png)
 
-
 5. Run the tests:
     ```bash
     bin/check
@@ -191,6 +208,7 @@ See the image below as an example:
 * Support for fallbacks: it should detect when a fallback string is in use and prevent attempts to override its value.
 
 ## License
+
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
 
 ## Copyright

data/app/assets/javascripts/moirai_translation_controller.js

@@ -27,6 +27,15 @@ export default class MoiraiTranslationController extends Controller {
           value: event.target.innerText
         }
       })
+    })
+    .then(response => response.json())
+    .then(data => {
+      if (data?.fallback_translation) {
+        event.target.innerText = data.fallback_translation
+      }
+    })
+    .catch(error => {
+      console.error('Error:', error);
     });
   }
 }

data/app/assets/stylesheets/moirai/application.css

@@ -12,4 +12,6 @@
  *
  *= require_tree .
  *= require_self
+ *= require translation_files
+
  */

data/app/assets/stylesheets/translation_files.css

@@ -0,0 +1,22 @@
+td {
+  height: 100px;
+  width: 200px;
+  vertical-align: top;
+}
+
+form {
+  height: 100%;
+  display: flex;
+  align-items: stretch;
+}
+
+textarea.translation-textarea {
+  width: 100%;
+  height: auto;
+  resize: vertical;
+  min-height: 3em;
+  overflow: hidden;
+  margin-bottom: 0;
+}
+
+/*# TODO: this isn't coming through */

data/app/controllers/moirai/translation_files_controller.rb

@@ -39,8 +39,17 @@ module Moirai
     def handle_update(translation)
       if translation_params[:value].blank? || translation_same_as_current?
         translation.destroy
-        flash.notice = "Translation #{translation.key} was successfully deleted."
-        redirect_to_translation_file(translation.file_path)
+        respond_to do |format|
+          format.json do
+            render json: {
+              fallback_translation: get_fallback_translation
+            }
+          end
+          format.html do
+            flash.notice = "Translation #{translation.key} was successfully deleted."
+            redirect_to_translation_file(translation.file_path)
+          end
+        end
         return
       end
 
@@ -60,6 +69,10 @@ module Moirai
         return
       end
 
+      if translation_params[:value].blank? && request.format.json?
+        return render json: {fallback_translation: get_fallback_translation}
+      end
+
       translation = Translation.new(translation_params)
 
       if translation.save
@@ -74,6 +87,7 @@ module Moirai
     def success_response(translation)
       respond_to do |format|
         format.json do
+          flash.discard
           render json: {}
         end
         format.all do
@@ -114,5 +128,14 @@ module Moirai
 
       translation_params[:value] == @file_handler.parse_file(file_paths.first)[translation_params[:key]]
     end
+
+    def get_fallback_translation
+      file_paths = KeyFinder.new.file_paths_for(translation_params[:key], locale: translation_params[:locale])
+
+      return "" if file_paths.empty?
+      return "" unless file_paths.all? { |file_path| File.exist?(file_path) }
+
+      @file_handler.parse_file(file_paths.first)[translation_params[:key]]
+    end
   end
 end

data/app/views/layouts/moirai/application.html.erb

@@ -8,6 +8,34 @@
   <%= stylesheet_link_tag    "moirai/application", media: "all" %>
   <link rel="stylesheet" href="https://cdn.simplecss.org/simple.min.css">
   <link rel="icon" href="data:image/png;base64,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">
+
+  <style>
+    td {
+      height: 100px; /* Ensure the cell has a consistent height */
+      width: 200px; /* Set a reasonable width */
+      vertical-align: top;
+    }
+
+    form {
+      height: 100%;
+      display: flex;
+      align-items: stretch;
+    }
+
+    textarea {
+      flex: 1; /* Allow the textarea to expand */
+      width: 100%; /* Ensure it fills the width */
+      resize: none; /* Disable manual resizing */
+      box-sizing: border-box; /* Account for padding and borders */
+      border: 1px solid #ccc; /* Standard input border style */
+      border-radius: 4px; /* Match the design */
+      padding: 5px; /* Inner padding for text */
+      font-family: inherit; /* Use consistent font */
+      font-size: inherit; /* Match the font size */
+      overflow: hidden; /* Hide overflow before it resizes */
+    }
+  </style>
+
 </head>
 <body>
 

data/app/views/moirai/translation_files/_form.html.erb

@@ -1,9 +1,9 @@
 <span 
-  contenteditable 
+  contenteditable
   data-action="blur->moirai-translation#submit click->moirai-translation#click"
-  style="border: 1px dashed #1d9f74; min-width: 30px; display: inline-block;" 
+  style="outline: 1px solid #1d9f74; min-width: 30px; display: inline-block; <%= 'color: red;' if is_missing_translation %>" 
   data-moirai-translation-key-value="<%= key %>"
   data-moirai-translation-locale-value="<%= locale %>"
   data-controller="moirai-translation">
-  <%= value %>
+  <%= value.to_s.gsub("<", "&lt;").gsub(">", "&gt;").html_safe %>
 </span>

data/app/views/moirai/translation_files/show.html.erb

@@ -9,6 +9,7 @@
       <tr>
         <th>Key</th>
         <th>Value</th>
+        <th>Original Translation</th>
       </tr>
     </thead>
     <tbody>
@@ -24,13 +25,17 @@
             <% end %>
           </td>
           <td>
-            <%= form_for translation&.presence || Moirai::Translation.new(key: key, locale: @locale, value: value), url: moirai_create_or_update_translation_path, method: :post do |f| %>
+            <%= form_for translation&.presence || Moirai::Translation.new(key: key, locale: @locale, value: value),
+                         url: moirai_create_or_update_translation_path,
+                         method: :post do |f| %>
               <%= f.hidden_field :key %>
               <%= f.hidden_field :locale %>
-              <%= f.text_field :value %>
-              <%= f.submit 'Update', style: 'display: none;' %>
+              <%= f.text_field :value, class: 'translation-textarea' %>
             <% end %>
           </td>
+          <td>
+            <%= I18n.translate_without_moirai(key, @locale) %>
+          </td>
         </tr>
       <% end %>
     </tbody>

data/lib/generators/moirai/install_generator.rb

@@ -10,9 +10,35 @@ module Moirai
         invoke "moirai:migration"
       end
 
+      def setup_javascript
+        if using_importmap?
+          say "Pin moirai"
+          string_to_be_added = "pin \"controllers/moirai_translation_controller\", to: \"moirai_translation_controller.js\""
+          say %(Appending: #{string_to_be_added})
+          append_to_file "config/importmap.rb", %(#{string_to_be_added}\n)
+        elsif using_js_bundling?
+          append_path = "app/javascript/controllers/moirai_translation_controller.js"
+          say "Copying Moirai Stimulus controller in #{append_path}"
+          copy_file "../../../../app/assets/javascripts/moirai_translation_controller.js", append_path
+          rails_command "stimulus:manifest:update"
+        end
+      end
+
+      private
+
+      def using_js_bundling?
+        Rails.root.join("app/javascript/controllers").exist?
+      end
+
       def mount_engine
         route 'mount Moirai::Engine => "/moirai", as: "moirai"'
       end
+
+      private
+
+      def using_importmap?
+        Rails.root.join("config/importmap.rb").exist?
+      end
     end
   end
 end

data/lib/i18n/extensions/i18n.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module I18n
+  class << self
+    attr_accessor :original_backend
+  end
+
+  def self.translate_without_moirai(key, locale, **)
+    raise "Original backend is not set" unless original_backend
+
+    original_backend.translate(locale, key, **)
+  end
+end

data/lib/moirai/engine.rb

@@ -9,7 +9,20 @@ module Moirai
     end
 
     config.after_initialize do
-      I18n.backend = I18n::Backend::Chain.new(I18n::Backend::Moirai.new, I18n.backend)
+      I18n.original_backend = I18n.backend
+      table_created =
+        begin
+          (defined?(ActiveRecord::ConnectionAdapters::SQLite3Adapter) &&
+            ActiveRecord::Base.connection.is_a?(ActiveRecord::ConnectionAdapters::SQLite3Adapter)) ||
+            ActiveRecord::Base.connection.table_exists?("moirai_translations")
+        rescue ActiveRecord::NoDatabaseError
+          false
+        end
+      if table_created
+        I18n.backend = I18n::Backend::Chain.new(I18n::Backend::Moirai.new, I18n.backend)
+      else
+        Rails.logger.warn("moirai disabled: tables have not been generated yet.")
+      end
     end
 
     # TODO: how to do this without rewriting the entire method?
@@ -22,12 +35,18 @@ module Moirai
           def translate(key, **options)
             value = original_translate(key, **options)
 
+            is_missing_translation = value.include?('class="translation_missing"')
+            if value.is_a?(String) && is_missing_translation
+              value = extract_inner_content(value)
+            end
+
             if moirai_edit_enabled?
               @key_finder ||= Moirai::KeyFinder.new
 
               render(partial: "moirai/translation_files/form",
                 locals: {key: scope_key_by_partial(key),
                          locale: I18n.locale,
+                         is_missing_translation: is_missing_translation,
                          value: value})
             else
               value
@@ -39,6 +58,13 @@ module Moirai
           def moirai_edit_enabled?
             params[:moirai] == "true"
           end
+
+          private
+
+          def extract_inner_content(html)
+            match = html.match(/<[^>]+>([^<]*)<\/[^>]+>/)
+            match ? match[1] : nil
+          end
         end
       end
     end

data/lib/moirai/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Moirai
-  VERSION = "0.1.0"
+  VERSION = "0.3.1"
 end

data/lib/moirai.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
 require "moirai/version"
+require "i18n/extensions/i18n"
+require "i18n/backend/moirai"
 require "moirai/engine"
 require "moirai/pull_request_creator"
-require "i18n/backend/moirai"
 
 module Moirai
   # Your code goes here...

data/moirai.gemspec

@@ -1,8 +1,10 @@
 # frozen_string_literal: true
 
+require_relative "lib/moirai/version"
+
 Gem::Specification.new do |spec|
   spec.name = "moirai"
-  spec.version = "0.2.0"
+  spec.version = Moirai::VERSION
   spec.authors = ["Alessandro Rodi", "Oliver Anthony", "Daniel Bengl"]
   spec.email = %w[alessandro.rodi@renuo.ch oliver.anthony@renuo.ch daniel.bengl@renuo.ch]
 

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: moirai
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Alessandro Rodi
 - Oliver Anthony
 - Daniel Bengl
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-11-06 00:00:00.000000000 Z
+date: 2024-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -38,8 +38,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/CODEOWNERS"
-- ".github/workflows/test.yml"
 - ".gitignore"
+- ".ruby-version"
+- ".semaphore/main-deploy.yml"
+- ".semaphore/semaphore.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -49,6 +51,7 @@ files:
 - app/assets/images/moirai/.keep
 - app/assets/javascripts/moirai_translation_controller.js
 - app/assets/stylesheets/moirai/application.css
+- app/assets/stylesheets/translation_files.css
 - app/controllers/concerns/.keep
 - app/controllers/moirai/application_controller.rb
 - app/controllers/moirai/translation_files_controller.rb
@@ -78,6 +81,7 @@ files:
 - lib/generators/moirai/templates/create_moirai_translations.rb.erb
 - lib/generators/moirai/templates/make_moirai_translations_file_path_not_required.rb.erb
 - lib/i18n/backend/moirai.rb
+- lib/i18n/extensions/i18n.rb
 - lib/moirai.rb
 - lib/moirai/engine.rb
 - lib/moirai/pull_request_creator.rb
@@ -92,7 +96,7 @@ metadata:
   changelog_uri: https://github.com/renuo/moirai/CHANGELOG.md
   steep_types: sig
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -107,8 +111,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
-signing_key:
+rubygems_version: 3.4.7
+signing_key: 
 specification_version: 4
 summary: Manage translation strings in real time
 test_files: []

data/.github/workflows/test.yml

@@ -1,60 +0,0 @@
-name: Test & lint
-on: [push]
-
-env:
-  RAILS_ENV: test
-  PGHOST: localhost
-  PGUSER: postgres
-  MOIRAI_GITHUB_REPO_NAME: ${{ secrets.MOIRAI_GITHUB_REPO_NAME }}
-  MOIRAI_GITHUB_ACCESS_TOKEN: ${{ secrets.MOIRAI_GITHUB_ACCESS_TOKEN }}
-jobs:
-  tests:
-    name: Test
-    
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ubuntu-latest]
-        ruby: [3.3]
-    
-    runs-on: ${{ matrix.os }}
-    
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-      
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-      
-      - name: Install dependencies
-        run: bundle install --jobs 4 --retry 3
-      
-      - name: Run tests
-        run: bundle exec rails test
-
-      - name: Run system tests
-        run: bundle exec rails test:system
-  
-  
-  lint:
-    name: Lint
-    runs-on: ubuntu-latest
-    
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-      
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 3.3
-          bundler-cache: true
-      
-      - name: Install dependencies
-        run: bundle install --jobs 4 --retry 3
-      
-      - name: Run linters
-        run: bin/fastcheck