flipper-active_record 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 132931f0a03b957491a3899d7624bec349299d0b
-  data.tar.gz: 369c0e4137231697019e090f5f25caff44eeadf7
+  metadata.gz: 7f229cea6ee1375f4e7646c83b5da628e96bb53f
+  data.tar.gz: f2e5c18eff0113f078e3b1e8bee95921404d827f
 SHA512:
-  metadata.gz: c003998d310119279d893d95f46bd098b95150aee12c41b6fbc92c69fef5e6145008c2fe71afe4eb6000731c68239287ccf8f952ecd52b7582f792ed38c9dc47
-  data.tar.gz: 25643fd1033438ce1b438d4373fb0c5b13a7bf6593497670bc66bcc5392b70cfb3b467fba5ff0ff1f45a075c8d2181b193a13029f4a7f91c5ee1645dcd7a30df
+  metadata.gz: fc26ab0e003c0bf66db5d9733ff7b403edf225a30dd5c1b93577981d471abe5065fe1cf522bcf1eba0a973af3fe1d6c15e9572cc0fd7c56f7349415f5a6df570
+  data.tar.gz: 1bfa2802ce615c641bde196294d15a726217f09c0ca59f46c3a5d373faa0d3d243fc4d6c6ac89111aaff79ffaabaea084e27b2338a97af67b30efd3e73006fb4

data/lib/flipper/adapters/active_record.rb

@@ -113,24 +113,9 @@ module Flipper
       def enable(feature, gate, thing)
         case gate.data_type
         when :boolean, :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
+          enable_single(feature, gate, thing)
         when :set
-          @gate_class.create! do |g|
-            g.feature_key = feature.key
-            g.key = gate.key
-            g.value = thing.value.to_s
-          end
+          enable_multi(feature, gate, thing)
         else
           unsupported_data_type gate.data_type
         end
@@ -178,6 +163,28 @@ module Flipper
 
       private
 
+      def enable_single(feature, gate, thing)
+        @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
+      end
+
+      def enable_multi(feature, gate, thing)
+        @gate_class.create! do |g|
+          g.feature_key = feature.key
+          g.key = gate.key
+          g.value = thing.value.to_s
+        end
+      rescue ::ActiveRecord::RecordNotUnique
+      rescue ::ActiveRecord::StatementInvalid => error
+        raise unless error.message =~ /unique/i
+      end
+
       def result_for_feature(feature, db_gates)
         db_gates ||= []
         result = {}

data/lib/flipper/version.rb

@@ -1,3 +1,3 @@
 module Flipper
-  VERSION = '0.11.0'.freeze
+  VERSION = '0.12.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flipper-active_record
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - John Nunemaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-07 00:00:00.000000000 Z
+date: 2018-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flipper
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement