force_format 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1866205dca78a0b08e5ac3f71874418eff03487
-  data.tar.gz: d7e6868ffd9742d3e3719e4fd6d20b762eee4dd3
+  metadata.gz: a968ff510d11c69b4429c7f611873c9329e0d3dd
+  data.tar.gz: e41c0108cdb7b26af2622c7aa1cac7ad144c84c5
 SHA512:
-  metadata.gz: 7d977a2e03662310507ca4cae5b9313e76cdb6647b066f37e2f1356cfb4a9e9d606b93517cb99b9055f1855f82659b022f13a3b8727440e366a405f80a547e00
-  data.tar.gz: 1c5156e06744368cd0a386eca1bc370023ffed67cd7ba8db0218fea225f4c9d9323b0c27214a07b75681e0b060078c6ea49145b3be0378c32a0f0a328e08bf7b
+  metadata.gz: 885860ffa29446ae06b1ca60119f645777d62b669649129e127e9f8bf761ade6def5c6453670778805c618133d4608c5bfa08258dc4565f6825c3e729afafe5a
+  data.tar.gz: 1e1f4969071e189f20fa6c325ff96aa900c455cab5dc0c3b53c35a27c3b627ffdf0918c15c4f086bce90506499e2d76ea6fbc5b4b2f12b31460f2b010de8367d

data/force_format.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec-rails', '~> 2.0'
   spec.add_development_dependency 'shoulda-matchers', '~> 2.4'
   spec.add_development_dependency "sqlite3"
+  spec.add_development_dependency "pry"
 
   spec.add_dependency "rails", "~> 3.2"
 end

data/lib/force_format/controller_access.rb

@@ -2,44 +2,38 @@ require_relative "errors"
 
 module ControllerAccess
   extend ActiveSupport::Concern
+  FORCE_FORMAT_TYPES = [:html, :js, :json, :pdf, :csv, :zip, :xml]
+  FORCE_FORMAT_DEFAULT_TYPES = [:html]
 
   module ClassMethods
     include ForceFormat::Errors
-    FORCE_FORMAT_TYPES = [:html, :js, :json, :pdf, :csv, :zip, :xml]
-    FORCE_FORMAT_DEFAULT_TYPES = [:html]
 
     def force_format_filter(opts={})
-      forced_formats = extract_options(opts)
-
-      unsupported = forced_formats - FORCE_FORMAT_TYPES
-      raise UnsupportedFormatsError.new("There is no support for #{unsupported} format") if unsupported.any?
-
-      self.send(:before_filter, opts.slice(:only, :except, :if, :unless)) do |controller|
-        return if controller.instance_variable_get("@_skip_force_format_filter") == true
-        format = controller.request.format
-        unless forced_formats.include?(format.try(:to_sym))
-          raise ActionController::RoutingError, "Format '#{format}' not supported for #{request.path.inspect}"
-        end
-      end
+      send(:before_filter, :force_format_filter_method, opts.slice(:only, :except, :if, :unless, :for))
     end
 
     def skip_force_format_filter(opts={})
-      self.send(:prepend_before_filter, opts.slice(:only, :except, :if, :unless)) do |controller|
-        controller.instance_variable_set("@_skip_force_format_filter", true)
-      end
+      send(:skip_before_filter, :force_format_filter_method, opts.slice(:only, :except, :if, :unless))
     end
 
-    private
+  end
+
+  private
 
-    def extract_options(opts)
-      if opts[:for].is_a?(Array)
-        opts[:for]
-      elsif opts[:for].is_a?(Symbol)
-        [opts[:for]]
-      else
-        FORCE_FORMAT_DEFAULT_TYPES
-      end
+  def force_format_filter_method
+    force_formats = force_format_extract_options_from_filter_chain
+    unsupported = force_formats - FORCE_FORMAT_TYPES
+    raise UnsupportedFormatsError.new("There is no support for #{unsupported} format") if unsupported.any?
+    format = request.format
+    unless force_formats.include?(format.try(:to_sym))
+      raise ActionController::RoutingError, "Format '#{format}' not supported for #{request.path.inspect}"
     end
+  end
 
+  def force_format_extract_options_from_filter_chain
+    filter = self._process_action_callbacks.find { |f| f.filter == :force_format_filter_method }
+    force_formats = filter.options[:for]
+    force_formats.is_a?(Array) ? force_formats : (force_formats.is_a?(Symbol) ? [force_formats] : FORCE_FORMAT_DEFAULT_TYPES)
   end
+
 end

data/lib/force_format/version.rb

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

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require 'rspec/rails'
 require 'rspec/autorun'
 require 'force_format'
+require 'pry'
 
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: force_format
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - |
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-25 00:00:00.000000000 Z
+date: 2013-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,6 +81,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement