flipflop 2.2.1 → 2.3.0

data/test/test_helper.rb

@@ -5,6 +5,7 @@ gem "minitest"
 require "minitest/autorun"
 
 require "action_controller"
+require "rails/generators"
 
 # Who is setting this to true? :o
 $VERBOSE = false
@@ -37,29 +38,67 @@ def reload_constant(name)
   Object.const_get(name)
 end
 
+class TestEngineGenerator < Rails::Generators::Base
+  source_root File.expand_path("../templates", __FILE__)
+
+  def copy_engine_file
+    copy_file "test_engine.rb", "lib/test_engine/test_engine.rb"
+  end
+
+  def copy_engine_features_file
+    copy_file "test_engine_features.rb", "lib/test_engine/config/features.rb"
+  end
+
+  def require_engine
+    environment "require 'test_engine/test_engine'"
+  end
+end
+
+class TestFeaturesGenerator < Rails::Generators::Base
+  source_root File.expand_path("../templates", __FILE__)
+
+  def copy_app_features_file
+    copy_file "test_app_features.rb", "config/features.rb"
+  end
+end
+
+class TestLocaleGenerator < Rails::Generators::Base
+  source_root File.expand_path("../templates", __FILE__)
+
+  def copy_locale_file
+    copy_file "nl.yml", "config/locales/nl.yml"
+  end
+end
+
 class TestApp
   class << self
-    def new
-      ActiveSupport::Dependencies.remove_constant("App")
-      super.tap do |current|
+    def new(generators = [])
+      name = "my_test_app"
+      super(name, generators).tap do |current|
         current.create!
         current.load!
         current.migrate!
-        reload_constant("Flipflop::Feature")
       end
     end
   end
 
+  attr_reader :name, :generators
+
+  def initialize(name, generators = [])
+    @name = name
+    @generators = generators
+  end
+
   def create!
-    require "rails/generators"
     require "rails/generators/rails/app/app_generator"
     require "generators/flipflop/install/install_generator"
 
-    FileUtils.rm_rf(File.expand_path("../../tmp/app", __FILE__))
+    FileUtils.rm_rf(File.expand_path("../../" + path, __FILE__))
     Dir.chdir(File.expand_path("../..", __FILE__))
 
-    Rails::Generators::AppGenerator.new(["tmp/app"],
+    Rails::Generators::AppGenerator.new([path],
       quiet: true,
+      api: ENV["RAILS_API_ONLY"].to_i.nonzero?,
       skip_active_job: true,
       skip_bundle: true,
       skip_gemfile: true,
@@ -74,15 +113,26 @@ class TestApp
     Flipflop::InstallGenerator.new([],
       quiet: true,
     ).invoke_all
+
+    generators.each do |generator|
+      generator.new([], quiet: true, force: true).invoke_all
+    end
   end
 
   def load!
     ENV["RAILS_ENV"] = "test"
     require "rails"
     require "flipflop/engine"
-    require File.expand_path("../../tmp/app/config/environment", __FILE__)
-    ActiveSupport::Dependencies.mechanism = :load
-    load(Rails.application.paths["config/features.rb"].existent.first)
+
+    load File.expand_path("../../#{path}/config/application.rb", __FILE__)
+    load File.expand_path("../../#{path}/config/environments/test.rb", __FILE__)
+    Rails.application.config.cache_classes = false
+    Rails.application.config.action_view.raise_on_missing_translations = true
+    Rails.application.config.i18n.enforce_available_locales = false
+    Rails.application.initialize!
+
+    I18n.locale = :en
+
     require "capybara/rails"
   end
 
@@ -94,9 +144,32 @@ class TestApp
     ActiveRecord::Migrator.migrate(Rails.application.paths["db/migrate"].to_a)
   end
 
+  def unload!
+    Flipflop::Strategies::AbstractStrategy::RequestInterceptor.request = nil
+    Flipflop::FeatureLoader.instance_variable_set(:@current, nil)
+
+    match = -> (path) { path.include?(File.expand_path("../..", __FILE__)) }
+    Rails.application.config.i18n.railties_load_path.reject!(&match)
+    Rails.application.config.i18n.load_path.reject!(&match)
+    I18n.load_path.reject!(&match)
+
+    Rails.app_class.instance_variable_set(:@instance, nil) if defined?(Rails.app_class)
+    Rails.instance_variable_set(:@application, nil)
+    I18n::Railtie.instance_variable_set(:@i18n_inited, false)
+
+    ActiveSupport::Dependencies.remove_constant(name.camelize)
+    ActiveSupport::Dependencies.remove_constant("Flipflop::Feature")
+  end
+
+  private
+
   def silence_stdout
     stdout, $stdout = $stdout, StringIO.new
     yield rescue nil
     $stdout = stdout
   end
+
+  def path
+    "tmp/" + name
+  end
 end

data/test/unit/configurable_test.rb

@@ -2,7 +2,7 @@ require File.expand_path("../../test_helper", __FILE__)
 
 describe Flipflop::Configurable do
   subject do
-    Flipflop::FeatureSet.current.reset!
+    Flipflop::FeatureSet.current.send(:initialize)
     Module.new do
       extend Flipflop::Configurable
     end

data/test/unit/feature_definition_test.rb

@@ -10,13 +10,25 @@ describe Flipflop::FeatureDefinition do
       assert_equal :my_key, subject.key
     end
 
-    it "should have humanized description" do
-      assert_equal "My key.", subject.description
+    it "should have name derived from key" do
+      assert_equal "my_key", subject.name
+    end
+
+    it "should have title derived from key" do
+      assert_equal "My key", subject.title
+    end
+
+    it "should have no description" do
+      assert_nil subject.description
     end
 
     it "should default to false" do
       assert_equal false, subject.default
     end
+
+    it "should have no group" do
+      assert_nil subject.group
+    end
   end
 
   describe "with options" do
@@ -24,6 +36,7 @@ describe Flipflop::FeatureDefinition do
       Flipflop::FeatureDefinition.new(:my_key,
         default: true,
         description: "Awesome feature",
+        group: Flipflop::GroupDefinition.new(:my_group),
       )
     end
 
@@ -31,6 +44,14 @@ describe Flipflop::FeatureDefinition do
       assert_equal :my_key, subject.key
     end
 
+    it "should have name derived from key" do
+      assert_equal "my_key", subject.name
+    end
+
+    it "should have title derived from key" do
+      assert_equal "My key", subject.title
+    end
+
     it "should have specified description" do
       assert_equal "Awesome feature", subject.description
     end
@@ -38,5 +59,9 @@ describe Flipflop::FeatureDefinition do
     it "should have specified default" do
       assert_equal true, subject.default
     end
+
+    it "should have specified group" do
+      assert_equal :my_group, subject.group.key
+    end
   end
 end

data/test/unit/feature_set_test.rb

@@ -19,7 +19,7 @@ end
 
 describe Flipflop::FeatureSet do
   subject do
-    Flipflop::FeatureSet.current.reset!
+    Flipflop::FeatureSet.current.send(:initialize)
     Flipflop::FeatureSet.current.tap do |set|
       set.add(Flipflop::FeatureDefinition.new(:one))
     end
@@ -105,18 +105,12 @@ describe Flipflop::FeatureSet do
       assert subject.feature(feature.key).frozen?
     end
 
-    it "should raise if feature with same key is added" do
+    it "should raise error with message if feature with same key is added" do
       subject.add(Flipflop::FeatureDefinition.new(:feature))
-      assert_raises Flipflop::FeatureError do
-        subject.add(Flipflop::FeatureDefinition.new(:feature))
-      end
-    end
-
-    it "should raise with message if feature with same key is added" do
-      subject.add(Flipflop::FeatureDefinition.new(:feature))
-      assert_raises Flipflop::FeatureError do
+      error = assert_raises Flipflop::FeatureError do
         subject.add(Flipflop::FeatureDefinition.new(:feature))
       end
+      assert_equal "Feature 'feature' already defined.", error.message
     end
   end
 
@@ -131,18 +125,12 @@ describe Flipflop::FeatureSet do
       assert subject.strategy(strategy.key).frozen?
     end
 
-    it "should raise if strategy with same key is added" do
+    it "should raise error with message if strategy with same key is added" do
       subject.use(NullStrategy.new)
-      assert_raises Flipflop::StrategyError do
-        subject.use(NullStrategy.new)
-      end
-    end
-
-    it "should raise with message if strategy with same key is added" do
-      subject.use(NullStrategy.new)
-      assert_raises Flipflop::StrategyError do
+      error = assert_raises Flipflop::StrategyError do
         subject.use(NullStrategy.new)
       end
+      assert_equal "Strategy 'null' (NullStrategy) already defined with identical options.", error.message
     end
   end
 

data/test/unit/flipflop_test.rb

@@ -2,22 +2,25 @@ require File.expand_path("../../test_helper", __FILE__)
 
 describe Flipflop do
   before do
-    Flipflop.configure do
-      feature :one, default: true
-      feature :two, default: false
+    Flipflop::FeatureSet.current.replace do
+      Flipflop.configure do
+        feature :one, default: true
+        feature :two, default: false
+      end
     end
   end
 
-  describe "configure" do
+  describe "replace" do
     before do
-      Flipflop.configure do
-        feature :config_feature, default: true
+      Flipflop::FeatureSet.current.replace do
+        Flipflop.configure do
+          feature :config_feature, default: true
+        end
       end
     end
 
     it "should reset feature set" do
-      Flipflop.configure do
-      end
+      Flipflop::FeatureSet.current.replace
       assert_equal [], Flipflop::FeatureSet.current.features
     end
 
@@ -57,9 +60,11 @@ describe Flipflop do
         end
       end
 
-      Flipflop.configure do
-        strategy counter
-        feature :one, default: true
+      Flipflop::FeatureSet.current.replace do
+        Flipflop.configure do
+          strategy counter
+          feature :one, default: true
+        end
       end
 
       begin

data/test/unit/group_definition_test.rb

@@ -0,0 +1,21 @@
+require File.expand_path("../../test_helper", __FILE__)
+
+describe Flipflop::GroupDefinition do
+  describe "with defaults" do
+    subject do
+      Flipflop::GroupDefinition.new(:my_key)
+    end
+
+    it "should have specified key" do
+      assert_equal :my_key, subject.key
+    end
+
+    it "should have name derived from key" do
+      assert_equal "my_key", subject.name
+    end
+
+    it "should have title derived from key" do
+      assert_equal "My key", subject.title
+    end
+  end
+end

data/test/unit/strategies/abstract_strategy_test.rb

@@ -14,6 +14,10 @@ describe Flipflop::Strategies::AbstractStrategy do
       assert_equal "abstract", subject.name
     end
 
+    it "should have title derived from name" do
+      assert_equal "Abstract", subject.title
+    end
+
     it "should have no default description" do
       assert_nil subject.description
     end
@@ -36,22 +40,12 @@ describe Flipflop::Strategies::AbstractStrategy do
         assert_equal 3, subject.send(:request)
       end
 
-      it "should raise if request is missing" do
-        Flipflop::Strategies::AbstractStrategy::RequestInterceptor.request = nil
-        assert_raises Flipflop::StrategyError do
-          subject.send(:request)
-        end
-      end
-
-      it "should raise with message if request is missing" do
+      it "should raise error with message if request is missing" do
         Flipflop::Strategies::AbstractStrategy::RequestInterceptor.request = nil
-        message = nil
-        begin
+        error = assert_raises Flipflop::StrategyError do
           subject.send(:request)
-        rescue => err
-          message = err.message
         end
-        assert_equal "Strategy 'abstract' required request, but was used outside request context.", message
+        assert_equal "Strategy 'abstract' required request, but was used outside request context.", error.message
       end
 
       it "should raise if request is missing in thread" do
@@ -88,6 +82,10 @@ describe Flipflop::Strategies::AbstractStrategy do
       assert_equal "strategy", subject.name
     end
 
+    it "should have title derived from name" do
+      assert_equal "Strategy", subject.title
+    end
+
     it "should have specified description" do
       assert_equal "my strategy", subject.description
     end
@@ -105,20 +103,11 @@ describe Flipflop::Strategies::AbstractStrategy do
       ).freeze
     end
 
-    it "should raise error" do
-      assert_raises Flipflop::StrategyError do
-        subject
-      end
-    end
-
-    it "should raise with message" do
-      message = nil
-      begin
+    it "should raise error with message" do
+      error = assert_raises Flipflop::StrategyError do
         subject
-      rescue => err
-        message = err.message
       end
-      assert_equal "Strategy 'abstract' did not understand option :unknown, :other.", message
+      assert_equal "Strategy 'abstract' did not understand option :unknown, :other.", error.message
     end
   end
 end

data/test/unit/strategies/active_record_strategy_test.rb

@@ -46,6 +46,10 @@ describe Flipflop::Strategies::ActiveRecordStrategy do
       assert_equal "active_record", subject.name
     end
 
+    it "should have title derived from name" do
+      assert_equal "Active record", subject.title
+    end
+
     it "should have default description" do
       assert_equal "Stores features in database. Applies to all users.",
         subject.description

data/test/unit/strategies/cookie_strategy_test.rb

@@ -18,6 +18,10 @@ describe Flipflop::Strategies::CookieStrategy do
       assert_equal "cookie", subject.name
     end
 
+    it "should have title derived from name" do
+      assert_equal "Cookie", subject.title
+    end
+
     it "should have default description" do
       assert_equal "Stores features in a browser cookie. Applies to current user.",
         subject.description

data/test/unit/strategies/default_strategy_test.rb

@@ -2,12 +2,14 @@ require File.expand_path("../../../test_helper", __FILE__)
 
 describe Flipflop::Strategies::DefaultStrategy do
   before do
-    Flipflop.configure do
-      feature :one, default: true
-      feature :two
+    Flipflop::FeatureSet.current.replace do
+      Flipflop.configure do
+        feature :one, default: true
+        feature :two
+      end
     end
   end
-    
+
   describe "with defaults" do
     subject do
       Flipflop::Strategies::DefaultStrategy.new.freeze
@@ -17,6 +19,10 @@ describe Flipflop::Strategies::DefaultStrategy do
       assert_equal "default", subject.name
     end
 
+    it "should have title derived from name" do
+      assert_equal "Default", subject.title
+    end
+
     it "should have no default description" do
       assert_equal "Uses feature default status.", subject.description
     end

data/test/unit/strategies/lambda_strategy_test.rb

@@ -10,6 +10,10 @@ describe Flipflop::Strategies::LambdaStrategy do
       assert_equal "lambda", subject.name
     end
 
+    it "should have title derived from name" do
+      assert_equal "Lambda", subject.title
+    end
+
     it "should not have default description" do
       assert_equal "Resolves feature settings with custom code.",
         subject.description
@@ -94,44 +98,24 @@ describe Flipflop::Strategies::LambdaStrategy do
       Flipflop::Strategies::LambdaStrategy.new(lambda: ->() { }).freeze
     end
 
-    it "should raise error" do
-      assert_raises Flipflop::StrategyError do
-        subject
-      end
-    end
-
-    it "should raise with message" do
-      message = nil
-      begin
+    it "should raise error with message" do
+      error = assert_raises Flipflop::StrategyError do
         subject
-      rescue => err
-        message = err.message
       end
-      assert_equal "Strategy 'lambda' has lambda with arity 0, expected 1 or -1.", message
+      assert_equal "Strategy 'lambda' has lambda with arity 0, expected 1 or -1.", error.message
     end
   end
 
   describe "with non conforming return value" do
     subject do
-      Flipflop::Strategies::LambdaStrategy.new(lambda: ->(feature) {
-        return feature
-      }).freeze
-    end
-
-    it "should raise error" do
-      assert_raises Flipflop::StrategyError do
-        subject.enabled?(:one)
-      end
+      Flipflop::Strategies::LambdaStrategy.new(lambda: -> (feature) {feature}).freeze
     end
 
-    it "should raise with message" do
-      message = nil
-      begin
+    it "should raise error with message" do
+      error = assert_raises Flipflop::StrategyError do
         subject.enabled?(:one)
-      rescue => err
-        message = err.message
       end
-      assert_equal "Strategy 'lambda' returned invalid result :one for feature 'one'.", message
+      assert_equal "Strategy 'lambda' returned invalid result :one for feature 'one'.", error.message
     end
   end
 end

data/test/unit/strategies/query_string_strategy_test.rb

@@ -18,6 +18,10 @@ describe Flipflop::Strategies::QueryStringStrategy do
       assert_equal "query_string", subject.name
     end
 
+    it "should have title derived from name" do
+      assert_equal "Query string", subject.title
+    end
+
     it "should not have default description" do
       assert_equal "Interprets query string parameters as features.",
         subject.description

data/test/unit/strategies/redis_strategy_test.rb

@@ -16,6 +16,10 @@ describe Flipflop::Strategies::RedisStrategy do
       assert_equal "redis", subject.name
     end
 
+    it "should have title derived from name" do
+      assert_equal "Redis", subject.title
+    end
+
     it "should have default description" do
       assert_equal "Stores features in Redis. Applies to all users.",
         subject.description

data/test/unit/strategies/session_strategy_test.rb

@@ -18,6 +18,10 @@ describe Flipflop::Strategies::SessionStrategy do
       assert_equal "session", subject.name
     end
 
+    it "should have title derived from name" do
+      assert_equal "Session", subject.title
+    end
+
     it "should have default description" do
       assert_equal "Stores features in the user session. Applies to current user.",
         subject.description

data/test/unit/strategies/test_strategy_test.rb

@@ -10,6 +10,10 @@ describe Flipflop::Strategies::TestStrategy do
       assert_equal "test", subject.name
     end
 
+    it "should have title derived from name" do
+      assert_equal "Test", subject.title
+    end
+
     it "should not have default description" do
       assert_nil subject.description
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flipflop
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Paul Annesley
@@ -10,20 +10,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-04 00:00:00.000000000 Z
+date: 2017-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.0'
 description: Declarative API for specifying features, switchable in declaration, database
@@ -36,18 +36,21 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
+- CHANGES.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
-- app/assets/stylesheets/flipflop.css
 - app/controllers/flipflop/features_controller.rb
 - app/controllers/flipflop/strategies_controller.rb
 - app/models/flipflop/feature.rb
 - app/views/flipflop/features/index.html.erb
+- app/views/flipflop/stylesheets/_flipflop.css
 - app/views/layouts/flipflop.html.erb
+- config/features.rb
+- config/locales/en.yml
 - config/routes.rb
 - flipflop.gemspec
 - lib/flipflop.rb
@@ -56,7 +59,9 @@ files:
 - lib/flipflop/facade.rb
 - lib/flipflop/feature_cache.rb
 - lib/flipflop/feature_definition.rb
+- lib/flipflop/feature_loader.rb
 - lib/flipflop/feature_set.rb
+- lib/flipflop/group_definition.rb
 - lib/flipflop/strategies/abstract_strategy.rb
 - lib/flipflop/strategies/active_record_strategy.rb
 - lib/flipflop/strategies/cookie_strategy.rb
@@ -77,14 +82,22 @@ files:
 - lib/generators/flipflop/migration/templates/create_features.rb
 - lib/generators/flipflop/routes/USAGE
 - lib/generators/flipflop/routes/routes_generator.rb
+- lib/test_engine/config/features.rb
+- lib/test_engine/test_engine.rb
+- src/stylesheets/_flipflop.scss
 - test/integration/app_test.rb
 - test/integration/dashboard_test.rb
+- test/templates/nl.yml
+- test/templates/test_app_features.rb
+- test/templates/test_engine.rb
+- test/templates/test_engine_features.rb
 - test/test_helper.rb
 - test/unit/configurable_test.rb
 - test/unit/feature_cache_test.rb
 - test/unit/feature_definition_test.rb
 - test/unit/feature_set_test.rb
 - test/unit/flipflop_test.rb
+- test/unit/group_definition_test.rb
 - test/unit/strategies/abstract_strategy_request_test.rb
 - test/unit/strategies/abstract_strategy_test.rb
 - test/unit/strategies/active_record_strategy_test.rb
@@ -106,12 +119,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []