flipside 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e49af6fc8d31128f0e88089ad6d46ce1745a223a68c4f5e4f2e5353f99091073
-  data.tar.gz: cb1547b1c3892b363830aa5f75375998092b90f150e6a275b3224051b6eb3b19
+  metadata.gz: d4d7b79a7cff6585a0858dfeb93ca2a79511458ae211bd27e5cf70c5f114ff79
+  data.tar.gz: b526c4c4eee41a72f6576d8fb3044815b3d58aa515a38280d754d504e4d55b15
 SHA512:
-  metadata.gz: cc95be97c95f5c6285d4eb57e6b378b47277d61e43f6606eb44bf9c9c6f914a2b6019c4a143c8b9a5058c64eac6ea0f4cffbecf7138ad3836ca0dcb196515c22
-  data.tar.gz: fb5262d598dea36dd87e7c987ae1d263500b2bc7e39882d7da5a119a6c11aab009821d7981732a442176985054900355e6bcf2b8d2b0fa68eab99e03a6469337
+  metadata.gz: 63a30c74eb4b138808e24b79316806325b47a42dabc17fa9d59550e2967edd8a106b85c80612bc2dfa7549a61f329ff2952331f25034bde125c3c9912d99db45
+  data.tar.gz: fbd4ac70e3e00e6935201925f51e7eb7bce04f8c4735267e4bba8e919d2f1214818bee38c2829691bbf7981543f28f0469379c47df8b63b3a7faca157e3150d0

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## [0.3.0] - 2025-05-14
+- Rewrite Sinatra UI to Roda
+- Fix links not respecting mount point
+- Add Cache-Control header for js files
+
+## [0.2.2] - 2025-04-25
+
+- Add disabled? method
+- Edit feature description from UI
+- Add configuration for setting default_object
+
 ## [0.2.1] - 2025-01-30
 
 - Option to create missing features

data/README.md

@@ -33,41 +33,72 @@ This will create a migration file. Run the migration, to add the flipside tables
 
 ## Usage
 
-1. Defining Features
+### Defining Features
 
 Features are created by running this (in a console or from code):
 ```ruby
-Flipside::Feature.create(
+Flipside.create(
   name: "MyFeature",
   description: "Some optional description about what this feature do"
 )
 ```
 
-By default features are turned off. If you would like it turned on from the beginning you could pass in `enabled: true`.
+By default features are turned off. If we would like it turned on from the get go we could pass in `enabled: true`.
 ```ruby
-Flipside::Feature.create(name: "MyFeature", enabled: true)
+Flipside.create(name: "MyFeature", enabled: true)
 ```
 
 Features can be active during a given period. Set `activated_at` and/or `deactivated_at` to define this period.
 Note: A feature is always disabled outside of the active period.
+Note: A nil value means that its active. I.e. `activated_at = nil` means active from the start, `deactivated_at = nil` means never deactivates.
 ```ruby
-Flipside::Feature.create(
+Flipside.create(
   name: "MyFeature",
   activated_at: 1.week.from_now,
   deactivated_at: 2.weeks.from_now
 )
 ```
 
-Features can be enabled for a certain record, typically a certain user or organization. This records are called entities. To enable a feature for a given record use `.add_entity`:
+### Checking Feature Status
+
+#### Globally
+
+Check if a feature is enabled globally:
+
+```ruby
+Flipside.enabled? "MyFeature"
+```
+
+We can also check if a feature is disabled:
+```ruby
+Flipside.disabled? "MyFeature"
+```
+
+#### For a Specific Record
+
+Check if a feature is enabled for a specific record (e.g. a user):
+
+```ruby
+Flipside.enabled? "MyFeature", user
+```
+
+We can also check multiple records. `.enabled?` will return `true` if any of them have the feature enabled:
+```ruby
+Flipside.enabled? "MyFeature", user, company, location
+```
+
+### Enabling features for specific records
+
+Features can be enabled for a certain record, typically a certain user or organization. These records are called entities. To enable a feature for a given record use `.add_entity`:
 ```ruby
 user = User.first
-Flipside.enabled? user # => false
+Flipside.enabled? "MyFeature", user # => false
 Flipside.add_entity(name: "MyFeature", user)
-Flipside.enabled? user # => true
+Flipside.enabled? "MyFeature", user # => true
 ```
 
 Features can be enabled for records responding true to a certain method. This is called a "role". Given that User records have an admin? method. A feature can then be enabled
-for all users how are admins, using the `.add_role` method:
+for all users who are admins, using the `.add_role` method:
 ```ruby
 user1 = User.new(admin: false)
 user2 = User.new(admin: true)
@@ -76,43 +107,69 @@ Flipside.add_role(
   class_name: "User",
   method_name: :admin?
 )
-Flipside.enabled? user1 # => false
-Flipside.enabled? user2 # => true
+Flipside.enabled? "MyFeature", user1 # => false
+Flipside.enabled? "MyFeature", user2 # => true
+Flipside.enabled? "MyFeature", user1, user2 # => true, enabled for at least one.
 ```
 
 
-2. Checking Feature Status
+## UI
+Flipside comes with a Roda web ui to mange feature flags. To mount this roda app in Rails add the following to your routes.rb file.
+```ruby
+mount Flipside::Web, at: '/flipside'
+```
+Note: you probably want to wrap this inside a constraints block to provide some authentication.
 
-#### Globally
+![UI](/features.png)
 
-Check if a feature is enabled globally:
 
-```ruby
-Flipside.enabled? "MyFeature"
-```
+### Configuration
 
-#### For a Specific Record
+The Flipside UI can be configured by calling some class methods on `Flipside` (see below).
 
-Check if a feature is enabled for a specific record (e.g. a user):
+`ui_back_path` is used to set a path to return to from the Flipside UI. If this is set, then the UI shows a "Back" button,
+targeting this path/url. By default no back button is shown.
+
+
+If `create_missing_features` is set to true, then features will automatically be created, whenever a check for an unknown feature is done.
+This can be a convenient way of makes features "show up" in the Flipside UI. However, the description will not reveal much about what this features does.
+(it will simply point to the place in the code where this check was done). So these features should be manually updated with a better description.
+By default, features are not added and code like `Flipside.enabled? "Some unknown feature"` will simply return `false`.
 
+`default_object` can be used to avoid the need to always pass in a record when checking if a feature is enabled. For example, say that we
+always want to check if a feature is enabled for the currently logged in user (`Current.user`). Then we might add this configuration:
 ```ruby
-Flipside.enabled? "MyFeature", user
+Flipside.default_object = -> { Current.user }
 ```
-
-## UI
-Flipside comes with a sinatra web ui to mange feature flags. To mount this sinatra app in Rails add the following to your routes.rb file.
+Now we can check if a feature is enabled without needing to pass in `Current.user`:
 ```ruby
-mount Flipside::Web, at: '/flipside'
+# With `default_object` set then all we need is this
+Flipside.enabled? :some_feature
+
+# Which will be the same as
+Flipside.enabled? :some_feature, Current.user
+
+# Note: if we do pass in an argument, then `default_object ` will not be used:
+Flipside.enabled? :some_feature, Current.company # check current company instead of user.
 ```
-Note: you probably want to wrap this inside a constraints block to provide some authentication.
 
-![UI](/features.png)
 
+Typically this configuration should be declared in an initializer file.
 
-### Configuration
+```ruby
+# config/initializers/flipside.rb
+require 'flipside'
 
-Entities can be added to a feature by searching for records and adding them.
-![Start screen](/add_entity.png)
+Flipside.ui_back_path = "/"
+Flipside.create_missing_features = true
+Flipside.default_object = -> { Current.user }
+```
+
+#### Entities
+
+Entities can be added to a feature by searching for records.
+
+![Add an entity](/add_entity.png)
 
 To make this work, some configuration is required. Use the class method `Flipside.register_entity` for this.
 ```ruby
@@ -123,12 +180,59 @@ Flipside.register_entity(
   identified_by: :id
 )
 ```
-Typically this should be configured in an initializer file.
 
-The `.register_entity` method should be called once for each class that may be used as feature enablers.
-The `search_by` keyword argument, which may be a symbol or a proc, dictates how records are found from searching in the ui. When a symbol is given, then searches with an exact match on the corresponding attribute are returned. E.g. `User.where(name: query)`.
+The `.register_entity` method should be called once for each class that may be used as a feature enabler.
+The `search_by` keyword argument, which may be a `Symbol` or a `Proc`, dictates how records are found from searching in the ui.
+When a `Symbol` is given, e.g. `:name`, then entities with an exact match on the corresponding attribute are returned. I.e. `User.where(name: query)`.
+When a `Proc` is given, then this `Proc` is called with the search string and is expected to return an object responding to `to_a` (e.g. an AR collection).
+This gives us the flexibility to decide how to search for entities. For example, to search for users with matching first name or last name or an email
+starting with _query_, something like this could be used.
+```ruby
+Flipside.register_entity(
+  class_name: "User",
+  search_by: ->(str) { User.where("lower(first_name) = :name OR lower(last_name) = :name or email LIKE :str", name: str.downcase, str: "#{str}%") },
+)
+
+```
+
+The `identified_by` keyword argument, sets the column used as primary key for the corresponding table. This defaults to `:id` and typically does need to be change.
+Currently composite keys are not supported.
+
+The `display_as` keyword argument, is used to configure how these entities show up in the combobox. When set to a `Symbol`, then this value is sent to the corresponding entity.
+For example, given the following setup. Users will be displayed with first name and last name:
+```ruby
+class User < ApplicationRecord
+  def name
+    [first_name, last_name].compact.map(&:capitalize).join(" ")
+  end
+end
+
+Flipside.register_entity(
+  class_name: "User",
+  display_as: :name,
+)
+```
+
+When a `Proc` is given, then it is expected to take an entity as input and return a string used for displaying the entity. The config above could then instead be done using:
+```ruby
+Flipside.register_entity(
+  class_name: "User",
+  display_as: ->(user) { [user.first_name, user.last_name].compact.map(&:capitalize).join(" ") }
+)
+```
 
-TODO
+#### Roles
+
+Features can be enabled for certain roles, by searching for roles (by method name).
+
+![Add a role](/add_role.png)
+
+This is configured by calling the class method `Flipside.register_role` for each role to be added.
+Note a role consists of a class and a corresponding instance method.
+```ruby
+Flipside.register_role(class_name: "User", method_name: :admin?)
+Flipside.register_role(class_name: "User", method_name: :awesome?)
+```
 
 ## Development
 

data/lib/flipside/config/settings.rb

@@ -2,6 +2,16 @@ module Flipside
   module Config
     module Settings
       attr_accessor :ui_back_path, :create_missing_features
+      attr_writer :default_object
+
+      def default_object
+        case @default_object
+        when Proc
+          @default_object.call
+        else
+          @default_object
+        end
+      end
     end
   end
 end

data/lib/flipside/feature_presenter.rb

@@ -2,49 +2,12 @@ require 'forwardable'
 
 class FeaturePresenter
   extend Forwardable
-  attr_reader :feature, :base_path
+  attr_reader :feature
 
   def_delegators :@feature, :name, :description, :enabled, :entities, :roles
 
-  def initialize(feature, base_path)
+  def initialize(feature)
     @feature = feature
-    @base_path = base_path
-  end
-
-  def href
-    File.join(base_path, "feature", ERB::Util.url_encode(name))
-  end
-
-  def toggle_path
-    File.join(href, "toggle")
-  end
-
-  def back_path
-    base_path
-  end
-
-  def entities_path
-    File.join(href, "entities")
-  end
-
-  def add_entity_path
-    File.join(href, "add_entity")
-  end
-
-  def remove_entity_path
-    File.join(href, "remove_entity")
-  end
-
-  def roles_path
-    File.join(href, "roles")
-  end
-
-  def add_role_path
-    File.join(href, "add_role")
-  end
-
-  def remove_role_path
-    File.join(href, "remove_role")
   end
 
   def status

data/lib/flipside/importmap.rb

@@ -0,0 +1,26 @@
+module Flipside
+  module Importmap
+    LIBRARIES = {
+      "@hotwired/stimulus": "https://cdn.jsdelivr.net/npm/@hotwired/stimulus/dist/stimulus.js",
+    }.freeze
+
+    def importmap_tags
+      JSON.generate({imports:})
+    end
+
+    private
+
+    def imports
+      LIBRARIES.merge(controllers)
+    end
+
+    def controllers
+      pattern = File.join(__dir__, "public/*_controller.js")
+
+      Dir.glob(pattern).to_h do |controller|
+        name = File.basename(controller, ".js")
+        [name, public_path("#{name}.js")]
+      end
+    end
+  end
+end

data/lib/flipside/public/index.js

@@ -1,9 +1,9 @@
 import { Application } from "@hotwired/stimulus"
-import ToggleController from "toggle_controller"
 import SearchController from "search_controller"
 import ModalController from "modal_controller"
+import InlineEditController from "inline_edit_controller"
 
 const application = Application.start()
-application.register("toggle", ToggleController)
 application.register("search", SearchController)
 application.register("modal", ModalController)
+application.register("inline-edit", InlineEditController)

data/lib/flipside/public/inline_edit_controller.js

@@ -0,0 +1,25 @@
+import { Controller } from "@hotwired/stimulus"
+
+export default class InlineEditController extends Controller {
+  static targets = ["read", "edit"];
+
+  edit() {
+    this.readTargets.forEach(element => {
+      element.classList.add("hidden")
+    })
+
+    this.editTargets.forEach(element => {
+      element.classList.remove("hidden")
+    })
+  }
+
+  cancel() {
+    this.editTargets.forEach(element => {
+      element.classList.add("hidden")
+    })
+    this.readTargets.forEach(element => {
+      element.classList.remove("hidden")
+    })
+  }
+}
+

data/lib/flipside/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Flipside
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/lib/flipside/views/_datetime_modal.erb

@@ -16,7 +16,7 @@
         </button>
       </div>
       <div class="mt-4">
-        <form action="<%= feature.href %>" method="post">
+        <form action="<%= feature_path(feature) %>" method="post">
           <input type="hidden" name="_method" value="put" />
           <%# <input type="hidden" name="feature_name" value="<%= feature.name %1>" /> %>
           <label class="font-bold text-slate-800">Update <%= attribute %></label>

data/lib/flipside/views/_feature_item.erb

@@ -1,6 +1,10 @@
-<div class="p-4 grid grid-cols-12 gap-4 cursor-pointer text-slate-300">
-  <div class="col-span-3 text-left text-xl"><%= feature.name %></div>
-  <div class="col-span-7 text-center text-lg"><%= feature.description&.capitalize %></div>
+<div class="p-4 grid grid-cols-12 gap-4 items-center text-slate-300">
+  <div class="col-span-10">
+    <a href=<%= feature_path(feature) %> class="grid grid-cols-9 cursor-pointer hover:text-slate-400">
+      <div class="col-span-3 text-left text-xl"><%= feature.name %></div>
+      <div class="col-span-6 text-center text-lg"><%= feature.description&.capitalize %></div>
+    </a>
+  </div>
   <div class="col-span-1 text-right text-lg font-normal">
     <span
       class="inline-block py-1 px-2 min-w-20 text-center rounded-lg <%= feature.status_color %>"
@@ -9,6 +13,6 @@
     </span>
   </div>
   <div class="text-right">
-    <%= erb :_toggle_button, locals: {feature:} %>
+    <%= render :_toggle_button, locals: {feature:} %>
   </div>
 </div>

data/lib/flipside/views/_toggle_button.erb

@@ -1,12 +1,12 @@
 <% color = feature.enabled ? "bg-blue-700" : "bg-gray-200" %>
 <% translate = feature.enabled ? "translate-x-5" : "translate-x-0" %>
+<%# FIXME: How to prevent clicking the submit button from propageting? E.g. link navigation on index page. %>
 
-<button type="button"
-        class="relative inline-flex h-6 w-11 shrink-0 cursor-pointer rounded-full border-2 border-transparent <%= color %>"
-        data-controller="toggle"
-        data-action="click->toggle#switch:prevent"
-        data-toggle-url-value="<%= feature.toggle_path %>"
-        data-toggle-enabled-value="<%= feature.enabled %>"
-        >
-        <span aria-hidden="true" class="pointer-events-none inline-block size-5 <%= translate %> transform rounded-full bg-white shadow"></span>
-</button>
+<form action="<%= feature_path(feature, "toggle") %>" method="post">
+  <input type="hidden" name="_method" value="put" />
+  <button type="submit"
+          class="relative inline-flex h-6 w-11 shrink-0 cursor-pointer rounded-full border-2 border-transparent <%= color %>"
+          >
+          <span aria-hidden="true" class="pointer-events-none inline-block size-5 <%= translate %> transform rounded-full bg-white shadow"></span>
+  </button>
+</form>

data/lib/flipside/views/feature_entities.erb

@@ -1,10 +1,10 @@
 <div class="m-12">
-  <a href="<%= feature.href %>" class="p-2 rounded-lg text-xl text-slate-300 bg-blue-900 border border-blue-950 hover:bg-blue-800">Back</a>
+  <a href="<%= feature_path(feature) %>" class="p-2 rounded-lg text-xl text-slate-300 bg-blue-900 border border-blue-950 hover:bg-blue-800">Back</a>
   <div class="mt-12 w-1/3 m-auto bg-gray-800 text-slate-400 p-8 rounded-lg shadow-lg">
     <h1 class="text-2xl font-bold mb-6">Entities for <span class="font-extrabold text-slate-300"><%= feature.name %></span></h1>
     <h2 class="text-xl font-bold">Add entity</h2>
-    <form action="<%= feature.add_entity_path %>" method="post">
-      <div data-controller="search" data-search-url-value="/flipside/search_entity" class="w-full flex p-0 gap-2 items-center">
+    <form action="<%= feature_path(feature, "add_entity") %>" method="post">
+      <div data-controller="search" data-search-url-value="<%= search_entity_path %>" class="w-full flex p-0 gap-2 items-center">
         <select
           name="class_name"
           data-search-target="param"
@@ -54,7 +54,7 @@
                 <%= Flipside.display_entity(entity.flippable) %> (<%= entity.flippable_type %>)
               </div>
               <div>
-                <form action="<%= feature.remove_entity_path %>" method="post">
+                <form action="<%= feature_path(feature, "remove_entity") %>" method="post">
                   <input type="hidden" name="entity_id" value="<%= entity.id %>" />
                   <button type="submit" class="p-2 bg-gray-300 text-gray-700 font-semibold rounded hover:bg-gray-400">Remove</button>
                 </form>

data/lib/flipside/views/feature_roles.erb

@@ -1,10 +1,10 @@
 <div class="m-12">
-  <a href="<%= feature.href %>" class="p-2 rounded-lg text-xl text-slate-300 bg-blue-900 border border-blue-950 hover:bg-blue-800">Back</a>
+  <a href="<%= feature_path(feature) %>" class="p-2 rounded-lg text-xl text-slate-300 bg-blue-900 border border-blue-950 hover:bg-blue-800">Back</a>
   <div class="mt-12 w-1/3 m-auto bg-gray-800 text-slate-400 p-8 rounded-lg shadow-lg">
     <h1 class="text-2xl font-bold mb-6">Roles for <span class="font-extrabold text-slate-300"><%= feature.name %></span></h1>
     <h2 class="text-xl font-bold">Add Role</h2>
-    <form action="<%= feature.add_role_path %>" method="post">
-      <div data-controller="search" data-search-url-value="/flipside/search_role" class="w-full flex p-0 gap-2 items-center">
+    <form action="<%= feature_path(feature, "add_role") %>" method="post">
+      <div data-controller="search" data-search-url-value="<%= search_role_path %>" class="w-full flex p-0 gap-2 items-center">
         <select
           name="class_name"
           data-search-target="param"
@@ -54,7 +54,7 @@
                 <%= "#{role.class_name}##{role.method}" %>
               </div>
               <div>
-                <form action="<%= feature.remove_role_path %>" method="post">
+                <form action="<%= feature_path(feature, "remove_role") %>" method="post">
                   <input type="hidden" name="role_id" value="<%= role.id %>" />
                   <button type="submit" class="p-2 bg-gray-300 text-gray-700 font-semibold rounded hover:bg-gray-400">Remove</button>
                 </form>

data/lib/flipside/views/index.erb

@@ -7,11 +7,13 @@
 
     <div class="mt-12 m-auto">
       <ul>
+        <li class="hidden only:block text-center">
+          <p>No feature added yet!</p><p>Create a new feature from the console by typing:</p>
+          <code class="inline-block p-1 text-green-700 bg-slate-900">Flipside.create(name: "my_feature", description: "Some decription...")</code>
+        </li>
         <% features.each do |feature| %>
-          <li class="border-b border-slate-500 hover:font-semibold">
-            <a href=<%= feature.href %>>
-              <%= erb :_feature_item, locals: {feature:} %>
-            </a>
+          <li class="border-b border-slate-500">
+            <%= render :_feature_item, locals: {feature:} %>
           </li>
         <% end %>
       </ul>

data/lib/flipside/views/layout.erb

@@ -5,14 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <script src="https://cdn.tailwindcss.com"></script>
     <script type="importmap">
-      {
-      "imports": {
-        "@hotwired/stimulus": "https://cdn.jsdelivr.net/npm/@hotwired/stimulus/dist/stimulus.js",
-        "toggle_controller": "/flipside/toggle_controller.js",
-        "search_controller": "/flipside/search_controller.js",
-        "modal_controller": "/flipside/modal_controller.js"
-      }
-    }
+      <%= importmap_tags %>
     </script>
   </head>
   <body class="w-full h-full bg-slate-600">
@@ -20,6 +13,6 @@
       <%= yield %>
     </div>
 
-    <script src="/flipside/index.js" type="module" ></script>
+    <script src="<%= public_path("index.js") %>" type="module" ></script>
   </body>
 </html>

data/lib/flipside/views/show.erb

@@ -1,5 +1,5 @@
 <div class="m-12">
-  <a href="<%= feature.back_path %>" class="p-2 rounded-lg text-xl text-slate-300 bg-blue-900 border border-blue-950 hover:bg-blue-800">Back</a>
+  <a href="<%= base_path %>" class="p-2 rounded-lg text-xl text-slate-300 bg-blue-900 border border-blue-950 hover:bg-blue-800">Back</a>
   <div class="mt-12 w-1/2 m-auto bg-gray-800 text-slate-400 p-8 rounded-lg shadow-lg">
     <h1 class="text-2xl font-bold mb-6">Feature Details</h1>
     <div class="mt-4 grid grid-cols-1 gap-4">
@@ -8,25 +8,47 @@
           <span class="font-semibold">Name:</span>
           <span class="font-bold text-lg text-slate-300"><%= feature.name %></span>
         </div>
-        <div class="mt-2 flex justify-between items-center">
-          <span class="font-semibold">Description:</span>
-          <span><%= feature.description %></span>
+				<div class="mt-2 flex justify-between items-center text-center" data-controller="inline-edit">
+          <div class="font-semibold">Description:</div>
+          <div data-inline-edit-target="read"><%= feature.description %></div>
+          <div class="ml-2 " data-inline-edit-target="read">
+            <button
+              class="px-2 py-1 rounded-lg bg-blue-900 text-xl text-slate-400 border border-blue-950 hover:bg-blue-800"
+              data-action="inline-edit#edit" >
+              Edit
+            </button>
+          </div>
+          <form action="<%= feature_path(feature) %>" method="post"  class="hidden ml-4 grow flex gap-2" data-inline-edit-target="edit">
+            <input type="hidden" name="_method" value="put" />
+            <input
+              type="text"
+              value="<%= feature.description %>"
+              name="description"
+              class="grow border text-slate-600 border-slate-300 rounded px-3 py-2 focus:outline-none focus:ring-2 focus:ring-blue-500" />
+              <button
+                type="button"
+                class="p-2 bg-slate-600 text-slate-300 font-semibold rounded hover:bg-slate-500"
+                data-action="inline-edit#cancel" >
+                Cancel
+              </button>
+              <button type="submit" class="p-2 bg-blue-900 font-semibold rounded hover:bg-blue-800">Update</button>
+          </form>
         </div>
       </div>
       <div class="mt-2 flex justify-between items-center">
         <span class="font-semibold">Enabled for all:</span>
-        <span><%= erb :_toggle_button, locals: {feature:} %></span>
+        <span><%= render :_toggle_button, locals: {feature:} %></span>
       </div>
       <div class="mt-2 flex justify-between items-center">
         <span class="font-semibold">Active From:</span>
         <span>
-          <%= erb :_datetime_modal, locals: {feature:, attribute: :activated_at} %>
+          <%= render :_datetime_modal, locals: {feature:, attribute: :activated_at} %>
         </span>
       </div>
       <div class="mt-2 flex justify-between items-center">
         <span class="font-semibold">Active Until:</span>
         <span>
-          <%= erb :_datetime_modal, locals: {feature:, attribute: :deactivated_at} %>
+          <%= render :_datetime_modal, locals: {feature:, attribute: :deactivated_at} %>
         </span>
       </div>
       <div class="mt-2 grid grid-cols-3 items-center">
@@ -34,17 +56,18 @@
         <span class="text-center"><%= feature.entity_count_str %></span>
         <span class="text-right text-xl text-slate-400">
           <a
-            href="<%= feature.entities_path %>"
+            href="<%= feature_path(feature, "entities") %>"
             class="px-2 py-1 rounded-lg bg-blue-900 border border-blue-950 hover:bg-blue-800" >
             Edit
           </a>
         </span>
-      </div><div class="mt-2 grid grid-cols-3  items-center">
+      </div>
+      <div class="mt-2 grid grid-cols-3 items-center">
         <span class="font-semibold">Roles:</span>
         <span class="text-center"><%= feature.role_count_str %></span>
         <span class="text-right text-xl text-slate-400">
           <a
-            href="<%= feature.roles_path %>"
+            href="<%= feature_path(feature, "roles") %>"
             class="px-2 py-1 rounded-lg bg-blue-900 border border-blue-950 hover:bg-blue-800" >
             Edit
           </a>

data/lib/flipside/web.rb

@@ -1,99 +1,125 @@
-require "sinatra"
+require 'roda'
 require "uri"
 require "flipside/feature_presenter"
+require "flipside/importmap"
+require "rack/method_override"
 
 module Flipside
-  class Web < Sinatra::Base
-    not_found do
-      erb :not_found
+  class Web < Roda
+    include Flipside::Importmap
+    use Rack::MethodOverride
+
+    opts[:add_script_name] = true
+
+    plugin :r
+    plugin :json
+    plugin :halt
+    plugin :path
+    plugin :all_verbs
+    plugin :unescape_path
+    plugin :render, views: File.expand_path("views", __dir__)
+    plugin :public,
+           root: File.expand_path("public", __dir__),
+           headers: {"Cache-Control" => "public, max-age=14400"}
+
+    path(:public) { |name| "/#{name}" }
+    path(:base, "/")
+    path(:feature) do |feature, *segments, **query|
+      path = "/feature/#{ERB::Util.url_encode(feature.name)}"
+      path = "#{path}/#{segments.join("/")}" if segments.any?
+      path = "#{path}?#{query.map { |k,v| "#{k}=#{v}" }.join("&")}" if query.keys.any?
+      path
     end
+    path(:search_entity, "/search_entity")
+    path(:search_role, "/search_role")
 
-    get "/" do
-      features = Flipside::Feature.order(:name).map do |feature|
-        FeaturePresenter.new(feature, base_path)
-      end
-
-      erb :index, locals: {features:}
+    def load_feature(name)
+      Flipside::Feature.find_by!(name:)
+    rescue
+      r.halt 404, view(:not_found)
     end
 
-    get "/feature/:name" do
-      erb :show, locals: {feature: FeaturePresenter.new(feature, base_path)}
-    end
+    route do |r|
+      r.public
 
-    put "/feature/:name/toggle" do
-      content_type :text
+      r.root do
+        features = Flipside::Feature.order(:name).map do |feature|
+          FeaturePresenter.new(feature)
+        end
 
-      if feature.update(enabled: !feature.enabled)
-        204
-      else
-        [422, "Failed to update feature"]
+        view :index, locals: {features:}
       end
-    end
-
-    put "/feature/:name" do
-      kwargs = params.slice("activated_at", "deactivated_at")
-      feature.update(**kwargs)
-      redirect to("/feature/#{params["name"]}"), 303
-    end
-
-    get "/feature/:name/entities" do
-      erb :feature_entities, locals: {feature: FeaturePresenter.new(feature, base_path)}
-    end
-
-    get '/search_entity' do
-      class_name = params[:class_name]
-      query = URI.decode_www_form_component(params[:q])
-      result = Flipside.search_entity(class_name:, query:)
-
-      erb :_search_result, locals: {result:, class_name:, query:}
-    end
-
-    post "/feature/:name/add_entity" do
-      name, class_name, identifier = params.values_at("name", "class_name", "identifier")
-
-      entity = Flipside.find_entity(class_name:, identifier:)
-      Flipside.add_entity(name: , entity:)
-      redirect to("/feature/#{name}/entities"), 303
-    end
-
-    post "/feature/:name/remove_entity" do
-      Flipside.remove_entity(name: params["name"], entity_id: params["entity_id"])
-      redirect to("/feature/#{params["name"]}/entities"), 303
-    end
-
-    get "/feature/:name/roles" do
-      erb :feature_roles, locals: {feature: FeaturePresenter.new(feature, base_path)}
-    end
-
-    get '/search_role' do
-      class_name = params[:class_name]
-      query = URI.decode_www_form_component(params[:q])
-      result = Flipside.search_role(class_name:, query:)
-
-      erb :_search_result, locals: {result:, class_name:, query:}
-    end
-
-    post "/feature/:name/add_role" do
-      name, class_name, method_name = params.values_at("name", "class_name", "identifier")
-      Flipside.add_role(name:, class_name:, method_name:)
-
-      redirect to("/feature/#{name}/roles"), 303
-    end
-
-    post "/feature/:name/remove_role" do
-      Flipside.remove_role(name: params["name"], role_id: params["role_id"])
 
-      redirect to("/feature/#{params["name"]}/roles"), 303
-    end
+      r.on "feature", String do |name|
+        feature = load_feature(name)
+
+        r.is do
+          r.get do
+            view(:show, locals: { feature: FeaturePresenter.new(feature) })
+          end
+
+          r.put do
+            kwargs = r.params.slice("description", "activated_at", "deactivated_at")
+            feature.update(**kwargs)
+            r.redirect r.path, 303
+          end
+        end
+
+        r.put "toggle" do
+          if feature.update(enabled: !feature.enabled)
+            referer = r.env["HTTP_REFERER"]
+            r.redirect (referer || feature_path(feature)), 303
+          else
+            response.status = 422
+            "Failed to update feature"
+          end
+        end
+
+        r.get "entities" do
+          view(:feature_entities, locals: { feature: FeaturePresenter.new(feature) })
+        end
+
+        r.post "add_entity" do
+          class_name, identifier = r.params.values_at("class_name", "identifier")
+          entity = Flipside.find_entity(class_name:, identifier:)
+          Flipside.add_entity(feature:, entity:)
+          r.redirect feature_path(feature, "entities"), 303
+        end
+
+        r.post "remove_entity" do
+          Flipside.remove_entity(feature:, entity_id: r.params["entity_id"])
+          r.redirect feature_path(feature, "entities"), 303
+        end
+
+        r.get "roles" do
+          view(:feature_roles, locals: { feature: FeaturePresenter.new(feature) })
+        end
+
+        r.post "add_role" do
+          class_name, method_name = r.params.values_at("class_name", "identifier")
+          Flipside.add_role(name:, class_name:, method_name:)
+          r.redirect feature_path(feature, "roles"), 303
+        end
+
+        r.post "remove_role" do
+          Flipside.remove_role(name:, role_id: r.params["role_id"])
+          r.redirect feature_path(feature, "roles"), 303
+        end
+      end
 
-    def feature
-      @feature ||= Flipside::Feature.find_by!(name: params["name"])
-    rescue
-      halt 404, "This feature does not exist"
-    end
+      r.get "search_entity" do
+        class_name = r.params["class_name"]
+        query = URI.decode_www_form_component(r.params["q"])
+        result = Flipside.search_entity(class_name:, query:)
+        view(:_search_result, locals: { result:, class_name:, query: })
+      end
 
-    def base_path
-      @base_path ||= request.script_name
+      r.get "search_role" do
+        class_name = r.params["class_name"]
+        query = URI.decode_www_form_component(r.params["q"])
+        result = Flipside.search_role(class_name:, query:)
+        view(:_search_result, locals: { result:, class_name:, query: })
+      end
     end
   end
 end

data/lib/flipside.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "active_record"
 require "flipside/version"
 require "flipside/web"
 require "flipside/config/settings"
@@ -25,32 +26,36 @@ module Flipside
       feature = find_by(name:)
       return false unless feature
 
-      objects << nil if objects.empty?
+      objects = [default_object] if objects.empty?
       objects.any? { |object| feature.enabled? object }
     end
 
+    def disabled?(...)
+      !enabled?(...)
+    end
+
     def enable!(name)
       feature = find_by!(name:)
       feature.update(enabled: true)
     end
 
-    def add_entity(name:, entity:)
-      feature = find_by!(name:)
+    def add_entity(entity:, feature: nil, name: nil)
+      feature ||= find_by!(name:)
       Entity.find_or_create_by(feature:, flippable: entity)
     end
 
-    def remove_entity(name:, entity_id:)
-      feature = find_by!(name:)
+    def remove_entity(entity_id:, feature: nil, name: nil)
+      feature ||= find_by!(name:)
       feature.entities.find_by(id: entity_id)&.destroy
     end
 
-    def add_role(name:, class_name:, method_name:)
-      feature = find_by!(name:)
+    def add_role(class_name:, method_name:, feature: nil, name: nil)
+      feature ||= find_by!(name:)
       Role.find_or_create_by(feature:, class_name:, method: method_name)
     end
 
-    def remove_role(name:, role_id:)
-      feature = find_by!(name:)
+    def remove_role(role_id:, feature: nil, name: nil)
+      feature ||= find_by!(name:)
       feature.roles.find_by(id: role_id)&.destroy
     end
 
@@ -64,11 +69,15 @@ module Flipside
       find_by(name:) || raise(NoSuchFeauture.new(name))
     end
 
+    def create(name:, description: nil)
+      Feature.create(name: name, description: description)
+    end
+
     def create_missing(name)
       trace = caller.find { |trace| !trace.start_with? __FILE__ }
       source, line, _ = trace.split(":")
       source = [source, line].join(":") if line.match?(/\d+/)
-      Feature.create(name:, description: "Created from #{source}")
+      create(name:, description: "Created from #{source}")
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flipside
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Sammy Henningsson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-30 00:00:00.000000000 Z
+date: 2025-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: roda
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rackup
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '2.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.5'
 description: Create simple feature toggles.
 email:
 - sammy.henningsson@hey.com
@@ -105,10 +147,11 @@ files:
 - lib/flipside/config/roles.rb
 - lib/flipside/config/settings.rb
 - lib/flipside/feature_presenter.rb
+- lib/flipside/importmap.rb
 - lib/flipside/public/index.js
+- lib/flipside/public/inline_edit_controller.js
 - lib/flipside/public/modal_controller.js
 - lib/flipside/public/search_controller.js
-- lib/flipside/public/toggle_controller.js
 - lib/flipside/search_result.rb
 - lib/flipside/version.rb
 - lib/flipside/views/_datetime_modal.erb

data/lib/flipside/public/toggle_controller.js

@@ -1,29 +0,0 @@
-import { Controller } from "@hotwired/stimulus";
-
-export default class ToggleController extends Controller {
-  static targets = ["switch"]
-  static values = {
-    url: String,
-    enabled: Boolean
-  }
-
-  async switch(event) {
-    try {
-      const data = {enable: !this.enabledValue}
-      const response = await fetch(this.urlValue, {
-        method: "PUT",
-        headers: {"Content-Type": "application/json"},
-        body: JSON.stringify(data)
-      })
-
-      if (response.ok) {
-        location.reload()
-      } else {
-        const text = await response.text()
-        console.error("Failed to update:", text)
-      }
-    } catch (error) {
-      console.error("Error during the PUT request:", error)
-    }
-  }
-}