flipper-sequel 0.20.3 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6400cc7ad23887096836e1d2f2410c27039a27dddadf14e995e7e6a1fecd8640
-  data.tar.gz: 51ffaac5e39b73ba34a170fe7e088437f780771397a6b3fb81e2c4cef176e9f5
+  metadata.gz: 5ed17230bf73572a1eb0d6e9d517e0a01a459f73a50ec0058f6977ad92c1e78a
+  data.tar.gz: 0d372c287dbc20dc98558544165bc1b96c9cc553ace717be21157d991372a005
 SHA512:
-  metadata.gz: 6b081d939a00fbba91e54ef4727416bd0c35fcb38c30a283925bbf7f3a3d8f5d31be290f3fdc78c69d92316a5ff937e4a0cd155bb5e4d9b2e84528ae5bfe193e
-  data.tar.gz: 58270f24e182c423e700e241d774bf2e5e09fff101db68405e2e0fbfd97c87a4e5857f64b11097c7ba93620bfdbe5e2502ec0a48ea8307433f6e136174555c88
+  metadata.gz: 4d4eb797141a7130d78f74b6b6daa2958f5216205f94da3660e65ae4c6d51aa20f6cbbcf46b65f20aa4c7349a9cf59938423ce1b116a4c24b17c8e43a768cdd9
+  data.tar.gz: a94221243cdbf03ccf2f6d4bf3ec550921e6f15e06700005972f392ae25ff466876ecb5f9b079b9941bea70d64a1d53a5d22073f6a5be7118327ac12027ba08d

data/docs/sequel/README.md

@@ -25,13 +25,18 @@ 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 like so:
+Once you have created and executed the migration, you can use the sequel adapter by simply requiring it:
 
 ```ruby
-require 'flipper/adapters/sequel'
-adapter = Flipper::Adapters::Sequel.new
-flipper = Flipper.new(adapter)
-# profit...
+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

data/examples/sequel/basic.rb

@@ -1,10 +1,4 @@
-require 'pathname'
-require 'logger'
-
-root_path = Pathname(__FILE__).dirname.join('..').expand_path
-lib_path  = root_path.join('lib')
-$:.unshift(lib_path)
-
+require 'bundler/setup'
 require 'sequel'
 Sequel::Model.db =  Sequel.sqlite(':memory:')
 Sequel.extension :migration, :core_extensions
@@ -13,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

@@ -1,11 +1,4 @@
-require 'pp'
-require 'pathname'
-require 'logger'
-
-root_path = Pathname(__FILE__).dirname.join('..').expand_path
-lib_path  = root_path.join('lib')
-$:.unshift(lib_path)
-
+require 'bundler/setup'
 require 'sequel'
 Sequel::Model.db =  Sequel.sqlite(':memory:')
 Sequel.extension :migration, :core_extensions
@@ -14,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? }
@@ -24,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
@@ -55,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) }
@@ -210,3 +214,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.20.3'.freeze
+  VERSION = '0.22.0'.freeze
 end

data/spec/flipper/adapters/sequel_spec.rb

@@ -28,4 +28,21 @@ RSpec.describe Flipper::Adapters::Sequel do
   end
 
   it_should_behave_like 'a flipper adapter'
+
+  context 'requiring "flipper-sequel"' do
+    before do
+      Flipper.configuration = nil
+      Flipper.instance = nil
+
+      load 'flipper/adapters/sequel.rb'
+    end
+
+    it 'configures itself' do
+      expect(Flipper.adapter.adapter).to be_a(Flipper::Adapters::Sequel)
+    end
+
+    it "defines #flipper_id on Sequel::Model" do
+      expect(Sequel::Model.ancestors).to include(Flipper::Identifier)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flipper-sequel
 version: !ruby/object:Gem::Version
-  version: 0.20.3
+  version: 0.22.0
 platform: ruby
 authors:
 - John Nunemaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-10 00:00:00.000000000 Z
+date: 2021-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flipper
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.3
+        version: 0.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.3
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement