flipper-ui 0.10.2 → 0.11.0.beta1

data/lib/flipper/ui/decorators/feature.rb

@@ -23,20 +23,20 @@ module Flipper
             'id' => name.to_s,
             'name' => pretty_name,
             'state' => state.to_s,
-            'gates' => gates.map { |gate|
+            'gates' => gates.map do |gate|
               Decorators::Gate.new(gate, gate_values[gate.key]).as_json
-            },
+            end,
           }
         end
 
         def color_class
           case feature.state
           when :on
-            "text-open"
+            'text-open'
           when :off
-            "text-closed"
+            'text-closed'
           when :conditional
-            "text-pending"
+            'text-pending'
           end
         end
 
@@ -45,10 +45,10 @@ module Flipper
         end
 
         StateSortMap = {
-          :on => 1,
-          :conditional => 2,
-          :off => 3,
-        }
+          on: 1,
+          conditional: 2,
+          off: 3,
+        }.freeze
 
         def <=>(other)
           if state == other.state

data/lib/flipper/ui/decorators/gate.rb

@@ -17,12 +17,13 @@ module Flipper
 
         # Public: Returns instance as hash that is ready to be json dumped.
         def as_json
-          value_as_json = case data_type
-          when :set
-            value.to_a # json doesn't like sets
-          else
-            value
-          end
+          value_as_json =
+            case data_type
+            when :set
+              value.to_a # json doesn't like sets
+            else
+              value
+            end
 
           {
             'key' => gate.key.to_s,

data/lib/flipper/ui/middleware.rb

@@ -9,31 +9,9 @@ end
 module Flipper
   module UI
     class Middleware
-      # Public: Initializes an instance of the UI middleware.
-      #
-      # app - The app this middleware is included in.
-      # flipper_or_block - The Flipper::DSL instance or a block that yields a
-      #                    Flipper::DSL instance to use for all operations.
-      #
-      # Examples
-      #
-      #   flipper = Flipper.new(...)
-      #
-      #   # using with a normal flipper instance
-      #   use Flipper::UI::Middleware, flipper
-      #
-      #   # using with a block that yields a flipper instance
-      #   use Flipper::UI::Middleware, lambda { Flipper.new(...) }
-      #
-      def initialize(app, flipper_or_block)
+      def initialize(app)
         @app = app
 
-        if flipper_or_block.respond_to?(:call)
-          @flipper_block = flipper_or_block
-        else
-          @flipper = flipper_or_block
-        end
-
         @action_collection = ActionCollection.new
 
         # UI
@@ -54,10 +32,6 @@ module Flipper
         @action_collection.add UI::Actions::Home
       end
 
-      def flipper
-        @flipper ||= @flipper_block.call
-      end
-
       def call(env)
         dup.call!(env)
       end
@@ -69,6 +43,7 @@ module Flipper
         if action_class.nil?
           @app.call(env)
         else
+          flipper = env.fetch('flipper')
           action_class.run(flipper, request)
         end
       end

data/lib/flipper/ui/util.rb

@@ -2,14 +2,14 @@ module Flipper
   module UI
     module Util
       # Private: 0x3000: fullwidth whitespace
-      NON_WHITESPACE_REGEXP = %r![^\s#{[0x3000].pack("U")}]!
+      NON_WHITESPACE_REGEXP = /[^\s#{[0x3000].pack("U")}]/
 
       def self.blank?(str)
         str.to_s !~ NON_WHITESPACE_REGEXP
       end
 
       def self.titleize(str)
-        str.to_s.split("_").map { |word| word.capitalize }.join(" ")
+        str.to_s.split('_').map(&:capitalize).join(' ')
       end
     end
   end

data/lib/flipper/version.rb

@@ -1,3 +1,3 @@
 module Flipper
-  VERSION = "0.10.2".freeze
+  VERSION = '0.11.0.beta1'.freeze
 end

data/spec/flipper/ui/action_spec.rb

@@ -1,59 +1,59 @@
 require 'helper'
 
 RSpec.describe Flipper::UI::Action do
-  let(:action_subclass) {
+  let(:action_subclass) do
     Class.new(described_class) do
       def noooope
-        raise "should never run this"
+        raise 'should never run this'
       end
 
       def get
-        [200, {}, "get"]
+        [200, {}, 'get']
       end
 
       def post
-        [200, {}, "post"]
+        [200, {}, 'post']
       end
 
       def put
-        [200, {}, "put"]
+        [200, {}, 'put']
       end
 
       def delete
-        [200, {}, "delete"]
+        [200, {}, 'delete']
       end
     end
-  }
+  end
 
   it "won't run method that isn't whitelisted" do
-    fake_request = Struct.new(:request_method, :env, :session).new("NOOOOPE", {}, {})
+    fake_request = Struct.new(:request_method, :env, :session).new('NOOOOPE', {}, {})
     action = action_subclass.new(flipper, fake_request)
-    expect {
+    expect do
       action.run
-    }.to raise_error(Flipper::UI::RequestMethodNotSupported)
+    end.to raise_error(Flipper::UI::RequestMethodNotSupported)
   end
 
-  it "will run get" do
-    fake_request = Struct.new(:request_method, :env, :session).new("GET", {}, {})
+  it 'will run get' do
+    fake_request = Struct.new(:request_method, :env, :session).new('GET', {}, {})
     action = action_subclass.new(flipper, fake_request)
-    expect(action.run).to eq([200, {}, "get"])
+    expect(action.run).to eq([200, {}, 'get'])
   end
 
-  it "will run post" do
-    fake_request = Struct.new(:request_method, :env, :session).new("POST", {}, {})
+  it 'will run post' do
+    fake_request = Struct.new(:request_method, :env, :session).new('POST', {}, {})
     action = action_subclass.new(flipper, fake_request)
-    expect(action.run).to eq([200, {}, "post"])
+    expect(action.run).to eq([200, {}, 'post'])
   end
 
-  it "will run put" do
-    fake_request = Struct.new(:request_method, :env, :session).new("PUT", {}, {})
+  it 'will run put' do
+    fake_request = Struct.new(:request_method, :env, :session).new('PUT', {}, {})
     action = action_subclass.new(flipper, fake_request)
-    expect(action.run).to eq([200, {}, "put"])
+    expect(action.run).to eq([200, {}, 'put'])
   end
 
-  it "will run delete" do
-    fake_request = Struct.new(:request_method, :env, :session).new("DELETE", {}, {})
+  it 'will run delete' do
+    fake_request = Struct.new(:request_method, :env, :session).new('DELETE', {}, {})
     action = action_subclass.new(flipper, fake_request)
-    expect(action.run).to eq([200, {}, "delete"])
+    expect(action.run).to eq([200, {}, 'delete'])
   end
 end

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

@@ -1,107 +1,111 @@
 require 'helper'
 
 RSpec.describe Flipper::UI::Actions::ActorsGate do
-  let(:token) {
+  let(:token) do
     if Rack::Protection::AuthenticityToken.respond_to?(:random_token)
       Rack::Protection::AuthenticityToken.random_token
     else
-      "a"
+      'a'
     end
-  }
-  let(:session) {
+  end
+  let(:session) do
     if Rack::Protection::AuthenticityToken.respond_to?(:random_token)
-      {:csrf => token}
+      { csrf: token }
     else
-      {"_csrf_token" => token}
+      { '_csrf_token' => token }
     end
-  }
+  end
 
-  describe "GET /features/:feature/actors" do
+  describe 'GET /features/:feature/actors' do
     before do
-      get "features/search/actors"
+      get 'features/search/actors'
     end
 
-    it "responds with success" do
+    it 'responds with success' do
       expect(last_response.status).to be(200)
     end
 
-    it "renders add new actor form" do
+    it 'renders add new actor form' do
       expect(last_response.body).to include('<form action="/features/search/actors" method="post">')
     end
   end
 
-  describe "POST /features/:feature/actors" do
-    context "enabling an actor" do
-      let(:value) { "User:6" }
+  describe 'POST /features/:feature/actors' do
+    context 'enabling an actor' do
+      let(:value) { 'User:6' }
 
       before do
-        post "features/search/actors",
-          {"value" => value, "operation" => "enable", "authenticity_token" => token},
-          "rack.session" => session
+        post 'features/search/actors',
+             { 'value' => value, 'operation' => 'enable', 'authenticity_token' => token },
+             'rack.session' => session
       end
 
-      it "adds item to members" do
-        expect(flipper[:search].actors_value).to include("User:6")
+      it 'adds item to members' do
+        expect(flipper[:search].actors_value).to include('User:6')
       end
 
-      it "redirects back to feature" do
+      it 'redirects back to feature' do
         expect(last_response.status).to be(302)
-        expect(last_response.headers["Location"]).to eq("/features/search")
+        expect(last_response.headers['Location']).to eq('/features/search')
       end
 
       context 'value contains whitespace' do
-        let(:value) { "  User:6  " }
+        let(:value) { '  User:6  ' }
 
-        it "adds item without whitespace" do
-          expect(flipper[:search].actors_value).to include("User:6")
+        it 'adds item without whitespace' do
+          expect(flipper[:search].actors_value).to include('User:6')
         end
       end
 
-      context "for an invalid actor value" do
-        context "empty value" do
-          let(:value) { "" }
+      context 'for an invalid actor value' do
+        context 'empty value' do
+          let(:value) { '' }
 
-          it "redirects back to feature" do
+          # 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/actors?error=%22%22+is+not+a+valid+actor+value.")
+            expect(last_response.headers['Location']).to eq('/features/search/actors?error=%22%22+is+not+a+valid+actor+value.')
           end
+          # rubocop:enable Metrics/LineLength
         end
 
-        context "nil value" do
+        context 'nil value' do
           let(:value) { nil }
 
-          it "redirects back to feature" do
+          # 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/actors?error=%22%22+is+not+a+valid+actor+value.")
+            expect(last_response.headers['Location']).to eq('/features/search/actors?error=%22%22+is+not+a+valid+actor+value.')
           end
+          # rubocop:enable Metrics/LineLength
         end
       end
     end
 
-    context "disabling an actor" do
-      let(:value) { "User:6" }
+    context 'disabling an actor' do
+      let(:value) { 'User:6' }
 
       before do
-        flipper[:search].enable_actor Flipper::UI::Actor.new("User:6")
-        post "features/search/actors",
-          {"value" => value, "operation" => "disable", "authenticity_token" => token},
-          "rack.session" => session
+        flipper[:search].enable_actor Flipper::UI::Actor.new('User:6')
+        post 'features/search/actors',
+             { 'value' => value, 'operation' => 'disable', 'authenticity_token' => token },
+             'rack.session' => session
       end
 
-      it "removes item from members" do
-        expect(flipper[:search].actors_value).not_to include("User:6")
+      it 'removes item from members' do
+        expect(flipper[:search].actors_value).not_to include('User:6')
       end
 
-      it "redirects back to feature" do
+      it 'redirects back to feature' do
         expect(last_response.status).to be(302)
-        expect(last_response.headers["Location"]).to eq("/features/search")
+        expect(last_response.headers['Location']).to eq('/features/search')
       end
 
       context 'value contains whitespace' do
-        let(:value) { "  User:6  " }
+        let(:value) { '  User:6  ' }
 
-        it "removes item whitout whitespace" do
-          expect(flipper[:search].actors_value).not_to include("User:6")
+        it 'removes item whitout whitespace' do
+          expect(flipper[:search].actors_value).not_to include('User:6')
         end
       end
     end

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

@@ -1,43 +1,43 @@
 require 'helper'
 
 RSpec.describe Flipper::UI::Actions::AddFeature do
-  describe "GET /features/new with feature_creation_enabled set to true" 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"
+      get '/features/new'
     end
 
     after do
       Flipper::UI.feature_creation_enabled = @original_feature_creation_enabled
     end
 
-    it "responds with success" do
+    it 'responds with success' do
       expect(last_response.status).to be(200)
     end
 
-    it "renders template" do
+    it 'renders template' 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
+  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"
+      get '/features/new'
     end
 
     after do
       Flipper::UI.feature_creation_enabled = @original_feature_creation_enabled
     end
 
-    it "returns 403" do
+    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.")
+    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/boolean_gate_spec.rb

@@ -1,55 +1,55 @@
 require 'helper'
 
 RSpec.describe Flipper::UI::Actions::BooleanGate do
-  let(:token) {
+  let(:token) do
     if Rack::Protection::AuthenticityToken.respond_to?(:random_token)
       Rack::Protection::AuthenticityToken.random_token
     else
-      "a"
+      'a'
     end
-  }
-  let(:session) {
+  end
+  let(:session) do
     if Rack::Protection::AuthenticityToken.respond_to?(:random_token)
-      {:csrf => token}
+      { csrf: token }
     else
-      {"_csrf_token" => token}
+      { '_csrf_token' => token }
     end
-  }
+  end
 
-  describe "POST /features/:feature/boolean" do
-    context "with enable" do
+  describe 'POST /features/:feature/boolean' do
+    context 'with enable' do
       before do
         flipper.disable :search
-        post "features/search/boolean",
-          {"action" => "Enable", "authenticity_token" => token},
-          "rack.session" => session
+        post 'features/search/boolean',
+             { 'action' => 'Enable', 'authenticity_token' => token },
+             'rack.session' => session
       end
 
-      it "enables the feature" do
+      it 'enables the feature' do
         expect(flipper.enabled?(:search)).to be(true)
       end
 
-      it "redirects back to feature" do
+      it 'redirects back to feature' do
         expect(last_response.status).to be(302)
-        expect(last_response.headers["Location"]).to eq("/features/search")
+        expect(last_response.headers['Location']).to eq('/features/search')
       end
     end
 
-    context "with disable" do
+    context 'with disable' do
       before do
         flipper.enable :search
-        post "features/search/boolean",
-          {"action" => "Disable", "authenticity_token" => token},
-          "rack.session" => session
+        post 'features/search/boolean',
+             { 'action' => 'Disable', 'authenticity_token' => token },
+             'rack.session' => session
       end
 
-      it "disables the feature" do
+      it 'disables the feature' do
         expect(flipper.enabled?(:search)).to be(false)
       end
 
-      it "redirects back to feature" do
+      it 'redirects back to feature' do
         expect(last_response.status).to be(302)
-        expect(last_response.headers["Location"]).to eq("/features/search")
+        expect(last_response.headers['Location']).to eq('/features/search')
       end
     end
   end