flipper-active_record 0.16.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6ee1ea1e930baa8bb351d4ac270b3a356fb01e17
-  data.tar.gz: 7446eb0f9705b4633f40394657548cd5f9adce6e
+SHA256:
+  metadata.gz: 976145403b3ed3058baca13ec4fba16b12d8f58ac0013782e5fed5dce324f074
+  data.tar.gz: 711d3a894b652d8d10b515bcabc43f2c70eeac1bbad0441f6794db87aa645d9f
 SHA512:
-  metadata.gz: 064be4212916b8b8638249b58c3b4c16ab4bb1c7fa38f771440caea5351c175023f037c8a5180ac3855cc03bf51145cbbdd6fa23078e7b40c91e84ec3feb2d44
-  data.tar.gz: 3d9802fe0f315883e05aeffcfd76d56e7404a985e940af61e4b69a4d0d57e13276f0f65be5be9411916429aa730d044f660b05c5d319cde1afaf249e7ca98890
+  metadata.gz: 51be50553347b5880d78bec7980668ea0e65c2487aca9b09af4f68c37cb9ddb0d76246bd41e19c96ec2f6a86706bd1778e60d160537e9f16f48a86366219cf88
+  data.tar.gz: eafc203fc9db9f2adce2f73014f2bd176b82d2441a0f7405f3399101347de4139e19bf47786795a040cb32ff06b027c212e425aa2f1f4df5ba7740fb67a33cfa

data/docs/active_record/README.md

@@ -4,9 +4,8 @@ An ActiveRecord adapter for [Flipper](https://github.com/jnunemaker/flipper).
 
 Supported Active Record versions:
 
-* 3.2.x
-* 4.2.x
 * 5.0.x
+* 6.0.x
 
 ## Installation
 

data/flipper-active_record.gemspec

@@ -10,7 +10,6 @@ Gem::Specification.new do |gem|
   gem.authors       = ['John Nunemaker']
   gem.email         = ['nunemaker@gmail.com']
   gem.summary       = 'ActiveRecord adapter for Flipper'
-  gem.description   = 'ActiveRecord adapter for Flipper'
   gem.license       = 'MIT'
   gem.homepage      = 'https://github.com/jnunemaker/flipper'
 
@@ -26,5 +25,5 @@ Gem::Specification.new do |gem|
   gem.metadata      = Flipper::METADATA
 
   gem.add_dependency 'flipper', "~> #{Flipper::VERSION}"
-  gem.add_dependency 'activerecord', '>= 3.2', '< 6'
+  gem.add_dependency 'activerecord', '>= 5.0', '< 7'
 end

data/lib/flipper-active_record.rb

@@ -1,3 +1,5 @@
+require 'active_support/lazy_load_hooks'
+
 ActiveSupport.on_load(:active_record) do
   require 'flipper/adapters/active_record'
 end

data/lib/flipper/adapters/active_record.rb

@@ -54,19 +54,23 @@ module Flipper
       # Public: Adds a feature to the set of known features.
       def add(feature)
         # race condition, but add is only used by enable/disable which happen
-        # super rarely, so it shouldn't matter in practice; additionally
-        # to_a.first is used instead of first because of a Ruby 2.4/Rails 3.2.21
-        # CI failure (https://travis-ci.org/jnunemaker/flipper/jobs/297274000).
-        unless @feature_class.where(key: feature.key).to_a.first
-          @feature_class.create! { |f| f.key = feature.key }
+        # super rarely, so it shouldn't matter in practice
+        @feature_class.transaction do
+          unless @feature_class.where(key: feature.key).first
+            begin
+              @feature_class.create! { |f| f.key = feature.key }
+            rescue ::ActiveRecord::RecordNotUnique
+            end
+          end
         end
+
         true
       end
 
       # Public: Removes a feature from the set of known features.
       def remove(feature)
         @feature_class.transaction do
-          @feature_class.where(key: feature.key).delete_all
+          @feature_class.where(key: feature.key).destroy_all
           clear(feature)
         end
         true
@@ -74,7 +78,7 @@ module Flipper
 
       # Public: Clears the gate values for a feature.
       def clear(feature)
-        @gate_class.where(feature_key: feature.key).delete_all
+        @gate_class.where(feature_key: feature.key).destroy_all
         true
       end
 
@@ -97,7 +101,7 @@ module Flipper
       end
 
       def get_all
-        rows = ::ActiveRecord::Base.connection.select_all <<-SQL
+        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
@@ -121,8 +125,10 @@ module Flipper
       # Returns true.
       def enable(feature, gate, thing)
         case gate.data_type
-        when :boolean, :integer
-          enable_single(feature, gate, thing)
+        when :boolean
+          set(feature, gate, thing, clear: true)
+        when :integer
+          set(feature, gate, thing)
         when :set
           enable_multi(feature, gate, thing)
         else
@@ -144,20 +150,9 @@ module Flipper
         when :boolean
           clear(feature)
         when :integer
-          @gate_class.transaction do
-            @gate_class.where(
-              feature_key: feature.key,
-              key: gate.key
-            ).delete_all
-
-            @gate_class.create! do |g|
-              g.feature_key = feature.key
-              g.key = gate.key
-              g.value = thing.value.to_s
-            end
-          end
+          set(feature, gate, thing)
         when :set
-          @gate_class.where(feature_key: feature.key, key: gate.key, value: thing.value).delete_all
+          @gate_class.where(feature_key: feature.key, key: gate.key, value: thing.value).destroy_all
         else
           unsupported_data_type gate.data_type
         end
@@ -172,15 +167,19 @@ module Flipper
 
       private
 
-      def enable_single(feature, gate, thing)
+      def set(feature, gate, thing, options = {})
+        clear_feature = options.fetch(:clear, false)
         @gate_class.transaction do
-          @gate_class.where(feature_key: feature.key, key: gate.key).delete_all
+          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
           end
         end
+
+        nil
       end
 
       def enable_multi(feature, gate, thing)
@@ -189,9 +188,10 @@ module Flipper
           g.key = gate.key
           g.value = thing.value.to_s
         end
+
+        nil
       rescue ::ActiveRecord::RecordNotUnique
-      rescue ::ActiveRecord::StatementInvalid => error
-        raise unless error.message =~ /unique/i
+        # already added so no need move on with life
       end
 
       def result_for_feature(feature, db_gates)
@@ -201,12 +201,12 @@ module Flipper
           result[gate.key] =
             case gate.data_type
             when :boolean
-              if db_gate = db_gates.detect { |db_gate| db_gate.key == gate.key.to_s }
-                db_gate.value
+              if detected_db_gate = db_gates.detect { |db_gate| db_gate.key == gate.key.to_s }
+                detected_db_gate.value
               end
             when :integer
-              if db_gate = db_gates.detect { |db_gate| db_gate.key == gate.key.to_s }
-                db_gate.value
+              if detected_db_gate = db_gates.detect { |db_gate| db_gate.key == gate.key.to_s }
+                detected_db_gate.value
               end
             when :set
               db_gates.select { |db_gate| db_gate.key == gate.key.to_s }.map(&:value).to_set

data/lib/flipper/version.rb

@@ -1,3 +1,3 @@
 module Flipper
-  VERSION = '0.16.0'.freeze
+  VERSION = '0.18.0'.freeze
 end

data/lib/generators/flipper/active_record_generator.rb

@@ -13,11 +13,11 @@ module Flipper
       end
 
       def self.migration_version
-        "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]" if rails5?
+        "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]" if requires_migration_number?
       end
 
-      def self.rails5?
-        Rails.version.start_with?('5')
+      def self.requires_migration_number?
+        Rails::VERSION::MAJOR.to_i >= 5
       end
 
       def create_migration_file

data/spec/flipper/adapters/active_record_requires_spec.rb

@@ -0,0 +1,5 @@
+# This nominally-empty spec ensures that the file "flipper-active_record.rb" can be
+# required without error, and guards against regressions of the kind fixed in
+# https://github.com/jnunemaker/flipper/pull/437.
+
+require "flipper-active_record.rb"

data/test_rails/generators/flipper/active_record_generator_test.rb

@@ -0,0 +1,43 @@
+require 'helper'
+require 'active_record'
+require 'rails/generators/test_case'
+require 'generators/flipper/active_record_generator'
+
+class FlipperActiveRecordGeneratorTest < Rails::Generators::TestCase
+  tests Flipper::Generators::ActiveRecordGenerator
+  destination File.expand_path('../../../../tmp', __FILE__)
+  setup :prepare_destination
+
+  def test_generates_migration
+    run_generator
+    migration_version = if Rails::VERSION::MAJOR.to_i < 5
+                          ""
+                        else
+                          "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
+                        end
+    assert_migration 'db/migrate/create_flipper_tables.rb', <<~MIGRATION
+      class CreateFlipperTables < ActiveRecord::Migration#{migration_version}
+        def self.up
+          create_table :flipper_features do |t|
+            t.string :key, null: false
+            t.timestamps null: false
+          end
+          add_index :flipper_features, :key, unique: true
+
+          create_table :flipper_gates do |t|
+            t.string :feature_key, null: false
+            t.string :key, null: false
+            t.string :value
+            t.timestamps null: false
+          end
+          add_index :flipper_gates, [:feature_key, :key, :value], unique: true
+        end
+
+        def self.down
+          drop_table :flipper_gates
+          drop_table :flipper_features
+        end
+      end
+    MIGRATION
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flipper-active_record
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.18.0
 platform: ruby
 authors:
 - John Nunemaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-01 00:00:00.000000000 Z
+date: 2020-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flipper
@@ -16,35 +16,35 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.18.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6'
-description: ActiveRecord adapter for Flipper
+        version: '7'
+description: 
 email:
 - nunemaker@gmail.com
 executables: []
@@ -61,9 +61,10 @@ files:
 - lib/flipper/version.rb
 - lib/generators/flipper/active_record_generator.rb
 - lib/generators/flipper/templates/migration.erb
+- spec/flipper/adapters/active_record_requires_spec.rb
 - spec/flipper/adapters/active_record_spec.rb
 - test/adapters/active_record_test.rb
-- test/generators/flipper/active_record_generator_test.rb
+- test_rails/generators/flipper/active_record_generator_test.rb
 homepage: https://github.com/jnunemaker/flipper
 licenses:
 - MIT
@@ -84,12 +85,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.4
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: ActiveRecord adapter for Flipper
 test_files:
+- spec/flipper/adapters/active_record_requires_spec.rb
 - spec/flipper/adapters/active_record_spec.rb
 - test/adapters/active_record_test.rb
-- test/generators/flipper/active_record_generator_test.rb

data/test/generators/flipper/active_record_generator_test.rb

@@ -1,43 +0,0 @@
-require 'helper'
-require 'active_record'
-require 'rails/generators/test_case'
-require 'generators/flipper/active_record_generator'
-
-class FlipperActiveRecordGeneratorTest < Rails::Generators::TestCase
-  tests Flipper::Generators::ActiveRecordGenerator
-  destination File.expand_path('../../../../tmp', __FILE__)
-  setup :prepare_destination
-
-  def test_generates_migration
-    run_generator
-    migration_version = if Rails::VERSION::MAJOR.to_i < 5
-                          ""
-                        else
-                          "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
-                        end
-    assert_migration 'db/migrate/create_flipper_tables.rb', <<-EOM
-class CreateFlipperTables < ActiveRecord::Migration#{migration_version}
-  def self.up
-    create_table :flipper_features do |t|
-      t.string :key, null: false
-      t.timestamps null: false
-    end
-    add_index :flipper_features, :key, unique: true
-
-    create_table :flipper_gates do |t|
-      t.string :feature_key, null: false
-      t.string :key, null: false
-      t.string :value
-      t.timestamps null: false
-    end
-    add_index :flipper_gates, [:feature_key, :key, :value], unique: true
-  end
-
-  def self.down
-    drop_table :flipper_gates
-    drop_table :flipper_features
-  end
-end
-EOM
-  end
-end