Fixes and tweaks

- Fix project when running with rollout with logging disabled
- Fix usage of `present?` which doesnt exist in plain Ruby
- Add development rackup config and instructions on how to run this project

Author: reneklacan

.gitignore

@@ -9,3 +9,5 @@
 
 # rspec failure tracking
 .rspec_status
+
+Gemfile.lock

.ruby-version

@@ -0,0 +1 @@
+2.6.6

Gemfile

@@ -4,3 +4,5 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in rollout-ui.gemspec
 gemspec
+
+

README.md

@@ -83,6 +83,19 @@ end
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/fetlife/rollout-ui.
 
+To run this project for development in isolation:
+
+```sh
+bundle install
+bundle exec rerun rackup
+```
+
+Alternatively you can also configure which Redis with:
+
+```sh
+REDIS_HOST=localhost REDIS_PORT=6379 REDIS_DB=10 be rerun rackup
+```
+
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

config.ru

@@ -0,0 +1,23 @@
+# Development Rackup config you can run with `bundle exec rerun rackup`
+
+require_relative 'lib/rollout/ui'
+require 'redis'
+
+redis_host = ENV.fetch('REDIS_HOST', 'localhost')
+redis_port = ENV.fetch('REDIS_PORT', '6379')
+redis_db = ENV.fetch('REDIS_DB', '10')
+
+redis = Redis.new(host: redis_host, port: redis_port, db: redis_db)
+rollout = Rollout.new(redis, logging: { history_length: 100, global: true })
+
+%i[employees developers subscribers].each do |group|
+  rollout.define_group(group) { }
+end
+
+Rollout::UI.configure do
+  instance { rollout }
+  actor { "JohnDoe" }
+  actor_url { "https://www.youtube.com/watch?v=fbGkxcY7YFU" }
+end
+
+run Rollout::UI::Web.new

lib/rollout/ui/config.rb

@@ -39,7 +39,7 @@ def get(key, *args, scope: nil)
     end
 
     def defined?(key)
-      @blocks.present? && @blocks.key?(key)
+      !@blocks.nil? && @blocks.key?(key)
     end
   end
 end

lib/rollout/ui/helpers.rb

@@ -10,7 +10,7 @@ def stylesheet_path(name)
     end
 
     def index_path
-      request.script_name
+      "#{request.script_name}/"
     end
 
     def new_feature_path
@@ -32,7 +32,17 @@ def activate_percentage_feature_path(feature_name, percentage)
     def current_user
       @current_user ||= begin
         id = request.session["warden.user.user.key"].try(:[], 0).try(:[], 0)
-        User.find_by(id: id) if id.present?
+        User.find_by(id: id) unless id.nil?
+      end
+    end
+
+    def with_rollout_context(rollout, context)
+      if rollout.respond_to?(:logging)
+        rollout.logging.with_context(context) do
+          yield
+        end
+      else
+        yield
       end
     end
 

lib/rollout/ui/views/features/partials/event_log.slim

@@ -26,7 +26,7 @@
               - if event.name == "update"
                 - if event.context && event.context[:actor]
                   - if config.defined?(:actor_url)
-                    a.underline> href=config.get(:actor_url, event.context[:actor])
+                    a.underline> href=config.get(:actor_url, event.context[:actor]) target='_blank'
                       = event.context[:actor]
                   - else
                     ' #{event.context[:actor]}

lib/rollout/ui/views/features/show.slim

@@ -1,4 +1,5 @@
-a.text-sm.text-blue-600(href=index_path class='hover:text-blue-700 hover:underline') ← back to overview
+a.text-sm.text-blue-600(href=index_path class='hover:text-blue-700 hover:underline')
+  ' ← back to overview
 
 h2.font-semibold.text-xl.text-gray-500.pt-12
   = @feature.name
@@ -20,7 +21,7 @@ form.p-6.bg-gray-100.max-w-lg.w-full.text-sm.rounded-sm action=feature_path(@fea
       | Groups
       span.ml-1.text-gray-400
         | (multi-select)
-    select.block.appearance-none.w-full.bg-white.border.border-gray-300.px-4.py-3.rounded-sm.leading-relaxed(name="groups[]" id='groups' multiple=true size=$rollout.groups.count)
+    select.block.appearance-none.w-full.bg-white.border.border-gray-300.px-4.py-3.rounded-sm.leading-relaxed(name="groups[]" id='groups' multiple=true size=(@rollout.groups.count + 1))
       option.py-1.px-1(value='' selected=(@feature.groups.count == 0))
         = '(none)'
       - @rollout.groups.each do |group|
@@ -38,9 +39,7 @@ form.p-6.bg-gray-100.max-w-lg.w-full.text-sm.rounded-sm action=feature_path(@fea
       value=@feature.percentage
       class='hover:border-gray-500'
       type='number'
-      min='0'
-      max='100'
-      step='10'
+      step='0.1'
     )
 
   .mb-5

lib/rollout/ui/web.rb

@@ -38,7 +38,7 @@ class Web < Sinatra::Base
       rollout = config.get(:instance)
       actor = config.get(:actor, scope: self)
 
-      rollout.logging.with_context(actor: actor) do
+      with_rollout_context(rollout, actor: actor) do
         rollout.with_feature(params[:feature_name]) do |feature|
           feature.percentage = params[:percentage].to_f.clamp(0.0, 100.0)
           feature.groups = (params[:groups] || []).reject(&:empty?).map(&:to_sym)
@@ -56,7 +56,7 @@ class Web < Sinatra::Base
       rollout = config.get(:instance)
       actor = config.get(:actor, scope: self)
 
-      rollout.logging.with_context(actor: actor) do
+      with_rollout_context(rollout, actor: actor) do
         rollout.with_feature(params[:feature_name]) do |feature|
           feature.percentage = params[:percentage].to_f.clamp(0.0, 100.0)
         end

rollout-ui.gemspec

@@ -1,32 +1,33 @@
-
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "rollout/ui/version"
+require 'rollout/ui/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "rollout-ui"
+  spec.name          = 'rollout-ui'
   spec.version       = Rollout::UI::VERSION
-  spec.authors       = ["FetLife"]
-  spec.email         = ["dev@fetlife.com"]
+  spec.authors       = ['FetLife']
+  spec.email         = ['dev@fetlife.com']
 
   spec.summary       = %q{}
   spec.description   = %q{}
-  spec.homepage      = "https://github.com/fetlife/rollout-ui"
-  spec.license       = "MIT"
+  spec.homepage      = 'https://github.com/fetlife/rollout-ui'
+  spec.license       = 'MIT'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "rollout", "~> 2.5"
-  spec.add_dependency "sinatra", "~> 2.0"
+  spec.add_dependency 'rollout', '~> 2.5'
+  spec.add_dependency 'sinatra', '~> 2.0'
+  spec.add_dependency 'slim', '~> 4.0'
 
-  spec.add_development_dependency "bundler", "~> 1.17"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency 'bundler', '~> 1.17'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
+  spec.add_development_dependency 'rerun', '~> 0.13'
 end