ffe 1.0.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6257e0d5cca9bdc5562b54fc2d0495e3e5bd0faacf6ffd5e1fcb32723a602ad
-  data.tar.gz: 5df5936bd8f0b7ca43cb5d1183416db4e8d9db688ddf46b89c3648a5367516b4
+  metadata.gz: 62134d82b78fed902a3390a6ceed90c803c7de2030bcd148170d2ee8a00b9de3
+  data.tar.gz: d8991bdd7f059ecd3b62e564beb20f64ed2e3ac8b0bf6350ea9ed042628b5214
 SHA512:
-  metadata.gz: c95f548a1454295b6d2cb3b44094ea1cf1c9f9ff7b47f581e0b505a98a764b4aac1ddea369b5f5dfdb46e80ecaa2ee3b928aa466824f933657a690c9ffed5cba
-  data.tar.gz: 0c0af9624635f4c398a24822d77ea08ade783dee0c5e8ef901e74e9ae19575d615782353ab5f4d28677d20f26de549687b94cc8c8f8abf5f3293f78c22a85690
+  metadata.gz: 60b2d15d75fc98affa4e44fd8617d0e1dbfa8991ba724c28205e65ec3310d2b76fd3b0776443e81f99bc460a2805cc7ad39f7c05c2d2ef30de94e77fb0bf3168
+  data.tar.gz: '0528ad0aa840e05741bb350b6bd14439a5c2c14648185556e092a7e12665f9fcb5718ed4cf0c12e708a01d49ab986be5b79464e577bef4eedcd8d6808973ba27'

data/README.md

@@ -41,7 +41,7 @@ $ bin/rails db:migrate
 
 Mount the engine in your application's `config/routes.rb` file:
 ```ruby
-mount Ffe::Engine => "/feature_flags"
+mount Ffe::Engine => "/ffe"
 ```
 
 ### Views
@@ -93,7 +93,7 @@ Run your app and go to [http://localhost:3000/ffe/feature_flags](http://localhos
 
 **Use Case**: Set a feature flag for an announcement, or something similar, for a specific period of time.
 
-> This requires the use of ActiveJob; currently, only `SolidQueue` and `Sidekiq` are supported. But feel free to add more.
+> This requires the use of ActiveJob; currently, only `SolidQueue` and `Sidekiq` adapters are supported. But feel free to add more.
 
 1. Create a feature flag in production, but without setting the expires date.
 2. Dump the flags, then replace the `config/feature_flags.json` file locally and commit it.

data/app/controllers/ffe/feature_flags_controller.rb

@@ -20,7 +20,7 @@ module Ffe
       @feature_flag = Ffe::FeatureFlag.new(feature_flag_params.except(:milieus, :clear_expires_at))
 
       if @feature_flag.save
-        redirect_to feature_flag_path(@feature_flag), notice: 'FFE wurde erstellt.'
+        redirect_to feature_flag_path(@feature_flag), notice: 'FFE created.'
       else
         render :new, status: :unprocessable_content
       end
@@ -28,7 +28,7 @@ module Ffe
 
     def update
       if @feature_flag.update(feature_flag_params.except(:milieus, :clear_expires_at))
-        redirect_to feature_flag_path(@feature_flag), notice: 'FFE wurde aktualisiert.'
+        redirect_to feature_flag_path(@feature_flag), notice: 'FFE updated.'
       else
         render :edit, status: :unprocessable_content
       end
@@ -36,11 +36,11 @@ module Ffe
 
     def destroy
       @feature_flag.destroy
-      redirect_to feature_flags_path, notice: 'FFE wurde gelöscht.'
+      redirect_to feature_flags_path, notice: 'FFE destroyed.'
     end
 
     def dump
-      render json: Ffe::FeatureFlag.order(:name).map { |ff| ff.attributes.slice('name', 'description', 'enabled', 'milieu', 'expires_at', 'percentage') }
+      render json: Ffe::FeatureFlag.order(:name).map { |ff| ff.attributes.slice('name', 'description', 'enabled', 'milieu', 'expires_at') }
     end
 
     private

data/app/models/concerns/async_adapter.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module AsyncAdapter
+  extend ActiveSupport::Concern
+
+  def adapter_job # rubocop:disable Naming/PredicateMethod
+    false
+  end
+end

data/app/models/ffe/feature_flag.rb

@@ -2,10 +2,13 @@
 
 module Ffe
   class FeatureFlag < ApplicationRecord
-    if Ffe.config.queue_adapter == :solid_queue
+    case Ffe.config.queue_adapter
+    when :solid_queue
       include SolidQueueAdapter
-    elsif Ffe.config.queue_adapter == :sidekiq
+    when :sidekiq
       include SidekiqAdapter
+    else
+      include AsyncAdapter
     end
 
     self.table_name = 'feature_flags'
@@ -16,7 +19,7 @@ module Ffe
     validates :expires_at, comparison: { greater_than: Time.current.end_of_day }, if: -> { expires_at.present? && expires_at_changed? } # rubocop:disable Layout/LineLength
 
     # callbacks
-    after_save_commit :handle_change_job, unless: -> { Rails.env.test? }
+    after_save_commit :handle_change_job, if: -> { %i[solid_queue sidekiq].include?(Ffe.config.queue_adapter) }
     before_destroy :destroy_job
 
     # the Flag functionality itself

data/lib/ffe/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ffe
-  VERSION = '1.0.1'
+  VERSION = '1.1.1'
 end

data/lib/generators/ffe/templates/feature_flags.json.tt

@@ -4,6 +4,6 @@
     "description": "A general testing FF.",
     "enabled": true,
     "milieu": "1000",
-    "expires_at": null,
+    "expires_at": null
   }
 ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffe
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.1
 platform: ruby
 authors:
 - LeFnord
@@ -40,6 +40,7 @@ files:
 - app/jobs/ffe/application_job.rb
 - app/jobs/ffe/expired_handling_job.rb
 - app/mailers/ffe/application_mailer.rb
+- app/models/concerns/async_adapter.rb
 - app/models/concerns/sidekiq_adapter.rb
 - app/models/concerns/solid_queue_adapter.rb
 - app/models/ffe/application_record.rb