mobileesp strategy accepts symbol for predefined detection procs

lib/mobvious/strategies/mobileesp.rb

@@ -25,8 +25,12 @@ class MobileESP
       # @param detection_procedure
       #   A lambda function that gets one parameter (`MobileESPConverted::UserAgentInfo` instance)
       #   and returns device type symbol or nil.
-      def initialize(detection_procedure = DEVICE_TYPES_MOBILE_DESKTOP)
-        @detection_procedure = detection_procedure
+      def initialize(detection_procedure = :mobile_desktop)
+        if detection_procedure.is_a? Symbol
+          @detection_procedure = eval("DEVICE_TYPES_#{detection_procedure.to_s.upcase}")
+        else
+          @detection_procedure = detection_procedure
+        end
       end
 
       # Gets device type using user-agent sniffing. Can return nil if the used

spec/mobvious/strategies/mobileesp_spec.rb

@@ -3,14 +3,17 @@
 module Mobvious::Strategies
   class MobileESPSpec < MiniTest::Spec
   describe MobileESP do
-    describe "using mobile_desktop strategy" do
+    before do
+      @request = mock 'request'
+      @env = mock 'env'
+
+      @request.stubs(:env).returns(@env)
+      @env.stubs('[]').with('HTTP_ACCEPT').returns('text/html')
+    end
+
+    describe "using default (mobile_desktop) strategy" do
       before do
         @strategy = Mobvious::Strategies::MobileESP.new
-        @request = mock 'request'
-        @env = mock 'env'
-
-        @request.stubs(:env).returns(@env)
-        @env.stubs('[]').with('HTTP_ACCEPT').returns('text/html')
       end
 
       it "categorizes iPhone as :mobile" do
@@ -31,13 +34,7 @@ class MobileESPSpec < MiniTest::Spec
 
     describe "using mobile_tablet_desktop strategy" do
       before do
-        @strategy = Mobvious::Strategies::MobileESP.new(
-          Mobvious::Strategies::MobileESP::DEVICE_TYPES_MOBILE_TABLET_DESKTOP)
-        @request = mock 'request'
-        @env = mock 'env'
-
-        @request.stubs(:env).returns(@env)
-        @env.stubs('[]').with('HTTP_ACCEPT').returns('text/html')
+        @strategy = Mobvious::Strategies::MobileESP.new(:mobile_tablet_desktop)
       end
 
       it "categorizes iPhone as :mobile" do
@@ -55,6 +52,20 @@ class MobileESPSpec < MiniTest::Spec
         @strategy.get_device_type(@request).must_equal :desktop
       end
     end
+
+    describe "custom strategy" do
+      before do
+        procedure = lambda {|mobileesp|
+          return :test
+        }
+        @strategy = Mobvious::Strategies::MobileESP.new(procedure)
+      end
+
+      it "categorizes anything as :test" do
+        @request.stubs(:user_agent).returns("Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.11 (KHTML, like Gecko) Chrome/17.0.963.46 Safari/535.11")
+        @strategy.get_device_type(@request).must_equal :test
+      end
+    end
   end
   end
 end