Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/controllers/flip/strategies_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ class StrategiesController < ApplicationController

def update
strategy.switch! feature_key, turn_on?
redirect_to features_url
redirect_to flip.features_url
end

def destroy
strategy.delete! feature_key
redirect_to features_url
redirect_to flip.features_url
end

private
Expand Down
14 changes: 3 additions & 11 deletions config/routes.rb
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
Flip::Engine.routes.draw do

scope module: "flip" do

resources :features, path: "", only: [ :index ] do

resources :strategies,
only: [ :update, :destroy ]

end

resources :features, path: "", only: [ :index ] do
resources :strategies,
only: [ :update, :destroy ]
end

end
2 changes: 2 additions & 0 deletions flip.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,6 @@ Gem::Specification.new do |s|
s.add_development_dependency("rspec", "~> 2.5")
s.add_development_dependency("rspec-its")
s.add_development_dependency("rake")
s.add_development_dependency("rack")
s.add_development_dependency("actionpack", ">= 3.0", "< 5")
end
2 changes: 1 addition & 1 deletion lib/flip/cookie_strategy.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def switch! key, on
end

def delete! key
cookies.delete cookie_name(key)
cookies.delete cookie_name(key), domain: :all
end

def self.cookies= cookies
Expand Down
4 changes: 4 additions & 0 deletions lib/flip/engine.rb
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
module Flip
class Engine < ::Rails::Engine
isolate_namespace Flip

initializer "flip.blarg" do
ActionController::Base.send(:include, Flip::CookieStrategy::Loader)
end

initializer "flip.assets.precompile" do |app|
app.config.assets.precompile += %w(flip.css)
end
end
end
16 changes: 13 additions & 3 deletions spec/cookie_strategy_spec.rb
Original file line number Diff line number Diff line change
@@ -1,18 +1,28 @@
require "spec_helper"
require "action_dispatch"
require "rack"

class ControllerWithoutCookieStrategy; end
class ControllerWithCookieStrategy
def self.before_filter(_); end
def self.after_filter(_); end
def cookies; []; end
def cookies; cookie_jar; end
include Flip::CookieStrategy::Loader
end

def cookie_jar
env = Rack::MockRequest.env_for("/example")
request = ActionDispatch::TestRequest.new(env)
ActionDispatch::Cookies::CookieJar.build(request)
end

describe Flip::CookieStrategy do

let(:cookies) do
{ strategy.cookie_name(:one) => "true",
strategy.cookie_name(:two) => "false" }
cookie_jar.tap do |jar|
jar[strategy.cookie_name(:one)] = "true"
jar[strategy.cookie_name(:two)] = "false"
end
end
let(:strategy) do
Flip::CookieStrategy.new.tap do |s|
Expand Down