flipper-ui 0.16.2 → 0.19.1

data/spec/flipper/ui/actions/percentage_of_time_gate_spec.rb

@@ -41,12 +41,10 @@ RSpec.describe Flipper::UI::Actions::PercentageOfTimeGate do
         expect(flipper[:search].percentage_of_time_value).to be(0)
       end
 
-      # rubocop:disable Metrics/LineLength
       it 'redirects back to feature' do
         expect(last_response.status).to be(302)
         expect(last_response.headers['Location']).to eq('/features/search?error=Invalid+percentage+of+time+value%3A+value+must+be+a+positive+number+less+than+or+equal+to+100%2C+but+was+555')
       end
-      # rubocop:enable Metrics/LineLength
     end
   end
 end

data/spec/flipper/ui/configuration_spec.rb

@@ -3,43 +3,10 @@ require 'helper'
 RSpec.describe Flipper::UI::Configuration do
   let(:configuration) { described_class.new }
 
-  describe "#actors" do
-    it "has default text" do
-      expect(configuration.actors.title).to eq("Actors")
-      expect(configuration.actors.description).to eq("Enable actors using the form above.")
-    end
-
-    it "can be updated" do
-      configuration.actors.title = "Actors Section"
-      expect(configuration.actors.title).to eq("Actors Section")
-    end
-  end
-
-  describe "#groups" do
-    it "has default text" do
-      expect(configuration.groups.title).to eq("Groups")
-      expect(configuration.groups.description).to eq("Enable groups using the form above.")
-    end
-  end
-
-  describe "#percentage_of_actors" do
-    it "has default text" do
-      expect(configuration.percentage_of_actors.title).to eq("Percentage of Actors")
-      expect(configuration.percentage_of_actors.description).to eq("Percentage of actors functions independently of percentage of time. If you enable 50% of Actors and 25% of Time then the feature will always be enabled for 50% of users and occasionally enabled 25% of the time for everyone.") # rubocop:disable Metrics/LineLength
-    end
-  end
-
-  describe "#percentage_of_time" do
-    it "has default text" do
-      expect(configuration.percentage_of_time.title).to eq("Percentage of Time")
-      expect(configuration.percentage_of_time.description).to eq("Percentage of actors functions independently of percentage of time. If you enable 50% of Actors and 25% of Time then the feature will always be enabled for 50% of users and occasionally enabled 25% of the time for everyone.") # rubocop:disable Metrics/LineLength
-    end
-  end
-
   describe "#delete" do
     it "has default text" do
       expect(configuration.delete.title).to eq("Danger Zone")
-      expect(configuration.delete.description).to eq("Deleting a feature removes it from the list of features and disables it for everyone.") # rubocop:disable Metrics/LineLength
+      expect(configuration.delete.description).to eq("Deleting a feature removes it from the list of features and disables it for everyone.")
     end
   end
 
@@ -102,4 +69,72 @@ RSpec.describe Flipper::UI::Configuration do
       expect(configuration.feature_removal_enabled).to eq(false)
     end
   end
+
+  describe "#fun" do
+    it "has default value" do
+      expect(configuration.fun).to eq(true)
+    end
+
+    it "can be updated" do
+      configuration.fun = false
+      expect(configuration.fun).to eq(false)
+    end
+  end
+
+  describe "#descriptions_source" do
+    it "has default value" do
+      expect(configuration.descriptions_source.call(%w[foo bar])).to eq({})
+    end
+
+    context "descriptions source is provided" do
+      it "can be updated" do
+        configuration.descriptions_source = lambda do |_keys|
+          YAML.load_file(FlipperRoot.join('spec/support/descriptions.yml'))
+        end
+        keys = %w[some_awesome_feature foo]
+        result = configuration.descriptions_source.call(keys)
+        expected = {
+          "some_awesome_feature" => "Awesome feature description",
+        }
+        expect(result).to eq(expected)
+      end
+    end
+  end
+
+  describe "#show_feature_description_in_list" do
+    it "has default value" do
+      expect(configuration.show_feature_description_in_list).to eq(false)
+    end
+
+    it "can be updated" do
+      configuration.show_feature_description_in_list = true
+      expect(configuration.show_feature_description_in_list).to eq(true)
+    end
+  end
+
+  describe "#show_feature_description_in_list?" do
+    subject { configuration.show_feature_description_in_list? }
+
+    context 'when using_descriptions? is false and show_feature_description_in_list is false' do
+      it { is_expected.to eq(false) }
+    end
+
+    context 'when using_descriptions? is false and show_feature_description_in_list is true' do
+      before { configuration.show_feature_description_in_list = true }
+      it { is_expected.to eq(false) }
+    end
+
+    context 'when using_descriptions? is true and show_feature_description_in_list is false' do
+      before { allow(configuration).to receive(:using_descriptions?).and_return(true) }
+      it { is_expected.to eq(false) }
+    end
+
+    context 'when using_descriptions? is true and show_feature_description_in_list is true' do
+      before do
+        allow(configuration).to receive(:using_descriptions?).and_return(true)
+        configuration.show_feature_description_in_list = true
+      end
+      it { is_expected.to eq(true) }
+    end
+  end
 end

data/spec/flipper/ui/decorators/feature_spec.rb

@@ -22,36 +22,6 @@ RSpec.describe Flipper::UI::Decorators::Feature do
     end
   end
 
-  describe '#as_json' do
-    before do
-      @result = subject.as_json
-    end
-
-    it 'returns Hash' do
-      expect(@result).to be_instance_of(Hash)
-    end
-
-    it 'includes id' do
-      expect(@result['id']).to eq('some_awesome_feature')
-    end
-
-    it 'includes pretty name' do
-      expect(@result['name']).to eq('Some Awesome Feature')
-    end
-
-    it 'includes state' do
-      expect(@result['state']).to eq('off')
-    end
-
-    it 'includes gates' do
-      gates = subject.gates.map do |gate|
-        value = subject.gate_values[gate.key]
-        Flipper::UI::Decorators::Gate.new(gate, value).as_json
-      end
-      expect(@result['gates']).to eq(gates)
-    end
-  end
-
   describe '#<=>' do
     let(:on) do
       flipper.enable(:on_a)
@@ -77,11 +47,11 @@ RSpec.describe Flipper::UI::Decorators::Feature do
     end
 
     it 'sorts :on before :off' do
-      expect((on <=> conditional)).to be(-1)
+      expect((on <=> off)).to be(-1)
     end
 
     it 'sorts :conditional before :off' do
-      expect((on <=> conditional)).to be(-1)
+      expect((conditional <=> off)).to be(-1)
     end
 
     it 'sorts on key for identical states' do

data/spec/flipper/ui_spec.rb

@@ -54,7 +54,7 @@ RSpec.describe Flipper::UI do
   # See https://github.com/jnunemaker/flipper/issues/80
   it 'can route features with names that match static directories' do
     post 'features/refactor-images/actors',
-         { 'value' => 'User:6', 'operation' => 'enable', 'authenticity_token' => token },
+         { 'value' => 'User;6', 'operation' => 'enable', 'authenticity_token' => token },
          'rack.session' => session
     expect(last_response.status).to be(302)
     expect(last_response.headers['Location']).to eq('/features/refactor-images')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flipper-ui
 version: !ruby/object:Gem::Version
-  version: 0.16.2
+  version: 0.19.1
 platform: ruby
 authors:
 - John Nunemaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-20 00:00:00.000000000 Z
+date: 2020-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -39,7 +39,7 @@ dependencies:
         version: 1.5.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,37 +49,42 @@ dependencies:
         version: 1.5.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: flipper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.2
+        version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.2
+        version: 0.19.1
 - !ruby/object:Gem::Dependency
-  name: erubis
+  name: erubi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.7.0
-description: Rack middleware that provides a fully featured web interface for the
-  flipper gem.
+        version: 2.0.0
+description: 
 email:
 - nunemaker@gmail.com
 executables: []
@@ -87,8 +92,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - docs/ui/README.md
-- docs/ui/images/configured-ui.png
-- docs/ui/images/environment-banner.png
+- docs/ui/images/banner.png
+- docs/ui/images/description.png
 - docs/ui/images/feature.png
 - docs/ui/images/features.png
 - examples/ui/basic.ru
@@ -108,139 +113,23 @@ files:
 - lib/flipper/ui/actions/percentage_of_actors_gate.rb
 - lib/flipper/ui/actions/percentage_of_time_gate.rb
 - lib/flipper/ui/assets/javascripts/application.coffee
-- lib/flipper/ui/assets/stylesheets/.DS_Store
-- lib/flipper/ui/assets/stylesheets/application.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/_alert.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/_badge.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/_breadcrumb.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/_button-group.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/_buttons.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/_card.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/_carousel.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/_close.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/_code.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/_custom-forms.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/_dropdown.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/_forms.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/_functions.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/_grid.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/_images.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/_input-group.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/_jumbotron.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/_list-group.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/_media.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/_mixins.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/_modal.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/_nav.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/_navbar.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/_pagination.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/_popover.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/_print.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/_progress.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/_reboot.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/_root.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/_tables.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/_tooltip.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/_transitions.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/_type.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/_utilities.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/_variables.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/bootstrap-grid.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/bootstrap-reboot.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/bootstrap.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/mixins/_alert.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/mixins/_background-variant.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/mixins/_badge.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/mixins/_border-radius.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/mixins/_box-shadow.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/mixins/_breakpoints.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/mixins/_buttons.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/mixins/_caret.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/mixins/_clearfix.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/mixins/_float.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/mixins/_forms.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/mixins/_gradients.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/mixins/_grid-framework.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/mixins/_grid.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/mixins/_hover.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/mixins/_image.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/mixins/_list-group.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/mixins/_lists.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/mixins/_nav-divider.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/mixins/_navbar-align.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/mixins/_pagination.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/mixins/_reset-text.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/mixins/_resize.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/mixins/_screen-reader.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/mixins/_size.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/mixins/_table-row.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/mixins/_text-emphasis.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/mixins/_text-hide.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/mixins/_text-truncate.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/mixins/_transition.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/mixins/_visibility.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/utilities/_align.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/utilities/_background.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/utilities/_borders.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/utilities/_clearfix.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/utilities/_display.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/utilities/_embed.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/utilities/_flex.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/utilities/_float.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/utilities/_position.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/utilities/_screenreaders.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/utilities/_sizing.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/utilities/_spacing.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/utilities/_text.scss
-- lib/flipper/ui/assets/stylesheets/bootstrap/utilities/_visibility.scss
-- lib/flipper/ui/assets/stylesheets/primer/.scss-lint.yml
-- lib/flipper/ui/assets/stylesheets/primer/_alerts.scss
-- lib/flipper/ui/assets/stylesheets/primer/_avatars.scss
-- lib/flipper/ui/assets/stylesheets/primer/_base.scss
-- lib/flipper/ui/assets/stylesheets/primer/_blankslate.scss
-- lib/flipper/ui/assets/stylesheets/primer/_buttons.scss
-- lib/flipper/ui/assets/stylesheets/primer/_counter.scss
-- lib/flipper/ui/assets/stylesheets/primer/_filter-list.scss
-- lib/flipper/ui/assets/stylesheets/primer/_flex-table.scss
-- lib/flipper/ui/assets/stylesheets/primer/_forms.scss
-- lib/flipper/ui/assets/stylesheets/primer/_layout.scss
-- lib/flipper/ui/assets/stylesheets/primer/_menu.scss
-- lib/flipper/ui/assets/stylesheets/primer/_mixins.scss
-- lib/flipper/ui/assets/stylesheets/primer/_normalize.scss
-- lib/flipper/ui/assets/stylesheets/primer/_states.scss
-- lib/flipper/ui/assets/stylesheets/primer/_tabnav.scss
-- lib/flipper/ui/assets/stylesheets/primer/_tooltips.scss
-- lib/flipper/ui/assets/stylesheets/primer/_truncate.scss
-- lib/flipper/ui/assets/stylesheets/primer/_type.scss
-- lib/flipper/ui/assets/stylesheets/primer/_utility.scss
-- lib/flipper/ui/assets/stylesheets/primer/_variables.scss
-- lib/flipper/ui/assets/stylesheets/primer/primer.scss
 - lib/flipper/ui/configuration.rb
 - lib/flipper/ui/configuration/option.rb
 - lib/flipper/ui/decorators/feature.rb
 - lib/flipper/ui/decorators/gate.rb
 - lib/flipper/ui/error.rb
-- lib/flipper/ui/eruby.rb
 - lib/flipper/ui/middleware.rb
 - lib/flipper/ui/public/css/application.css
-- lib/flipper/ui/public/fonts/bootstrap/glyphicons-halflings-regular.eot
-- lib/flipper/ui/public/fonts/bootstrap/glyphicons-halflings-regular.svg
-- lib/flipper/ui/public/fonts/bootstrap/glyphicons-halflings-regular.ttf
-- lib/flipper/ui/public/fonts/bootstrap/glyphicons-halflings-regular.woff
-- lib/flipper/ui/public/fonts/bootstrap/glyphicons-halflings-regular.woff2
 - lib/flipper/ui/public/images/logo.png
-- lib/flipper/ui/public/images/remove.png
 - lib/flipper/ui/public/js/application.js
 - lib/flipper/ui/public/octicons/LICENSE.txt
 - lib/flipper/ui/public/octicons/README.md
 - lib/flipper/ui/public/octicons/octicons-local.ttf
 - lib/flipper/ui/public/octicons/octicons.css
 - lib/flipper/ui/public/octicons/octicons.eot
-- lib/flipper/ui/public/octicons/octicons.less
 - lib/flipper/ui/public/octicons/octicons.svg
 - lib/flipper/ui/public/octicons/octicons.ttf
 - lib/flipper/ui/public/octicons/octicons.woff
-- lib/flipper/ui/public/octicons/sprockets-octicons.scss
 - lib/flipper/ui/util.rb
 - lib/flipper/ui/views/add_actor.erb
 - lib/flipper/ui/views/add_feature.erb
@@ -287,8 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: UI for the Flipper gem

data/lib/flipper/ui/assets/stylesheets/application.scss

@@ -1,19 +0,0 @@
-html {
-  font-size: 0.8rem;
-}
-body {
-  padding-top: 1.5em;
-  padding-bottom: 1.5em;
-}
-
-$light: #ddd;
-@import "bootstrap/bootstrap";
-
-.flash {
-  margin-bottom:15px;
-}
-
-.row + .row {
-  margin-top: 1.5em;
-}
-