iceburn 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba5196ab435fc62388caaf8ad53b582732163a3f
-  data.tar.gz: 545368d9b0c7deee1d1d94598f539297d36ffec6
+  metadata.gz: a79b92788b7e450df00428879d8d7dd0ca3e167b
+  data.tar.gz: 6be5570ba58214811d2f6de1a24054611e741e59
 SHA512:
-  metadata.gz: 3a6cbf3c347b7f7fe3b09c317ea073fbcf22cc8a17111eb6124216a6105300574b56961689de858cef81dcd7ca1f3623870d7d41eb7a3547a0fb2d88a23dac70
-  data.tar.gz: 46b4fdfbde101a71413ca4ec71f8a0a350ea092c420f0290f970d5a49062c60ac6a3fea6437a1678fd92922e224105a1c463d0152c8ef175a3659dd983f47c14
+  metadata.gz: 75d359fc1d953c7cb4d02861436ab11cf6cc3bae559434e6cc31c855cefd2aacc120a6e82f71c79538536e5e5dc384666424f7a2de3bd3223ada3c08cd8f4996
+  data.tar.gz: 9597602fbc7fc5bfb8cf3f45cfa126f7b874f03f8d610dfba4a14ac72f318836b3ab8e163b4821c36df8a45084e46decb1f533c0493f465517ea1f7bf3629323

data/Gemfile.lock

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

data/lib/iceburn/filters.rb

@@ -1,12 +1,9 @@
-require 'iceburn/whitelist'
-
 # The before_filter used to handle HTML requests that aren't caught by
-# the main application routes.
+# the main application routes. Can also be used in conjunction with
+# Iceburn::Whitelist.
 
 module Iceburn
   module Filters
-    include Whitelist
-
     # Return blank on all requests to the root path.
     def index
       handle_html_requests
@@ -14,15 +11,20 @@ module Iceburn
 
     protected
     def handle_html_requests
-      return if json_request? || whitelisted?
-      return if request.xhr?
-      render text: '', layout: 'application' and return # block the rest of the chain
+      render text: '', layout: 'application' and return unless skip?
     end
 
     private
+    def skip?
+      json_request? || xhr_request? || whitelisted?
+    end
 
     def json_request?
       "#{params[:format]}" == 'json'
     end
+
+    def xhr_request?
+      request.xhr?
+    end
   end
 end

data/lib/iceburn/railtie.rb

@@ -1,8 +1,13 @@
+require 'iceburn/filters'
+require 'iceburn/routes'
+require 'iceburn/whitelist'
+
 module Iceburn
   # Hook into Rails.
   class Railtie < Rails::Railtie
     initializer 'iceburn.add_filters' do
       ActionController::Base.class_eval do
+        include Iceburn::Whitelist
         include Iceburn::Filters
       end
     end

data/lib/iceburn/version.rb

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

data/lib/iceburn/whitelist.rb

@@ -24,7 +24,6 @@ module Iceburn
       iceburn_whitelisted_controllers.include? params[:controller]
     end
 
-    private
     def iceburn_whitelisted_controllers
       self.class.iceburn_whitelisted_controllers || []
     end

metadata

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