adjustable_mime_type 0.0.0 → 1.0.0

data/VERSION

@@ -1 +1 @@
-0.0.0
+1.0.0

data/adjustable_mime_type.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{adjustable_mime_type}
-  s.version = "0.0.0"
+  s.version = "1.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brad Gessler"]

data/lib/adjustable_mime_type.rb

@@ -1,21 +1,29 @@
 module AdjustableMimeType
+  def self.init!
+    ::Mime::Type.send :include, AdjustableMimeType::RegisterAliasExtension
+    ::ActionController::Base.send :include, AdjustableMimeType::ControllerFilter
+  end
   
   module RegisterAliasExtension
     def self.included(base)
       base.send :extend, ClassMethods
+      base.class_eval do
+        class << self
+          alias_method_chain :register_alias, :adjustable_format
+        end
+      end
     end
     
     module ClassMethods
-      def register_alias_with_adjustable_formats(*args, &block)
-        format = register_alias_without_adjustable_formats *args
-        adjustable_formats[format] = block
-        format
+      def register_alias_with_adjustable_format(string, symbol, extension_synonyms=[], &block)
+        adjustable_formats[symbol] = block
+        register_alias_without_adjustable_format(string, symbol, extension_synonyms)
       end
       
       def adjust_format(request)
-        if format = adjustable_formats.find{|format, block| block.call(request) }
-          symbol, block = format
-          request.format = format
+        if adjustable_format = adjustable_formats.find{|format, block| block.call(request) }
+          symbol, block = adjustable_format
+          request.format = symbol
         end
       end
       
@@ -35,7 +43,7 @@ module AdjustableMimeType
   private
     # Adjusts the incoming format based aliases with defined request blocks
     def adjust_mime_type_format
-      Mime::Type.adjust_format(request)
+      Mime::Type.adjust_format(request) unless params.include?(:format)
     end
   end
   

data/rails/init.rb

@@ -1,4 +1,3 @@
-require File.join(File.dirname(__FILE__), '../lib/adjustable_mime_type')
+require File.join(File.dirname(__FILE__), '/../lib/adjustable_mime_type')
 
-Mime::Type.send :include, AdjustableMimeType::RegisterAliasExtension
-ActionController::Base.send :include, AdjustableMimeType::ControllerFilter
+AdjustableMimeType.init!

data/spec/adjustable_mime_type_spec.rb

@@ -1,7 +1,45 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
+AdjustableMimeType.init!
+
+Mime::Type.register_alias "text/html", :iphone do |req|
+  req.user_agent =~ /Mobile.*Safari/
+end
+
+class PenguinsController < ActionController::Base
+  def index
+    respond_to do |wants|
+      wants.html   { render :text => 'html' }
+      wants.iphone { render :text => 'iphone' }
+    end
+  end
+end
+
 describe "AdjustableMimeType" do
-  it "fails" do
-    fail "hey buddy, you should probably rename this file and start specing for real"
+  before(:each) do
+    @controller = PenguinsController.new
+    @request = ActionController::TestRequest.new
+    @response = ActionController::TestResponse.new
+    
+    ActionController::Routing::Routes.draw do |map|
+      map.resources :penguins
+    end
+  end
+  
+  it "should adjust format" do
+    @request.user_agent = 'Mobile Safari'
+    get :index
+    @response.body.should eql('iphone')
+  end
+  
+  it "should not adjust format" do
+    get :index
+    @response.body.should eql('html')
+  end
+  
+  it "should not ovveride explicit .formats" do
+    @request.user_agent = 'Mobile Safari'
+    get :index, :format => 'html'
+    @response.body.should eql('html')
   end
 end

data/spec/spec_helper.rb

@@ -1,9 +1,19 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'adjustable_mime_type'
+
 require 'spec'
 require 'spec/autorun'
 
+# Force RoR 2.3.x
+require 'rubygems'
+gem 'actionpack', '2.3.5'
+
+require 'action_controller'
+require 'action_controller/test_process'
+
+require 'adjustable_mime_type'
+
+include ActionController::TestProcess
+
 Spec::Runner.configure do |config|
-  
 end

metadata

@@ -3,10 +3,10 @@ name: adjustable_mime_type
 version: !ruby/object:Gem::Version 
   prerelease: false
   segments: 
+  - 1
   - 0
   - 0
-  - 0
-  version: 0.0.0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Brad Gessler