iceburn 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a79b92788b7e450df00428879d8d7dd0ca3e167b
-  data.tar.gz: 6be5570ba58214811d2f6de1a24054611e741e59
+  metadata.gz: f6e02310aea7adbca0b0ec5601d1a94fca78b87d
+  data.tar.gz: 93f07e64ad647a36e28797a8e0b0e1cd19067329
 SHA512:
-  metadata.gz: 75d359fc1d953c7cb4d02861436ab11cf6cc3bae559434e6cc31c855cefd2aacc120a6e82f71c79538536e5e5dc384666424f7a2de3bd3223ada3c08cd8f4996
-  data.tar.gz: 9597602fbc7fc5bfb8cf3f45cfa126f7b874f03f8d610dfba4a14ac72f318836b3ab8e163b4821c36df8a45084e46decb1f533c0493f465517ea1f7bf3629323
+  metadata.gz: d9dfbb362c9709d87d1177858e33cfaa3ca8ef868f63f7f390454b489a51b570e9acf670c5200f1a0c1d814aa8dbdbe7c6ce347ae5db2b89d267e0daba7e3dcd
+  data.tar.gz: d8b05b361fb852cde4c5e8d81437abaae687ab024caf930c6c3fb68c9ca917f97d7d62c47388964fac88dfe6c783433cf99b35be1977fb04569a4cbc7d2e7a5b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    iceburn (0.0.3)
+    iceburn (0.0.4)
       rails
 
 GEM

data/lib/iceburn/version.rb

@@ -1,3 +1,3 @@
 module Iceburn
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/iceburn/whitelist.rb

@@ -9,11 +9,11 @@ module Iceburn
     extend ActiveSupport::Concern
 
     module ClassMethods
-      cattr_accessor :iceburn_whitelisted_controllers
+      cattr_accessor :iceburn_whitelisted_routes
 
       # Set the whitelist of controllers not affected by Filters.
-      def iceburn_whitelist(*controllers)
-        self.iceburn_whitelisted_controllers = controllers
+      def iceburn_whitelist(*routes)
+        self.iceburn_whitelisted_routes = routes
       end
     end
 
@@ -21,11 +21,22 @@ module Iceburn
     # Test if this controller is in the pre-defined whitelist controller
     # params.
     def whitelisted?
-      iceburn_whitelisted_controllers.include? params[:controller]
+      controller_whitelisted? || action_whitelisted?
     end
 
-    def iceburn_whitelisted_controllers
-      self.class.iceburn_whitelisted_controllers || []
+    private
+    def controller_whitelisted?
+      iceburn_whitelisted_routes.include? params[:controller]
+    end
+
+    def action_whitelisted?
+      iceburn_whitelisted_routes.any? do |route|
+        route =~ /#{params[:controller]}##{params[:action]}/
+      end
+    end
+
+    def iceburn_whitelisted_routes
+      self.class.iceburn_whitelisted_routes || []
     end
   end
 end

data/spec/iceburn/whitelist_spec.rb

@@ -9,23 +9,48 @@ module Iceburn
   describe Whitelist do
     subject { Controller.new }
 
-    context "when a whitelist is defined" do
+    context "when a whitelist is defined with only controllers" do
       before do
         Controller.class_eval { iceburn_whitelist 'sessions', 'users' }
       end
 
       it "defines a whitelist" do
-        expect(Controller.iceburn_whitelisted_controllers).to include('sessions')
-        expect(Controller.iceburn_whitelisted_controllers).to include('users')
+        expect(Controller.iceburn_whitelisted_routes).to include('sessions')
+        expect(Controller.iceburn_whitelisted_routes).to include('users')
       end
 
       it "whitelists controllers in the whitelist" do
         allow(subject).to receive(:params).and_return(:controller => 'sessions')
+        expect(subject.send(:controller_whitelisted?)).to eq(true)
         expect(subject).to be_whitelisted
       end
 
       it "allows other controllers to be filtered html" do
         allow(subject).to receive(:params).and_return(:controller => 'posts')
+        expect(subject.send(:controller_whitelisted?)).to eq(false)
+        expect(subject).to_not be_whitelisted
+      end
+    end
+
+    context "when a whitelist is defined with actions" do
+      before do
+        Controller.class_eval { iceburn_whitelist 'sessions#new' }
+      end
+
+      it "defines a whitelist" do
+        expect(Controller.iceburn_whitelisted_routes).to include('sessions#new')
+      end
+
+      it "whitelists controllers in the whitelist" do
+        allow(subject).to receive(:params).and_return \
+          :controller => 'sessions', :action => 'new'
+        expect(subject).to be_whitelisted
+        expect(subject.send(:action_whitelisted?)).to eq(true)
+      end
+
+      it "allows other controllers to be filtered html" do
+        allow(subject).to receive(:params).and_return(:controller => 'posts')
+        expect(subject.send(:action_whitelisted?)).to eq(false)
         expect(subject).to_not be_whitelisted
       end
     end
@@ -37,6 +62,8 @@ module Iceburn
 
       it "allows all controllers to be filtered html" do
         allow(subject).to receive(:params).and_return(:controller => 'sessions')
+        expect(subject.send(:controller_whitelisted?)).to eq(false)
+        expect(subject.send(:action_whitelisted?)).to eq(false)
         expect(subject).to_not be_whitelisted
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iceburn
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Tom Scott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-21 00:00:00.000000000 Z
+date: 2014-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails