rollout-ui 0.4.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28a0fb4a8472f7306389a27a5a876393b4448cd6cbaec5f2a88b8bc8efbfb5ce
-  data.tar.gz: 973788c7f25536390ee88921f831f7ffb0e30c311106576665c79c9837bc1e7d
+  metadata.gz: 23d80e49f2a5b8224f029c2f3345e19028947ae8e2db02c38240cb4b3a93b3a9
+  data.tar.gz: 4e1bf428271120df8b39f797b43cdb0031539779dfac48a9d1d2d8e4e117c364
 SHA512:
-  metadata.gz: 43d5446ef0c8508709a07723445ebf0334bb6b9b9f4dd4e19ec813e965d186e81f99ae1ff1e2c54f463d0385cf59b1d78f5f5a5c6fa784ff21a3e8a6eff391f1
-  data.tar.gz: 255a70ad4639eb42da84b492e6659e3c71d39fad19fca1e5543fbb9454038dd801b23efb77527ba4bd81b0a3a4cc7298f87a31e57ad329317856aad2bcca0c54
+  metadata.gz: 0cb581a7d9caa5bf22d3fa404561dbbc221db7a39f0a85438a47c0033a293924c00484457e1fb5f11e995d8d1e61b7b8e2881eff094adad6265415aacd78d465
+  data.tar.gz: 8f8acc759b488724625a5b2c5ac147523db44ccf0f3105b4a4418f74d5f43a52fb1a23772636ec5dab13f0006a3b70d41136525050e3256dc5659037173663e5

data/.ruby-version

@@ -1 +1 @@
-2.7.2
+3.1.2

data/lib/rollout/ui/version.rb

@@ -1,5 +1,5 @@
 class Rollout
   module UI
-    VERSION = "0.4.0"
+    VERSION = "0.5.1"
   end
 end

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

@@ -1,68 +1,76 @@
 a.text-sm.text-blue-600(href=index_path class='hover:text-blue-700 hover:underline')
   ' ← back to overview
 
+- if params[:error]
+  pre.text-red-500= params[:error]
 h2.font-semibold.text-xl.text-gray-500.pt-12
   = @feature.name
 
 .w-8.h-1.bg-gray-300.my-10
+main.p-6.bg-gray-100.max-w-lg.w-full.text-sm.rounded-sm
+  form#updateFormSubmit action=feature_path(@feature.name) method='POST'
+    input type='hidden' name='last_updated_at' value=(@feature.data['updated_at'])
+    .mb-5
+      label.block.text-gray-500.mb-2(for='description') Description
+      input.appearance-none.border.rounded-sm.w-full.py-2.px-4.text-gray-600.leading-relaxed.bg-white(
+        name='description'
+        id='description'
+        value=@feature.data['description']
+        class='hover:border-gray-500'
+      )
 
-form.p-6.bg-gray-100.max-w-lg.w-full.text-sm.rounded-sm action=feature_path(@feature.name) method='POST'
-  .mb-5
-    label.block.text-gray-500.mb-2(for='description') Description
-    input.appearance-none.border.rounded-sm.w-full.py-2.px-4.text-gray-600.leading-relaxed.bg-white(
-      name='description'
-      id='description'
-      value=@feature.data['description']
-      class='hover:border-gray-500'
-    )
-
-  .mb-5
-    label.block.text-gray-500.mb-2(for='groups')
-      | 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 + 1))
-      option.py-1.px-1(value='' selected=(@feature.groups.count == 0))
-        = '(none)'
-      - @rollout.groups.each do |group|
-        option.py-1.px-1(
-          value=group
-          selected=@feature.groups.include?(group)
-        )
-          = group
-
-  .mb-5
-    label.block.text-gray-500.mb-2(for='percentage') Percentage
-    input.appearance-none.border.rounded-sm.w-full.py-2.px-4.text-gray-600.leading-relaxed.bg-white(
-      name='percentage'
-      id='percentage'
-      value=@feature.percentage
-      class='hover:border-gray-500'
-      type='number'
-      step='0.1'
-    )
-
-  .mb-5
-    label.block.text-gray-500.mb-2 Users
+    .mb-5
+      label.block.text-gray-500.mb-2(for='groups')
+        | 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 + 1))
+        option.py-1.px-1(value='' selected=(@feature.groups.count == 0))
+          = '(none)'
+        - @rollout.groups.each do |group|
+          option.py-1.px-1(
+            value=group
+            selected=@feature.groups.include?(group)
+          )
+            = group
 
-    - if @feature.users.count > 100
-      .appearance-none.border.rounded-sm.w-full.py-2.px-4.text-gray-600.leading-relaxed.bg-gray-100
-        = @feature.users.count
-    - else
-      textarea.appearance-none.border.rounded-sm.w-full.py-2.px-4.text-gray-600.leading-relaxed.bg-white(
-        name='users'
-        id='users'
-        value=@feature.users.join(', ')
+    .mb-5
+      label.block.text-gray-500.mb-2(for='percentage') Percentage
+      input.appearance-none.border.rounded-sm.w-full.py-2.px-4.text-gray-600.leading-relaxed.bg-white(
+        name='percentage'
+        id='percentage'
+        value=@feature.percentage
         class='hover:border-gray-500'
-        rows='2'
+        type='number'
+        step='0.1'
       )
-        = @feature.users.join(', ')
+
+    .mb-5
+      label.block.text-gray-500.mb-2 Users
+
+      - if @feature.users.count > 150
+        .appearance-none.border.rounded-sm.w-full.py-2.px-4.text-gray-600.leading-relaxed.bg-gray-100
+          = @feature.users.count
+      - else
+        textarea.appearance-none.border.rounded-sm.w-full.py-2.px-4.text-gray-600.leading-relaxed.bg-white(
+          name='users'
+          id='users'
+          value=@feature.users.join(', ')
+          class='hover:border-gray-500'
+          rows='2'
+        )
+          = @feature.users.join(', ')
 
   .flex.items-center.justify-end
     form action=delete_feature_path(@feature.name) method='POST'
       button.mr-5.text-gray-600(class='hover:underline' type='submit' onclick="return confirm('Are you sure you want to delete #{@feature.name}?')")
-        ' Delete
-    button.py-4.px-5.bg-gray-700.text-gray-200.rounded-sm.font-bold.leading-none.transition-colors.duration-200(class='hover:bg-gray-800' type='submit') Update
+        | Delete
+    button.py-4.px-5.bg-gray-700.text-gray-200.rounded-sm.font-bold.leading-none.transition-colors.duration-200(
+      type='submit'
+      class='hover:bg-gray-800'
+      form='updateFormSubmit'
+    )
+      | Update
 
 - history_events = @rollout.respond_to?(:logging) ? @rollout.logging.events(@feature.name).reverse : []
 

data/lib/rollout/ui/web.rb

@@ -49,7 +49,10 @@ module Rollout::UI
     post '/features/:feature_name' do
       rollout = config.get(:instance)
       actor = config.get(:actor, scope: self)
-
+      feature_data = rollout.get(params[:feature_name]).data
+      if feature_data['updated_at'] && params[:last_updated_at] != feature_data['updated_at']
+        redirect "#{feature_path(params[:feature_name])}?error=Rollout version outdated. Review changes below and try again."
+      end
       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)
@@ -58,6 +61,7 @@ module Rollout::UI
             feature.users = params[:users].split(',').map(&:strip).uniq.sort
           end
           feature.data.update(description: params[:description])
+          feature.data.update(updated_at: Time.now.to_i)
         end
       end
 
@@ -71,6 +75,7 @@ module Rollout::UI
       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.data.update(updated_at: Time.now.to_i)
         end
       end
 

data/rollout-ui.gemspec

@@ -25,12 +25,13 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rollout', '~> 2.5'
   spec.add_dependency 'sinatra', '~> 2.0'
   spec.add_dependency 'sinatra-contrib', '~> 2.1'
-  spec.add_dependency 'slim', '~> 4.0'
+  spec.add_dependency 'slim', ['>= 3.0', '< 5.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'
   spec.add_development_dependency 'rack-test'
+  spec.add_development_dependency 'puma'
   spec.add_development_dependency 'pry'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rollout-ui
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.1
 platform: ruby
 authors:
 - FetLife
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-02-03 00:00:00.000000000 Z
+date: 2022-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rollout
@@ -56,16 +56,22 @@ dependencies:
   name: slim
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +142,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -185,7 +205,7 @@ homepage: https://github.com/fetlife/rollout-ui
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -200,8 +220,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.3.21
+signing_key:
 specification_version: 4
 summary: ''
 test_files: []