simple_flag 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f2041da22824b405194cc6203aa275e474ee4055f733d4959c60256d0984d51
-  data.tar.gz: d5c4f449cadb4febda25719c8653eeff8d1f4fc65c42c72f9f0d1661cae3eac1
+  metadata.gz: 18fd6ddd2543f859954f77dbb4d2a64554371199ce04c0077ce8959ae0686b6c
+  data.tar.gz: f84e73174f51d979c5472e627bc3dabc7f52842cadb432b644db65303a235faf
 SHA512:
-  metadata.gz: d95d77afd1ee6c44acf335e977034920f7f70eba17f52577823489240bfa3089ee5348a762fd7f2a192ed7ac29b93a1aca52d35567fc4e80363d751bf2602a47
-  data.tar.gz: 440b21b9616ff41ff02597088ec1da841224cbfa513c6c3f5c309ef576e5480fac001399715a316edc7929c6aa76385609327fdea6f5b3b357d2ace469e1f223
+  metadata.gz: d17a746f61b88cf9379133f45de57bf51ed0cfa991fb6e5fdf71eb0c61e6caf22cca57cefd77b2d9d26a12150af251c867568f2a2298e43f377aace9a8c8fb7e
+  data.tar.gz: 5b8c4fd26b55ea4b34a51bca29b0aca56730e3d1fd24c8131a2b26335dc026c3ffa8f75f4d25ad4fe02eeb076e93134597f18e5cc0c75c9d2f719863cb081ad0

data/lib/simple_flag/overrides.rb

@@ -0,0 +1,47 @@
+class SimpleFlag
+  module Overrides
+
+    def override(name, result = true, &block)
+      raise FlagNotDefined, "Feature flag `#{name}` is not defined" unless flag?(name)
+
+      # We are using proc, not lambda, because proc does not check for number of arguments
+      original_block = overridden?(name) ? @overrides[name] : @flags[name]
+      @overrides[name] = original_block
+      @flags[name] =
+        if block_given?
+          validate_flag_arity(name, original_block.arity, block.arity)
+          block
+        else
+          proc { |*_args| result }
+        end
+
+      original_block
+    end
+
+    def override_with(name, result = true, &block)
+      raise FlagNotDefined, "Feature flag `#{name}` is not defined" unless flag?(name)
+
+      original_block = @flags[name]
+      @flags[name] = proc { |*_args| result }
+      block.call
+    ensure
+      @flags[name] = original_block
+    end
+
+    def reset_override(name)
+      raise FlagNotOverridden, "Feature flag `#{name}` was not overridden" unless overridden?(name)
+
+      original_block = @overrides.delete(name)
+      @flags[name] = original_block
+    end
+
+    def reset_all_overrides
+      @overrides.each_key { |name| reset_override(name) }
+    end
+
+    def overridden?(name)
+      @overrides.key?(name)
+    end
+
+  end
+end

data/lib/simple_flag/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class SimpleFlag
-  VERSION = '0.1.1'
+  VERSION = '0.2.0'
 end

data/lib/simple_flag.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'simple_flag/version'
+require 'simple_flag/overrides'
 
 # Class FeatureFlag defines and stores feature flags
 #
@@ -48,6 +49,8 @@ require 'simple_flag/version'
 # @see http://blog.arkency.com/2015/11/simple-feature-toggle-for-rails-app/
 #
 class SimpleFlag
+  include Overrides
+
   FlagAlreadyDefined = Class.new(StandardError)
   FlagNotDefined = Class.new(StandardError)
   FlagNotOverridden = Class.new(StandardError)
@@ -80,64 +83,38 @@ class SimpleFlag
     block.call if active?(name, *args)
   end
 
-  def override(name, result = true, &block)
-    raise FlagNotDefined, "Feature flag `#{name}` is not defined" unless flag?(name)
-    raise FlagAlreadyDefined, "Feature flag `#{name}` is already overridden" if overridden?(name)
-
-    # We are using proc, not lambda, because proc does not check for number of arguments
-    original_block = @flags[name]
-    @overrides[name] = original_block
-    @flags[name] =
-      if block_given?
-        validate_flag_arity(name, original_block.arity, block.arity)
-        block
-      else
-        proc { |*_args| result }
-      end
-
-    original_block
-  end
-
-  def reset_override(name)
-    raise FlagNotOverridden, "Feature flag `#{name}` was not overridden" unless overridden?(name)
-
-    original_block = @overrides.delete(name)
-    @flags[name] = original_block
-  end
-
-  def reset_all_overrides
-    @overrides.each_key { |name| reset_override(name) }
-  end
-
-  def override_with(name, result = true, &block)
-    raise FlagNotDefined, "Feature flag `#{name}` is not defined" unless flag?(name)
-
-    original_block = @flags[name]
-    @flags[name] = proc { |*_args| result }
-    block.call
-  ensure
-    @flags[name] = original_block
-  end
-
   def flag?(name)
     @flags.key?(name)
   end
 
-  def overridden?(name)
-    @overrides.key?(name)
-  end
-
   def active?(name, *args)
     flag = @flags.fetch(name, proc { |*_args| false })
     validate_flag_arguments(name, flag.arity, args.size)
     flag.call(*args)
   end
   alias enabled? active?
+  alias on? active?
 
   def inactive?(name, *args)
     !active?(name, *args)
   end
   alias disabled? inactive?
+  alias off? inactive?
+
+  # Returns thruthy value, returned by flag or nil
+  #
+  # @param [Symbol] name The name of the flag
+  # @param [Array<Symbol>] args The flag arguments
+  #
+  # @return [TrueClass,NilClass] Returns truthy value from flag or nil
+  #
+  # @example Usage in Rails
+  #   user.birth_date = birth_date || FEATURE.on?(:fake_data).presence && '1983-01-01'
+  #   user.birth_date = birth_date || FEATURE.presence(:fake_data) && '1983-01-01'
+  #
+  def presence(name, *args)
+    active?(name, *args) || nil
+  end
 
   def env?(*args)
     [*args].map(&:to_s).include?(env.to_s)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_flag
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Vojtěch Kusý
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-29 00:00:00.000000000 Z
+date: 2021-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -70,6 +70,7 @@ files:
 - bin/console
 - bin/setup
 - lib/simple_flag.rb
+- lib/simple_flag/overrides.rb
 - lib/simple_flag/version.rb
 - simple_flag.gemspec
 homepage: https://github.com/wojtha/simple_flag
@@ -81,7 +82,7 @@ metadata:
   changelog_uri: https://github.com/wojtha/simple_flag/blob/master/CHANGELOG.md
   source_code_uri: https://github.com/wojtha/simple_flag
   bug_tracker_uri: https://github.com/wojtha/simple_flag/issues
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -96,8 +97,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.1
-signing_key: 
+rubygems_version: 3.2.27
+signing_key:
 specification_version: 4
 summary: Simple feature flags
 test_files: []