flipper-active_record 0.21.0 → 0.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 817d24520675d09850b573dd90cc0d3156d9814660df8f9e5e3ae0454c7ba2be
-  data.tar.gz: 0f463aae2f5b685c468adece153f1d90a9da712f105dd473d54a09cdf212a2e5
+  metadata.gz: 4432d45cbc87e12df5a8de40225e97a2d7c9b04f67f9e7ee640b9bd13ec24ba7
+  data.tar.gz: 8027fea6e1bc7cc2bddfcbd72f1ec7624354186739ff57856b5c534f6f94bc65
 SHA512:
-  metadata.gz: 57808e710308f1644695be92077fd70dedac3b0c513888fcdcef8afcbe7f5a271bab928c352fdc1e1d4c91ce42df2dd2ac71a7ecff352403a33d7231072f783d
-  data.tar.gz: 20cc9301fd6e53258e14737bc0fd9b97e2e5c78a9bb6eea147b2cc0c539ee44dbf46388730d2114972577f2e3e5adc5b9dd0433bcfe25edcc9cfcb01ff8af0a4
+  metadata.gz: 738c9be60a2aa4f9e66f20bbe5d18e02ea9c57491136cd9f567fa48baa4ced3e6d44ab45e9d7ff4a3eead067d147556e1afc0c40205158910e2162843dd21921
+  data.tar.gz: c37ce69fbf80ec2fe653c53d9128ea02dc660524e419ac0fd91a2fdf7b4835f1f1c2652803b49d12dbad11ec9a60a1f0dfc96684e52ef16916adf2b5d235fbed

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', '< 8'
 end

data/lib/flipper/adapters/active_record.rb

@@ -7,21 +7,26 @@ module Flipper
     class ActiveRecord
       include ::Flipper::Adapter
 
+      # Abstract base class for internal models
+      class Model < ::ActiveRecord::Base
+        self.abstract_class = true
+      end
+
       # Private: Do not use outside of this adapter.
-      class Feature < ::ActiveRecord::Base
+      class Feature < Model
         self.table_name = [
-          ::ActiveRecord::Base.table_name_prefix,
+          Model.table_name_prefix,
           "flipper_features",
-          ::ActiveRecord::Base.table_name_suffix,
+          Model.table_name_suffix,
         ].join
       end
 
       # Private: Do not use outside of this adapter.
-      class Gate < ::ActiveRecord::Base
+      class Gate < Model
         self.table_name = [
-          ::ActiveRecord::Base.table_name_prefix,
+          Model.table_name_prefix,
           "flipper_gates",
-          ::ActiveRecord::Base.table_name_suffix,
+          Model.table_name_suffix,
         ].join
       end
 
@@ -101,11 +106,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 = @feature_class.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 +178,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
 

data/lib/flipper/version.rb

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

data/spec/flipper/adapters/active_record_spec.rb

@@ -1,6 +1,4 @@
-require 'helper'
 require 'flipper/adapters/active_record'
-require 'flipper/spec/shared_adapter_specs'
 
 # Turn off migration logging for specs
 ActiveRecord::Migration.verbose = false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flipper-active_record
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.25.0
 platform: ruby
 authors:
 - John Nunemaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-09 00:00:00.000000000 Z
+date: 2022-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flipper
@@ -16,34 +16,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.25.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.25.0
 - !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'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
 description: 
 email:
 - nunemaker@gmail.com
@@ -51,7 +51,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- docs/active_record/README.md
 - examples/active_record/ar_setup.rb
 - examples/active_record/basic.rb
 - examples/active_record/internals.rb
@@ -84,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: ActiveRecord adapter for Flipper

data/docs/active_record/README.md

@@ -1,156 +0,0 @@
-# Flipper ActiveRecord
-
-An ActiveRecord adapter for [Flipper](https://github.com/jnunemaker/flipper).
-
-Supported Active Record versions:
-
-* 5.0.x
-* 6.0.x
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-    gem 'flipper-active_record'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself with:
-
-    $ gem install flipper-active_record
-
-## Usage
-
-For your convenience a migration generator is provided to create the necessary migrations for using the active record adapter. By default this generates a migration that will create two database tables - `flipper_features` and `flipper_gates`.
-
-    $ rails g flipper:active_record
-
-Note that the active record adapter requires the database tables to be created in order to work; failure to run the migration first will cause an exception to be raised when attempting to initialize the active record adapter.
-
-Flipper will be configured to use the ActiveRecord adapter when `flipper-active_record` is loaded. But **if you need to customize the adapter**, you can add this to an initializer:
-
-```ruby
-require 'flipper/adapters/active_record'
-Flipper.configure do |config|
-  config.adapter { Flipper::Adapters::ActiveRecord.new }
-end
-```
-
-## Internals
-
-Each feature is stored as a row in a features table. Each gate is stored as a row in a gates table, related to the feature by the feature's key.
-
-```ruby
-# Register a few groups.
-Flipper.register(:admins) { |thing| thing.admin? }
-Flipper.register(:early_access) { |thing| thing.early_access? }
-
-# Create a user class that has flipper_id instance method.
-User = Struct.new(:flipper_id)
-
-Flipper.enable :stats
-Flipper.enable_group :stats, :admins
-Flipper.enable_group :stats, :early_access
-Flipper.enable_actor :stats, User.new('25')
-Flipper.enable_actor :stats, User.new('90')
-Flipper.enable_actor :stats, User.new('180')
-Flipper.enable_percentage_of_time :stats, 15
-Flipper.enable_percentage_of_actors :stats, 45
-
-Flipper.enable :search
-
-puts 'all rows in features table'
-pp Flipper::Adapters::ActiveRecord::Feature.all
-# [#<Flipper::Adapters::ActiveRecord::Feature:0x007fd259b47110
-#   id: 1,
-#   key: "stats",
-#   created_at: 2015-12-21 16:26:29 UTC,
-#   updated_at: 2015-12-21 16:26:29 UTC>,
-#  #<Flipper::Adapters::ActiveRecord::Feature:0x007fd259b46cd8
-#   id: 2,
-#   key: "search",
-#   created_at: 2015-12-21 16:26:29 UTC,
-#   updated_at: 2015-12-21 16:26:29 UTC>]
-puts
-
-puts 'all rows in gates table'
-pp Flipper::Adapters::ActiveRecord::Gate.all
-# [#<Flipper::Adapters::ActiveRecord::Gate:0x007fd259b0f0f8
-#   id: 1,
-#   feature_key: "stats",
-#   key: "boolean",
-#   value: "true",
-#   created_at: 2015-12-21 16:26:29 UTC,
-#   updated_at: 2015-12-21 16:26:29 UTC>,
-#  #<Flipper::Adapters::ActiveRecord::Gate:0x007fd259b0ebd0
-#   id: 2,
-#   feature_key: "stats",
-#   key: "groups",
-#   value: "admins",
-#   created_at: 2015-12-21 16:26:29 UTC,
-#   updated_at: 2015-12-21 16:26:29 UTC>,
-#  #<Flipper::Adapters::ActiveRecord::Gate:0x007fd259b0e748
-#   id: 3,
-#   feature_key: "stats",
-#   key: "groups",
-#   value: "early_access",
-#   created_at: 2015-12-21 16:26:29 UTC,
-#   updated_at: 2015-12-21 16:26:29 UTC>,
-#  #<Flipper::Adapters::ActiveRecord::Gate:0x007fd259b0e568
-#   id: 4,
-#   feature_key: "stats",
-#   key: "actors",
-#   value: "25",
-#   created_at: 2015-12-21 16:26:29 UTC,
-#   updated_at: 2015-12-21 16:26:29 UTC>,
-#  #<Flipper::Adapters::ActiveRecord::Gate:0x007fd259b0e0b8
-#   id: 5,
-#   feature_key: "stats",
-#   key: "actors",
-#   value: "90",
-#   created_at: 2015-12-21 16:26:29 UTC,
-#   updated_at: 2015-12-21 16:26:29 UTC>,
-#  #<Flipper::Adapters::ActiveRecord::Gate:0x007fd259b0da50
-#   id: 6,
-#   feature_key: "stats",
-#   key: "actors",
-#   value: "180",
-#   created_at: 2015-12-21 16:26:29 UTC,
-#   updated_at: 2015-12-21 16:26:29 UTC>,
-#  #<Flipper::Adapters::ActiveRecord::Gate:0x007fd259b0d3c0
-#   id: 7,
-#   feature_key: "stats",
-#   key: "percentage_of_time",
-#   value: "15",
-#   created_at: 2015-12-21 16:26:29 UTC,
-#   updated_at: 2015-12-21 16:26:29 UTC>,
-#  #<Flipper::Adapters::ActiveRecord::Gate:0x007fd259b0cdf8
-#   id: 8,
-#   feature_key: "stats",
-#   key: "percentage_of_actors",
-#   value: "45",
-#   created_at: 2015-12-21 16:26:29 UTC,
-#   updated_at: 2015-12-21 16:26:29 UTC>,
-#  #<Flipper::Adapters::ActiveRecord::Gate:0x007fd259b0cbf0
-#   id: 9,
-#   feature_key: "search",
-#   key: "boolean",
-#   value: "true",
-#   created_at: 2015-12-21 16:26:29 UTC,
-#   updated_at: 2015-12-21 16:26:29 UTC>]
-puts
-
-puts 'flipper get of feature'
-pp adapter.get(flipper[:stats])
-# flipper get of feature
-```
-
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Added some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request