mime_fallback 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d85a44df5ffc15a5d5990f90b5453b56154d5bea
-  data.tar.gz: 389e258195c55cf6cf0a0274304f4c4789dd8c40
+  metadata.gz: 6becf0be23c41284570b5062bc354122a8ed3c52
+  data.tar.gz: a8373245f4f0d32a4b5fadbab3b335ec4a0e6008
 SHA512:
-  metadata.gz: 980868568bf78534930d879dfd0bef68c195db86cfec94d6c831bf2c2bed7141ec5832cd51acd5de40195ef8631cf4886d11a65f7abfa1ec96ee033043adff24
-  data.tar.gz: b28d9e033f917a6d9b64176d330fd251f21526a551f9af7b11265e2c7a2127734653677b3e88d740dd7d5eb62044034f7c838094e3b31b01f76e922572b2033a
+  metadata.gz: 67b05bcd555d94bcbb017883223f776fc639393bfbb13f9fffb9695d3af1a297ef1d3e292d5ccea2695629da3b7edbb2a2421be364c648a1bae6febb2f1ba06f
+  data.tar.gz: 2376454189c823d9a2cf2e85aaee0c76e70714cc1a9fdeec0c5581c33a17ccef4a4a9150eecaed9b375d3050c7031c73fbb9f55a8482b8a6de353c63b0e2dea7

data/lib/mime_fallback/mime_negotiation.rb

@@ -0,0 +1,30 @@
+# This overrides the behavior of negotiating mime. Doing this because we
+#   aren't able to hook into ActionDispatch::Request
+# This allows the fallbacks to work when you call respond_to {|format| format.something_with_a_fallback }
+module ActionDispatch
+  module Http
+    module MimeNegotiation
+
+      # Override to support mime type fallbacks
+      def negotiate_mime(order)
+        formats.each do |priority|
+          if priority == Mime::ALL
+            return order.first
+          else
+            # Try to find an exact match to what we're responding to
+            types = Array(priority) + MimeFallback::Type.fallbacks(priority.to_sym)
+            types.each do |fallback|
+              return fallback if order.map(&:to_sym).include?(fallback.to_sym)
+            end
+            
+            if order.include?(priority)
+              return priority
+            end
+          end
+        end
+        
+        order.include?(Mime::ALL) ? formats.first : nil
+      end
+    end
+  end
+end

data/lib/mime_fallback/railtie.rb

@@ -5,7 +5,6 @@ module MimeFallback
 
     initializer "mime_fallback" do |app|
       ActiveSupport.on_load(:action_controller) do
-        ActionDispatch::Http::MimeNegotiation.send(:include, MimeFallback::NegotiationExtensions)
         append_view_path MimeFallback::Resolver.new(File.join(app.root, app.config.mime_fallback.view_path))
       end
     end

data/lib/mime_fallback/resolver.rb

@@ -8,7 +8,7 @@ module MimeFallback
       fallbacks ||= MimeFallback::Type.fallbacks(format).dup
       if fallbacks.present?
         fallback_details = details.dup
-        fallback_details[:formats] = Array(format.to_s) + fallbacks.map(&:to_sym)
+        fallback_details[:formats] = Array(format.to_sym) + fallbacks.map(&:to_sym)
         path = build_path(name, prefix, partial)
         query(path, fallback_details.select {|key| EXTENSIONS.include?(key)}, fallback_details[:formats])
       else

data/lib/mime_fallback/version.rb

@@ -1,3 +1,3 @@
 module MimeFallback
-  VERSION = "0.0.1"
+  VERSION = "0.0.3"
 end

data/lib/mime_fallback.rb

@@ -1,9 +1,9 @@
-require 'rails'
+require "rails"
 
 module MimeFallback
-  autoload :NegotiationExtensions, "mime_fallback/negotiation_extensions"
   autoload :Resolver, "mime_fallback/resolver"
   autoload :Type, "mime_fallback/type"
 end
 
-require 'mime_fallback/railtie'
+require "mime_fallback/railtie"
+require "mime_fallback/mime_negotiation"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mime_fallback
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Jeff Ching
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-20 00:00:00.000000000 Z
+date: 2013-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -45,7 +45,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/mime_fallback/negotiation_extensions.rb
+- lib/mime_fallback/mime_negotiation.rb
 - lib/mime_fallback/railtie.rb
 - lib/mime_fallback/resolver.rb
 - lib/mime_fallback/type.rb

data/lib/mime_fallback/negotiation_extensions.rb

@@ -1,31 +0,0 @@
-module MimeFallback
-  module NegotiationExtensions
-    extend ActiveSupport::Concern
-
-    included do
-      alias_method_chain :negotiate_mime, :mime_fallback
-    end
-
-    # Override to support mime type fallbacks
-    def negotiate_mime_with_fallback(order)
-      formats.each do |priority|
-        if priority == Mime::ALL
-          return order.first
-        else
-          # Try to find an exact match to what we're responding to
-          types = Array(priority) + MimeFallback::Type.fallbacks(priority.to_sym)
-          types.each do |fallback|
-            return fallback if order.map(&:to_sym).include?(fallback.to_sym)
-          end
-          
-          if order.include?(priority)
-            return priority
-          end
-        end
-      end
-      
-      order.include?(Mime::ALL) ? formats.first : nil
-    end
-
-  end
-end