flipper-sequel 0.21.0 → 0.23.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa83337636b5039464206b454335756a1065343c1ae8d7fe8083b4d27dcf604e
-  data.tar.gz: 32af671861afdf85d3a6c800fa38e6223cef9fa67fc837db1b19a03b1d206857
+  metadata.gz: e8e3f9947bf861064bf8986d7456aebd581a448d907fdcaff54c02c92ca2197f
+  data.tar.gz: a53796f762aaa927baafdfae6dfae234c5f27510069ea980ab64ee09430ac650
 SHA512:
-  metadata.gz: a613b22e95c6c5478837cece0f58508d5e92b51e3b9902a873146b17813ffbd3fdd9dccd89ec8bd4bd8fe0b36a3e4743c9947b28244c54d3c549d4f620f7ef88
-  data.tar.gz: 5d5eef8a95a52645e07ef5d10c201dc32d9551941168f53df10ff7c847a5c6b327f3739ab6c1eee8ee98dd56cbe994232711775feb99693b3e405313835a4d10
+  metadata.gz: 571d14ed54c82b7b6e6da8afb61a15fe9345ac4d7341d2f40a5036e2989caaff1ea9182cf19bf930c6815f41839af5f6909a4318dc8dce6cb963e4e5b2036578
+  data.tar.gz: 50447c3d780a7794cd3d0cb1469b99532517983657f071b809d4bf4d219b152bde2c622baeb5187dea6233a17e04c87cc8a1639504dd29284bd19ad862fef2a8

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
 

data/lib/flipper/version.rb

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

data/spec/flipper/adapters/sequel_spec.rb

@@ -1,4 +1,3 @@
-require 'helper'
 require 'sequel'
 
 Sequel::Model.db = Sequel.sqlite(':memory:')
@@ -6,7 +5,6 @@ Sequel.extension :migration, :core_extensions
 
 require 'flipper/adapters/sequel'
 require 'generators/flipper/templates/sequel_migration'
-require 'flipper/spec/shared_adapter_specs'
 
 RSpec.describe Flipper::Adapters::Sequel do
   subject do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flipper-sequel
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.23.0
 platform: ruby
 authors:
 - John Nunemaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-09 00:00:00.000000000 Z
+date: 2021-12-24 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
+        version: 0.23.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.23.0
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -51,7 +51,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- docs/sequel/README.md
 - examples/sequel/basic.rb
 - examples/sequel/internals.rb
 - flipper-sequel.gemspec
@@ -81,7 +80,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: Sequel adapter for Flipper

data/docs/sequel/README.md

@@ -1,103 +0,0 @@
-# Flipper Sequel
-
-A [Sequel](https://github.com/jeremyevans/sequel) adapter for [Flipper](https://github.com/jnunemaker/flipper).
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-    gem 'flipper-sequel'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself with:
-
-    $ gem install flipper-sequel
-
-## Usage
-
-For your convenience, a sequel migration is provided to create the necessary tables. This migration will create two database tables - flipper_features and flipper_gates.
-
-```ruby
-require 'generators/flipper/templates/sequel_migration'
-CreateFlipperTablesSequel.new(Sequel::Model.db).up
-```
-
-Once you have created and executed the migration, you can use the sequel adapter by simply requiring it:
-
-```ruby
-require 'flipper-sequel`
-```
-
-**If you need to customize the adapter**, you can add this to an initializer:
-
-```ruby
-Flipper.configure do |config|
-  config.adapter { Flipper::Adapters::Sequel.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
-require 'flipper/adapters/sequel'
-adapter = Flipper::Adapters::Sequel.new
-flipper = Flipper.new(adapter)
-
-# 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[: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
-
-puts 'all rows in features table'
-pp Flipper::Adapters::Sequel::Feature.all
-#[#<Flipper::Adapters::Sequel::Feature @values={:key=>"stats", :created_at=>2016-11-19 13:57:48 -0500, :updated_at=>2016-11-19 13:57:48 -0500}>,
-# #<Flipper::Adapters::Sequel::Feature @values={:key=>"search", :created_at=>2016-11-19 13:57:48 -0500, :updated_at=>2016-11-19 13:57:48 -0500}>]
-puts
-
-puts 'all rows in gates table'
-pp Flipper::Adapters::Sequel::Gate.all
-# [#<Flipper::Adapters::Sequel::Gate @values={:feature_key=>"stats", :key=>"boolean", :value=>"true", :created_at=>2016-11-19 13:57:48 -0500, :updated_at=>2016-11-19 13:57:48 -0500}>,
-#  #<Flipper::Adapters::Sequel::Gate @values={:feature_key=>"stats", :key=>"groups", :value=>"admins", :created_at=>2016-11-19 13:57:48 -0500, :updated_at=>2016-11-19 13:57:48 -0500}>,
-#  #<Flipper::Adapters::Sequel::Gate @values={:feature_key=>"stats", :key=>"groups", :value=>"early_access", :created_at=>2016-11-19 13:57:48 -0500, :updated_at=>2016-11-19 13:57:48 -0500}>,
-#  #<Flipper::Adapters::Sequel::Gate @values={:feature_key=>"stats", :key=>"actors", :value=>"25", :created_at=>2016-11-19 13:57:48 -0500, :updated_at=>2016-11-19 13:57:48 -0500}>,
-#  #<Flipper::Adapters::Sequel::Gate @values={:feature_key=>"stats", :key=>"actors", :value=>"90", :created_at=>2016-11-19 13:57:48 -0500, :updated_at=>2016-11-19 13:57:48 -0500}>,
-#  #<Flipper::Adapters::Sequel::Gate @values={:feature_key=>"stats", :key=>"actors", :value=>"180", :created_at=>2016-11-19 13:57:48 -0500, :updated_at=>2016-11-19 13:57:48 -0500}>,
-#  #<Flipper::Adapters::Sequel::Gate @values={:feature_key=>"stats", :key=>"percentage_of_time", :value=>"15", :created_at=>2016-11-19 13:57:48 -0500, :updated_at=>2016-11-19 13:57:48 -0500}>,
-#  #<Flipper::Adapters::Sequel::Gate @values={:feature_key=>"stats", :key=>"percentage_of_actors", :value=>"45", :created_at=>2016-11-19 13:57:48 -0500, :updated_at=>2016-11-19 13:57:48 -0500}>,
-#  #<Flipper::Adapters::Sequel::Gate @values={:feature_key=>"search", :key=>"boolean", :value=>"true", :created_at=>2016-11-19 13:57:48 -0500, :updated_at=>2016-11-19 13:57:48 -0500}>]
-puts
-
-puts 'flipper get of feature'
-pp adapter.get(flipper[:stats])
-# {:boolean=>"true",
-#  :groups=>#<Set: {"admins", "early_access"}>,
-#  :actors=>#<Set: {"180", "25", "90"}>,
-#  :percentage_of_actors=>"45",
-#  :percentage_of_time=>"15"}
-```
-
-## 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