flipper-active_record 0.11.0.beta9 → 0.11.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '093d7f5bb5ea97b06469f6c195268f62b78bb363'
-  data.tar.gz: bb0203e938669e12652ca430428efd873f73c9d6
+  metadata.gz: e6d78e97956403298bc2ef1e7ea2e9790460aaae
+  data.tar.gz: ddbda182c4fb85332caada8445e8d0d78f7b77fc
 SHA512:
-  metadata.gz: fd7a8a8a7ff4dcbbd7007d39d33f9d2dd933898e99e6086dcbba01936da2ee276c7f435ed41275a55431d49fc101b1432f8721157d2d8d189bbf85b02d21e90b
-  data.tar.gz: 62857cad99a48ed5beeef9172c31ebb2e7a208e9b1ce4e05369d4a7964e7873e841a1f9e055f41e72db60230308db64802a0e65585296e7fd7d11d06420c9232
+  metadata.gz: 2acc8a3002b193d58df21b7ed8a11c05017f62afe07f5eba59a4e589d83ccbd4c45cade944ac24b25b354e3ac50cd51aa907f5f542d5f40ccee3d33ca7507c65
+  data.tar.gz: 52eb7c119788e0d16a699a63a094cd10aca7f45bf8250224dba177112f5d2752b5c726770e0c44b07a5fd42a9076e796bae7fd306462ca5031b9a09c6a49f232

data/examples/active_record/ar_setup.rb

@@ -0,0 +1,36 @@
+require 'pathname'
+require 'logger'
+
+root_path = Pathname(__FILE__).dirname.join('..').expand_path
+lib_path  = root_path.join('lib')
+$:.unshift(lib_path)
+
+require 'active_record'
+ActiveRecord::Base.establish_connection({
+  adapter: 'sqlite3',
+  database: ':memory:',
+})
+
+ActiveRecord::Base.connection.execute <<-SQL
+  CREATE TABLE flipper_features (
+    id integer PRIMARY KEY,
+    key text NOT NULL UNIQUE,
+    created_at datetime NOT NULL,
+    updated_at datetime NOT NULL
+  )
+SQL
+
+ActiveRecord::Base.connection.execute <<-SQL
+  CREATE TABLE flipper_gates (
+    id integer PRIMARY KEY,
+    feature_key text NOT NULL,
+    key text NOT NULL,
+    value text DEFAULT NULL,
+    created_at datetime NOT NULL,
+    updated_at datetime NOT NULL
+  )
+SQL
+
+ActiveRecord::Base.connection.execute <<-SQL
+  CREATE UNIQUE INDEX index_gates_on_keys_and_value on flipper_gates (feature_key, key, value)
+SQL

data/examples/active_record/basic.rb

@@ -1,18 +1,4 @@
-require 'pathname'
-require 'logger'
-
-root_path = Pathname(__FILE__).dirname.join('..').expand_path
-lib_path  = root_path.join('lib')
-$:.unshift(lib_path)
-
-require 'active_record'
-ActiveRecord::Base.establish_connection({
-  adapter: 'sqlite3',
-  database: ':memory:',
-})
-
-require 'generators/flipper/templates/migration'
-CreateFlipperTables.up
+require_relative "./ar_setup"
 
 # Requires the flipper-active_record gem to be installed.
 require 'flipper/adapters/active_record'

data/examples/active_record/internals.rb

@@ -1,20 +1,6 @@
-require 'pp'
-require 'pathname'
-require 'logger'
-
-root_path = Pathname(__FILE__).dirname.join('..').expand_path
-lib_path  = root_path.join('lib')
-$:.unshift(lib_path)
-
-require 'active_record'
-ActiveRecord::Base.establish_connection({
-  adapter: 'sqlite3',
-  database: ':memory:',
-})
-
-require 'generators/flipper/templates/migration'
-CreateFlipperTables.up
+require_relative "./ar_setup"
 
+# Requires the flipper-active_record gem to be installed.
 require 'flipper/adapters/active_record'
 adapter = Flipper::Adapters::ActiveRecord.new
 flipper = Flipper.new(adapter)

data/flipper-active_record.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
   gem.homepage      = 'https://github.com/jnunemaker/flipper'
 
   extra_files = [
-    'lib/generators/flipper/templates/migration.rb',
+    'lib/generators/flipper/templates/migration.erb',
     'lib/flipper/version.rb',
   ]
   gem.files         = `git ls-files`.split("\n").select(&flipper_active_record_files) + extra_files

data/lib/flipper/adapters/active_record.rb

@@ -46,8 +46,10 @@ module Flipper
       # Public: Adds a feature to the set of known features.
       def add(feature)
         # race condition, but add is only used by enable/disable which happen
-        # super rarely, so it shouldn't matter in practice
-        unless @feature_class.where(key: feature.key).first
+        # super rarely, so it shouldn't matter in practice; additionally
+        # to_a.first is used instead of first because of a Ruby 2.4/Rails 3.2.21
+        # CI failure (https://travis-ci.org/jnunemaker/flipper/jobs/297274000).
+        unless @feature_class.where(key: feature.key).to_a.first
           @feature_class.create! { |f| f.key = feature.key }
         end
         true
@@ -86,6 +88,21 @@ module Flipper
         result
       end
 
+      def get_all
+        joins = <<-EOJ
+          INNER JOIN #{@feature_class.table_name}
+          ON #{@feature_class.table_name}.key = #{@gate_class.table_name}.feature_key
+        EOJ
+        db_gates = @gate_class.joins(joins).all.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) }
+        features.each do |feature|
+          result[feature.key] = result_for_feature(feature, grouped_db_gates[feature.key])
+        end
+        result
+      end
+
       # Public: Enables a gate for a given thing.
       #
       # feature - The Flipper::Feature for the gate.

data/lib/flipper/version.rb

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

data/lib/generators/flipper/active_record_generator.rb

@@ -8,12 +8,27 @@ module Flipper
 
       source_paths << File.join(File.dirname(__FILE__), 'templates')
 
+      def self.next_migration_number(dirname)
+        ::ActiveRecord::Generators::Base.next_migration_number(dirname)
+      end
+
+      def self.migration_version
+        "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]" if rails5?
+      end
+
+      def self.rails5?
+        Rails.version.start_with?('5')
+      end
+
       def create_migration_file
-        migration_template 'migration.rb', 'db/migrate/create_flipper_tables.rb'
+        options = {
+          migration_version: migration_version,
+        }
+        migration_template 'migration.erb', 'db/migrate/create_flipper_tables.rb', options
       end
 
-      def self.next_migration_number(dirname)
-        ::ActiveRecord::Generators::Base.next_migration_number(dirname)
+      def migration_version
+        self.class.migration_version
       end
     end
   end

data/lib/generators/flipper/templates/{migration.rb → migration.erb}

@@ -1,4 +1,4 @@
-class CreateFlipperTables < ActiveRecord::Migration
+class CreateFlipperTables < ActiveRecord::Migration<%= migration_version %>
   def self.up
     create_table :flipper_features do |t|
       t.string :key, null: false

data/spec/flipper/adapters/active_record_spec.rb

@@ -5,8 +5,6 @@ require 'flipper/spec/shared_adapter_specs'
 # Turn off migration logging for specs
 ActiveRecord::Migration.verbose = false
 
-require 'generators/flipper/templates/migration'
-
 RSpec.describe Flipper::Adapters::ActiveRecord do
   subject { described_class.new }
 
@@ -16,11 +14,34 @@ RSpec.describe Flipper::Adapters::ActiveRecord do
   end
 
   before(:each) do
-    CreateFlipperTables.up
+    ActiveRecord::Base.connection.execute <<-SQL
+      CREATE TABLE flipper_features (
+        id integer PRIMARY KEY,
+        key text NOT NULL UNIQUE,
+        created_at datetime NOT NULL,
+        updated_at datetime NOT NULL
+      )
+    SQL
+
+    ActiveRecord::Base.connection.execute <<-SQL
+      CREATE TABLE flipper_gates (
+        id integer PRIMARY KEY,
+        feature_key text NOT NULL,
+        key text NOT NULL,
+        value text DEFAULT NULL,
+        created_at datetime NOT NULL,
+        updated_at datetime NOT NULL
+      )
+    SQL
+
+    ActiveRecord::Base.connection.execute <<-SQL
+      CREATE UNIQUE INDEX index_gates_on_keys_and_value on flipper_gates (feature_key, key, value)
+    SQL
   end
 
   after(:each) do
-    CreateFlipperTables.down
+    ActiveRecord::Base.connection.execute("DROP table IF EXISTS `flipper_features`")
+    ActiveRecord::Base.connection.execute("DROP table IF EXISTS `flipper_gates`")
   end
 
   it_should_behave_like 'a flipper adapter'

data/test/adapters/active_record_test.rb

@@ -1,6 +1,5 @@
 require 'test_helper'
 require 'flipper/adapters/active_record'
-require 'generators/flipper/templates/migration'
 
 # Turn off migration logging for specs
 ActiveRecord::Migration.verbose = false
@@ -13,10 +12,34 @@ class ActiveRecordTest < MiniTest::Test
 
   def setup
     @adapter = Flipper::Adapters::ActiveRecord.new
-    CreateFlipperTables.up
+
+    ActiveRecord::Base.connection.execute <<-SQL
+      CREATE TABLE flipper_features (
+        id integer PRIMARY KEY,
+        key text NOT NULL UNIQUE,
+        created_at datetime NOT NULL,
+        updated_at datetime NOT NULL
+      )
+    SQL
+
+    ActiveRecord::Base.connection.execute <<-SQL
+      CREATE TABLE flipper_gates (
+        id integer PRIMARY KEY,
+        feature_key text NOT NULL,
+        key text NOT NULL,
+        value text DEFAULT NULL,
+        created_at datetime NOT NULL,
+        updated_at datetime NOT NULL
+      )
+    SQL
+
+    ActiveRecord::Base.connection.execute <<-SQL
+      CREATE UNIQUE INDEX index_gates_on_keys_and_value on flipper_gates (feature_key, key, value)
+    SQL
   end
 
   def teardown
-    CreateFlipperTables.down
+    ActiveRecord::Base.connection.execute("DROP table IF EXISTS `flipper_features`")
+    ActiveRecord::Base.connection.execute("DROP table IF EXISTS `flipper_gates`")
   end
 end

data/test/generators/flipper/active_record_generator_test.rb

@@ -10,8 +10,13 @@ class FlipperActiveRecordGeneratorTest < Rails::Generators::TestCase
 
   def test_generates_migration
     run_generator
+    migration_version = if Rails::VERSION::MAJOR.to_i < 5
+                          ""
+                        else
+                          "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
+                        end
     assert_migration 'db/migrate/create_flipper_tables.rb', <<-EOM
-class CreateFlipperTables < ActiveRecord::Migration
+class CreateFlipperTables < ActiveRecord::Migration#{migration_version}
   def self.up
     create_table :flipper_features do |t|
       t.string :key, null: false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flipper-active_record
 version: !ruby/object:Gem::Version
-  version: 0.11.0.beta9
+  version: 0.11.0.rc1
 platform: ruby
 authors:
 - John Nunemaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-28 00:00:00.000000000 Z
+date: 2017-11-04 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.beta9
+        version: 0.11.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0.beta9
+        version: 0.11.0.rc1
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - docs/active_record/README.md
+- examples/active_record/ar_setup.rb
 - examples/active_record/basic.rb
 - examples/active_record/internals.rb
 - flipper-active_record.gemspec
@@ -59,7 +60,7 @@ files:
 - lib/flipper/adapters/active_record.rb
 - lib/flipper/version.rb
 - lib/generators/flipper/active_record_generator.rb
-- lib/generators/flipper/templates/migration.rb
+- lib/generators/flipper/templates/migration.erb
 - spec/flipper/adapters/active_record_spec.rb
 - test/adapters/active_record_test.rb
 - test/generators/flipper/active_record_generator_test.rb