quartermaster 1.0.1 → 1.0.2

data/History.txt

@@ -1,3 +1,13 @@
+=== 1.0.2 / 2008-05-08
+
+* 1 major enhancement
+  * Muffed handling of request's that have *no* user agent (request.user_agent is nil). Fixed!
+
+=== 1.0.1 / 2008-05-08
+
+* 1 major enhancement
+  * Muffed handling of unknown browsers. Fixed!
+
 === 1.0.0 / 2008-05-06
 
 * 1 major enhancement

data/lib/quartermaster.rb

@@ -1,5 +1,5 @@
 module Quartermaster
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
   
   module Helper
     # Uses the output of +browser_from_user_agent+ to figure out what stylesheets to look for and then uses +stylesheet_link_tag+ 
@@ -24,7 +24,7 @@ module Quartermaster
     
     # Returns an array containing the base browser name and a version-specific name (except for Konqueror) for the given +user_agent+ which defaults to Rails' +request.user_agent+
     def browser_from_user_agent( user_agent = request.user_agent )
-      @browser_from_user_agent ||= case user_agent.downcase
+      @browser_from_user_agent ||= case user_agent.to_s.downcase
         when /opera[ \/](\d)/     then "opera opera#{$1}" # Have to check for opera before msie
         when /msie (\d)/          then "ie ie#{$1}" # F U ie5.5 - todo: Support minor versions
         when /firefox\/(\d)/      then "firefox firefox#{$1}"
@@ -32,15 +32,17 @@ module Quartermaster
         when /rv:([^)]+)\) gecko/ then "gecko gecko#{$1}"
         when /applewebkit\/(\d)/  then "webkit webkit#{$1}"
         when /konqueror/          then 'konqueror'
-      end.to_s.split(' ')
+        else ''
+      end.split(' ')
     end
     
     # Returns a short version of the OS name for the given +user_agent+ which defaults to Rails' +request.user_agent+
     def os_from_user_agent( user_agent = request.user_agent )
-      @os_from_user_agent ||= case user_agent.downcase
+      @os_from_user_agent ||= case user_agent.to_s.downcase
         when /win/         then 'win'
         when /mac/         then 'mac'
         when /(linux|x11)/ then 'linux'
+        else ''
       end
     end
   end

data/test/test_quartermaster.rb

@@ -165,6 +165,33 @@ describe 'Quartermaster' do
       @qm.stub!(:request).and_return(@request)
     end
     
+    it "should return an empty string for os" do
+      @qm.os_from_user_agent.should == ''
+    end
+    
+    it "should return an empty array for browser" do
+      @qm.browser_from_user_agent.should == []
+    end
+    
+    it "should return an empty string for the CSS classes" do
+      @qm.user_agent_for_css.should == ''
+    end
+  end
+  
+  describe "when request has no user agent" do
+    before(:each) do
+      @request = mock('Request', :user_agent => nil)
+      @qm.stub!(:request).and_return(@request)
+    end
+    
+    it "should return an empty string for os" do
+      @qm.os_from_user_agent.should == ''
+    end
+    
+    it "should return an empty array for browser" do
+      @qm.browser_from_user_agent.should == []
+    end
+    
     it "should return an empty string for the CSS classes" do
       @qm.user_agent_for_css.should == ''
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: quartermaster
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors: 
 - Dave Myron