flipper 0.6.3 → 0.7.0.beta1

data/lib/flipper/gates/actor.rb

@@ -25,26 +25,24 @@ module Flipper
       end
 
       def enabled?(value)
-        !value.nil? && !value.empty?
+        !Typecast.to_set(value).empty?
       end
 
       # Internal: Checks if the gate is open for a thing.
       #
       # Returns true if gate open for thing, false if not.
-      def open?(thing, value)
-        instrument(:open?, thing) { |payload|
-          if thing.nil?
-            false
+      def open?(thing, value, options = {})
+        if thing.nil?
+          false
+        else
+          if protects?(thing)
+            actor = wrap(thing)
+            enabled_actor_ids = value
+            enabled_actor_ids.include?(actor.value)
           else
-            if protects?(thing)
-              actor = wrap(thing)
-              enabled_actor_ids = value
-              enabled_actor_ids.include?(actor.value)
-            else
-              false
-            end
+            false
           end
-        }
+        end
       end
 
       def wrap(thing)

data/lib/flipper/gates/boolean.rb

@@ -1,13 +1,6 @@
 module Flipper
   module Gates
     class Boolean < Gate
-      TruthMap = {
-        true    => true,
-        false   => false,
-        'true'  => true,
-        'false' => false,
-      }
-
       # Internal: The name of the gate. Used for instrumentation, etc.
       def name
         :boolean
@@ -31,17 +24,15 @@ module Flipper
       end
 
       def enabled?(value)
-        !!TruthMap[value]
+        Typecast.to_boolean(value)
       end
 
       # Internal: Checks if the gate is open for a thing.
       #
       # Returns true if explicitly set to true, false if explicitly set to false
       # or nil if not explicitly set.
-      def open?(thing, value)
-        instrument(:open?, thing) { |payload|
-          !!TruthMap[value]
-        }
+      def open?(thing, value, options = {})
+        value
       end
 
       def protects?(thing)

data/lib/flipper/gates/group.rb

@@ -25,27 +25,25 @@ module Flipper
       end
 
       def enabled?(value)
-        !value.nil? && !value.empty?
+        !Typecast.to_set(value).empty?
       end
 
       # Internal: Checks if the gate is open for a thing.
       #
       # Returns true if gate open for thing, false if not.
-      def open?(thing, value)
-        instrument(:open?, thing) { |payload|
-          if thing.nil?
-            false
-          else
-            value.any? { |name|
-              begin
-                group = Flipper.group(name)
-                group.match?(thing)
-              rescue GroupNotRegistered
-                false
-              end
-            }
-          end
-        }
+      def open?(thing, value, options = {})
+        if thing.nil?
+          false
+        else
+          value.any? { |name|
+            begin
+              group = Flipper.group(name)
+              group.match?(thing)
+            rescue GroupNotRegistered
+              false
+            end
+          }
+        end
       end
 
       def protects?(thing)

data/lib/flipper/gates/percentage_of_actors.rb

@@ -26,24 +26,23 @@ module Flipper
       end
 
       def enabled?(value)
-        !value.nil? && value.to_i > 0
+        Typecast.to_integer(value) > 0
       end
 
       # Internal: Checks if the gate is open for a thing.
       #
       # Returns true if gate open for thing, false if not.
-      def open?(thing, value)
-        instrument(:open?, thing) { |payload|
-          percentage = value.to_i
-
-          if Types::Actor.wrappable?(thing)
-            actor = Types::Actor.wrap(thing)
-            key = "#{@feature_name}#{actor.value}"
-            Zlib.crc32(key) % 100 < percentage
-          else
-            false
-          end
-        }
+      def open?(thing, value, options = {})
+        feature_name = options.fetch(:feature_name)
+        percentage = Typecast.to_integer(value)
+
+        if Types::Actor.wrappable?(thing)
+          actor = Types::Actor.wrap(thing)
+          key = "#{feature_name}#{actor.value}"
+          Zlib.crc32(key) % 100 < percentage
+        else
+          false
+        end
       end
 
       def protects?(thing)

data/lib/flipper/gates/{percentage_of_random.rb → percentage_of_time.rb}

@@ -1,14 +1,14 @@
 module Flipper
   module Gates
-    class PercentageOfRandom < Gate
+    class PercentageOfTime < Gate
       # Internal: The name of the gate. Used for instrumentation, etc.
       def name
-        :percentage_of_random
+        :percentage_of_time
       end
 
       # Internal: Name converted to value safe for adapter.
       def key
-        :percentage_of_random
+        :percentage_of_time
       end
 
       def data_type
@@ -24,22 +24,19 @@ module Flipper
       end
 
       def enabled?(value)
-        !value.nil? && value.to_i > 0
+        Typecast.to_integer(value) > 0
       end
 
       # Internal: Checks if the gate is open for a thing.
       #
       # Returns true if gate open for thing, false if not.
-      def open?(thing, value)
-        instrument(:open?, thing) { |payload|
-          percentage = value.to_i
-
-          rand < (percentage / 100.0)
-        }
+      def open?(thing, value, options = {})
+        percentage = Typecast.to_integer(value)
+        rand < (percentage / 100.0)
       end
 
       def protects?(thing)
-        thing.is_a?(Flipper::Types::PercentageOfRandom)
+        thing.is_a?(Flipper::Types::PercentageOfTime)
       end
     end
   end

data/lib/flipper/instrumentation/log_subscriber.rb

@@ -74,7 +74,7 @@ module Flipper
       #   # Flipper feature(search) gate(group) open false (0.1ms)  [ thing=... ]
       #   # Flipper feature(search) gate(actor) open false (0.1ms)  [ thing=... ]
       #   # Flipper feature(search) gate(percentage_of_actors) open false (0.1ms)  [ thing=... ]
-      #   # Flipper feature(search) gate(percentage_of_random) open false (0.1ms)  [ thing=... ]
+      #   # Flipper feature(search) gate(percentage_of_time) open false (0.1ms)  [ thing=... ]
       #
       # Returns nothing.
       def gate_operation(event)

data/lib/flipper/instrumentation/subscriber.rb

@@ -95,7 +95,7 @@ module Flipper
 
       # Private
       def strip_trailing_question_mark(operation)
-        operation.to_s.gsub(/\?$/, '')
+        operation.to_s.chomp('?')
       end
     end
   end

data/lib/flipper/spec/shared_adapter_specs.rb

@@ -10,7 +10,7 @@ shared_examples_for 'a flipper adapter' do
   let(:group_gate)   { feature.gate(:group) }
   let(:actor_gate)   { feature.gate(:actor) }
   let(:actors_gate)  { feature.gate(:percentage_of_actors) }
-  let(:random_gate)  { feature.gate(:percentage_of_random) }
+  let(:time_gate)  { feature.gate(:percentage_of_time) }
 
   before do
     Flipper.register(:admins) { |actor|
@@ -41,7 +41,7 @@ shared_examples_for 'a flipper adapter' do
       :groups => Set.new,
       :actors => Set.new,
       :percentage_of_actors => nil,
-      :percentage_of_random => nil,
+      :percentage_of_time => nil,
     })
   end
 
@@ -63,7 +63,7 @@ shared_examples_for 'a flipper adapter' do
     subject.enable(feature, group_gate, flipper.group(:admins)).should eq(true)
     subject.enable(feature, actor_gate, flipper.actor(actor_22)).should eq(true)
     subject.enable(feature, actors_gate, flipper.actors(25)).should eq(true)
-    subject.enable(feature, random_gate, flipper.random(45)).should eq(true)
+    subject.enable(feature, time_gate, flipper.time(45)).should eq(true)
 
     subject.disable(feature, boolean_gate, flipper.boolean).should eq(true)
 
@@ -72,7 +72,7 @@ shared_examples_for 'a flipper adapter' do
       :groups => Set.new,
       :actors => Set.new,
       :percentage_of_actors => nil,
-      :percentage_of_random => nil,
+      :percentage_of_time => nil,
     })
   end
 
@@ -121,14 +121,14 @@ shared_examples_for 'a flipper adapter' do
     result[:percentage_of_actors].should eq('0')
   end
 
-  it "can enable, disable and get value for percentage of random gate" do
-    subject.enable(feature, random_gate, flipper.random(10)).should eq(true)
+  it "can enable, disable and get value for percentage of time gate" do
+    subject.enable(feature, time_gate, flipper.time(10)).should eq(true)
     result = subject.get(feature)
-    result[:percentage_of_random].should eq('10')
+    result[:percentage_of_time].should eq('10')
 
-    subject.disable(feature, random_gate, flipper.random(0)).should eq(true)
+    subject.disable(feature, time_gate, flipper.time(0)).should eq(true)
     result = subject.get(feature)
-    result[:percentage_of_random].should eq('0')
+    result[:percentage_of_time].should eq('0')
   end
 
   it "converts boolean value to a string" do
@@ -149,10 +149,10 @@ shared_examples_for 'a flipper adapter' do
     result[:groups].should eq(Set['admins'])
   end
 
-  it "converts percentage of random integer value to a string" do
-    subject.enable(feature, random_gate, flipper.random(10)).should eq(true)
+  it "converts percentage of time integer value to a string" do
+    subject.enable(feature, time_gate, flipper.time(10)).should eq(true)
     result = subject.get(feature)
-    result[:percentage_of_random].should eq('10')
+    result[:percentage_of_time].should eq('10')
   end
 
   it "converts percentage of actors integer value to a string" do
@@ -183,7 +183,7 @@ shared_examples_for 'a flipper adapter' do
     subject.enable(feature, group_gate, flipper.group(:admins)).should eq(true)
     subject.enable(feature, actor_gate, flipper.actor(actor_22)).should eq(true)
     subject.enable(feature, actors_gate, flipper.actors(25)).should eq(true)
-    subject.enable(feature, random_gate, flipper.random(45)).should eq(true)
+    subject.enable(feature, time_gate, flipper.time(45)).should eq(true)
 
     subject.remove(feature).should eq(true)
 
@@ -192,7 +192,7 @@ shared_examples_for 'a flipper adapter' do
       :groups => Set.new,
       :actors => Set.new,
       :percentage_of_actors => nil,
-      :percentage_of_random => nil,
+      :percentage_of_time => nil,
     })
   end
 
@@ -202,7 +202,7 @@ shared_examples_for 'a flipper adapter' do
     subject.enable(feature, group_gate, flipper.group(:admins)).should eq(true)
     subject.enable(feature, actor_gate, flipper.actor(actor_22)).should eq(true)
     subject.enable(feature, actors_gate, flipper.actors(25)).should eq(true)
-    subject.enable(feature, random_gate, flipper.random(45)).should eq(true)
+    subject.enable(feature, time_gate, flipper.time(45)).should eq(true)
 
     subject.clear(feature).should eq(true)
 
@@ -211,7 +211,7 @@ shared_examples_for 'a flipper adapter' do
       :groups => Set.new,
       :actors => Set.new,
       :percentage_of_actors => nil,
-      :percentage_of_random => nil,
+      :percentage_of_time => nil,
     })
   end
 

data/lib/flipper/type.rb

@@ -12,4 +12,4 @@ require 'flipper/types/boolean'
 require 'flipper/types/group'
 require 'flipper/types/percentage'
 require 'flipper/types/percentage_of_actors'
-require 'flipper/types/percentage_of_random'
+require 'flipper/types/percentage_of_time'

data/lib/flipper/typecast.rb

@@ -0,0 +1,44 @@
+module Flipper
+  module Typecast
+    TruthMap = {
+      true    => true,
+      1       => true,
+      "true"  => true,
+      "1"     => true,
+    }
+
+    # Internal: Convert value to a boolean.
+    #
+    # Returns true or false.
+    def self.to_boolean(value)
+      !!TruthMap[value]
+    end
+
+    # Internal: Convert value to an integer.
+    #
+    # Returns an Integer representation of the value.
+    # Raises ArgumentError if conversion is not possible.
+    def self.to_integer(value)
+      if value.respond_to?(:to_i)
+        value.to_i
+      else
+        raise ArgumentError, "#{value.inspect} cannot be converted to an integer"
+      end
+    end
+
+    # Internal: Convert value to a set.
+    #
+    # Returns a Set representation of the value.
+    # Raises ArgumentError if conversion is not possible.
+    def self.to_set(value)
+      return value if value.is_a?(Set)
+      return Set.new if value.nil? || value.empty?
+
+      if value.respond_to?(:to_set)
+        value.to_set
+      else
+        raise ArgumentError, "#{value.inspect} cannot be converted to a set"
+      end
+    end
+  end
+end

data/lib/flipper/types/actor.rb

@@ -8,11 +8,8 @@ module Flipper
       end
 
       def self.wrap(thing)
-        if thing.is_a?(Flipper::Types::Actor)
-          thing
-        else
-          new(thing)
-        end
+        return thing if thing.is_a?(self)
+        new(thing)
       end
 
       attr_reader :value

data/lib/flipper/types/group.rb

@@ -1,6 +1,12 @@
 module Flipper
   module Types
     class Group < Type
+
+      def self.wrap(group_or_name)
+        return group_or_name if group_or_name.is_a?(self)
+        Flipper.group(group_or_name)
+      end
+
       attr_reader :name
 
       def initialize(name, &block)

data/lib/flipper/types/percentage.rb

@@ -1,10 +1,16 @@
 module Flipper
   module Types
     class Percentage < Type
+
+      def self.wrap(value)
+        return value if value.is_a?(self)
+        new(value)
+      end
+
       attr_reader :value
 
       def initialize(value)
-        value = value.to_i
+        value = Typecast.to_integer(value)
 
         if value < 0 || value > 100
           raise ArgumentError, "value must be a positive number less than or equal to 100, but was #{value}"

data/lib/flipper/types/{percentage_of_random.rb → percentage_of_time.rb}

@@ -1,6 +1,6 @@
 module Flipper
   module Types
-    class PercentageOfRandom < Percentage
+    class PercentageOfTime < Percentage
     end
   end
 end

data/lib/flipper/version.rb

@@ -1,3 +1,3 @@
 module Flipper
-  VERSION = "0.6.3"
+  VERSION = "0.7.0.beta1"
 end

data/script/bootstrap

@@ -0,0 +1,21 @@
+#!/bin/sh
+#/ Usage: bootstrap [bundle options]
+#/
+#/ Bundle install the dependencies.
+#/
+#/ Examples:
+#/
+#/   bootstrap
+#/   bootstrap --local
+#/
+
+set -e
+cd $(dirname "$0")/..
+
+[ "$1" = "--help" -o "$1" = "-h" -o "$1" = "help" ] && {
+    grep '^#/' <"$0"| cut -c4-
+    exit 0
+}
+
+rm -rf .bundle/{binstubs,config}
+bundle install --binstubs .bundle/binstubs --path .bundle --quiet "$@"