mobilized_styles.rb in mobile-fu-0.1.0

- old
+ new
@@ -1,73 +1,24 @@
-# Copyright (c) 2008 Brendan G. Lim (brendan@intridea.com)
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
 module MobileFu
   module MobilizedStyles
 
     # This logic was taken from Michael Bleigh's browserized styles
     # with modification to work for mobile browsers.
 
-    def user_agent_device_name
-      @user_agent_device_name ||= begin
-
-        ua = request.user_agent
-        return nil if ua.nil?
-        ua.downcase!
-
-        if ua.index('mobileexplorer') || ua.index('windows ce')
-          'mobileexplorer'
-        elsif ua.index('blackberry')
-          'blackberry'
-        elsif ua.index('iphone') || ua.index('ipod')
-          'iphone'
-        elsif ua.index('ipad')
-          'ipad'
-        elsif ua.index('android')
-          'android'
-        elsif ua.index('nokia')
-          'nokia'
-        elsif ua.index('palm')
-          'palm'
-        end
-      end
+    def device_name
+      @device_name ||= headers['X_MOBILE_DEVICE']
     end
 
     def stylesheet_link_tag_with_mobilization(*sources)
       mobilized_sources = Array.new
       sources.each do |source|
-        subbed_source = source.to_s.gsub ".css",""
-
-        possible_sources = ["#{subbed_source.to_s}_#{user_agent_device_name}"]
-
         mobilized_sources << source
 
-        for possible_source in possible_sources
-          path = File.join config.stylesheets_dir, "#{possible_source}.css"
-          sass_path = File.join config.stylesheets_dir, "sass", "#{possible_source}.sass"
-          mobilized_sources << possible_source if File.exist?(path) || File.exist?(sass_path)
-        end
+        path = File.join config.stylesheets_dir, "#{source.to_s.gsub '.css', ''}_#{device_name}.css"
+        mobilized_sources << possible_source if File.exist?(path)
       end
 
-      stylesheet_link_tag_without_mobilization *mobilized_sources
+      stylesheet_link_tag *mobilized_sources
     end
   end
 end
 
 ActionView::Base.send :include, MobileFu::MobilizedStyles