flipper 0.23.0 → 0.24.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7754b40752e0c255308fedfb6ef7784e7e9b3cf4ba0035a289a02074e61e4e7
-  data.tar.gz: 7e0add2ac95c2dc929a97fef218ece9fbc904c911ffe6f4ac1d3ccbc36befab9
+  metadata.gz: a73ea66b4ab3342f5cf63a162bf8b0482fdc644dc0fff38fcb2d3fa2b39015be
+  data.tar.gz: a680008dad6bc0affee30e0d150aab5cc869d46d37ac2ae3ce8b7b2f57de9e9b
 SHA512:
-  metadata.gz: 3e5b7b82f89f1cdbb93f0a07d6909aea686214e9ce6a7c1daf4661f900da5e3dfe3176ed89ffe1bb63b8317788bce1a662ad27b2e88b01bebb77856213be7f4d
-  data.tar.gz: e8d25c0ed393a34f4f7ec93b2d2ec8707f009ba35e83ef606d4850c7031bb7e923af83c2472fd2d6d00004d6561f410156021b7892dab20883dd0c6fe2efcb15
+  metadata.gz: 50d1ff58301b4040e2ac0ed6590c057952f3c926aa88371858cec083be2d5fcdb17920fa120f6c59f9a5625ad2260aa0cdf40c26dfa64239a4790f247287c720
+  data.tar.gz: 40d68ac75fde3051cece778aa09145891ca3cf289abb795c66695f3e3fac569c28e81864d3be386d7ab03d0fd9c1b9c303fca6f5865ef6a2cd4eb9edbdc12eee

data/.github/workflows/ci.yml

@@ -15,13 +15,17 @@ jobs:
           --health-retries 5
     strategy:
       matrix:
-        ruby: ['2.5', '2.6', '2.7']
+        ruby: ['2.6', '2.7', '3.0', '3.1']
         rails: ['5.2', '6.0.0', '6.1.0', '7.0.0']
         exclude:
-          - ruby: "2.5"
-            rails: "7.0.0"
           - ruby: "2.6"
             rails: "7.0.0"
+          - ruby: "3.0"
+            rails: "5.2"
+          - ruby: "3.1"
+            rails: "5.2"
+          - ruby: "3.1"
+            rails: "6.0.0"
     env:
       SQLITE3_VERSION: 1.4.1
       REDIS_URL: redis://localhost:6379/0
@@ -43,7 +47,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gems-${{ matrix.ruby }}-${{ matrix.rails }}-
       - name: Set up Ruby ${{ matrix.ruby }}
-        uses: actions/setup-ruby@v1
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
       - name: Install libpq-dev

data/.github/workflows/examples.yml

@@ -16,8 +16,18 @@ jobs:
           --health-retries 5
     strategy:
       matrix:
-        ruby: ['2.5', '2.6', '2.7']
-        rails: ['5.2', '6.0.0', '6.1.0']
+        ruby: ['2.6', '2.7', '3.0', '3.1']
+        rails: ['5.2', '6.0.0', '6.1.0', '7.0.0']
+        exclude:
+          - ruby: "2.6"
+            rails: "7.0.0"
+          - ruby: "3.0"
+            rails: "5.2"
+          - ruby: "3.1"
+            rails: "5.2"
+          - ruby: "3.1"
+            rails: "6.0.0"
+
     env:
       SQLITE3_VERSION: 1.4.1
       REDIS_URL: redis://localhost:6379/0
@@ -39,7 +49,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gems-${{ matrix.ruby }}-${{ matrix.rails }}-
       - name: Set up Ruby ${{ matrix.ruby }}
-        uses: actions/setup-ruby@v1
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
       - name: Install libpq-dev

data/Changelog.md

@@ -1,3 +1,33 @@
+## 0.24.1
+
+### Additions/Changes
+
+* flipper-api: `exclude_gates` parameter to exclude gate data in GETs (https://github.com/jnunemaker/flipper/pull/572).
+* Make it possible to disable internal memoization (https://github.com/jnunemaker/flipper/pull/612).
+* Add Flipper::Actor#hash so actors can be hash keys (https://github.com/jnunemaker/flipper/pull/616).
+* Pretty Up `rails routes` again and make rack-protection dependency less strict (https://github.com/jnunemaker/flipper/pull/619).
+* Add kwargs for method_missing using ruby 3.0 (https://github.com/jnunemaker/flipper/pull/620).
+
+## 0.24.0
+
+### Additions/Changes
+
+* Add Ruby 3.0 and 3.1 to the CI matrix and fix groups block arity check for ruby 3 (https://github.com/jnunemaker/flipper/pull/601)
+* Removed support for Ruby 2.5 (which was end of line 9 months ago)
+* Add (alpha) client side instrumentation of events to cloud (https://github.com/jnunemaker/flipper/pull/602)
+* Fix deprecated uses of Redis#pipelined (https://github.com/jnunemaker/flipper/pull/603). redis-rb >= 3 now required.
+* Fix Flipper UI Rack application when `Rack::Session::Pool` is used to build it (https://github.com/jnunemaker/flipper/pull/606).
+
+## 0.23.1
+
+### Additions/Changes
+
+* Relax dalli version constraint (https://github.com/jnunemaker/flipper/pull/596)
+
+### Bug Fixes
+
+* Fix railtie initialization to mount middleware after config/intializers/* (https://github.com/jnunemaker/flipper/pull/586)
+
 ## 0.23.0
 
 ### Additions/Changes

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.5
+FROM ruby:3.0
 
 RUN apt-get update && apt-get install -y \
   # build-essential \

data/lib/flipper/actor.rb

@@ -12,5 +12,9 @@ module Flipper
       self.class.eql?(other.class) && @flipper_id == other.flipper_id
     end
     alias_method :==, :eql?
+
+    def hash
+      flipper_id.hash
+    end
   end
 end

data/lib/flipper/dsl.rb

@@ -17,10 +17,12 @@ module Flipper
     # adapter - The adapter that this DSL instance should use.
     # options - The Hash of options.
     #           :instrumenter - What should be used to instrument all the things.
+    #           :memoize - Should adapter be wrapped by memoize adapter or not.
     def initialize(adapter, options = {})
       @instrumenter = options.fetch(:instrumenter, Instrumenters::Noop)
-      memoized = Adapters::Memoizable.new(adapter)
-      @adapter = memoized
+      memoize = options.fetch(:memoize, true)
+      adapter = Adapters::Memoizable.new(adapter) if memoize
+      @adapter = adapter
       @memoized_features = {}
     end
 

data/lib/flipper/railtie.rb

@@ -10,6 +10,12 @@ module Flipper
       )
     end
 
+    initializer "flipper.identifier" do
+      ActiveSupport.on_load(:active_record) do
+        ActiveRecord::Base.include Flipper::Identifier
+      end
+    end
+
     initializer "flipper.default", before: :load_config_initializers do |app|
       Flipper.configure do |config|
         config.default do
@@ -18,28 +24,23 @@ module Flipper
       end
     end
 
-    initializer "flipper.memoizer" do |app|
-      config = app.config.flipper
+    initializer "flipper.log", after: :load_config_initializers do |app|
+      flipper = app.config.flipper
 
-      if config.memoize
-        app.middleware.use Flipper::Middleware::Memoizer, {
-          env_key: config.env_key,
-          preload: config.preload,
-          if: config.memoize.respond_to?(:call) ? config.memoize : nil
-        }
-      end
-    end
-
-    initializer "flipper.log" do |app|
-      config = app.config.flipper
-      if config.log && config.instrumenter == ActiveSupport::Notifications
+      if flipper.log && flipper.instrumenter == ActiveSupport::Notifications
         require "flipper/instrumentation/log_subscriber"
       end
     end
 
-    initializer "flipper.identifier" do
-      ActiveSupport.on_load(:active_record) do
-        ActiveRecord::Base.include Flipper::Identifier
+    initializer "flipper.memoizer", after: :load_config_initializers do |app|
+      flipper = app.config.flipper
+
+      if flipper.memoize
+        app.middleware.use Flipper::Middleware::Memoizer, {
+          env_key: flipper.env_key,
+          preload: flipper.preload,
+          if: flipper.memoize.respond_to?(:call) ? flipper.memoize : nil
+        }
       end
     end
   end

data/lib/flipper/types/actor.rb

@@ -23,8 +23,14 @@ module Flipper
         super || @thing.respond_to?(*args)
       end
 
-      def method_missing(name, *args, &block)
-        @thing.send name, *args, &block
+      if RUBY_VERSION >= '3.0'
+        def method_missing(name, *args, **kwargs, &block)
+          @thing.send name, *args, **kwargs, &block
+        end
+      else
+        def method_missing(name, *args, &block)
+          @thing.send name, *args, &block
+        end
       end
     end
   end

data/lib/flipper/types/group.rb

@@ -14,7 +14,7 @@ module Flipper
 
         if block_given?
           @block = block
-          @single_argument = @block.arity.abs == 1
+          @single_argument = call_with_no_context?(@block)
         else
           @block = ->(_thing, _context) { false }
           @single_argument = false
@@ -28,6 +28,13 @@ module Flipper
           @block.call(thing, context)
         end
       end
+
+      NO_PARAMS_IN_RUBY_3 = [[:req], [:rest]]
+      def call_with_no_context?(block)
+        return true if block.parameters == NO_PARAMS_IN_RUBY_3
+
+        block.arity.abs == 1
+      end
     end
   end
 end

data/lib/flipper/version.rb

@@ -1,3 +1,3 @@
 module Flipper
-  VERSION = '0.23.0'.freeze
+  VERSION = '0.24.1'.freeze
 end

data/spec/flipper/actor_spec.rb

@@ -43,4 +43,14 @@ RSpec.describe Flipper::Actor do
       expect(actor1.==(actor2)).to be(false)
     end
   end
+
+  describe '#hash' do
+    it 'returns a hash-value based on the flipper id' do
+      h = {
+        described_class.new("User;123") => true
+      }
+      expect(h).to have_key(described_class.new("User;123"))
+      expect(h).not_to have_key(described_class.new("User;456"))
+    end
+  end
 end

data/spec/flipper/dsl_spec.rb

@@ -6,9 +6,19 @@ RSpec.describe Flipper::DSL do
   let(:adapter) { Flipper::Adapters::Memory.new }
 
   describe '#initialize' do
-    it 'sets adapter' do
-      dsl = described_class.new(adapter)
-      expect(dsl.adapter).not_to be_nil
+    context 'when using default memoize strategy' do
+      it 'wraps the given adapter with Flipper::Adapters::Memoizable' do
+        dsl = described_class.new(adapter)
+        expect(dsl.adapter.class).to be(Flipper::Adapters::Memoizable)
+        expect(dsl.adapter.adapter).to be(adapter)
+      end
+    end
+
+    context 'when disabling memoization' do
+      it 'uses the given adapter directly' do
+        dsl = described_class.new(adapter, memoize: false)
+        expect(dsl.adapter).to be(adapter)
+      end
     end
 
     it 'defaults instrumenter to noop' do

data/spec/flipper/middleware/memoizer_spec.rb

@@ -1,6 +1,5 @@
 require 'rack/test'
 require 'active_support/cache'
-require 'active_support/cache/dalli_store'
 require 'flipper/adapters/active_support_cache_store'
 require 'flipper/adapters/operation_logger'
 

data/spec/flipper/railtie_spec.rb

@@ -3,11 +3,8 @@ require 'flipper/railtie'
 
 RSpec.describe Flipper::Railtie do
   let(:application) do
-    Class.new(Rails::Application).new(
-      railties: [Flipper::Railtie],
-    ).tap do |app|
-      app.config.eager_load = false
-      app.run_load_hooks!
+    Class.new(Rails::Application).create(railties: [Flipper::Railtie]) do
+      config.eager_load = false
     end
   end
 
@@ -22,40 +19,42 @@ RSpec.describe Flipper::Railtie do
 
   describe 'initializers' do
     it 'sets defaults' do
+      subject # initialize
       expect(config.env_key).to eq("flipper")
       expect(config.memoize).to be(true)
       expect(config.preload).to be(true)
     end
 
     it "configures instrumentor on default instance" do
-      subject
-
+      subject # initialize
       expect(Flipper.instance.instrumenter).to eq(ActiveSupport::Notifications)
     end
 
     it 'uses Memoizer middleware if config.memoize = true' do
+      initializer { config.memoize = true }
       expect(subject.middleware).to include(Flipper::Middleware::Memoizer)
     end
 
     it 'does not use Memoizer middleware if config.memoize = false' do
-      # load but don't initialize
-      config.memoize = false
-
+      initializer { config.memoize = false }
       expect(subject.middleware).not_to include(Flipper::Middleware::Memoizer)
     end
 
     it 'passes config to memoizer' do
-      # load but don't initialize
-      config.update(
-        env_key: 'my_flipper',
-        preload: [:stats, :search]
-      )
-
-      expect(Flipper::Middleware::Memoizer).to receive(:new).with(application.routes,
-        env_key: 'my_flipper', preload: [:stats, :search], if: nil
-      )
+      initializer do
+        config.update(
+          env_key: 'my_flipper',
+          preload: [:stats, :search]
+        )
+      end
 
-      subject # initialize
+      expect(subject.middleware).to include(Flipper::Middleware::Memoizer)
+      middleware = subject.middleware.detect { |m| m.klass == Flipper::Middleware::Memoizer }
+      expect(middleware.args[0]).to eq({
+        env_key: config.env_key,
+        preload: config.preload,
+        if: nil
+      })
     end
 
     it "defines #flipper_id on AR::Base" do
@@ -64,4 +63,11 @@ RSpec.describe Flipper::Railtie do
       expect(ActiveRecord::Base.ancestors).to include(Flipper::Identifier)
     end
   end
+
+  # Add app initializer in the same order as config/initializers/*
+  def initializer(&block)
+    application.initializer 'spec', before: :load_config_initializers do
+      block.call
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -22,6 +22,7 @@ Dir[FlipperRoot.join('spec/support/**/*.rb')].sort.each { |f| require f }
 
 RSpec.configure do |config|
   config.before(:example) do
+    Flipper::Cloud::Registry.default.clear if defined?(Flipper::Cloud)
     Flipper.unregister_groups
     Flipper.configuration = nil
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flipper
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.24.1
 platform: ruby
 authors:
 - John Nunemaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-24 00:00:00.000000000 Z
+date: 2022-04-13 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: