midas-guilded 0.2.6 → 0.2.7

data/History.txt

@@ -1,3 +1,13 @@
+= 0.2.7 2009-06-10
+
+* Changed the BrowserDetector to need to be instantiated to use.  No longer just static methods.
+
+
+= 0.2.6 2009-06-10
+
+* Added some more view helpers for the browser detector.
+
+
 = 0.2.5 2009-06-10
 
 * Added BrowserDetector to assist with determining which browser is making a request.

data/guilded.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{guilded}
-  s.version = "0.2.6"
+  s.version = "0.2.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["C. Jason Harrelson (midas)"]

data/lib/guilded.rb

@@ -73,7 +73,7 @@ require 'guilded/rails/inactive_record/human_attribute_hint'
 #   <%= g_load_alerter :skin => 'blueish', :id => 'load_alerter' %>
 #
 module Guilded
-  VERSION = '0.2.6'
+  VERSION = '0.2.7'
 end
 
 ActionView::Base.send( :include, Guilded::Rails::ViewHelpers ) if defined?( ActionView )

data/lib/guilded/browser_detector.rb

@@ -5,6 +5,10 @@ module Guilded
   #
   class BrowserDetector
     
+    def initialize( request )
+      @request = request
+    end
+    
     # Returns true if the browser matches the options ent in, otherwise returns false.
     #
     # === Request
@@ -14,15 +18,14 @@ module Guilded
     # * +:name+ - The name of the browser.  For example 'ie'.
     # * +:version+ - The version of the browser.  For example '7'.
     #
-    def self.browser_is?( request, options={} )
-      #name = name.to_s.strip
+    def browser_is?( options={} )
       name = options[:name].to_s.strip
       version = options[:version].to_s.strip
 
-      return true if browser_name( request ) == name
-      return true if name == 'mozilla' && browser_name( request ) == 'gecko'
-      return true if name == 'ie' && browser_name( request ).index( 'ie' )
-      return true if name == 'webkit' && browser_name( request ) == 'safari'
+      return true if browser_name == name
+      return true if name == 'mozilla' && browser_name == 'gecko'
+      #return true if name == 'ie' && browser_name.index( 'ie' )
+      return true if name == 'webkit' && browser_name == 'safari'
     end
 
     # Returns the name of the browser that is making this request.  For example 'ie'.
@@ -30,9 +33,9 @@ module Guilded
     # === Request
     # * +request+ - The request object.
     #
-    def self.browser_name( request )
+    def browser_name
       @browser_name ||= begin
-        ua = request.env['HTTP_USER_AGENT']
+        ua = @request.env['HTTP_USER_AGENT']
         if ua.nil?
           'unknown'
         else
@@ -40,9 +43,9 @@ module Guilded
 
           if ua.index( 'msie' ) && !ua.index( 'opera' ) && !ua.index( 'webtv' )
             if ua.index( 'windows ce' )
-              'ie' + ua[ua.index( 'msie' ) + 5].chr + '_ce'
+              'ie' + '_ce' #+ ua[ua.index( 'msie' ) + 5].chr 
             else
-              'ie' + ua[ua.index( 'msie' ) + 5].chr
+              'ie' # + ua[ua.index( 'msie' ) + 5].chr
             end
           elsif ua.index( 'netscape' )
             'netscape'
@@ -70,8 +73,8 @@ module Guilded
     # === Request
     # * +request+ - The request object.
     #
-    def self.browser_full_name( request )
-      browser_name( request ) + browser_version( request )
+    def browser_full_name
+      browser_name + browser_version
     end
 
     # Returns the version of the browser that is making this request.  For example '7'.
@@ -79,26 +82,27 @@ module Guilded
     # === Request
     # * +request+ - The request object.
     #
-    def self.browser_version( request )
+    def browser_version
       @browser_version ||= begin
-        ua = request.env['HTTP_USER_AGENT'].downcase
+        ua = @request.env['HTTP_USER_AGENT'].downcase
 
-        if browser_name( request ) == 'opera'
+        if browser_name == 'opera'
           ua[ua.index( 'opera' ) + 6].chr
-        elsif browser_name( request ) == 'firefox'
-          ua[ua.index( 'firefox' ) + 8 ].chr
-        elsif browser_name( request ) == 'netscape'
+        elsif browser_name == 'firefox'
+          ua[ua.index( 'firefox' ) + 8].chr
+        elsif browser_name == 'netscape'
           ua[ua.index( 'netscape' ) + 9].chr
-        elsif browser_name( request ).index( 'ie' )
+        elsif browser_name.index( 'ie' )
           ua[ua.index( 'msie' ) + 5].chr
+        elsif browser_name.index( 'safari' )
+          ua[ua.index( 'version' ) + 8].chr
         else
           'unknown'
         end
-
       end
     end
     
-    def self.can_use_png?
+    def can_use_png?
       if browser_name.index( 'ie' ) == 0
   		  if browser_version.to_i < 7 
   				false
@@ -113,12 +117,12 @@ module Guilded
   	end
 
     def self.all_browsers
-      %W( ie7, ie6, opera, firefox, netscape, konqueror, safari )
+      %W( ie8, ie7, ie6, opera, firefox, netscape, konqueror, safari )
     end
 
     def self.all_mobile_browsers
-      %w( ie4_ce )
+      %w( ie_ce4 )
     end
-
+    
   end
 end

data/lib/guilded/rails/view_helpers.rb

@@ -83,32 +83,48 @@ module Guilded
         end      
       end
       
-      # Returns the name of the browser that is making this request.  For example 'ie'.
+      # Returns the name of the browser that is making this request.  For example 'ie'.  When using 
+      # the browser detector in the contoller you may put a :g_browser_detector variabe in the session if 
+      # you wish to keep the BrowserDetector from being instantiated more than once per request.
       #
       def g_browser_name
-        Guilded::BrowserDetector.browser_name( request )
+        @g_browser_detector = session[:g_browser_detector] if respond_to?( :session )
+        @g_browser_detector ||= Guilded::BrowserDetector.new( request )
+        @g_browser_detector.browser_name
       end
       
-      # Returns the version of the browser that is making this request.  For example '7'.
+      # Returns the version of the browser that is making this request.  For example '7'.  When using 
+      # the browser detector in the contoller you may put a :g_browser_detector variabe in the session if 
+      # you wish to keep the BrowserDetector from being instantiated more than once per request.
       #
       def g_browser_version
-        Guilded::BrowserDetector.browser_version( request )
+        @g_browser_detector = session[:g_browser_detector] if respond_to?( :session )
+        @g_browser_detector ||= Guilded::BrowserDetector.new( request )
+        @g_browser_detector.browser_version
       end
       
-      # Returns the browser name concatenated with the browser version.  for example, 'ie7'.
+      # Returns the browser name concatenated with the browser version.  for example, 'ie7'.  When using 
+      # the browser detector in the contoller you may put a :g_browser_detector variabe in the session if 
+      # you wish to keep the BrowserDetector from being instantiated more than once per request.
       #
       def g_browser_full_name
-        Guilded::BrowserDetector.browser_full_name( request )
+        @g_browser_detector = session[:g_browser_detector] if respond_to?( :session )
+        @g_browser_detector ||= Guilded::BrowserDetector.new( request )
+        @g_browser_detector.browser_full_name
       end
       
-      # Returns true if the browser matches the options ent in, otherwise returns false.
+      # Returns true if the browser matches the options ent in, otherwise returns false.  When using 
+      # the browser detector in the contoller you may put a :g_browser_detector variabe in the session if 
+      # you wish to keep the BrowserDetector from being instantiated more than once per request.
       #
       # === Options
       # * +:name+ - The name of the browser.  For example 'ie'.
       # * +:version+ - The version of the browser.  For example '7'.
       #
       def g_browser_is?( options={} )
-        Guilded::BrowserDetector.browser_is?( request, options )
+        @g_browser_detector = session[:g_browser_detector] if respond_to?( :session )
+        @g_browser_detector ||= Guilded::BrowserDetector.new( request )
+        @g_browser_detector.browser_is?( options )
       end
       
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: midas-guilded
 version: !ruby/object:Gem::Version 
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors: 
 - C. Jason Harrelson (midas)