Skip to content

Commit

Permalink
format
Browse files Browse the repository at this point in the history
  • Loading branch information
rshewitt committed Apr 25, 2024
1 parent 3828eed commit 375dc1a
Show file tree
Hide file tree
Showing 8 changed files with 48 additions and 46 deletions.
40 changes: 20 additions & 20 deletions app/controllers/translates_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@ def create

@response_info = {}
@response_info[:success] = true
@response_info[:readerStructureStatus] = "OK"
@response_info[:readerStructureStatus] = 'OK'
@response_info[:readerStructureMessages] = @md_return[
:readerStructureMessages
]
@response_info[:readerValidationStatus] = "OK"
@response_info[:readerValidationStatus] = 'OK'
@response_info[:readerValidationMessages] = @md_return[
:readerValidationMessages
]
@response_info[:readerExecutionStatus] = "OK"
@response_info[:readerExecutionStatus] = 'OK'
@response_info[:readerExecutionMessages] = @md_return[
:readerExecutionMessages
]
@response_info[:writerStatus] = "OK"
@response_info[:writerStatus] = 'OK'
@response_info[:writerMessages] = @md_return[:writerMessages]
@response_info[:readerRequested] = @md_return[:readerRequested]
@response_info[:readerVersionRequested] = @md_return[
Expand All @@ -51,28 +51,28 @@ def create
a_e_mess = @response_info[:readerExecutionMessages]
a_w_mess = @response_info[:writerMessages]

status = "OK"
status = "NOTICE" if a_s_mess.any? { |s| s.include?("NOTICE") }
status = "WARNING" if a_s_mess.any? { |s| s.include?("WARNING") }
status = "ERROR" if a_s_mess.any? { |s| s.include?("ERROR") }
status = 'OK'
status = 'NOTICE' if a_s_mess.any? { |s| s.include?('NOTICE') }
status = 'WARNING' if a_s_mess.any? { |s| s.include?('WARNING') }
status = 'ERROR' if a_s_mess.any? { |s| s.include?('ERROR') }
@response_info[:readerStructureStatus] = status

status = "OK"
status = "NOTICE" if a_v_mess.any? { |s| s.include?("NOTICE") }
status = "WARNING" if a_v_mess.any? { |s| s.include?("WARNING") }
status = "ERROR" if a_v_mess.any? { |s| s.include?("ERROR") }
status = 'OK'
status = 'NOTICE' if a_v_mess.any? { |s| s.include?('NOTICE') }
status = 'WARNING' if a_v_mess.any? { |s| s.include?('WARNING') }
status = 'ERROR' if a_v_mess.any? { |s| s.include?('ERROR') }
@response_info[:readerValidationStatus] = status

status = "OK"
status = "NOTICE" if a_e_mess.any? { |s| s.include?("NOTICE") }
status = "WARNING" if a_e_mess.any? { |s| s.include?("WARNING") }
status = "ERROR" if a_e_mess.any? { |s| s.include?("ERROR") }
status = 'OK'
status = 'NOTICE' if a_e_mess.any? { |s| s.include?('NOTICE') }
status = 'WARNING' if a_e_mess.any? { |s| s.include?('WARNING') }
status = 'ERROR' if a_e_mess.any? { |s| s.include?('ERROR') }
@response_info[:readerExecutionStatus] = status

status = "OK"
status = "NOTICE" if a_w_mess.any? { |s| s.include?("NOTICE") }
status = "WARNING" if a_w_mess.any? { |s| s.include?("WARNING") }
status = "ERROR" if a_w_mess.any? { |s| s.include?("ERROR") }
status = 'OK'
status = 'NOTICE' if a_w_mess.any? { |s| s.include?('NOTICE') }
status = 'WARNING' if a_w_mess.any? { |s| s.include?('WARNING') }
status = 'ERROR' if a_w_mess.any? { |s| s.include?('ERROR') }
@response_info[:writerStatus] = status

# check for errors returned by parser, validator, reader, and writer
Expand Down
4 changes: 2 additions & 2 deletions config/environments/production.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

# Disable serving static files from the `/public` folder by default since
# Apache or NGINX already handles this.
config.public_file_server.enabled = ENV["RAILS_SERVE_STATIC_FILES"].present?
config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?

# Enable serving of images, stylesheets, and JavaScripts from an asset server.
# config.action_controller.asset_host = 'http://assets.example.com'
Expand Down Expand Up @@ -75,7 +75,7 @@
# require 'syslog/logger'
# config.logger = ActiveSupport::TaggedLogging.new(Syslog::Logger.new 'app-name')

if ENV["RAILS_LOG_TO_STDOUT"].present?
if ENV['RAILS_LOG_TO_STDOUT'].present?
logger = ActiveSupport::Logger.new($stdout)
logger.formatter = config.log_formatter
config.logger = ActiveSupport::TaggedLogging.new(logger)
Expand Down
2 changes: 1 addition & 1 deletion config/environments/test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
}

# Show full error reports and disable caching.
config.consider_all_requests_local = true
config.consider_all_requests_local = true
config.action_controller.perform_caching = false
config.cache_store = :null_store

Expand Down
4 changes: 1 addition & 3 deletions config/initializers/wrap_parameters.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@
# is enabled by default.

# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
ActiveSupport.on_load(:action_controller) do
wrap_parameters format: [:json]
end
ActiveSupport.on_load(:action_controller) { wrap_parameters format: [:json] }

# To enable root element in JSON for ActiveRecord objects.
# ActiveSupport.on_load(:active_record) do
Expand Down
10 changes: 5 additions & 5 deletions config/puma.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@
# the maximum value specified for Puma. Default is set to 5 threads for minimum
# and maximum; this matches the default thread size of Active Record.
#
max_threads_count = ENV.fetch("RAILS_MAX_THREADS", 5)
min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count }
max_threads_count = ENV.fetch('RAILS_MAX_THREADS', 5)
min_threads_count = ENV.fetch('RAILS_MIN_THREADS') { max_threads_count }
threads min_threads_count, max_threads_count

# Specifies the `port` that Puma will listen on to receive requests; default is 3000.
#
port ENV.fetch("PORT", 3000)
port ENV.fetch('PORT', 3000)

# Specifies the `environment` that Puma will run in.
#
environment ENV.fetch("RAILS_ENV", "development")
environment ENV.fetch('RAILS_ENV', 'development')

# Specifies the `pidfile` that Puma will use.
pidfile ENV.fetch("PIDFILE", "tmp/pids/server.pid")
pidfile ENV.fetch('PIDFILE', 'tmp/pids/server.pid')

# Specifies the number of `workers` to boot in clustered mode.
# Workers are forked web server processes. If using threads and workers together
Expand Down
12 changes: 6 additions & 6 deletions db/schema.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
# It's strongly recommended that you check this file into your version control system.

ActiveRecord::Schema.define(version: 2023_12_26_174535) do
create_table "translates", force: :cascade do |t|
t.binary "file"
t.string "reader"
t.string "writer"
t.datetime "created_at", precision: 6, null: false
t.datetime "updated_at", precision: 6, null: false
create_table 'translates', force: :cascade do |t|
t.binary 'file'
t.string 'reader'
t.string 'writer'
t.datetime 'created_at', precision: 6, null: false
t.datetime 'updated_at', precision: 6, null: false
end
end
10 changes: 5 additions & 5 deletions test/controllers/translates_controller_test.rb
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# frozen_string_literal: true

require "test_helper"
require 'test_helper'

class TranslatesControllerTest < ActionDispatch::IntegrationTest
test "post valid transformation of sbJson to mdJson" do
test 'post valid transformation of sbJson to mdJson' do
@translate = translates(:sbjson_to_mdjson)
@file =
File.read(
File.join(File.dirname(__FILE__), "../fixtures/#{@translate.file}")
)
post "/translates",
post '/translates',
params: {
file: @file,
reader: @translate.reader,
Expand All @@ -19,13 +19,13 @@ class TranslatesControllerTest < ActionDispatch::IntegrationTest
assert_response 200
end

test "post invalid transformation of fgdc to iso19115_3" do
test 'post invalid transformation of fgdc to iso19115_3' do
@translate = translates(:fgdc_to_iso)
@file =
File.read(
File.join(File.dirname(__FILE__), "../fixtures/#{@translate.file}")
)
post "/translates",
post '/translates',
params: {
file: @file,
reader: @translate.reader,
Expand Down
12 changes: 8 additions & 4 deletions test/models/translate_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,17 @@
class TranslateTest < ActiveSupport::TestCase
test 'convert fgdc to iso19115_3' do
@translate = translates(:fgdc_to_iso)
@file = File.read(File.expand_path("../../fixtures/#{@translate.file}", __FILE__))
@file =
File.read(File.expand_path("../../fixtures/#{@translate.file}", __FILE__))
@reader = @translate.reader
@writer = @translate.writer

@md_return = ADIWG::Mdtranslator.translate(
file: @file, reader: @reader, writer: @writer
)
@md_return =
ADIWG::Mdtranslator.translate(
file: @file,
reader: @reader,
writer: @writer
)

assert_not_nil(@md_return[:writerOutput])
end
Expand Down

0 comments on commit 375dc1a

Please sign in to comment.