flipper-active_record 0.21.0.rc1 → 0.22.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10540b212a4437f26f70a34fb2c172208194cdc610aaf9d7a5cf7f4b8e0f7c49
-  data.tar.gz: 5b7f5cb7baa50a1729f230d4ec8962e162e697f5023b73fd6aecd2eb91485fd6
+  metadata.gz: 18500d2bb4a616c89ca974e8c6328d12d6079ef87cd6bdb679711cac461c8ebc
+  data.tar.gz: c170462a9bbb135de87bcef3e50a840bc5330d9858400288e20d420fd108917f
 SHA512:
-  metadata.gz: 38b1110e99668682f51f606f7e08ebde6c03336e7912eef0ecf829ccc784584361b6d1298234739e654b68b18ef6c6ecd1c8cc3102e2d4930b8f60deba0a3e2f
-  data.tar.gz: f6ca4e9da379fe7aeb3d3aa58a027f883c30f480ab019a13806f4f378427b742b8ecccf9451f586a46e57b73b3584a4bf7f4d16709af119e17d95c544975c274
+  metadata.gz: 6e0365f6a63821655f3d9411e0f4417b262116546feda368e3fe1f98198be8df9db7e27c2b38f7dee77fa2db71c224943bf1ebd2cd7e7919dc24197658a08f37
+  data.tar.gz: 39c4170606321f2befbe7b6da2316e77f2e1363476099aacbf9acaa2113c292825aff566a8fbdbe23beac9e2f25f99c7df54c7d58f1e8d1dabb2ba7d0229582e

data/docs/active_record/README.md

@@ -34,9 +34,7 @@ Flipper will be configured to use the ActiveRecord adapter when `flipper-active_
 ```ruby
 require 'flipper/adapters/active_record'
 Flipper.configure do |config|
-  config.default do
-    Flipper.new(Flipper::Adapters::ActiveRecord.new)
-  end
+  config.adapter { Flipper::Adapters::ActiveRecord.new }
 end
 ```
 

data/examples/active_record/basic.rb

@@ -3,20 +3,17 @@ require_relative "./ar_setup"
 # Requires the flipper-active_record gem to be installed.
 require 'flipper/adapters/active_record'
 
-adapter = Flipper::Adapters::ActiveRecord.new
-flipper = Flipper.new(adapter)
+Flipper[:stats].enable
 
-flipper[:stats].enable
-
-if flipper[:stats].enabled?
+if Flipper[:stats].enabled?
   puts "Enabled!"
 else
   puts "Disabled!"
 end
 
-flipper[:stats].disable
+Flipper[:stats].disable
 
-if flipper[:stats].enabled?
+if Flipper[:stats].enabled?
   puts "Enabled!"
 else
   puts "Disabled!"

data/examples/active_record/internals.rb

@@ -2,8 +2,6 @@ require_relative "./ar_setup"
 
 # Requires the flipper-active_record gem to be installed.
 require 'flipper/adapters/active_record'
-adapter = Flipper::Adapters::ActiveRecord.new
-flipper = Flipper.new(adapter)
 
 # Register a few groups.
 Flipper.register(:admins) { |thing| thing.admin? }
@@ -12,16 +10,16 @@ Flipper.register(:early_access) { |thing| thing.early_access? }
 # Create a user class that has flipper_id instance method.
 User = Struct.new(:flipper_id)
 
-flipper[:stats].enable
-flipper[:stats].enable_group :admins
-flipper[:stats].enable_group :early_access
-flipper[:stats].enable_actor User.new('25')
-flipper[:stats].enable_actor User.new('90')
-flipper[:stats].enable_actor User.new('180')
-flipper[:stats].enable_percentage_of_time 15
-flipper[:stats].enable_percentage_of_actors 45
+Flipper[:stats].enable
+Flipper[:stats].enable_group :admins
+Flipper[:stats].enable_group :early_access
+Flipper[:stats].enable_actor User.new('25')
+Flipper[:stats].enable_actor User.new('90')
+Flipper[:stats].enable_actor User.new('180')
+Flipper[:stats].enable_percentage_of_time 15
+Flipper[:stats].enable_percentage_of_actors 45
 
-flipper[:search].enable
+Flipper[:search].enable
 
 puts 'all rows in features table'
 pp Flipper::Adapters::ActiveRecord::Feature.all
@@ -105,5 +103,5 @@ pp Flipper::Adapters::ActiveRecord::Gate.all
 puts
 
 puts 'flipper get of feature'
-pp adapter.get(flipper[:stats])
+pp Flipper.adapter.get(Flipper[:stats])
 # flipper get of feature

data/flipper-active_record.gemspec

@@ -25,5 +25,5 @@ Gem::Specification.new do |gem|
   gem.metadata      = Flipper::METADATA
 
   gem.add_dependency 'flipper', "~> #{Flipper::VERSION}"
-  gem.add_dependency 'activerecord', '>= 5.0', '< 7'
+  gem.add_dependency 'activerecord', '>= 4.2', '< 7'
 end

data/lib/flipper/adapters/active_record.rb

@@ -101,11 +101,12 @@ module Flipper
       end
 
       def get_all
-        rows = ::ActiveRecord::Base.connection.select_all <<-SQL.tr("\n", ' ')
-          SELECT ff.key AS feature_key, fg.key, fg.value
-          FROM #{@feature_class.table_name} ff
-          LEFT JOIN #{@gate_class.table_name} fg ON ff.key = fg.feature_key
-        SQL
+        features = ::Arel::Table.new(@feature_class.table_name.to_sym)
+        gates = ::Arel::Table.new(@gate_class.table_name.to_sym)
+        rows_query = features.join(gates, Arel::Nodes::OuterJoin)
+          .on(features[:key].eq(gates[:feature_key]))
+          .project(features[:key].as('feature_key'), gates[:key], gates[:value])
+        rows = ::ActiveRecord::Base.connection.select_all rows_query
         db_gates = rows.map { |row| Gate.new(row) }
         grouped_db_gates = db_gates.group_by(&:feature_key)
         result = Hash.new { |hash, key| hash[key] = default_config }
@@ -172,10 +173,15 @@ module Flipper
         @gate_class.transaction do
           clear(feature) if clear_feature
           @gate_class.where(feature_key: feature.key, key: gate.key).destroy_all
-          @gate_class.create! do |g|
-            g.feature_key = feature.key
-            g.key = gate.key
-            g.value = thing.value.to_s
+          begin
+            @gate_class.create! do |g|
+              g.feature_key = feature.key
+              g.key = gate.key
+              g.value = thing.value.to_s
+            end
+          rescue ::ActiveRecord::RecordNotUnique
+            # assume this happened concurrently with the same thing and its fine
+            # see https://github.com/jnunemaker/flipper/issues/544
           end
         end
 
@@ -219,3 +225,7 @@ module Flipper
     end
   end
 end
+
+Flipper.configure do |config|
+  config.adapter { Flipper::Adapters::ActiveRecord.new }
+end

data/lib/flipper/version.rb

@@ -1,3 +1,3 @@
 module Flipper
-  VERSION = '0.21.0.rc1'.freeze
+  VERSION = '0.22.1'.freeze
 end

data/lib/flipper-active_record.rb

@@ -2,12 +2,4 @@ require 'active_support/lazy_load_hooks'
 
 ActiveSupport.on_load(:active_record) do
   require 'flipper/adapters/active_record'
-
-  Flipper.configure do |config|
-    config.default do
-      Flipper.new(Flipper::Adapters::ActiveRecord.new)
-    end
-  end
-
-  ActiveRecord::Base.include Flipper::Identifier
 end

data/spec/flipper/adapters/active_record_spec.rb

@@ -51,16 +51,12 @@ RSpec.describe Flipper::Adapters::ActiveRecord do
       Flipper.configuration = nil
       Flipper.instance = nil
 
-      load 'flipper-active_record.rb'
+      load 'flipper/adapters/active_record.rb'
       ActiveSupport.run_load_hooks(:active_record, ActiveRecord::Base)
     end
 
     it 'configures itself' do
       expect(Flipper.adapter.adapter).to be_a(Flipper::Adapters::ActiveRecord)
     end
-
-    it "defines #flipper_id on AR::Base" do
-      expect(ActiveRecord::Base.ancestors).to include(Flipper::Identifier)
-    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flipper-active_record
 version: !ruby/object:Gem::Version
-  version: 0.21.0.rc1
+  version: 0.22.1
 platform: ruby
 authors:
 - John Nunemaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-01 00:00:00.000000000 Z
+date: 2021-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flipper
@@ -16,21 +16,21 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.0.rc1
+        version: 0.22.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.0.rc1
+        version: 0.22.1
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -40,7 +40,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7'
@@ -80,9 +80,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3
 signing_key: