mobileesp_converted 0.2.0 → 0.2.1

data/Rakefile

@@ -7,7 +7,7 @@ task :default => [:test]
 desc "Download Java MobileESP source code to ./tmp directory."
 task :download_source do
   `mkdir -p java_source`
-  `cd java_source; wget http://mobileesp.googlecode.com/svn/Java/UAgentInfo.java`
+  `cd java_source; rm UAgentInfo.java; wget http://mobileesp.googlecode.com/svn/Java/UAgentInfo.java`
 end
 
 Rake::TestTask.new do |t|

data/java_source/UAgentInfo.java

@@ -1,6 +1,21 @@
 /* *******************************************
 // Copyright 2010-2012, Anthony Hand
 //
+// File version date: April 23, 2012
+//		Update:
+//		- Updated DetectAmazonSilk(): Fixed an issue in the detection logic.  
+//
+// File version date: April 22, 2012 - Second update
+//		Update: To address additional Kindle issues...
+//		- Updated DetectRichCSS(): Excluded e-Ink Kindle devices. 
+//		- Created DetectAmazonSilk(): Created to detect Kindle Fire devices in Silk mode. 
+//		- Updated DetectMobileQuick(): Updated to include e-Ink Kindle devices and the Kindle Fire in Silk mode.  
+//
+// File version date: April 11, 2012
+//		Update: 
+//		- Added a new variable for the new BlackBerry Curve Touch (9380): deviceBBCurveTouch. 
+//		- Updated DetectBlackBerryTouch() to support the new BlackBerry Curve Touch (9380).
+//
 // File version date: January 21, 2012
 //		Update: 
 //		- Moved Windows Phone 7 to the iPhone Tier. WP7.5's IE 9-based browser is good enough now.  
@@ -16,13 +31,6 @@
 //		Update: 
 //		- Updated DetectAndroidTablet() to exclude Opera Mini, which was falsely reporting as running on a tablet device when on a phone.
 //
-// File version date: August 7, 2011
-//		Update: 
-//		- The Opera for Android browser doesn't follow Google's recommended useragent string guidelines, so some fixes were needed.
-//		- Updated DetectAndroidPhone() and DetectAndroidTablet() to properly detect devices running Opera Mobile.
-//		- Created 2 new methods: DetectOperaAndroidPhone() and DetectOperaAndroidTablet(). 
-//		- Updated DetectTierIphone(). Removed the call to DetectMaemoTablet(), an obsolete mobile OS.
-//
 //
 // LICENSE INFORMATION
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -106,6 +114,7 @@ public class UAgentInfo {
     public static final String deviceBBBoldTouch = "blackberry 99";  //Bold 99x0 (touchscreen)
     public static final String deviceBBTour = "blackberry96";  //Tour
     public static final String deviceBBCurve = "blackberry89";  //Curve 2
+    public static final String deviceBBCurveTouch = "blackberry 938";  //Curve Touch 9380
     public static final String deviceBBTorch = "blackberry 98";  //Torch
     public static final String deviceBBPlaybook = "playbook"; //PlayBook tablet
     
@@ -116,7 +125,8 @@ public class UAgentInfo {
     public static final String engineBlazer = "blazer"; //Old Palm
     public static final String engineXiino = "xiino"; //Another old Palm
     
-    public static final String deviceKindle = "kindle";  //Amazon Kindle, eInk one.
+    public static final String deviceKindle = "kindle";  //Amazon Kindle, eInk one
+    public static final String engineSilk = "silk";  //Amazon's accelerated Silk browser for Kindle Fire
     
     public static final String deviceNuvifone = "nuvifone";  //Garmin Nuvifone
     
@@ -533,7 +543,8 @@ public class UAgentInfo {
         if (detectBlackBerry() &&
 			(userAgent.indexOf(deviceBBStorm) != -1 ||
 			userAgent.indexOf(deviceBBTorch) != -1 ||
-			userAgent.indexOf(deviceBBBoldTouch) != -1)) {
+			userAgent.indexOf(deviceBBBoldTouch) != -1 ||
+                        userAgent.indexOf(deviceBBCurveTouch) != -1 )) {
             return true;
         }
         return false;
@@ -745,6 +756,18 @@ public class UAgentInfo {
         return false;
     }
 
+    /**
+     * Detects if the current Amazon device is using the Silk Browser.
+     * Note: Typically used by the the Kindle Fire.
+     * @return detection of an Amazon Kindle Fire in Silk mode.
+     */
+    public boolean detectAmazonSilk() {
+        if (userAgent.indexOf(engineSilk)  != -1) {
+            return true;
+        }
+        return false;
+    }
+
     /**
      *	Detects if the current device is a mobile device.
      *  This method catches most of the popular modern devices. 
@@ -789,6 +812,12 @@ public class UAgentInfo {
             return true;
         }
 
+        //We also look for Kindle devices
+        if (detectKindle()
+                        || detectAmazonSilk()) {
+            return true;
+        }
+
         return false;
     }
 
@@ -990,7 +1019,8 @@ public class UAgentInfo {
 		//Note: 'High' BlackBerry devices ONLY
 		if (detectMobileQuick()) {
 
-			if (!detectTierIphone()) {
+                        //Exclude iPhone Tier and e-Ink Kindle devices.
+			if (!detectTierIphone() && !detectKindle()) {
 
 				//The following devices are explicitly ok.
 				//Note: 'High' BlackBerry devices ONLY

data/lib/mobileesp_converted/user_agent_info.rb

@@ -6,6 +6,21 @@
  *******************************************
 # Copyright 2010-2012, Anthony Hand
 #
+# File version date: April 23, 2012
+#        Update:
+#        - Updated DetectAmazonSilk(): Fixed an issue in the detection logic.
+#
+# File version date: April 22, 2012 - Second update
+#        Update: To address additional Kindle issues...
+#        - Updated DetectRichCSS(): Excluded e-Ink Kindle devices.
+#        - Created DetectAmazonSilk(): Created to detect Kindle Fire devices in Silk mode.
+#        - Updated DetectMobileQuick(): Updated to include e-Ink Kindle devices and the Kindle Fire in Silk mode.
+#
+# File version date: April 11, 2012
+#        Update:
+#        - Added a new variable for the new BlackBerry Curve Touch (9380): deviceBBCurveTouch.
+#        - Updated DetectBlackBerryTouch() to support the new BlackBerry Curve Touch (9380).
+#
 # File version date: January 21, 2012
 #        Update:
 #        - Moved Windows Phone 7 to the iPhone Tier. WP7.5's IE 9-based browser is good enough now.
@@ -21,13 +36,6 @@
 #        Update:
 #        - Updated DetectAndroidTablet() to exclude Opera Mini, which was falsely reporting as running on a tablet device when on a phone.
 #
-# File version date: August 7, 2011
-#        Update:
-#        - The Opera for Android browser doesn't follow Google's recommended useragent string guidelines, so some fixes were needed.
-#        - Updated DetectAndroidPhone() and DetectAndroidTablet() to properly detect devices running Opera Mobile.
-#        - Created 2 new methods: DetectOperaAndroidPhone() and DetectOperaAndroidTablet().
-#        - Updated DetectTierIphone(). Removed the call to DetectMaemoTablet(), an obsolete mobile OS.
-#
 #
 # LICENSE INFORMATION
 # Licensed under the Apache License, Version 2.0 (the "License")
@@ -115,6 +123,7 @@ module MobileESPConverted
     DEVICE_B_B_BOLD_TOUCH = "blackberry 99"
     DEVICE_B_B_TOUR = "blackberry96"
     DEVICE_B_B_CURVE = "blackberry89"
+    DEVICE_B_B_CURVE_TOUCH = "blackberry 938"
     DEVICE_B_B_TORCH = "blackberry 98"
     DEVICE_B_B_PLAYBOOK = "playbook"
 
@@ -126,6 +135,7 @@ module MobileESPConverted
     ENGINE_XIINO = "xiino"
 
     DEVICE_KINDLE = "kindle"
+    ENGINE_SILK = "silk"
 
     DEVICE_NUVIFONE = "nuvifone"
 
@@ -595,7 +605,8 @@ module MobileESPConverted
       if (detect_black_berry() &&
           (user_agent.include?(DEVICE_B_B_STORM) ||
            user_agent.include?(DEVICE_B_B_TORCH) ||
-           user_agent.include?(DEVICE_B_B_BOLD_TOUCH)))
+           user_agent.include?(DEVICE_B_B_BOLD_TOUCH) ||
+           user_agent.include?(DEVICE_B_B_CURVE_TOUCH) ))
         return true
       end
       return false
@@ -812,6 +823,20 @@ module MobileESPConverted
       return false
     end
 
+=begin
+*
+     * Detects if the current Amazon device is using the Silk Browser.
+     * Note: Typically used by the the Kindle Fire.
+     * @return detection of an Amazon Kindle Fire in Silk mode.
+
+=end
+    def detect_amazon_silk()
+      if (user_agent.include?(ENGINE_SILK))
+        return true
+      end
+      return false
+    end
+
 =begin
 *
      *    Detects if the current device is a mobile device.
@@ -850,6 +875,11 @@ module MobileESPConverted
         return true
       end
 
+
+      if (detect_kindle() || detect_amazon_silk())
+        return true
+      end
+
       return false
     end
 
@@ -1054,7 +1084,8 @@ module MobileESPConverted
 
       if (detect_mobile_quick())
 
-        if (!detect_tier_iphone())
+
+        if (!detect_tier_iphone() && !detect_kindle())
 
 
 

data/lib/mobileesp_converted/version.rb

@@ -1,3 +1,3 @@
 module MobileESPConverted
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/mobileesp_converted.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |gem|
   # Smart irb
   gem.add_development_dependency 'pry'
 
+  gem.add_development_dependency 'rake'
   # Specs
   gem.add_development_dependency 'minitest'
 end

data/spec/mobileesp_converted/user_agent_info_spec.rb

@@ -106,6 +106,32 @@ module MobileESPConverted
         uai.detect_android_phone.must_equal false
         uai.detect_android_tablet.must_equal false
       end
+
+      # categorization according to original MobileESP implementation
+      it "categorizes Kindle Fire" do
+        uai = UserAgentInfo.new("Mozilla/5.0 (Linux; U; Android 2.3.4; en-us; Kindle Fire Build/GINGERBREAD) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1", "text/html")
+        uai.is_tier_tablet.must_equal false
+        uai.is_tier_iphone.must_equal true
+        uai.is_tier_rich_css.must_equal false
+        uai.is_tier_generic_mobile.must_equal false
+        uai.detect_iphone.must_equal false
+        uai.detect_ipad.must_equal false
+        uai.detect_android_phone.must_equal true
+        uai.detect_android_tablet.must_equal false
+      end
+
+      # categorization according to original MobileESP implementation
+      it "categorizes Kindle Fire silk mode" do
+        uai = UserAgentInfo.new("Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_3; en-us; Silk/1.1.0-80) AppleWebKit/533.16 (KHTML, like Gecko) Version/5.0 Safari/533.16 Silk-Accelerated=true", "text/html")
+        uai.is_tier_tablet.must_equal false
+        uai.is_tier_iphone.must_equal false
+        uai.is_tier_rich_css.must_equal true
+        uai.is_tier_generic_mobile.must_equal false
+        uai.detect_iphone.must_equal false
+        uai.detect_ipad.must_equal false
+        uai.detect_android_phone.must_equal false
+        uai.detect_android_tablet.must_equal false
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mobileesp_converted
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-12 00:00:00.000000000 Z
+date: 2012-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &23808700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,31 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23808700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &23808240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,7 +54,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *23808240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Autoconverted version (from Java to Ruby) of MobileESP library.
 email:
 - jistr@jistr.com
@@ -67,7 +93,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 595848370185603424
+      hash: -745614850810800464
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -76,11 +102,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 595848370185603424
+      hash: -745614850810800464
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Provides device type detection based on HTTP request headers.
-test_files: []
+test_files:
+- spec/mobileesp_converted/user_agent_info_spec.rb
+- spec/spec_helper.rb