Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions flipper.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -35,4 +35,6 @@ Gem::Specification.new do |gem|
gem.metadata = Flipper::METADATA

gem.add_dependency 'concurrent-ruby', '< 2'

gem.required_ruby_version = ">= #{Flipper::REQUIRED_RUBY_VERSION}"
end
4 changes: 4 additions & 0 deletions lib/flipper/engine.rb
Original file line number Diff line number Diff line change
Expand Up @@ -83,5 +83,9 @@ def self.default_strict_value
:warn
end
end

def self.deprecated_rails_version?
Gem::Version.new(Rails.version) < Gem::Version.new(Flipper::NEXT_REQUIRED_RAILS_VERSION)
end
end
end
1 change: 1 addition & 0 deletions lib/flipper/ui/action.rb
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ def feature_name
style-src 'self' 'unsafe-inline';
style-src-attr 'unsafe-inline' ;
style-src-elem 'self';
connect-src https://www.flippercloud.io;
CSP

# Public: Call this in subclasses so the action knows its route.
Expand Down
33 changes: 33 additions & 0 deletions lib/flipper/ui/public/js/version.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
// Get the latest release from RubyGems.org and show a badge if it's not the current version
function checkLatestRelease() {
// Skip check if last check was less than 1 day ago
if(localStorage.getItem('flipper.releaseCheckedAt') > new Date().getTime() - 86400000) return

// store the last time we checked for a new version
localStorage.setItem('flipper.releaseCheckedAt', new Date().getTime())

fetch('https://www.flippercloud.io/release.json').then(response => {
// Something went wrong, so just give up
if(!response.ok) return

response.json().then(release => {
localStorage.setItem('flipper.release', JSON.stringify(release))
showReleaseBadge()
})
})
}

// Show a badge if a new release is available
function showReleaseBadge() {
const badge = document.querySelector('#new-version-badge')
const release = JSON.parse(localStorage.getItem('flipper.release') || false)

if(!badge || !release || badge.dataset.version === release.version) return

badge.innerText = `${release.version} available!`
badge.setAttribute('href', release.changelog_uri)
badge.classList.remove('d-none')
}

checkLatestRelease()
showReleaseBadge()
17 changes: 16 additions & 1 deletion lib/flipper/ui/views/layout.erb
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,20 @@
<a href="https://www.flippercloud.io/docs/ui?utm_source=oss&utm_medium=ui&utm_campaign=docs">Docs</a> &bull;
<a href="<%= script_name %>/settings">Settings</a> &bull;
Version: <%= Flipper::VERSION %>
<a href="#" class="badge badge-warning ml-2 d-none" style="font-size:100%" id="new-version-badge" data-version="<%= Flipper::VERSION %>">
</a>

<% if Flipper.deprecated_ruby_version? %>
<a href="https://github.com/flippercloud/flipper/pull/776" class="badge badge-danger ml-2" style="font-size:100%">
Ruby <%= RUBY_VERSION %> deprecated
</a>
<% end %>

<% if defined?(Rails) && Flipper::Engine.deprecated_rails_version? %>
<a href="https://github.com/flippercloud/flipper/pull/776" class="badge badge-danger ml-2" style="font-size:100%">
Rails <%= Rails.version %> deprecated
</a>
<% end %>
</div>

<nav aria-label="breadcrumb">
Expand Down Expand Up @@ -60,6 +74,7 @@
<script src="<%= script_name + jquery_js[:src] %>" integrity="<%= jquery_js[:hash] %>" crossorigin="anonymous"></script>
<script src="<%= script_name + popper_js[:src] %>" integrity="<%= popper_js[:hash] %>" crossorigin="anonymous"></script>
<script src="<%= script_name + bootstrap_js[:src] %>" integrity="<%= bootstrap_js[:hash] %>" crossorigin="anonymous"></script>
<script src="<%= script_name %>/js/application.js"></script>
<script src="<%= script_name %>/js/application.js?v=<%= Flipper::VERSION %>"></script>
<script src="<%= script_name %>/js/version.js?v=<%= Flipper::VERSION %>"></script>
</body>
</html>
10 changes: 10 additions & 0 deletions lib/flipper/version.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
module Flipper
VERSION = '1.1.2'.freeze

REQUIRED_RUBY_VERSION = '2.6'.freeze
NEXT_REQUIRED_RUBY_VERSION = '3.0'.freeze

REQUIRED_RAILS_VERSION = '5.2'.freeze
NEXT_REQUIRED_RAILS_VERSION = '6.1.0'.freeze

def self.deprecated_ruby_version?
Gem::Version.new(RUBY_VERSION) < Gem::Version.new(NEXT_REQUIRED_RUBY_VERSION)
end
end