flip 0.0.2 → 0.0.3

data/lib/flip/cookie_strategy.rb

@@ -27,7 +27,7 @@ module Flip
     end
 
     def self.cookies= cookies
-      @@cookies = cookies
+      @cookies = cookies
     end
 
     def cookie_name(definition)
@@ -38,16 +38,22 @@ module Flip
     private
 
     def cookies
-      @@cookies || raise("Cookies not loaded")
+      self.class.instance_variable_get(:@cookies) || {}
     end
 
     # Include in ApplicationController to push cookies into CookieStrategy.
+    # Users before_filter and after_filter rather than around_filter to
+    # avoid pointlessly adding to stack depth.
     module Loader
       extend ActiveSupport::Concern
-      included { around_filter :cookie_feature_strategy }
-      def cookie_feature_strategy
+      included do
+        before_filter :flip_cookie_strategy_before
+        after_filter :flip_cookie_strategy_after
+      end
+      def flip_cookie_strategy_before
         CookieStrategy.cookies = cookies
-        yield
+      end
+      def flip_cookie_strategy_after
         CookieStrategy.cookies = nil
       end
     end

data/lib/flip/version.rb

@@ -1,3 +1,3 @@
 module Flip
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/cookie_strategy_spec.rb

@@ -2,7 +2,8 @@ require "spec_helper"
 
 class ControllerWithoutCookieStrategy; end
 class ControllerWithCookieStrategy
-  def self.around_filter(_); end
+  def self.before_filter(_); end
+  def self.after_filter(_); end
   def cookies; []; end
   include Flip::CookieStrategy::Loader
 end
@@ -73,33 +74,39 @@ end
 
 describe Flip::CookieStrategy::Loader do
 
-  it "adds around_filter when included in controller" do
+  it "adds filters when included in controller" do
     ControllerWithoutCookieStrategy.tap do |klass|
-      klass.should_receive(:around_filter).with(:cookie_feature_strategy)
+      klass.should_receive(:before_filter).with(:flip_cookie_strategy_before)
+      klass.should_receive(:after_filter).with(:flip_cookie_strategy_after)
       klass.send :include, Flip::CookieStrategy::Loader
     end
   end
 
-  describe "#cookie_feature_strategy as around_filter" do
-
+  describe "filter methods" do
     let(:strategy) { Flip::CookieStrategy.new }
     let(:controller) { ControllerWithCookieStrategy.new }
-
-    it "yields to block" do
-      run = false
-      ControllerWithCookieStrategy.new.cookie_feature_strategy { run = true }
-      run.should be_true
+    describe "#flip_cookie_strategy_before" do
+      it "passes controller cookies to CookieStrategy" do
+        controller.should_receive(:cookies).and_return(strategy.cookie_name(:test) => "true")
+        expect {
+          controller.flip_cookie_strategy_before
+        }.to change {
+          [ strategy.knows?(:test), strategy.on?(:test) ]
+        }.from([false, false]).to([true, true])
+      end
     end
-
-    it "passes controller cookies to Flip::CookieStrategy" do
-      controller.should_receive(:cookies).and_return(strategy.cookie_name(:test) => "true")
-      results = []
-      controller.cookie_feature_strategy {
-        results << strategy.on?(:test)
-        results << strategy.on?(:different)
-      }
-      results.should == [ true, false ]
+    describe "#flip_cookie_strategy_after" do
+      before do
+        Flip::CookieStrategy.cookies = { strategy.cookie_name(:test) => "true" }
+      end
+      it "passes controller cookies to CookieStrategy" do
+        expect {
+          controller.flip_cookie_strategy_after
+        }.to change {
+          [ strategy.knows?(:test), strategy.on?(:test) ]
+        }.from([true, true]).to([false, false])
+      end
     end
-
   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flip
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70134752968140 !ruby/object:Gem::Requirement
+  requirement: &70214336000200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70134752968140
+  version_requirements: *70214336000200
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70134752967220 !ruby/object:Gem::Requirement
+  requirement: &70214335999180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70134752967220
+  version_requirements: *70214335999180
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70134752966320 !ruby/object:Gem::Requirement
+  requirement: &70214335997480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *70134752966320
+  version_requirements: *70214335997480
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70134752965900 !ruby/object:Gem::Requirement
+  requirement: &70214335996600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70134752965900
+  version_requirements: *70214335996600
 description: Declarative API for specifying features, switchable in declaration, database
   and cookies.
 email: