flipper-sequel 0.21.0.rc1 → 0.22.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e54420e133a98d1409c46eee996cb5e1b2f1dc5f7a42e13a239d117aad1b1f4e
-  data.tar.gz: 6a33075a77c44f4661dea0b86b790e10ecc4b57bf73c2d54188eb97654fe72b5
+  metadata.gz: 5ce2ffdf3cf436c77fb8ba03a3c029d29de3fb4f9c957432802d44b1eaf8da9e
+  data.tar.gz: 9326d3430684b8b0b6be6f01548d7cbbf392a8f3ed12715c12fb4ea00ce36174
 SHA512:
-  metadata.gz: dc79979ecadab2e090576c0a3adb3c35b1d542eed28cfe7129a4ff988ed247f3bc7c3643b4485d332989e5584d2fb8499b2a2fd278c5d181593ac1f81fa1402e
-  data.tar.gz: e67db92eacbac704ff680d4a4fd3aacbdbb568f155914d819daa7b223dab72b18955c442d73bbcbb0a58326acca983c59e150cbf47bed8bb128a1414be129bbd
+  metadata.gz: 5d1031cbbdcabe73ef9feac30dd00d7ccfcb955abb24283f615bf19d70265c86cd0f2bc6eeeea96abb0028eee1a8848ea15699dceeb421a927a725156f03d7fb
+  data.tar.gz: 9acf7c0ea2ec149ea78334f305c2ff704d95207b0dc63fe708038fb94a92422917546b9f95c9a338316c2eb8da5792f4ae7ba7c2cd23e533532299a730441766

data/docs/sequel/README.md

@@ -35,9 +35,7 @@ require 'flipper-sequel`
 
 ```ruby
 Flipper.configure do |config|
-  config.default do
-    Flipper.new(Flipper::Adapters::Sequel.new)
-  end
+  config.adapter { Flipper::Adapters::Sequel.new }
 end
 ```
 

data/examples/sequel/basic.rb

@@ -7,20 +7,18 @@ require 'generators/flipper/templates/sequel_migration'
 CreateFlipperTablesSequel.new(Sequel::Model.db).up
 
 require 'flipper/adapters/sequel'
-adapter = Flipper::Adapters::Sequel.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/sequel/internals.rb

@@ -7,8 +7,6 @@ require 'generators/flipper/templates/sequel_migration'
 CreateFlipperTablesSequel.new(Sequel::Model.db).up
 
 require 'flipper/adapters/sequel'
-adapter = Flipper::Adapters::Sequel.new
-flipper = Flipper.new(adapter)
 
 # Register a few groups.
 Flipper.register(:admins) { |thing| thing.admin? }
@@ -17,16 +15,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::Sequel::Feature.all
@@ -48,7 +46,7 @@ pp Flipper::Adapters::Sequel::Gate.all
 puts
 
 puts 'flipper get of feature'
-pp adapter.get(flipper[:stats])
+pp Flipper.adapter.get(Flipper[:stats])
 # {:boolean=>"true",
 #  :groups=>#<Set: {"admins", "early_access"}>,
 #  :actors=>#<Set: {"180", "25", "90"}>,

data/lib/flipper/adapters/sequel.rb

@@ -97,11 +97,15 @@ module Flipper
       end
 
       def get_all
-        db_gates = @gate_class.fetch(<<-SQL).to_a
-          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
+        feature_table = @feature_class.table_name.to_sym
+        gate_table = @gate_class.table_name.to_sym
+        features_sql = @feature_class.select(:key.qualify(feature_table).as(:feature_key))
+            .select_append(:key.qualify(gate_table))
+            .select_append(:value.qualify(gate_table))
+            .left_join(@gate_class.table_name.to_sym, feature_key: :key)
+            .sql
+
+        db_gates = @gate_class.fetch(features_sql).to_a
         grouped_db_gates = db_gates.group_by(&:feature_key)
         result = Hash.new { |hash, key| hash[key] = default_config }
         features = grouped_db_gates.keys.map { |key| Flipper::Feature.new(key, self) }
@@ -175,7 +179,11 @@ module Flipper
         @gate_class.db.transaction do
           clear(feature) if clear_feature
           @gate_class.where(args).delete
-          @gate_class.create(gate_attrs(feature, gate, thing))
+
+          begin
+            @gate_class.create(gate_attrs(feature, gate, thing))
+          rescue ::Sequel::UniqueConstraintViolation
+          end
         end
       end
 
@@ -210,3 +218,9 @@ module Flipper
     end
   end
 end
+
+Flipper.configure do |config|
+  config.adapter { Flipper::Adapters::Sequel.new }
+end
+
+Sequel::Model.include Flipper::Identifier

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-sequel.rb

@@ -1,9 +1 @@
 require 'flipper/adapters/sequel'
-
-Flipper.configure do |config|
-  config.default do
-    Flipper.new(Flipper::Adapters::Sequel.new)
-  end
-end
-
-Sequel::Model.include Flipper::Identifier

data/spec/flipper/adapters/sequel_spec.rb

@@ -34,7 +34,7 @@ RSpec.describe Flipper::Adapters::Sequel do
       Flipper.configuration = nil
       Flipper.instance = nil
 
-      load 'flipper-sequel.rb'
+      load 'flipper/adapters/sequel.rb'
     end
 
     it 'configures itself' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flipper-sequel
 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,14 +16,14 @@ 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: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -77,9 +77,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: