flipper 0.2.0 → 0.2.1

data/Gemfile

@@ -12,10 +12,6 @@ end
 
 group(:test) do
   gem 'rspec'
-  gem 'timecop'
-  gem 'bson_ext'
-  gem 'mongo'
-  gem 'redis'
   gem 'rack-test'
 end
 

data/lib/flipper/dsl.rb

@@ -34,18 +34,8 @@ module Flipper
       Flipper.group(name)
     end
 
-    def actor(actor_or_number)
-      raise ArgumentError, "actor cannot be nil" if actor_or_number.nil?
-
-      identifier = if actor_or_number.respond_to?(:identifier)
-        actor_or_number.identifier
-      elsif actor_or_number.respond_to?(:id)
-        actor_or_number.id
-      else
-        actor_or_number
-      end
-
-      Flipper::Types::Actor.new(identifier)
+    def actor(thing)
+      Flipper::Types::Actor.new(thing)
     end
 
     def random(number)

data/lib/flipper/gates/actor.rb

@@ -12,9 +12,10 @@ module Flipper
       end
 
       def open?(actor)
-        if actor && actor.respond_to?(:identifier)
-          identifiers.include?(actor.identifier)
-        end
+        return if actor.nil?
+        return unless Types::Actor.wrappable?(actor)
+        actor = Types::Actor.wrap(actor)
+        identifiers.include?(actor.identifier)
       end
 
       def identifiers

data/lib/flipper/types/actor.rb

@@ -1,10 +1,34 @@
 module Flipper
   module Types
     class Actor < Type
+      def self.wrappable?(thing)
+        thing.is_a?(Flipper::Types::Actor) ||
+          thing.respond_to?(:identifier) ||
+          thing.respond_to?(:id) ||
+          thing.respond_to?(:to_i)
+      end
+
+      def self.wrap(thing)
+        if thing.is_a?(Flipper::Types::Actor)
+          thing
+        else
+          new(thing)
+        end
+      end
+
       attr_reader :identifier
 
-      def initialize(identifier)
-        @identifier = identifier.to_i
+      def initialize(thing)
+        raise ArgumentError, "thing cannot be nil" if thing.nil?
+
+        @thing = thing
+        @identifier = if thing.respond_to?(:identifier)
+          thing.identifier
+        elsif thing.respond_to?(:id)
+          thing.id
+        else
+          thing
+        end.to_i
       end
 
       def enabled_value
@@ -12,6 +36,14 @@ module Flipper
       end
 
       alias_method :disabled_value, :enabled_value
+
+      def respond_to?(*args)
+        super || @thing.respond_to?(*args)
+      end
+
+      def method_missing(name, *args, &block)
+        @thing.send name, *args, &block
+      end
     end
   end
 end

data/lib/flipper/version.rb

@@ -1,3 +1,3 @@
 module Flipper
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/flipper/feature_spec.rb

@@ -15,8 +15,8 @@ describe Flipper::Feature do
   let(:admin_group) { Flipper.group(:admins) }
   let(:dev_group)   { Flipper.group(:devs) }
 
-  let(:admin_thing) { double 'Non Flipper Thing', :admin? => true, :dev? => false }
-  let(:dev_thing)   { double 'Non Flipper Thing', :admin? => false, :dev? => true }
+  let(:admin_thing) { double 'Non Flipper Thing', :identifier => 1,  :admin? => true, :dev? => false }
+  let(:dev_thing)   { double 'Non Flipper Thing', :identifier => 10, :admin? => false, :dev? => true }
 
   let(:pitt)        { Flipper::Types::Actor.new(1) }
   let(:clooney)     { Flipper::Types::Actor.new(10) }
@@ -62,6 +62,14 @@ describe Flipper::Feature do
         subject.enabled?(dev_thing).should be_false
       end
 
+      it "enables feature for flipper actor in group" do
+        subject.enabled?(Flipper::Types::Actor.new(admin_thing)).should be_true
+      end
+
+      it "does not enable for flipper actor not in group" do
+        subject.enabled?(Flipper::Types::Actor.new(dev_thing)).should be_false
+      end
+
       it "does not enable feature for all" do
         subject.enabled?.should be_false
       end
@@ -153,6 +161,14 @@ describe Flipper::Feature do
       it "does not disable feature for non flipper thing in other groups" do
         subject.enabled?(dev_thing).should be_true
       end
+
+      it "disables feature for flipper actor in group" do
+        subject.enabled?(Flipper::Types::Actor.new(admin_thing)).should be_false
+      end
+
+      it "does not disable feature for flipper actor in other groups" do
+        subject.enabled?(Flipper::Types::Actor.new(dev_thing)).should be_true
+      end
     end
 
     context "with an actor" do
@@ -230,6 +246,22 @@ describe Flipper::Feature do
       end
     end
 
+    context "for actor in enabled group" do
+      before do
+        adapter.set_add("#{subject.name}#{Flipper::Gate::Separator}#{group_key}", admin_group.name)
+      end
+
+      it "returns true" do
+        subject.enabled?(Flipper::Types::Actor.new(admin_thing)).should be_true
+      end
+    end
+
+    context "for actor in disbled group" do
+      it "returns false" do
+        subject.enabled?(Flipper::Types::Actor.new(dev_thing)).should be_false
+      end
+    end
+
     context "for enabled actor" do
       before do
         adapter.set_add("#{subject.name}#{Flipper::Gate::Separator}#{actor_key}", pitt.identifier)

data/spec/flipper/types/actor_spec.rb

@@ -3,21 +3,119 @@ require 'flipper/types/actor'
 
 describe Flipper::Types::Actor do
   subject {
-    Flipper::Types::Actor.new(2)
+    described_class.new(2)
   }
 
+  let(:thing_class) {
+    Class.new {
+      attr_reader :identifier
+
+      def initialize(identifier)
+        @identifier = identifier
+      end
+
+      def admin?
+        true
+      end
+    }
+  }
+
+  describe ".wrappable?" do
+    it "returns true if actor" do
+      thing = described_class.new(1)
+      described_class.wrappable?(thing).should be_true
+    end
+
+    it "returns true if responds to identifier" do
+      thing = Struct.new(:identifier).new(10)
+      described_class.wrappable?(thing).should be_true
+    end
+
+    it "returns true if responds to id" do
+      thing = Struct.new(:id).new(10)
+      described_class.wrappable?(thing).should be_true
+    end
+
+    it "returns true if responds to to_i" do
+      described_class.wrappable?(1).should be_true
+    end
+
+    it "returns false if not actor and does not respond to identifier, id, nor to_i" do
+      described_class.wrappable?(:nope).should be_false
+    end
+  end
+
+  describe ".wrap" do
+    context "for actor" do
+      it "returns actor" do
+        actor = described_class.wrap(subject)
+        actor.should be_instance_of(described_class)
+        actor.should be(subject)
+      end
+    end
+
+    context "for other thing" do
+      it "returns actor" do
+        actor = described_class.wrap(1)
+        actor.should be_instance_of(described_class)
+      end
+    end
+  end
+
   it "initializes with identifier" do
-    actor = Flipper::Types::Actor.new(2)
-    actor.should be_instance_of(Flipper::Types::Actor)
+    actor = described_class.new(2)
+    actor.should be_instance_of(described_class)
+  end
+
+  it "initializes with object that responds to identifier" do
+    thing = Struct.new(:identifier).new(1)
+    actor = described_class.new(thing)
+    actor.identifier.should be(1)
+  end
+
+  it "initializes with object that responds to id" do
+    thing = Struct.new(:id).new(13)
+    actor = described_class.new(thing)
+    actor.identifier.should be(13)
+  end
+
+  it "raises error when initialized with nil" do
+    expect {
+      described_class.new(nil)
+    }.to raise_error(ArgumentError)
   end
 
   it "converts identifier to integer" do
-    actor = Flipper::Types::Actor.new('2')
+    actor = described_class.new('2')
     actor.identifier.should eq(2)
   end
 
   it "has identifier" do
-    actor = Flipper::Types::Actor.new(2)
+    actor = described_class.new(2)
     actor.identifier.should eq(2)
   end
+
+  it "proxies everything to thing" do
+    thing = thing_class.new(10)
+    actor = described_class.new(thing)
+    actor.admin?.should be_true
+  end
+
+  describe "#respond_to?" do
+    it "returns true if responds to method" do
+      actor = described_class.new(10)
+      actor.respond_to?(:enabled_value).should be_true
+    end
+
+    it "returns true if thing responds to method" do
+      thing = thing_class.new(10)
+      actor = described_class.new(thing)
+      actor.respond_to?(:admin?).should be_true
+    end
+
+    it "returns false if does not respond to method and thing does not respond to method" do
+      actor = described_class.new(10)
+      actor.respond_to?(:frankenstein).should be_false
+    end
+  end
 end

data/spec/helper.rb

@@ -25,7 +25,6 @@ RSpec.configure do |config|
 
   config.before(:each) do
     Flipper.groups = nil
-    Timecop.return
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flipper
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-07 00:00:00.000000000 Z
+date: 2012-08-08 00:00:00.000000000 Z
 dependencies: []
 description: Feature flipper for any adapter
 email:
@@ -89,7 +89,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4384200680021858400
+      hash: 1261844147465808882
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -98,7 +98,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4384200680021858400
+      hash: 1261844147465808882
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10