force_format 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2fe49634705c6855feceebc92a404d1387131592
-  data.tar.gz: 4612743defc0c159744ff61c0446a9f9a597a192
+  metadata.gz: 00ac779bcc013cd1f365392fc62a32e2f4f46e44
+  data.tar.gz: fa92721556b7cdf1ab10e2e0939ab5bbb16afd4d
 SHA512:
-  metadata.gz: 9e8dd46441bd10e71348585584b5a06f75b2785755a7d83872b2c804b1c7fffb3132e23fb0025c992c15b3ef2bd2d9aa5a0f19051483da453dfd7adc53609704
-  data.tar.gz: f09a265a3532b543204e86e62100a6bb757b417c8260807a8540bee041722f17ba9f292edb75abb29ed74286e6a454cfead4cbe6239591dc43ee59657f56aea0
+  metadata.gz: 6c61b3540f0d4e658ec60c82327d0de69f7f03238fe5cd3efcb478abd59d13aeacc9812a6aa04e53eba27323c72c6d7c08738a969cd21744a4249c57fddffee8
+  data.tar.gz: 6acfad6780cb668e7ffd489ae62317a1efa9ee6acc350928323dc8ce2719fce90a3b6e91926eb2ef6297bea4fa631b530ef915a02f091754f0fa74e3042e849e

data/lib/force_format/controller_access.rb

@@ -1,59 +1,77 @@
 require_relative "errors"
 
-module ControllerAccess
-  extend ActiveSupport::Concern
-  FORCE_FORMAT_TYPES = [:html, :js, :json, :pdf, :csv, :zip, :xml]
-  FORCE_FORMAT_DEFAULT_TYPES = [:html]
-  FORCE_FORMAT_EXCEPTION = lambda { |o| raise(ActionController::RoutingError, o) }
+module ForceFormat
+  module ControllerAccess
+    extend ActiveSupport::Concern
+    FORCE_FORMAT_TYPES = [:html, :js, :json, :pdf, :csv, :zip, :xml]
+    FORCE_FORMAT_DEFAULT_TYPES = [:html]
+    FORCE_FORMAT_EXCEPTION = lambda { |o| raise(ActionController::RoutingError, o) }
+    FORCE_FORMAT_WILDCARD = "*/*"
 
-  module ClassMethods
-    include ForceFormat::Errors
+    module ClassMethods
+      include ForceFormat::Errors
 
-    def force_format_filter(opts={})
-      send(:before_filter, :force_format_filter_method, opts.slice(:only, :except, :if, :unless, :for, :exception))
-    end
+      def force_format_filter(opts={})
+        parsed = opts.slice(:only, :except, :if, :unless, :for, :exception, :skip_wildcard)
+        send(:before_filter, :force_format_filter_method, parsed)
+      end
+
+      def skip_force_format_filter(opts={})
+        parsed = opts.slice(:only, :except, :if, :unless)
+        send(:skip_before_filter, :force_format_filter_method, parsed)
+      end
 
-    def skip_force_format_filter(opts={})
-      send(:skip_before_filter, :force_format_filter_method, opts.slice(:only, :except, :if, :unless))
     end
 
-  end
+    private
 
-  private
+    def force_format_filter_method
+      force_formats = force_format_extract_formats
+      return unless force_formats
+      unsupported = force_formats - FORCE_FORMAT_TYPES
+      raise UnsupportedFormatsError.new("There is no support for #{unsupported} format") if unsupported.any?
 
-  def force_format_filter_method
-    force_formats = force_format_extract_formats
-    return unless force_formats
-    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))
-      force_format_extract_exception.call("Format '#{format}' not supported for #{request.path.inspect}")
+      if request.format.to_s == FORCE_FORMAT_WILDCARD and not force_format_skip_wildcard_rewrite?
+        request.format = :html
+      end
+
+      format = request.format
+      unless force_formats.include?(format.try(:to_sym))
+        force_format_extract_exception.call("Format '#{format}' not supported for #{request.path.inspect}")
+      end
     end
-  end
 
-  def force_format_load_filter_chain
-    filter = self._process_action_callbacks.find { |f| f.filter == :force_format_filter_method }
-  end
+    def force_format_load_filter_chain
+      filter = self._process_action_callbacks.find { |f| f.filter == :force_format_filter_method }
+    end
 
-  def force_format_extract_formats
-    force_formats = force_format_load_filter_chain.options[:for]
+    def force_format_extract_formats
+      force_formats = force_format_load_filter_chain.options[:for]
 
-    if force_formats.is_a? (Array || Symbol)
-      [*force_formats]
-    elsif force_formats.is_a? Hash
-      if force_formats[self.action_name.to_sym]
-        [*force_formats[self.action_name.to_sym]]
+      if force_formats.is_a? (Array || Symbol)
+        [*force_formats]
+      elsif force_formats.is_a? Hash
+        if force_formats[self.action_name.to_sym]
+          [*force_formats[self.action_name.to_sym]]
+        else
+          force_formats[:default] ? [*force_formats[:default]] : nil
+        end
       else
-        force_formats[:default] ? [*force_formats[:default]] : nil
+        FORCE_FORMAT_DEFAULT_TYPES
       end
-    else
-      FORCE_FORMAT_DEFAULT_TYPES
     end
-  end
 
-  def force_format_extract_exception
-    force_format_load_filter_chain.options[:exception] || FORCE_FORMAT_EXCEPTION
-  end
+    def force_format_extract_wildcard_option
+      force_format_load_filter_chain.options[:skip_wildcard]
+    end
 
+    def force_format_skip_wildcard_rewrite?
+      force_format_extract_wildcard_option
+    end
+
+    def force_format_extract_exception
+      force_format_load_filter_chain.options[:exception] || FORCE_FORMAT_EXCEPTION
+    end
+
+  end
 end

data/lib/force_format/version.rb

@@ -1,3 +1,3 @@
 module ForceFormat
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/force_format/view_patch.rb

@@ -1,11 +1,13 @@
-module ViewPatch
-  class ActionView::LookupContext
-    def formats=(values)
-      if values
-        values.concat(default_formats) if values.delete "*/*"
-        values << :html if values.empty?
+module ForceFormat
+  module ViewPatch
+    class ActionView::LookupContext
+      def formats=(values)
+        if values
+          values.concat(default_formats) if values.delete "*/*"
+          values << :html if values.empty?
+        end
+        super(values)
       end
-      super(values)
     end
   end
-end
+end

data/spec/base_spec.rb

@@ -351,7 +351,7 @@ describe PagesController, :type => :controller do
       end
     end
 
-    it "should respond with RoutingError for html" do
+    it "should respond with UnsupportedFormatsError for html" do
       expect { get "index", :format => :html }.to raise_error(UnsupportedFormatsError)
     end
 
@@ -367,7 +367,7 @@ describe PagesController, :type => :controller do
       end
     end
 
-    it "should respond with RoutingError for html" do
+    it "should respond with UnsupportedFormatsError for html" do
       expect { get "index", :format => :html }.to raise_error(UnsupportedFormatsError)
     end
 
@@ -383,9 +383,47 @@ describe PagesController, :type => :controller do
       end
     end
 
-    it "should respond with RoutingError for html" do
+    it "should respond with RecordNotFound for html" do
       expect { get "index", :format => :html }.to raise_error(ActiveRecord::RecordNotFound)
     end
 
   end
+
+  context "force_format_filter is used with a wildcard format and rewrite set" do
+
+    controller do
+      send "force_format_filter", :for => :html, :skip_wildcard => false
+
+      def index
+        render "with_html"
+      end
+    end
+
+    it "should respond with 200 for html" do
+      request.env["HTTP_ACCEPT"] = '*/*'
+      get "index"
+    end
+
+  end
+
+
+  context "force_format_filter is used with a wildcard format and rewrite set to false" do
+
+    controller do
+      send "force_format_filter", :for => :html, :skip_wildcard => true
+
+      def index
+        render "with_html"
+      end
+    end
+
+    it "should respond with RoutingError for html" do
+      expect do
+        request.env["HTTP_ACCEPT"] = '*/*'
+        get "index"
+      end.to raise_error(ActionController::RoutingError)
+    end
+
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: force_format
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - |
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-26 00:00:00.000000000 Z
+date: 2013-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler