mobile-fu 0.1.2 → 0.2.0

data/lib/mobile-fu.rb

@@ -3,7 +3,6 @@ require 'rack/mobile-detect'
 
 module MobileFu
   autoload :Helper, 'mobile-fu/helper'
-  autoload :MobilizedStyles, 'mobile-fu/mobilized_styles'
 
   class Railtie < Rails::Railtie
     initializer "mobile-fu.configure" do |app|
@@ -35,7 +34,6 @@ module ActionController
       #      has_mobile_fu false
       #    end
       #
-
       def has_mobile_fu(set_request_format = true)
         include ActionController::MobileFu::InstanceMethods
 
@@ -102,3 +100,5 @@ module ActionController
 end
 
 ActionController::Base.send :include, ActionController::MobileFu
+ActionView::Base.send :include, MobileFu::Helper
+ActionView::Base.send :alias_method_chain, :stylesheet_link_tag, :mobilization

data/lib/mobile-fu/helper.rb

@@ -3,7 +3,22 @@ module MobileFu
     def js_enabled_mobile_device?
       is_device?('iphone') || is_device?('ipod') || is_device?('ipad') || is_device?('mobileexplorer') || is_device?('android')
     end
+
+    def stylesheet_link_tag_with_mobilization(*sources)
+      mobilized_sources = Array.new
+      sources.each do |source|
+        mobilized_sources << source
+
+        device_names = is_mobile_device? ? ['mobile', mobile_device.downcase] : []
+
+        device_names.compact.each do |device_name|
+          possible_source = "#{source.to_s.gsub '.css', ''}_#{device_name}.css"
+          path = File.join config.stylesheets_dir, possible_source
+          mobilized_sources << possible_source if File.exist?(path)
+        end
+      end
+
+      stylesheet_link_tag_without_mobilization *mobilized_sources
+    end
   end
 end
-
-ActionView::Base.send :include, MobileFu::Helper

data/lib/mobile-fu/version.rb

@@ -1,3 +1,3 @@
 module MobileFu
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
   - 2
-  version: 0.1.2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Brendan Lim
@@ -88,7 +88,6 @@ files:
 - Rakefile
 - lib/mobile-fu.rb
 - lib/mobile-fu/helper.rb
-- lib/mobile-fu/mobilized_styles.rb
 - lib/mobile-fu/version.rb
 - mobile-fu.gemspec
 - spec/mobilized_styles_spec.rb

data/lib/mobile-fu/mobilized_styles.rb

@@ -1,26 +0,0 @@
-module MobileFu
-  module MobilizedStyles
-
-    # This logic was taken from Michael Bleigh's browserized styles
-    # with modification to work for mobile browsers.
-
-    def device_name
-      @device_name ||= request.headers['X_MOBILE_DEVICE']
-    end
-
-    def stylesheet_link_tag_with_mobilization(*sources)
-      mobilized_sources = Array.new
-      sources.each do |source|
-        mobilized_sources << source
-
-        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 *mobilized_sources
-    end
-  end
-end
-
-ActionView::Base.send :include, MobileFu::MobilizedStyles
-ActionView::Base.send :alias_method_chain, :stylesheet_link_tag, :mobilization