flipper-ui 0.7.5 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe2cc2f1662ed0329d08964ed342e26a96939c0f
-  data.tar.gz: 99574660cdbf06e70e1e5a4f6ad46775dfb39002
+  metadata.gz: c9ad8f99301748583192db920f873597dc0d3ac3
+  data.tar.gz: d41e140edc11650a62521e840db6476042404110
 SHA512:
-  metadata.gz: f6c5a3c6f42668e7992d3fb22ace5d2eb9fefd3e736ea727f3488de1a6c0cfb63c0f3fbcfe0d406f7db18da56078a6161eb32caca704de2931701ecbfde96220
-  data.tar.gz: fad63e6135fa1d5f4bf3a93f4917a99959a9a2d1aafd7f14842efefc49fe85564494b5e19f061371f8952717ecaa94e2b0ade381fe44bf224838f329f4e95343
+  metadata.gz: 2df9f15278dce52132dd77fa494f963a7fa2e000f5d43b1797de2498d6e95a66e4e27e7ccda3a8fff06c95f8e3a992326d312f8d4f0588ef50fbd7b3848d8a6e
+  data.tar.gz: 81eb62be1129995195ef6621b0dc9c3059dfbede4fc2035789c8825bcb30b9c2f65799b39abe311037f83fa51657cc3919597d2a0de82d15770a1b144c3f9077

data/lib/flipper/ui.rb

@@ -21,8 +21,15 @@ module Flipper
       # says "App" which points to this href. The href can be a path (ie: "/")
       # or full url ("https://app.example.com/").
       attr_accessor :application_breadcrumb_href
+
+      # Public: Is feature creation allowed from the UI? Defaults to true. If
+      # set to false, users of the UI cannot create features. All feature
+      # creation will need to be done through the conigured flipper instance.
+      attr_accessor :feature_creation_enabled
     end
 
+    self.feature_creation_enabled = true
+
     def self.root
       @root ||= Pathname(__FILE__).dirname.expand_path.join('ui')
     end

data/lib/flipper/ui/actions/add_feature.rb

@@ -8,6 +8,16 @@ module Flipper
         route %r{features/new/?\Z}
 
         def get
+          unless Flipper::UI.feature_creation_enabled
+            status 403
+
+            breadcrumb "Home", "/"
+            breadcrumb "Features", "/features"
+            breadcrumb "Noooooope"
+
+            halt view_response(:feature_creation_disabled)
+          end
+
           breadcrumb "Home", "/"
           breadcrumb "Features", "/features"
           breadcrumb "Add"

data/lib/flipper/ui/actions/features.rb

@@ -24,6 +24,16 @@ module Flipper
         end
 
         def post
+          unless Flipper::UI.feature_creation_enabled
+            status 403
+
+            breadcrumb "Home", "/"
+            breadcrumb "Features", "/features"
+            breadcrumb "Noooooope"
+
+            halt view_response(:feature_creation_disabled)
+          end
+
           value = params["value"]
 
           if Util.blank?(value)

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

@@ -52,3 +52,7 @@ body {
 .feature-enabled-gates {
   width:380px;
 }
+
+p.help {
+  color: #999;
+}

data/lib/flipper/ui/public/css/application.css

@@ -2601,3 +2601,6 @@ a.list-group-item-danger {
 
 .feature-enabled-gates {
   width: 380px; }
+
+p.help {
+  color: #999; }

data/lib/flipper/ui/views/add_feature.erb

@@ -11,8 +11,13 @@
   <div class="panel-body">
     <form action="<%= script_name %>/features" method="post">
       <%== csrf_input_tag %>
-      <input type="text" name="value" placeholder="ie: admins, orgs_next, etc.">
+      <input type="text" name="value" size="30" placeholder="ie: search, new_pricing, etc.">
       <input type="submit" value="Add Feature" class="btn">
     </form>
+    <p class="help">
+      Recommended naming conventions: lower case, <a href="https://en.wikipedia.org/wiki/Snake_case">snake case</a>, underscores over dashes.
+      <strong>Good</strong>: foo_bar, foo.
+      <strong>Bad</strong>: FooBar, Foo Bar, foo bar, foo-bar.
+    </p>
   </div>
 </div>

data/lib/flipper/ui/views/feature.erb

@@ -56,6 +56,7 @@
             <input type="text" name="value" <% if @feature.percentage_of_actors_value > 0 %>value="<%= @feature.percentage_of_actors_value %>"<% end %> placeholder="custom (ie: 26, 32, etc.)" class="input-mini">
             <input type="submit" name="action" value="Enable" class="btn btn-sm">
           </form>
+          <p class="help"><small>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.</small></p>
         </div>
       </div>
     </div>
@@ -81,6 +82,8 @@
             <input type="text" name="value" <% if @feature.percentage_of_time_value > 0 %>value="<%= @feature.percentage_of_time_value %>"<% end %> placeholder="custom (ie: 26, 32, etc.)" class="input-mini">
             <input type="submit" name="action" value="Enable" class="btn btn-sm">
           </form>
+
+          <p class="help"><small>Percentage of time functions independently of percentage of actors. 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.</small></p>
         </div>
       </div>
     </div>

data/lib/flipper/ui/views/feature_creation_disabled.erb

@@ -0,0 +1,3 @@
+<div class="flash flash-error">
+  Feature creation is disabled. To enable, you'll need to set <code>Flipper::UI.feature_creation_enabled = true</code> wherever flipper is running from.
+</div>

data/lib/flipper/ui/views/layout.erb

@@ -17,7 +17,9 @@
   </head>
   <body>
     <div class="container header">
-      <a class="btn btn-sm right" href="<%= script_name %>/features/new">Add Feature</a>
+      <%- if Flipper::UI.feature_creation_enabled -%>
+        <a class="btn btn-sm right" href="<%= script_name %>/features/new">Add Feature</a>
+      <%- end -%>
 
       <ol class="breadcrumb">
         <% @breadcrumbs.each do |breadcrumb| %>

data/lib/flipper/version.rb

@@ -1,3 +1,3 @@
 module Flipper
-  VERSION = "0.7.5"
+  VERSION = "0.8.0"
 end

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

@@ -1,11 +1,17 @@
 require 'helper'
 
 RSpec.describe Flipper::UI::Actions::AddFeature do
-  describe "GET /features/new" do
+  describe "GET /features/new with feature_creation_enabled set to true" do
     before do
+      @original_feature_creation_enabled = Flipper::UI.feature_creation_enabled
+      Flipper::UI.feature_creation_enabled = true
       get "/features/new"
     end
 
+    after do
+      Flipper::UI.feature_creation_enabled = @original_feature_creation_enabled
+    end
+
     it "responds with success" do
       expect(last_response.status).to be(200)
     end
@@ -14,4 +20,24 @@ RSpec.describe Flipper::UI::Actions::AddFeature do
       expect(last_response.body).to include('<form action="/features" method="post">')
     end
   end
+
+  describe "GET /features/new with feature_creation_enabled set to false" do
+    before do
+      @original_feature_creation_enabled = Flipper::UI.feature_creation_enabled
+      Flipper::UI.feature_creation_enabled = false
+      get "/features/new"
+    end
+
+    after do
+      Flipper::UI.feature_creation_enabled = @original_feature_creation_enabled
+    end
+
+    it "returns 403" do
+      expect(last_response.status).to be(403)
+    end
+
+    it "renders feature creation disabled template" do
+      expect(last_response.body).to include("Feature creation is disabled.")
+    end
+  end
 end

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

@@ -18,13 +18,19 @@ RSpec.describe Flipper::UI::Actions::Features do
     end
   end
 
-  describe "POST /features" do
+  describe "POST /features with feature_creation_enabled set to true" do
     before do
+      @original_feature_creation_enabled = Flipper::UI.feature_creation_enabled
+      Flipper::UI.feature_creation_enabled = true
       post "/features",
         {"value" => "notifications_next", "authenticity_token" => "a"},
         "rack.session" => {"_csrf_token" => "a"}
     end
 
+    after do
+      Flipper::UI.feature_creation_enabled = @original_feature_creation_enabled
+    end
+
     it "adds feature" do
       expect(flipper.features.map(&:key)).to include("notifications_next")
     end
@@ -34,4 +40,30 @@ RSpec.describe Flipper::UI::Actions::Features do
       expect(last_response.headers["Location"]).to eq("/features/notifications_next")
     end
   end
+
+  describe "POST /features with feature_creation_enabled set to false" do
+    before do
+      @original_feature_creation_enabled = Flipper::UI.feature_creation_enabled
+      Flipper::UI.feature_creation_enabled = false
+      post "/features",
+        {"value" => "notifications_next", "authenticity_token" => "a"},
+        "rack.session" => {"_csrf_token" => "a"}
+    end
+
+    after do
+      Flipper::UI.feature_creation_enabled = @original_feature_creation_enabled
+    end
+
+    it "does not add feature" do
+      expect(flipper.features.map(&:key)).to_not include("notifications_next")
+    end
+
+    it "returns 403" do
+      expect(last_response.status).to be(403)
+    end
+
+    it "renders feature creation disabled template" do
+      expect(last_response.body).to include("Feature creation is disabled.")
+    end
+  end
 end

data/spec/flipper/ui_spec.rb

@@ -93,4 +93,41 @@ RSpec.describe Flipper::UI do
       expect(last_response.body).to include('<a href="https://myapp.com/">App</a>')
     end
   end
+
+  it "should set feature_creation_enabled to true by default" do
+    expect(Flipper::UI.feature_creation_enabled).to be(true)
+  end
+
+  context "with feature_creation_enabled set to true" do
+    before do
+      @original_feature_creation_enabled = Flipper::UI.feature_creation_enabled
+      Flipper::UI.feature_creation_enabled = true
+    end
+
+    it 'has the add_feature button' do
+      get '/features'
+      expect(last_response.body).to include('Add Feature')
+    end
+
+    after do
+      Flipper::UI.feature_creation_enabled = @original_feature_creation_enabled
+    end
+  end
+
+  context "with feature_creation_enabled set to false" do
+    before do
+      @original_feature_creation_enabled = Flipper::UI.feature_creation_enabled
+      Flipper::UI.feature_creation_enabled = false
+    end
+
+    it 'does not have the add_feature button' do
+      get '/features'
+      expect(last_response.body).to_not include('Add Feature')
+    end
+
+    after do
+      Flipper::UI.feature_creation_enabled = @original_feature_creation_enabled
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flipper-ui
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.8.0
 platform: ruby
 authors:
 - John Nunemaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2016-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.5
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.5
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
@@ -245,6 +245,7 @@ files:
 - lib/flipper/ui/views/add_feature.erb
 - lib/flipper/ui/views/add_group.erb
 - lib/flipper/ui/views/feature.erb
+- lib/flipper/ui/views/feature_creation_disabled.erb
 - lib/flipper/ui/views/features.erb
 - lib/flipper/ui/views/layout.erb
 - lib/flipper/version.rb