kevinsivic/dawarich
1
0
Fork 0
mirror of https://github.com/Freika/dawarich.git synced 2026-01-11 09:41:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move APP_VERSION to a constant

Browse source
This commit is contained in:
Eugene Burmakin 2024-11-24 14:56:20 +01:00
parent be3a9c69b5
commit 79bf74add4
7 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/helpers/application_helper.rb
View file

@ -69,10 +69,6 @@ module ApplicationHelper
CheckAppVersion.new.call
end
def app_version
File.read('.app_version').strip
end
def app_theme
current_user&.theme == 'light' ? 'light' : 'dark'
end

2
app/jobs/reverse_geocoding_job.rb
View file

@ -6,6 +6,8 @@ class ReverseGeocodingJob < ApplicationJob
def perform(klass, id)
return unless REVERSE_GEOCODING_ENABLED
sleep 1 if PHOTON_API_HOST == 'photon.komoot.io'
data_fetcher(klass, id).call
end

3
app/services/check_app_version.rb
View file

@ -5,11 +5,10 @@ class CheckAppVersion
def initialize
@repo_url = 'https://api.github.com/repos/Freika/dawarich/tags'
@app_version = File.read('.app_version').strip
end
def call
latest_version != @app_version
latest_version != APP_VERSION
rescue StandardError
false
end

4
app/views/shared/_navbar.html.erb
View file

@ -19,10 +19,10 @@
<a href="https://github.com/Freika/dawarich/releases/latest" target="_blank" class="inline-flex items-center">
<% if new_version_available? %>
<span class="tooltip tooltip-bottom" data-tip="New version available! Check out Github releases!">
<span class="hidden sm:inline"><%= app_version %>&nbsp;!</span>
<span class="hidden sm:inline"><%= APP_VERSION %>&nbsp;!</span>
</span>
<% else %>
<span class="hidden sm:inline"><%= app_version %></span>
<span class="hidden sm:inline"><%= APP_VERSION %></span>
<% end %>
</a>
</div>

1
config/initializers/01_constants.rb
View file

@ -5,3 +5,4 @@ REVERSE_GEOCODING_ENABLED = ENV.fetch('REVERSE_GEOCODING_ENABLED', 'true') == 't
PHOTON_API_HOST = ENV.fetch('PHOTON_API_HOST', nil)
PHOTON_API_USE_HTTPS = ENV.fetch('PHOTON_API_USE_HTTPS', 'true') == 'true'
DISTANCE_UNIT = ENV.fetch('DISTANCE_UNIT', 'km').to_sym
APP_VERSION = File.read('.app_version').strip

1
config/initializers/geocoder.rb
View file

@ -6,6 +6,7 @@ settings = {
cache: Redis.new,
always_raise: :all,
use_https: PHOTON_API_USE_HTTPS,
http_headers: { 'User-Agent' => "Dawarich #{APP_VERSION} (https://dawarich.app)" },
cache_options: {
expiration: 1.day
}

12
spec/services/check_app_version_spec.rb
View file

@ -6,27 +6,25 @@ RSpec.describe CheckAppVersion do
describe '#call' do
subject(:check_app_version) { described_class.new.call }
let(:app_version) { File.read('.app_version').strip }
before do
stub_request(:any, 'https://api.github.com/repos/Freika/dawarich/tags')
.to_return(status: 200, body: '[{"name": "1.0.0"}]', headers: {})
stub_const('APP_VERSION', '1.0.0')
end
context 'when latest version is newer' do
before { allow(File).to receive(:read).with('.app_version').and_return('0.9.0') }
before { stub_const('APP_VERSION', '0.9.0') }
it { is_expected.to be true }
end
context 'when latest version is the same' do
before { allow(File).to receive(:read).with('.app_version').and_return('1.0.0') }
it { is_expected.to be false }
end
context 'when latest version is older' do
before { allow(File).to receive(:read).with('.app_version').and_return('1.1.0') }
before { stub_const('APP_VERSION', '1.1.0') }
it { is_expected.to be true }
end
@ -34,7 +32,7 @@ RSpec.describe CheckAppVersion do
context 'when request fails' do
before do
allow(Net::HTTP).to receive(:get).and_raise(StandardError)
allow(File).to receive(:read).with('.app_version').and_return(app_version)
allow(File).to receive(:read).with('.app_version').and_return(APP_VERSION)
end
it { is_expected.to be false }