flipper-sequel 0.10.2 → 0.11.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90e3061ed905c5f60e924d150ab6528c9c0441cb
-  data.tar.gz: 427a99d66693ebd319e32b152167c7d6a1c5ca86
+  metadata.gz: 97719a3b02001fa2a41c5d2df3c1a41529946581
+  data.tar.gz: 82a6ab85e1d35f13b2844b1c15f455c42e974c26
 SHA512:
-  metadata.gz: a6427b163839819f4eb5bf9776553ddada04aab33b316f67b96d1ce4eea53b7c597ef622fa442588e491d545e41cd5751b34617a20981c3e36a8f47eeb3d2b35
-  data.tar.gz: 60da3d47612c6d2b559cb22c593bbcd8843c46ecebb2887110497c572378bf3df9b1976e5233701bb439fea627dae5b3a52ae9f4ac6a77e73fb680549f471659
+  metadata.gz: 8e7f2d381bb3bf56d64bd64dad06a6deb4c76574cf9d0a2fac4291f94bfe0686fab41633f2b2fd6819d2a45f41822e7433cab7df7c49d6ad0c4757fe8f32cc12
+  data.tar.gz: 4cdd6c49c10ea4c2b6b6091eca8e78b212b664a028ad73b123ee25ddc7cf0ed00f709a45052d31cb4a7880808ee3bc2258d6db7a55ec9c8d3557ccfa6b1c93d7

data/docs/sequel/README.md

@@ -1,6 +1,6 @@
 # Flipper Sequel
 
-A Sequel adapter for [Flipper](https://github.com/jnunemaker/flipper).
+A [Sequel](https://github.com/jeremyevans/sequel) adapter for [Flipper](https://github.com/jnunemaker/flipper).
 
 ## Installation
 

data/flipper-sequel.gemspec

@@ -1,25 +1,25 @@
 # -*- encoding: utf-8 -*-
 require File.expand_path('../lib/flipper/version', __FILE__)
 
-flipper_sequel_files = lambda { |file| file =~ /sequel/ }
+flipper_sequel_files = ->(file) { file =~ /sequel/ }
 
 Gem::Specification.new do |gem|
-  gem.authors       = ["John Nunemaker"]
-  gem.email         = ["nunemaker@gmail.com"]
-  gem.summary       = "Sequel adapter for Flipper"
-  gem.description   = "Sequel adapter for Flipper"
-  gem.license       = "MIT"
-  gem.homepage      = "https://github.com/jnunemaker/flipper"
+  gem.authors       = ['John Nunemaker']
+  gem.email         = ['nunemaker@gmail.com']
+  gem.summary       = 'Sequel adapter for Flipper'
+  gem.description   = 'Sequel adapter for Flipper'
+  gem.license       = 'MIT'
+  gem.homepage      = 'https://github.com/jnunemaker/flipper'
 
   extra_files = [
-    "lib/flipper/version.rb",
+    'lib/flipper/version.rb',
   ]
   gem.files         = `git ls-files`.split("\n").select(&flipper_sequel_files) + extra_files
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n").select(&flipper_sequel_files)
-  gem.name          = "flipper-sequel"
-  gem.require_paths = ["lib"]
+  gem.name          = 'flipper-sequel'
+  gem.require_paths = ['lib']
   gem.version       = Flipper::VERSION
 
   gem.add_dependency 'flipper', "~> #{Flipper::VERSION}"
-  gem.add_dependency 'sequel', ">= 4.0.0", "< 5"
+  gem.add_dependency 'sequel', '>= 4.0.0', '< 5'
 end

data/lib/flipper/adapters/sequel.rb

@@ -9,11 +9,15 @@ module Flipper
 
       # Private: Do not use outside of this adapter.
       class Feature < ::Sequel::Model(:flipper_features)
+        unrestrict_primary_key
+
         plugin :timestamps, update_on_create: true
       end
 
       # Private: Do not use outside of this adapter.
       class Gate < ::Sequel::Model(:flipper_gates)
+        unrestrict_primary_key
+
         plugin :timestamps, update_on_create: true
       end
 
@@ -77,7 +81,7 @@ module Flipper
 
       def get_multi(features)
         db_gates = @gate_class.where(feature_key: features.map(&:key)).to_a
-        grouped_db_gates = db_gates.group_by { |gate| gate.feature_key }
+        grouped_db_gates = db_gates.group_by(&:feature_key)
         result = {}
         features.each do |feature|
           result[feature.key] = result_for_feature(feature, grouped_db_gates[feature.key])
@@ -98,7 +102,7 @@ module Flipper
           @gate_class.db.transaction do
             args = {
               feature_key: feature.key,
-              key: gate.key.to_s
+              key: gate.key.to_s,
             }
             @gate_class.where(args).delete
 
@@ -128,7 +132,7 @@ module Flipper
           @gate_class.db.transaction do
             args = {
               feature_key: feature.key.to_s,
-              key: gate.key.to_s
+              key: gate.key.to_s,
             }
             @gate_class.where(args).delete
 
@@ -154,27 +158,28 @@ module Flipper
         {
           feature_key: feature.key.to_s,
           key: gate.key.to_s,
-          value: thing.value.to_s
+          value: thing.value.to_s,
         }
       end
 
       def result_for_feature(feature, db_gates)
         db_gates ||= []
         feature.gates.each_with_object({}) do |gate, result|
-          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
+          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
+              end
+            when :integer
+              if db_gate = db_gates.detect { |db_gate| db_gate.key == gate.key.to_s }
+                db_gate.value
+              end
+            when :set
+              db_gates.select { |db_gate| db_gate.key == gate.key.to_s }.map(&:value).to_set
+            else
+              unsupported_data_type gate.data_type
             end
-          when :integer
-            if db_gate = db_gates.detect { |db_gate| db_gate.key == gate.key.to_s }
-              db_gate.value
-            end
-          when :set
-            db_gates.select { |db_gate| db_gate.key == gate.key.to_s }.map(&:value).to_set
-          else
-            unsupported_data_type gate.data_type
-          end
         end
       end
     end

data/lib/flipper/version.rb

@@ -1,3 +1,3 @@
 module Flipper
-  VERSION = "0.10.2".freeze
+  VERSION = '0.11.0.beta1'.freeze
 end

data/lib/generators/flipper/templates/sequel_migration.rb

@@ -1,20 +1,19 @@
 class CreateFlipperTablesSequel < Sequel::Migration
   def up
-    create_table :flipper_features do |t|
-      String :key, null: false
+    create_table :flipper_features do |_t|
+      String :key, primary_key: true, null: false
       DateTime :created_at, null: false
       DateTime :updated_at, null: false
     end
-    add_index :flipper_features, :key, unique: true
 
-    create_table :flipper_gates do |t|
+    create_table :flipper_gates do |_t|
       String :feature_key, null: false
       String :key, null: false
       String :value
       DateTime :created_at, null: false
       DateTime :updated_at, null: false
+      primary_key [:feature_key, :key, :value]
     end
-    add_index :flipper_gates, [:feature_key, :key, :value], unique: true
   end
 
   def down

data/spec/flipper/adapters/sequel_spec.rb

@@ -1,7 +1,7 @@
 require 'helper'
 require 'sequel'
 
-Sequel::Model.db =  Sequel.sqlite(':memory:')
+Sequel::Model.db = Sequel.sqlite(':memory:')
 Sequel.extension :migration, :core_extensions
 
 require 'flipper/adapters/sequel'

data/test/adapters/sequel_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 require 'sequel'
 
-Sequel::Model.db =  Sequel.sqlite(':memory:')
+Sequel::Model.db = Sequel.sqlite(':memory:')
 Sequel.extension :migration, :core_extensions
 
 require 'flipper/adapters/sequel'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flipper-sequel
 version: !ruby/object:Gem::Version
-  version: 0.10.2
+  version: 0.11.0.beta1
 platform: ruby
 authors:
 - John Nunemaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-08 00:00:00.000000000 Z
+date: 2017-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flipper
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: 0.11.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.2
+        version: 0.11.0.beta1
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -76,12 +76,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Sequel adapter for Flipper