flipper 0.11.0.beta1 → 0.11.0.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1dba40ce57cd34d4be2608ce8725c2b314eb5345
-  data.tar.gz: 929230ec45235cfb08634d63ab0bdfe704197b45
+  metadata.gz: 7ff62d3ba23318ccb0c071a989e83364739c731a
+  data.tar.gz: ecefd31c44930c4d6a3dc70c55175b3d3d1ba44f
 SHA512:
-  metadata.gz: 3618c5c38a0901f219e719de7b04230ad8ca4534673f271b31c055fe1d88bb7545638b5bdb90c3fdec6e842819678e4137c2f32eb83eb77826381396eb75d95e
-  data.tar.gz: 98e939ae62ee4ac6bd7f19eab5be8c0c58281525db190a852a0b36643e8108c16feb5df94a4ca943ab4517bccec6c7a20d80ea5389fa7bb595bb7d7fdb394cf9
+  metadata.gz: d6cf59627197fb719492b2438b931c51645c2aa8860943b89845a01f4ef8f1696080aec6b53965ea1e918aaa647325c23d1b3731dd85ae5b787f426333c43bb3
+  data.tar.gz: 73b5f76153abc395ef61069e4dc1338335d9a2c21932d853891435a7f9529f6fdf322e402562515db0af62cd95c0f8ab8e937432bb6e0636304e75917ffd7121

data/Changelog.md

@@ -1,12 +1,18 @@
 ## 0.11
 
-* Use primary keys with sequel adapter (https://github.com/jnunemaker/flipper/pull/210).
+### Backwards Compatibility Breaks
+
+* * Set flipper from env for API and UI (https://github.com/jnunemaker/flipper/pull/223 and https://github.com/jnunemaker/flipper/pull/229). It is documented, but now the memoizing middleware requires that the SetupEnv middleware is used first.
+* Drop support for Ruby 2.0 as it is end of lined (https://github.com/jnunemaker/flipper/commit/c2c81ed89938155ce91acb5173ac38580f630e3d).
+* Allow unregistered groups (https://github.com/jnunemaker/flipper/pull/244). Only break in compatiblity is that previously unregistered groups could not be enabled and now they can be.
+
+### Additions/Changes
+
+* Use primary keys with sequel adapter (https://github.com/jnunemaker/flipper/pull/210). Should be backwards compatible, but if you want it to work this way you will need to migrate your database to the new schema.
 * Add redis cache adapter (https://github.com/jnunemaker/flipper/pull/211).
 * Finish API and HTTP adapter that speaks to API.
-* Set flipper from env for API and UI (https://github.com/jnunemaker/flipper/pull/223 and https://github.com/jnunemaker/flipper/pull/229).
-* Add flipper cloud adapter (https://github.com/jnunemaker/flipper/pull/249).
-* Allow unregistered groups (https://github.com/jnunemaker/flipper/pull/244).
-* Drop support for Ruby 2.0 as it is end of lined (https://github.com/jnunemaker/flipper/commit/c2c81ed89938155ce91acb5173ac38580f630e3d).
+* Add flipper cloud adapter (https://github.com/jnunemaker/flipper/pull/249). Nothing to see here yet, but good stuff soon. ;)
+* Add importing (https://github.com/jnunemaker/flipper/pull/251).
 
 ## 0.10.2
 

data/docs/Adapters.md

@@ -91,3 +91,33 @@ end
 A good place to start when creating your own adapter is to copy one of the adapters mentioned above and replace the client specific code with whatever client you are attempting to adapt.
 
 I would also recommend setting `fail_fast = true` in your RSpec configuration as that will just give you one failure at a time to work through. It is also handy to have the shared adapter spec file open.
+
+## Swapping Adapters
+
+If you find yourself using one adapter and would like to swap to another, you can do that! Flipper adapters support importing another adapter's data. This will wipe the adapter you are wanting to swap to, if it isn't already clean, so please be careful.
+
+```ruby
+# Say you are using redis...
+redis_adapter = Flipper::Adapters::Redis.new(Redis.new)
+redis_flipper = Flipper.new(redis_adapter)
+
+# And redis has some stuff enabled...
+redis_flipper.enable(:search)
+redis_flipper.enable_percentage_of_time(:verbose_logging, 5)
+redis_flipper.enable_percentage_of_actors(:new_feature, 5)
+redis_flipper.enable_actor(:issues, Flipper::Actor.new('1'))
+redis_flipper.enable_actor(:issues, Flipper::Actor.new('2'))
+redis_flipper.enable_group(:request_tracing, :staff)
+
+# And you would like to switch to active record...
+ar_adapter = Flipper::Adapters::ActiveRecord.new
+ar_flipper = Flipper.new(ar_adapter)
+
+# NOTE: This wipes active record clean and copies features/gates from redis into active record.
+ar_flipper.import(redis_flipper)
+
+# active record is now identical to redis.
+ar_flipper.features.each do |feature|
+  pp feature: feature.key, values: feature.gate_values
+end
+```

data/examples/importing.rb

@@ -0,0 +1,37 @@
+require File.expand_path('../example_setup', __FILE__)
+
+require 'flipper'
+require 'flipper/adapters/redis'
+require 'flipper/adapters/active_record'
+
+# Active Record boiler plate, feel free to ignore.
+ActiveRecord::Base.establish_connection({
+  adapter: 'sqlite3',
+  database: ':memory:',
+})
+require 'generators/flipper/templates/migration'
+CreateFlipperTables.up
+
+# Say you are using redis...
+redis_adapter = Flipper::Adapters::Redis.new(Redis.new)
+redis_flipper = Flipper.new(redis_adapter)
+
+# And redis has some stuff enabled...
+redis_flipper.enable(:search)
+redis_flipper.enable_percentage_of_time(:verbose_logging, 5)
+redis_flipper.enable_percentage_of_actors(:new_feature, 5)
+redis_flipper.enable_actor(:issues, Flipper::Actor.new('1'))
+redis_flipper.enable_actor(:issues, Flipper::Actor.new('2'))
+redis_flipper.enable_group(:request_tracing, :staff)
+
+# And you would like to switch to active record...
+ar_adapter = Flipper::Adapters::ActiveRecord.new
+ar_flipper = Flipper.new(ar_adapter)
+
+# NOTE: This wipes active record clean and copies features/gates from redis into active record.
+ar_flipper.import(redis_flipper)
+
+# active record is now identical to redis.
+ar_flipper.features.each do |feature|
+  pp feature: feature.key, values: feature.gate_values
+end

data/lib/flipper.rb

@@ -80,6 +80,7 @@ module Flipper
   end
 end
 
+require 'flipper/actor'
 require 'flipper/adapter'
 require 'flipper/dsl'
 require 'flipper/errors'

data/lib/flipper/actor.rb

@@ -0,0 +1,16 @@
+# Simple class for turning a flipper_id into an actor that can be based
+# to Flipper::Feature#enabled?.
+module Flipper
+  class Actor
+    attr_reader :flipper_id
+
+    def initialize(flipper_id)
+      @flipper_id = flipper_id
+    end
+
+    def eql?(other)
+      self.class.eql?(other.class) && @flipper_id == other.flipper_id
+    end
+    alias_method :==, :eql?
+  end
+end

data/lib/flipper/adapter.rb

@@ -1,6 +1,23 @@
 module Flipper
   # Adding a module include so we have some hooks for stuff down the road
   module Adapter
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    module ClassMethods
+      # Public: Default config for a feature's gate values.
+      def default_config
+        {
+          boolean: nil,
+          groups: Set.new,
+          actors: Set.new,
+          percentage_of_actors: nil,
+          percentage_of_time: nil,
+        }
+      end
+    end
+
     # Public: Get multiple features in one call. Defaults to one get per
     # feature. Feel free to override per adapter to make this more efficient and
     # reduce network calls.
@@ -12,14 +29,55 @@ module Flipper
       result
     end
 
+    # Public: Wipe features and gate values and then import features and gate
+    # values from provided adapter.
+    #
+    # Returns nothing.
+    def import(source_adapter)
+      wipe
+      copy_features_and_gates(source_adapter)
+      nil
+    end
+
+    # Public: Default config for a feature's gate values.
     def default_config
-      {
-        boolean: nil,
-        groups: Set.new,
-        actors: Set.new,
-        percentage_of_actors: nil,
-        percentage_of_time: nil,
-      }
+      self.class.default_config
+    end
+
+    private
+
+    # Private: Copy source adapter features and gate values into self.
+    def copy_features_and_gates(source_adapter)
+      source_adapter.features.each do |key|
+        source_feature = Flipper::Feature.new(key, source_adapter)
+        destination_feature = Flipper::Feature.new(key, self)
+
+        case source_feature.state
+        when :on
+          destination_feature.enable
+        when :conditional
+          source_feature.groups_value.each do |value|
+            destination_feature.enable_group(value)
+          end
+
+          source_feature.actors_value.each do |value|
+            destination_feature.enable_actor(Flipper::Actor.new(value))
+          end
+
+          destination_feature.enable_percentage_of_actors(source_feature.percentage_of_actors_value)
+          destination_feature.enable_percentage_of_time(source_feature.percentage_of_time_value)
+        when :off
+          destination_feature.add
+        end
+      end
+    end
+
+    # Private: Completely wipe adapter features and gate values.
+    def wipe
+      features.each do |key|
+        feature = Flipper::Feature.new(key, self)
+        remove(feature)
+      end
     end
   end
 end

data/lib/flipper/dsl.rb

@@ -139,6 +139,15 @@ module Flipper
       feature(name).disable_percentage_of_actors
     end
 
+    # Public: Add a feature.
+    #
+    # name - The String or Symbol name of the feature.
+    #
+    # Returns result of add.
+    def add(name)
+      feature(name).add
+    end
+
     # Public: Remove a feature.
     #
     # name - The String or Symbol name of the feature.
@@ -241,5 +250,9 @@ module Flipper
     def features
       adapter.features.map { |name| feature(name) }.to_set
     end
+
+    def import(flipper)
+      adapter.import(flipper.adapter)
+    end
   end
 end

data/lib/flipper/feature.rb

@@ -69,6 +69,13 @@ module Flipper
       end
     end
 
+    # Public: Adds this feature.
+    #
+    # Returns the result of Adapter#add.
+    def add
+      instrument(:add) { adapter.add(self) }
+    end
+
     # Public: Removes this feature.
     #
     # Returns the result of Adapter#remove.

data/lib/flipper/middleware/memoizer.rb

@@ -8,6 +8,9 @@ module Flipper
       # using the Flipper::Middleware::SetupEnv middleware.
       #
       # app - The app this middleware is included in.
+      # opts - The Hash of options.
+      #        :preload_all - Boolean of whether or not to preload all features.
+      #        :preload - Array of Symbol feature names to preload.
       #
       # Examples
       #
@@ -20,6 +23,10 @@ module Flipper
       #   use Flipper::Middleware::Memoizer, preload: [:stats, :search, :some_feature]
       #
       def initialize(app, opts = {})
+        if opts.is_a?(Flipper::DSL) || opts.is_a?(Proc)
+          raise 'Flipper::Middleware::Memoizer no longer initializes with a flipper instance or block. Read more at: https://git.io/vSo31.' # rubocop:disable LineLength
+        end
+
         @app = app
         @opts = opts
       end

data/lib/flipper/spec/shared_adapter_specs.rb

@@ -1,8 +1,6 @@
 # Requires the following methods:
 # * subject - The instance of the adapter
 RSpec.shared_examples_for 'a flipper adapter' do
-  let(:actor_class) { Struct.new(:flipper_id) }
-
   let(:flipper) { Flipper.new(subject) }
   let(:feature) { flipper[:stats] }
 
@@ -52,7 +50,7 @@ RSpec.shared_examples_for 'a flipper adapter' do
   end
 
   it 'fully disables all enabled things when boolean gate disabled' do
-    actor22 = actor_class.new('22')
+    actor22 = Flipper::Actor.new('22')
     expect(subject.enable(feature, boolean_gate, flipper.boolean)).to eq(true)
     expect(subject.enable(feature, group_gate, flipper.group(:admins))).to eq(true)
     expect(subject.enable(feature, actor_gate, flipper.actor(actor22))).to eq(true)
@@ -81,8 +79,8 @@ RSpec.shared_examples_for 'a flipper adapter' do
   end
 
   it 'can enable, disable and get value for actor gate' do
-    actor22 = actor_class.new('22')
-    actor_asdf = actor_class.new('asdf')
+    actor22 = Flipper::Actor.new('22')
+    actor_asdf = Flipper::Actor.new('asdf')
 
     expect(subject.enable(feature, actor_gate, flipper.actor(actor22))).to eq(true)
     expect(subject.enable(feature, actor_gate, flipper.actor(actor_asdf))).to eq(true)
@@ -158,7 +156,7 @@ RSpec.shared_examples_for 'a flipper adapter' do
   end
 
   it 'converts the actor value to a string' do
-    expect(subject.enable(feature, actor_gate, flipper.actor(actor_class.new(22)))).to eq(true)
+    expect(subject.enable(feature, actor_gate, flipper.actor(Flipper::Actor.new(22)))).to eq(true)
     result = subject.get(feature)
     expect(result[:actors]).to eq(Set['22'])
   end
@@ -198,7 +196,7 @@ RSpec.shared_examples_for 'a flipper adapter' do
   end
 
   it 'clears all the gate values for the feature on remove' do
-    actor22 = actor_class.new('22')
+    actor22 = Flipper::Actor.new('22')
     expect(subject.enable(feature, boolean_gate, flipper.boolean)).to eq(true)
     expect(subject.enable(feature, group_gate, flipper.group(:admins))).to eq(true)
     expect(subject.enable(feature, actor_gate, flipper.actor(actor22))).to eq(true)
@@ -211,7 +209,7 @@ RSpec.shared_examples_for 'a flipper adapter' do
   end
 
   it 'can clear all the gate values for a feature' do
-    actor22 = actor_class.new('22')
+    actor22 = Flipper::Actor.new('22')
     subject.add(feature)
     expect(subject.features).to include(feature.key)
 

data/lib/flipper/test/shared_adapter_test.rb

@@ -5,7 +5,6 @@ module Flipper
       def setup
         super
         @flipper = Flipper.new(@adapter)
-        @actor_class = Struct.new(:flipper_id)
         @feature = @flipper[:stats]
         @boolean_gate = @feature.gate(:boolean)
         @group_gate = @feature.gate(:group)
@@ -48,7 +47,7 @@ module Flipper
       end
 
       def test_fully_disables_all_enabled_things_when_boolean_gate_disabled
-        actor22 = @actor_class.new('22')
+        actor22 = Flipper::Actor.new('22')
         assert_equal true, @adapter.enable(@feature, @boolean_gate, @flipper.boolean)
         assert_equal true, @adapter.enable(@feature, @group_gate, @flipper.group(:admins))
         assert_equal true, @adapter.enable(@feature, @actor_gate, @flipper.actor(actor22))
@@ -75,8 +74,8 @@ module Flipper
       end
 
       def test_can_enable_disable_and_get_value_for_an_actor_gate
-        actor22 = @actor_class.new('22')
-        actor_asdf = @actor_class.new('asdf')
+        actor22 = Flipper::Actor.new('22')
+        actor_asdf = Flipper::Actor.new('asdf')
 
         assert_equal true, @adapter.enable(@feature, @actor_gate, @flipper.actor(actor22))
         assert_equal true, @adapter.enable(@feature, @actor_gate, @flipper.actor(actor_asdf))
@@ -153,7 +152,7 @@ module Flipper
 
       def test_converts_the_actor_value_to_a_string
         assert_equal true,
-                     @adapter.enable(@feature, @actor_gate, @flipper.actor(@actor_class.new(22)))
+                     @adapter.enable(@feature, @actor_gate, @flipper.actor(Flipper::Actor.new(22)))
         result = @adapter.get(@feature)
         assert_equal Set['22'], result[:actors]
       end
@@ -193,7 +192,7 @@ module Flipper
       end
 
       def test_clears_all_the_gate_values_for_the_feature_on_remove
-        actor22 = @actor_class.new('22')
+        actor22 = Flipper::Actor.new('22')
         assert_equal true, @adapter.enable(@feature, @boolean_gate, @flipper.boolean)
         assert_equal true, @adapter.enable(@feature, @group_gate, @flipper.group(:admins))
         assert_equal true, @adapter.enable(@feature, @actor_gate, @flipper.actor(actor22))
@@ -206,7 +205,7 @@ module Flipper
       end
 
       def test_can_clear_all_the_gate_values_for_a_feature
-        actor22 = @actor_class.new('22')
+        actor22 = Flipper::Actor.new('22')
         @adapter.add(@feature)
         assert_includes @adapter.features, @feature.key
 

data/lib/flipper/version.rb

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

data/spec/flipper/actor_spec.rb

@@ -0,0 +1,48 @@
+require 'helper'
+
+RSpec.describe Flipper::Actor do
+  it 'initializes with and knows flipper_id' do
+    actor = described_class.new("User;235")
+    expect(actor.flipper_id).to eq("User;235")
+  end
+
+  describe '#eql?' do
+    it 'returns true if same class and flipper_id' do
+      actor1 = described_class.new("User;235")
+      actor2 = described_class.new("User;235")
+      expect(actor1.eql?(actor2)).to be(true)
+    end
+
+    it 'returns false if same class but different flipper_id' do
+      actor1 = described_class.new("User;235")
+      actor2 = described_class.new("User;1")
+      expect(actor1.eql?(actor2)).to be(false)
+    end
+
+    it 'returns false for different class' do
+      actor1 = described_class.new("User;235")
+      actor2 = Struct.new(:flipper_id).new("User;235")
+      expect(actor1.eql?(actor2)).to be(false)
+    end
+  end
+
+  describe '#==' do
+    it 'returns true if same class and flipper_id' do
+      actor1 = described_class.new("User;235")
+      actor2 = described_class.new("User;235")
+      expect(actor1.==(actor2)).to be(true)
+    end
+
+    it 'returns false if same class but different flipper_id' do
+      actor1 = described_class.new("User;235")
+      actor2 = described_class.new("User;1")
+      expect(actor1.==(actor2)).to be(false)
+    end
+
+    it 'returns false for different class' do
+      actor1 = described_class.new("User;235")
+      actor2 = Struct.new(:flipper_id).new("User;235")
+      expect(actor1.==(actor2)).to be(false)
+    end
+  end
+end

data/spec/flipper/adapter_spec.rb

@@ -0,0 +1,114 @@
+require 'helper'
+require 'flipper/adapters/memory'
+
+RSpec.describe Flipper::Adapter do
+  let(:source_flipper) { build_flipper }
+  let(:destination_flipper) { build_flipper }
+  let(:default_config) do
+    {
+      boolean: nil,
+      groups: Set.new,
+      actors: Set.new,
+      percentage_of_actors: nil,
+      percentage_of_time: nil,
+    }
+  end
+
+  describe '.default_config' do
+    it 'returns default config' do
+      adapter_class = Class.new do
+        include described_class
+      end
+      expect(adapter_class.default_config).to eq(default_config)
+    end
+  end
+
+  describe '#default_config' do
+    it 'returns default config' do
+      adapter_class = Class.new do
+        include described_class
+      end
+      expect(adapter_class.new.default_config).to eq(default_config)
+    end
+  end
+
+  describe '#import' do
+    it 'returns nothing' do
+      result = destination_flipper.import(source_flipper)
+      expect(result).to be(nil)
+    end
+
+    it 'can import from one adapter to another' do
+      source_flipper.enable(:search)
+      destination_flipper.import(source_flipper)
+      expect(destination_flipper[:search].boolean_value).to eq(true)
+      expect(destination_flipper.features.map(&:key).sort).to eq(%w(search))
+    end
+
+    it 'can import features that have been added but their state is off' do
+      source_flipper.add(:search)
+      destination_flipper.import(source_flipper)
+      expect(destination_flipper.features.map(&:key)).to eq(["search"])
+    end
+
+    it 'can import multiple features' do
+      source_flipper.enable(:yep)
+      source_flipper.enable_group(:preview_features, :developers)
+      source_flipper.enable_group(:preview_features, :marketers)
+      source_flipper.enable_group(:preview_features, :company)
+      source_flipper.enable_group(:preview_features, :early_access)
+      source_flipper.enable_actor(:preview_features, Flipper::Actor.new('1'))
+      source_flipper.enable_actor(:preview_features, Flipper::Actor.new('2'))
+      source_flipper.enable_actor(:preview_features, Flipper::Actor.new('3'))
+      source_flipper.enable_percentage_of_actors(:issues_next, 25)
+      source_flipper.enable_percentage_of_time(:verbose_logging, 5)
+
+      destination_flipper.import(source_flipper)
+
+      feature = destination_flipper[:preview_features]
+      expect(feature.boolean_value).to be(false)
+      expect(feature.actors_value).to eq(Set['1', '2', '3'])
+      expected_groups = Set['developers', 'marketers', 'company', 'early_access']
+      expect(feature.groups_value).to eq(expected_groups)
+      expect(feature.percentage_of_actors_value).to be(0)
+      expect(feature.percentage_of_time_value).to be(0)
+
+      feature = destination_flipper[:issues_next]
+      expect(feature.boolean_value).to eq(false)
+      expect(feature.actors_value).to eq(Set.new)
+      expect(feature.groups_value).to eq(Set.new)
+      expect(feature.percentage_of_actors_value).to be(25)
+      expect(feature.percentage_of_time_value).to be(0)
+
+      feature = destination_flipper[:verbose_logging]
+      expect(feature.boolean_value).to eq(false)
+      expect(feature.actors_value).to eq(Set.new)
+      expect(feature.groups_value).to eq(Set.new)
+      expect(feature.percentage_of_actors_value).to be(0)
+      expect(feature.percentage_of_time_value).to be(5)
+    end
+
+    it 'wipes existing enablements for adapter' do
+      destination_flipper.enable(:stats)
+      destination_flipper.enable_percentage_of_time(:verbose_logging, 5)
+      source_flipper.enable_percentage_of_time(:stats, 5)
+      source_flipper.enable_percentage_of_actors(:verbose_logging, 25)
+
+      destination_flipper.import(source_flipper)
+
+      feature = destination_flipper[:stats]
+      expect(feature.boolean_value).to be(false)
+      expect(feature.percentage_of_time_value).to be(5)
+
+      feature = destination_flipper[:verbose_logging]
+      expect(feature.percentage_of_time_value).to be(0)
+      expect(feature.percentage_of_actors_value).to be(25)
+    end
+
+    it 'wipes existing features for adapter' do
+      destination_flipper.add(:stats)
+      destination_flipper.import(source_flipper)
+      expect(destination_flipper.features.map(&:key)).to eq([])
+    end
+  end
+end

data/spec/flipper/adapters/http_spec.rb

@@ -60,7 +60,7 @@ RSpec.describe Flipper::Adapters::Http do
     headers = {
       'Accept' => 'application/json',
       'Content-Type' => 'application/json',
-      'User-Agent' => 'Flipper HTTP Adapter v0.10.2',
+      'User-Agent' => "Flipper HTTP Adapter v#{Flipper::VERSION}",
     }
     stub_request(:get, "http://app.com/flipper/features/feature_panel")
       .with(headers: headers)

data/spec/flipper/adapters/read_only_spec.rb

@@ -2,8 +2,6 @@ require 'helper'
 require 'flipper/adapters/read_only'
 
 RSpec.describe Flipper::Adapters::ReadOnly do
-  let(:actor_class) { Struct.new(:flipper_id) }
-
   let(:adapter) { Flipper::Adapters::Memory.new }
   let(:flipper) { Flipper.new(subject) }
   let(:feature) { flipper[:stats] }
@@ -44,7 +42,7 @@ RSpec.describe Flipper::Adapters::ReadOnly do
   end
 
   it 'can get feature' do
-    actor22 = actor_class.new('22')
+    actor22 = Flipper::Actor.new('22')
     adapter.enable(feature, boolean_gate, flipper.boolean)
     adapter.enable(feature, group_gate, flipper.group(:admins))
     adapter.enable(feature, actor_gate, flipper.actor(actor22))

data/spec/flipper/dsl_spec.rb

@@ -107,7 +107,7 @@ RSpec.describe Flipper::DSL do
   describe '#actor' do
     context 'for a thing' do
       it 'returns actor instance' do
-        thing = Struct.new(:flipper_id).new(33)
+        thing = Flipper::Actor.new(33)
         actor = subject.actor(thing)
         expect(actor).to be_instance_of(Flipper::Types::Actor)
         expect(actor.value).to eq('33')
@@ -204,7 +204,7 @@ RSpec.describe Flipper::DSL do
 
   describe '#enable_actor/disable_actor' do
     it 'enables and disables the feature for actor' do
-      actor = Struct.new(:flipper_id).new(5)
+      actor = Flipper::Actor.new(5)
 
       expect(subject[:stats].actors_value).to be_empty
       subject.enable_actor(:stats, actor)
@@ -217,7 +217,7 @@ RSpec.describe Flipper::DSL do
 
   describe '#enable_group/disable_group' do
     it 'enables and disables the feature for group' do
-      actor = Struct.new(:flipper_id).new(5)
+      actor = Flipper::Actor.new(5)
       group = Flipper.register(:fives) { |actor| actor.flipper_id == 5 }
 
       expect(subject[:stats].groups_value).to be_empty
@@ -251,13 +251,28 @@ RSpec.describe Flipper::DSL do
     end
   end
 
+  describe '#add' do
+    it 'adds the feature' do
+      expect(subject.features).to eq(Set.new)
+      subject.add(:stats)
+      expect(subject.features).to eq(Set[subject[:stats]])
+    end
+  end
+
   describe '#remove' do
     it 'removes the feature' do
-      subject.enable(:stats)
-
-      expect { subject.remove(:stats) }.to change { subject.enabled?(:stats) }.to(false)
+      subject.adapter.add(subject[:stats])
+      expect(subject.features).to eq(Set[subject[:stats]])
+      subject.remove(:stats)
+      expect(subject.features).to eq(Set.new)
+    end
+  end
 
-      expect(subject.features).to be_empty
+  describe '#import' do
+    it 'delegates to adapter' do
+      destination_flipper = build_flipper
+      expect(subject.adapter).to receive(:import).with(destination_flipper.adapter)
+      subject.import(destination_flipper)
     end
   end
 end

data/spec/flipper/feature_check_context_spec.rb

@@ -3,7 +3,7 @@ require 'helper'
 RSpec.describe Flipper::FeatureCheckContext do
   let(:feature_name) { :new_profiles }
   let(:values) { Flipper::GateValues.new({}) }
-  let(:thing) { Struct.new(:flipper_id).new('5') }
+  let(:thing) { Flipper::Actor.new('5') }
   let(:options) do
     {
       feature_name: feature_name,

data/spec/flipper/feature_spec.rb

@@ -89,6 +89,23 @@ RSpec.describe Flipper::Feature do
     end
   end
 
+  describe '#add' do
+    it 'adds feature to adapter' do
+      expect(adapter.features).to eq(Set.new)
+      subject.add
+      expect(adapter.features).to eq(Set[subject.key])
+    end
+  end
+
+  describe '#remove' do
+    it 'removes feature from adapter' do
+      adapter.add(subject)
+      expect(adapter.features).to eq(Set[subject.key])
+      subject.remove
+      expect(adapter.features).to eq(Set.new)
+    end
+  end
+
   describe '#inspect' do
     it 'returns easy to read string representation' do
       string = subject.inspect
@@ -113,7 +130,7 @@ RSpec.describe Flipper::Feature do
     end
 
     it 'is recorded for enable' do
-      thing = Flipper::Types::Actor.new(Struct.new(:flipper_id).new('1'))
+      thing = Flipper::Types::Actor.new(Flipper::Actor.new('1'))
       gate = subject.gate_for(thing)
 
       subject.enable(thing)
@@ -128,7 +145,7 @@ RSpec.describe Flipper::Feature do
     end
 
     it 'always instruments flipper type instance for enable' do
-      thing = Struct.new(:flipper_id).new('1')
+      thing = Flipper::Actor.new('1')
       gate = subject.gate_for(thing)
 
       subject.enable(thing)
@@ -153,7 +170,7 @@ RSpec.describe Flipper::Feature do
       expect(event.payload[:result]).not_to be_nil
     end
 
-    user = Struct.new(:flipper_id).new('1')
+    user = Flipper::Actor.new('1')
     actor = Flipper::Types::Actor.new(user)
     boolean_true = Flipper::Types::Boolean.new(true)
     boolean_false = Flipper::Types::Boolean.new(false)
@@ -184,7 +201,7 @@ RSpec.describe Flipper::Feature do
     end
 
     it 'always instruments flipper type instance for disable' do
-      thing = Struct.new(:flipper_id).new('1')
+      thing = Flipper::Actor.new('1')
       gate = subject.gate_for(thing)
 
       subject.disable(thing)
@@ -195,6 +212,17 @@ RSpec.describe Flipper::Feature do
       expect(event.payload[:thing]).to eq(Flipper::Types::Actor.new(thing))
     end
 
+    it 'is recorded for add' do
+      subject.add
+
+      event = instrumenter.events.last
+      expect(event).not_to be_nil
+      expect(event.name).to eq('feature_operation.flipper')
+      expect(event.payload[:feature_name]).to eq(:search)
+      expect(event.payload[:operation]).to eq(:add)
+      expect(event.payload[:result]).not_to be_nil
+    end
+
     it 'is recorded for remove' do
       subject.remove
 
@@ -207,7 +235,7 @@ RSpec.describe Flipper::Feature do
     end
 
     it 'is recorded for enabled?' do
-      thing = Flipper::Types::Actor.new(Struct.new(:flipper_id).new('1'))
+      thing = Flipper::Types::Actor.new(Flipper::Actor.new('1'))
       gate = subject.gate_for(thing)
 
       subject.enabled?(thing)
@@ -221,7 +249,7 @@ RSpec.describe Flipper::Feature do
       expect(event.payload[:result]).to eq(false)
     end
 
-    user = Struct.new(:flipper_id).new('1')
+    user = Flipper::Actor.new('1')
     actor = Flipper::Types::Actor.new(user)
     {
       nil => nil,
@@ -461,8 +489,8 @@ RSpec.describe Flipper::Feature do
 
     context 'when one or more actors are enabled' do
       before do
-        subject.enable Flipper::Types::Actor.new(Struct.new(:flipper_id).new('User:5'))
-        subject.enable Flipper::Types::Actor.new(Struct.new(:flipper_id).new('User:22'))
+        subject.enable Flipper::Types::Actor.new(Flipper::Actor.new('User:5'))
+        subject.enable Flipper::Types::Actor.new(Flipper::Actor.new('User:22'))
       end
 
       it 'returns set of actor ids' do
@@ -565,7 +593,7 @@ RSpec.describe Flipper::Feature do
     context 'with gate values set in adapter' do
       before do
         subject.enable Flipper::Types::Boolean.new(true)
-        subject.enable Flipper::Types::Actor.new(Struct.new(:flipper_id).new(5))
+        subject.enable Flipper::Types::Actor.new(Flipper::Actor.new(5))
         subject.enable Flipper::Types::Group.new(:admins)
         subject.enable Flipper::Types::PercentageOfTime.new(50)
         subject.enable Flipper::Types::PercentageOfActors.new(25)
@@ -584,7 +612,7 @@ RSpec.describe Flipper::Feature do
   describe '#enable_actor/disable_actor' do
     context 'with object that responds to flipper_id' do
       it 'updates the gate values to include the actor' do
-        actor = Struct.new(:flipper_id).new(5)
+        actor = Flipper::Actor.new(5)
         expect(subject.gate_values.actors).to be_empty
         subject.enable_actor(actor)
         expect(subject.gate_values.actors).to eq(Set['5'])
@@ -595,7 +623,7 @@ RSpec.describe Flipper::Feature do
 
     context 'with actor instance' do
       it 'updates the gate values to include the actor' do
-        actor = Struct.new(:flipper_id).new(5)
+        actor = Flipper::Actor.new(5)
         instance = Flipper::Types::Actor.new(actor)
         expect(subject.gate_values.actors).to be_empty
         subject.enable_actor(instance)
@@ -609,7 +637,7 @@ RSpec.describe Flipper::Feature do
   describe '#enable_group/disable_group' do
     context 'with symbol group name' do
       it 'updates the gate values to include the group' do
-        actor = Struct.new(:flipper_id).new(5)
+        actor = Flipper::Actor.new(5)
         group = Flipper.register(:five_only) { |actor| actor.flipper_id == 5 }
         expect(subject.gate_values.groups).to be_empty
         subject.enable_group(:five_only)
@@ -621,7 +649,7 @@ RSpec.describe Flipper::Feature do
 
     context 'with string group name' do
       it 'updates the gate values to include the group' do
-        actor = Struct.new(:flipper_id).new(5)
+        actor = Flipper::Actor.new(5)
         group = Flipper.register(:five_only) { |actor| actor.flipper_id == 5 }
         expect(subject.gate_values.groups).to be_empty
         subject.enable_group('five_only')
@@ -633,7 +661,7 @@ RSpec.describe Flipper::Feature do
 
     context 'with group instance' do
       it 'updates the gate values for the group' do
-        actor = Struct.new(:flipper_id).new(5)
+        actor = Flipper::Actor.new(5)
         group = Flipper.register(:five_only) { |actor| actor.flipper_id == 5 }
         expect(subject.gate_values.groups).to be_empty
         subject.enable_group(group)

data/spec/flipper/gates/boolean_spec.rb

@@ -11,7 +11,7 @@ RSpec.describe Flipper::Gates::Boolean do
     Flipper::FeatureCheckContext.new(
       feature_name: feature_name,
       values: Flipper::GateValues.new(boolean: bool),
-      thing: Flipper::Types::Actor.new(Struct.new(:flipper_id).new(1))
+      thing: Flipper::Types::Actor.new(Flipper::Actor.new(1))
     )
   end
 

data/spec/flipper/gates/group_spec.rb

@@ -11,7 +11,7 @@ RSpec.describe Flipper::Gates::Group do
     Flipper::FeatureCheckContext.new(
       feature_name: feature_name,
       values: Flipper::GateValues.new(groups: set),
-      thing: Flipper::Types::Actor.new(Struct.new(:flipper_id).new('5'))
+      thing: Flipper::Types::Actor.new(Flipper::Actor.new('5'))
     )
   end
 
@@ -22,7 +22,7 @@ RSpec.describe Flipper::Gates::Group do
       end
 
       it 'ignores group' do
-        thing = Struct.new(:flipper_id).new('5')
+        thing = Flipper::Actor.new('5')
         expect(subject.open?(context(Set[:newbs, :staff]))).to be(true)
       end
     end

data/spec/flipper/gates/percentage_of_actors_spec.rb

@@ -11,7 +11,7 @@ RSpec.describe Flipper::Gates::PercentageOfActors do
     Flipper::FeatureCheckContext.new(
       feature_name: feature,
       values: Flipper::GateValues.new(percentage_of_actors: integer),
-      thing: thing || Flipper::Types::Actor.new(Struct.new(:flipper_id).new(1))
+      thing: thing || Flipper::Types::Actor.new(Flipper::Actor.new(1))
     )
   end
 
@@ -22,7 +22,7 @@ RSpec.describe Flipper::Gates::PercentageOfActors do
       let(:number_of_actors) { 100 }
 
       let(:actors) do
-        (1..number_of_actors).map { |n| Struct.new(:flipper_id).new(n) }
+        (1..number_of_actors).map { |n| Flipper::Actor.new(n) }
       end
 
       let(:feature_one_enabled_actors) do

data/spec/flipper/instrumentation/log_subscriber_spec.rb

@@ -49,7 +49,7 @@ RSpec.describe Flipper::Instrumentation::LogSubscriber do
   end
 
   context 'feature enabled checks with a thing' do
-    let(:user) { Flipper::Types::Actor.new(Struct.new(:flipper_id).new('1')) }
+    let(:user) { Flipper::Types::Actor.new(Flipper::Actor.new('1')) }
 
     before do
       clear_logs
@@ -63,7 +63,7 @@ RSpec.describe Flipper::Instrumentation::LogSubscriber do
   end
 
   context 'changing feature enabled state' do
-    let(:user) { Flipper::Types::Actor.new(Struct.new(:flipper_id).new('1')) }
+    let(:user) { Flipper::Types::Actor.new(Flipper::Actor.new('1')) }
 
     before do
       clear_logs

data/spec/flipper/instrumentation/metriks_subscriber_spec.rb

@@ -11,7 +11,7 @@ RSpec.describe Flipper::Instrumentation::MetriksSubscriber do
     Flipper.new(adapter, instrumenter: ActiveSupport::Notifications)
   end
 
-  let(:user) { user = Struct.new(:flipper_id).new('1') }
+  let(:user) { user = Flipper::Actor.new('1') }
 
   before do
     Metriks::Registry.default.clear

data/spec/flipper/instrumentation/statsd_subscriber_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe Flipper::Instrumentation::StatsdSubscriber do
     Flipper.new(adapter, instrumenter: ActiveSupport::Notifications)
   end
 
-  let(:user) { user = Struct.new(:flipper_id).new('1') }
+  let(:user) { user = Flipper::Actor.new('1') }
 
   before do
     described_class.client = statsd_client

data/spec/flipper/middleware/memoizer_spec.rb

@@ -18,6 +18,19 @@ RSpec.describe Flipper::Middleware::Memoizer do
     flipper.adapter.memoize = nil
   end
 
+  it 'raises if initialized with app and flipper instance' do
+    expect do
+      described_class.new(app, flipper)
+    end.to raise_error(/no longer initializes with a flipper/)
+  end
+
+  it 'raises if initialized with app and block' do
+    block = -> { flipper }
+    expect do
+      described_class.new(app, block)
+    end.to raise_error(/no longer initializes with a flipper/)
+  end
+
   RSpec.shared_examples_for 'flipper middleware' do
     it 'delegates' do
       called = false

data/spec/flipper/types/group_spec.rb

@@ -69,7 +69,7 @@ RSpec.describe Flipper::Types::Group do
       context = Flipper::FeatureCheckContext.new(
         feature_name: :my_feature,
         values: Flipper::GateValues.new({}),
-        thing: Flipper::Types::Actor.new(Struct.new(:flipper_id).new(1))
+        thing: Flipper::Types::Actor.new(Flipper::Actor.new(1))
       )
       group = Flipper.register(:group_with_context) { |actor| actor }
       yielded_actor = group.match?(admin_actor, context)
@@ -80,7 +80,7 @@ RSpec.describe Flipper::Types::Group do
       context = Flipper::FeatureCheckContext.new(
         feature_name: :my_feature,
         values: Flipper::GateValues.new({}),
-        thing: Flipper::Types::Actor.new(Struct.new(:flipper_id).new(1))
+        thing: Flipper::Types::Actor.new(Flipper::Actor.new(1))
       )
       group = Flipper.register(:group_with_context) { |actor, context| [actor, context] }
       yielded_actor, yielded_context = group.match?(admin_actor, context)

data/spec/integration_spec.rb

@@ -6,9 +6,6 @@ RSpec.describe Flipper do
   let(:adapter)     { Flipper::Adapters::Memory.new }
   let(:flipper)     { described_class.new(adapter) }
   let(:feature)     { flipper[:search] }
-
-  let(:actor_class) { Struct.new(:flipper_id) }
-
   let(:admin_group) { flipper.group(:admins) }
   let(:dev_group)   { flipper.group(:devs) }
 
@@ -26,8 +23,8 @@ RSpec.describe Flipper do
     double 'Non Flipper Thing', flipper_id: 1,  admin?: nil, dev?: false
   end
 
-  let(:pitt)        { actor_class.new(1) }
-  let(:clooney)     { actor_class.new(10) }
+  let(:pitt)        { Flipper::Actor.new(1) }
+  let(:clooney)     { Flipper::Actor.new(10) }
 
   let(:five_percent_of_actors) { flipper.actors(5) }
   let(:five_percent_of_time) { flipper.time(5) }
@@ -123,7 +120,7 @@ RSpec.describe Flipper do
 
       it 'enables feature for actor within percentage' do
         enabled = (1..100).select do |i|
-          thing = actor_class.new(i)
+          thing = Flipper::Actor.new(i)
           feature.enabled?(thing)
         end.size
 
@@ -202,7 +199,7 @@ RSpec.describe Flipper do
 
       it 'disables actor in percentage of actors' do
         enabled = (1..100).select do |i|
-          thing = actor_class.new(i)
+          thing = Flipper::Actor.new(i)
           feature.enabled?(thing)
         end.size
 
@@ -285,7 +282,7 @@ RSpec.describe Flipper do
 
       it 'disables feature' do
         enabled = (1..100).select do |i|
-          thing = actor_class.new(i)
+          thing = Flipper::Actor.new(i)
           feature.enabled?(thing)
         end.size
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flipper
 version: !ruby/object:Gem::Version
-  version: 0.11.0.beta1
+  version: 0.11.0.beta3
 platform: ruby
 authors:
 - John Nunemaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-02 00:00:00.000000000 Z
+date: 2017-04-10 00:00:00.000000000 Z
 dependencies: []
 description: Feature flipper is the act of enabling/disabling features in your application,
   ideally without re-deploying or changing anything in your code base. Flipper makes
@@ -44,6 +44,7 @@ files:
 - examples/group.rb
 - examples/group_dynamic_lookup.rb
 - examples/group_with_members.rb
+- examples/importing.rb
 - examples/individual_actor.rb
 - examples/instrumentation.rb
 - examples/percentage_of_actors.rb
@@ -52,6 +53,7 @@ files:
 - examples/percentage_of_time.rb
 - flipper.gemspec
 - lib/flipper.rb
+- lib/flipper/actor.rb
 - lib/flipper/adapter.rb
 - lib/flipper/adapters/http.rb
 - lib/flipper/adapters/http/client.rb
@@ -96,6 +98,8 @@ files:
 - lib/flipper/types/percentage_of_time.rb
 - lib/flipper/version.rb
 - spec/fixtures/feature.json
+- spec/flipper/actor_spec.rb
+- spec/flipper/adapter_spec.rb
 - spec/flipper/adapters/http_spec.rb
 - spec/flipper/adapters/instrumented_spec.rb
 - spec/flipper/adapters/memoizable_spec.rb
@@ -163,6 +167,8 @@ specification_version: 4
 summary: Feature flipper for ANYTHING
 test_files:
 - spec/fixtures/feature.json
+- spec/flipper/actor_spec.rb
+- spec/flipper/adapter_spec.rb
 - spec/flipper/adapters/http_spec.rb
 - spec/flipper/adapters/instrumented_spec.rb
 - spec/flipper/adapters/memoizable_spec.rb