feature 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83131f6c0bc8a7fe056a4c621130a968fcb1ec5a
-  data.tar.gz: 9772c00ec3dd58a84a259162591fe3f3983019f6
+  metadata.gz: 19c7e68f322b7bd8ecc077e38301ca81f0101b98
+  data.tar.gz: 6494be8fbf82513c8bc3584f5b79ee64db13dce8
 SHA512:
-  metadata.gz: fcfa2c4877b32898c8f08dff2531eb22089b6bd38d63caa95bc6752ff396034d6aef6fba1c038f6a0b509471da8126a45a5b884ac2d267fa49a23668c2753317
-  data.tar.gz: 7c5cc34fbbe4007030e5708d2db9c50105a6cda84445492f5a881bb567f15db2cabef41b971fdabcc57a4fd45c0a917adc2b719935b1aa81647058ab4641475e
+  metadata.gz: e2552d77a0338981f11f30520712345a6f0e1b45f827748004fcf1fe373e6f0304826fd433bdadf2e572812705d96c7b5bf9d4e9f254d57803016c182b5414dc
+  data.tar.gz: 0b0208a6710fd63b2fdecc397a16895ad52cfc814465bc42ef2d49292e7bd242035794c652f803b13914fd0ef1d72b31f57980b61facaad31154b4f03bc06b97

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.3.0 (2015-06-12)
+
+* Support testing with multiple features (stevenwilkin)
+* Bugfix when using auto_refresh and testing support (javidjamae)
+* Fixing an issue with Feature.run_with_activated if @active_features is nil (tommyh)
+
 ## 1.2.0 (2014-10-28)
 
 * add Support for auto-refresh of feature data (javidjamae)

data/README.md

@@ -13,9 +13,11 @@ The feature toggle functionality has to be configured by feature repositories. A
 
 With this approach Feature is higly configurable and not bound to a specific kind of configuration.
 
-**NOTE:** Ruby 1.8 is only supported until version 0.7.0. Later Versions require at least Ruby 1.9.
+**NOTE:** Ruby 1.9 is supported explicitly only until version 1.2.0. Later version may require 2+.
 
-**NOTE:** Using feature with ActiveRecord and Rails 3 MAY work. Use version 1.1.0 if you need support for Rails 3.
+**NOTE:** Ruby 1.8 is only supported until version 0.7.0. Later Versions require Ruby 1.9+.
+
+**NOTE:** Using feature with ActiveRecord and Rails 3 MAY work. Version 1.1.0 supports Rails 3.
 
 ## Installation
 
@@ -52,11 +54,11 @@ With this approach Feature is higly configurable and not bound to a specific kin
 
         require 'feature/testing'
 
-        Feature.run_with_activated(:feature_name) do
+        Feature.run_with_activated(:feature) do
           # your test code
         end
 
-        Feature.run_with_deactivated(:feature_name) do
+        Feature.run_with_deactivated(:feature, :another_feature) do
           # your test code
         end
 

data/Rakefile

@@ -15,4 +15,4 @@ task :mutant do
   fail unless result == Mutant::CLI::EXIT_SUCCESS
 end
 
-task default: [:spec, :rubocop, :mutant]
+task default: [:spec, :rubocop]

data/lib/feature/repository/yaml_repository.rb

@@ -71,14 +71,23 @@ module Feature
 
         return [] unless data['features']
 
-        invalid_value = data['features'].values.select { |value| ![true, false].include?(value) }
-        unless invalid_value.empty?
-          fail ArgumentError, "#{invalid_value.first} is not allowed value in config, use true/false"
-        end
+        check_valid_feature_data(data['features'])
 
         data['features'].keys.select { |key| data['features'][key] }.map(&:to_sym)
       end
       private :get_active_features
+
+      # Checks for valid values in given feature hash
+      #
+      # @param features [Hash] feature hash
+      #
+      def check_valid_feature_data(features)
+        features.values.each do |value|
+          unless [true, false].include?(value)
+            fail ArgumentError, "#{value} is not allowed value in config, use true/false"
+          end
+        end
+      end
     end
   end
 end

data/lib/feature/testing.rb

@@ -7,31 +7,47 @@ require 'feature'
 # To enable Feature testing capabilities do:
 #   require 'feature/testing'
 module Feature
-  # Execute the code block with the given feature active
+  # Execute the code block with the given features active
   #
   # Example usage:
-  #   Feature.run_with_activated(:feature) do
+  #   Feature.run_with_activated(:feature, :another_feature) do
   #     # your test code here
   #   end
-  def self.run_with_activated(feature)
-    old_features = @active_features.dup
-    @active_features.push(feature).uniq!
-    yield
-  ensure
-    @active_features = old_features
+  def self.run_with_activated(*features, &blk)
+    with_stashed_config do
+      @active_features.concat(features).uniq!
+      @auto_refresh = false
+      @perform_initial_refresh = false
+      blk.call
+    end
   end
 
-  # Execute the code block with the given feature deactive
+  # Execute the code block with the given features deactive
   #
   # Example usage:
-  #   Feature.run_with_deactivated(:feature) do
+  #   Feature.run_with_deactivated(:feature, :another_feature) do
   #     # your test code here
   #   end
-  def self.run_with_deactivated(feature)
+  def self.run_with_deactivated(*features, &blk)
+    with_stashed_config do
+      @active_features -= features
+      @auto_refresh = false
+      @perform_initial_refresh = false
+      blk.call
+    end
+  end
+
+  # Execute the given code block and store + restore the feature
+  # configuration before/after the execution
+  def self.with_stashed_config
+    @active_features = [] if @active_features.nil?
     old_features = @active_features.dup
-    @active_features.delete(feature)
+    old_auto_refresh = @auto_refresh
+    old_perform_initial_refresh = @perform_initial_refresh
     yield
   ensure
     @active_features = old_features
+    @auto_refresh = old_auto_refresh
+    @perform_initial_refresh = old_perform_initial_refresh
   end
 end

data/spec/feature/feature_spec.rb

@@ -58,8 +58,7 @@ describe Feature do
 
       it 'should reload active features on first call only' do
         @repository.add_active_feature(:feature_a)
-        expect(@repository).to receive(:active_features).exactly(1).times
-                           .and_return(@repository.active_features)
+        expect(@repository).to receive(:active_features).once.and_return(@repository.active_features)
         Feature.active?(:feature_a)
         Feature.active?(:feature_a)
       end
@@ -71,8 +70,7 @@ describe Feature do
       end
       it 'should reload active features on every call' do
         @repository.add_active_feature(:feature_a)
-        expect(@repository).to receive(:active_features).exactly(2).times
-                           .and_return(@repository.active_features)
+        expect(@repository).to receive(:active_features).twice.and_return(@repository.active_features)
         Feature.active?(:feature_a)
         Feature.active?(:feature_a)
       end

data/spec/feature/redis_repository_spec.rb

@@ -37,5 +37,4 @@ describe Feature::Repository::RedisRepository do
       @repository.add_active_feature :feature_a
     end.to raise_error(ArgumentError, 'feature :feature_a already added')
   end
-
 end

data/spec/feature/testing_spec.rb

@@ -1,30 +1,107 @@
 require 'spec_helper'
 require 'feature/testing'
 
+shared_examples 'a testable repository' do
+  before do
+    expect(Feature.active?(:active_feature)).to be_truthy
+    expect(Feature.active?(:another_active_feature)).to be_truthy
+    expect(Feature.active?(:deactive_feature)).to be_falsey
+    expect(Feature.active?(:another_deactive_feature)).to be_falsey
+  end
+
+  after do
+    expect(Feature.active?(:active_feature)).to be_truthy
+    expect(Feature.active?(:another_active_feature)).to be_truthy
+    expect(Feature.active?(:deactive_feature)).to be_falsey
+    expect(Feature.active?(:another_deactive_feature)).to be_falsey
+  end
+
+  describe '.run_with_activated' do
+    it 'activates a deactivated feature' do
+      Feature.run_with_activated(:deactive_feature) do
+        expect(Feature.active?(:deactive_feature)).to be_truthy
+      end
+    end
+
+    it 'activates multiple deactivated features' do
+      Feature.run_with_activated(:deactive_feature, :another_deactive_feature) do
+        expect(Feature.active?(:deactive_feature)).to be_truthy
+        expect(Feature.active?(:another_deactive_feature)).to be_truthy
+      end
+    end
+  end
+
+  describe '.run_with_deactivated' do
+    it 'deactivates an activated feature' do
+      Feature.run_with_deactivated(:active_feature) do
+        expect(Feature.active?(:active_feature)).to be_falsey
+      end
+    end
+
+    it 'deactivates multiple activated features' do
+      Feature.run_with_deactivated(:active_feature, :another_active_feature) do
+        expect(Feature.active?(:active_feature)).to be_falsey
+        expect(Feature.active?(:another_active_feature)).to be_falsey
+      end
+    end
+  end
+end
+
 describe 'Feature testing support' do
-  before(:each) do
-    repository = SimpleRepository.new
-    repository.add_active_feature(:active_feature)
-    Feature.set_repository(repository)
+  context 'without auto_refresh' do
+    before(:all) do
+      repository = Feature::Repository::SimpleRepository.new
+      repository.add_active_feature(:active_feature)
+      repository.add_active_feature(:another_active_feature)
+      Feature.set_repository(repository)
+    end
+
+    it_behaves_like 'a testable repository'
   end
 
-  it 'should execute code block with an deactivated feature' do
-    expect(Feature.active?(:another_feature)).to be_falsey
+  context 'with auto_refresh' do
+    before(:all) do
+      repository = Feature::Repository::SimpleRepository.new
+      repository.add_active_feature(:active_feature)
+      repository.add_active_feature(:another_active_feature)
+      Feature.set_repository(repository, true)
+    end
 
-    Feature.run_with_activated(:another_feature) do
-      expect(Feature.active?(:another_feature)).to be_truthy
+    it_behaves_like 'a testable repository'
+
+    describe '.run_with_deactivated' do
+      it 'should disable perform_initial_refresh for the first call to Feature.active?' do
+        Feature.run_with_activated(:deactive_feature) do
+          expect(Feature.active?(:deactive_feature)).to be_truthy
+        end
+      end
     end
 
-    expect(Feature.active?(:another_feature)).to be_falsey
+    describe '.run_with_deactivated' do
+      it 'should disable perform_initial_refresh for the first call to Feature.active?' do
+        Feature.run_with_deactivated(:active_feature) do
+          expect(Feature.active?(:active_feature)).to be_falsey
+        end
+      end
+    end
   end
 
-  it 'should execute code block with an deactivated feature' do
-    expect(Feature.active?(:active_feature)).to be_truthy
+  context 'with no features activated' do
+    before(:all) do
+      repository = Feature::Repository::SimpleRepository.new
+      Feature.set_repository(repository)
+    end
 
-    Feature.run_with_deactivated(:active_feature) do
-      expect(Feature.active?(:active_feature)).to be_falsey
+    describe '.run_with_activated' do
+      it 'should not raise an error' do
+        expect { Feature.run_with_activated(:foo) {} }.to_not raise_error
+      end
     end
 
-    expect(Feature.active?(:active_feature)).to be_truthy
+    describe '.run_with_deactivated' do
+      it 'should not raise an error' do
+        expect { Feature.run_with_deactivated(:foo) {} }.to_not raise_error
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: feature
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Markus Gerdes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-28 00:00:00.000000000 Z
+date: 2015-06-12 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: github@mgsnova.de
@@ -60,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Feature Toggle library for ruby