RubyGems - spy-vs-spy - Versions diffs - 0.0.4 → 0.0.5 - Mend

spy-vs-spy 0.0.4 → 0.0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

data/Change.log +3 -0
data/LICENSE +19 -0
data/README +18 -0
data/Rakefile +30 -0
data/VERSION +1 -0
data/lib/{spy-vs-spy.rb → spy_vs_spy.rb} +180 -163
data/test/msie/msie-6.0.txt +0 -1
data/test/safari/safari.txt +0 -1
data/test/ss-test.rb +19 -139
metadata +73 -69
data/spy-vs-spy.gemspec +0 -76

data/Change.log ADDED Viewed

@@ -0,0 +1,3 @@
+Nov.19-2009:
+-- corrected an error in the middleware that prevented it from working

data/LICENSE ADDED Viewed

@@ -0,0 +1,19 @@
+Copyright (c) 2009 Kristan 'Krispy' Uccello <krispy@soldierofcode.com> - Soldier Of Code
+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.

data/README CHANGED Viewed

@@ -0,0 +1,18 @@
+=Spy vs Spy
+== Intelligent User Agent parsing for the future! Now in Black & White
+This is user agent parsing with lots and lots of tests. And accurate results. Its awesome
+== Usage
+  >> require 'spy-vs-spy'
+  >> agent = SOC::SpyVsSpy.new("Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 5.1; Trident/4.0; .NET CLR 1.1.4322; .NET CLR 2.0.50727; .NET CLR 3.0.04506.30; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729)")
+  << #<SoldierOfCode::SpyVsSpy:0x100351a28 @version.major="5", @agent="Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 5.1; Trident/4.0; .NET CLR 1.1.4322; .NET CLR 2.0.50727; .NET CLR 3.0.04506.30; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729)", @identifier="", @product_token="Mozilla/4.0 ", @mobile=["iPhone", "iPod", "BlackBerry", "Android", "HTC-", "LG", "Motorola", "Nokia", "Treo", "Pre/", "Samsung", "SonyEricsson"], @renderer="", @browser="MSIE", @engine="", @version.minor="5", @ostype="Windows", @platform="Desktop", @detail="(compatible; MSIE 5.5; Windows NT 5.1; Trident/4.0; .NET CLR 1.1.4322; .NET CLR 2.0.50727; .NET CLR 3.0.04506.30; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729)">
+  >> agent.browser
+  << "MSIE"
+  >> agent.version.to_s
+  << "5.5"
+  >> agent.version.major
+  >> "5"

data/Rakefile ADDED Viewed

@@ -0,0 +1,30 @@
+require 'rake/testtask'
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |s|
+    s.name = "spy-vs-spy"
+    s.description = s.summary = "Rack middleware to detect and provide more detail on the requesting user agent edit"
+    s.email = "kuccello@gmail.com"
+    s.homepage = "http://github.com/kuccello/Spy-Vs-Spy"
+    s.authors = ['Kristan "Krispy" Uccello']
+    s.files = FileList["[A-Z]*", "{lib,test}/**/*"]
+  end
+  Jeweler::GemcutterTasks.new
+rescue LoadError
+  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+end
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/*-test.rb']
+  t.verbose = true
+end
+require 'rake/rdoctask'
+desc "Generate documentation"
+Rake::RDocTask.new do |rd|
+  rd.main = "README.rdoc"
+  rd.rdoc_files.include("README.rdoc", "lib/**/*.rb")
+  rd.rdoc_dir = 'rdoc'
+end

data/VERSION ADDED Viewed

	@@ -0,0 +1 @@
1	+ 0.0.5

data/lib/{spy-vs-spy.rb → spy_vs_spy.rb} RENAMED Viewed

@@ -33,63 +33,89 @@
   see LICENSE file for details
 =end
-class String
-  def starts_with?(str)
-    str = str.to_str
-    head = self[0, str.length]
-    head == str
-  end
-end
 module SoldierOfCode
   class SpyVsSpy
-    def initialize(app=nil)
-      @app = app
-    end
+    class Middleware
+      def initialize(app=nil)
+        @app = app
+      end
-    def call(env)
+      def call(env)
-      http_user_agent = env['HTTP_USER_AGENT']
+        http_user_agent = env['HTTP_USER_AGENT']
-      env['soldierofcode.spy-vs-spy'] = deconstruct(http_user_agent)
+        env['soldierofcode.spy-vs-spy'] = SpyVsSpy.new(http_user_agent)
+        @app.call(env)
+      end
-      @app.call(env)
-    end
-    def deconstruct(agent)
-      ParseUserAgent.new.parse(agent)
+    end
+    class Version
+      attr_accessor :major, :minor, :sub
+      def to_s
+        [major, minor, sub].compact.join('.')
+      end
+      def update(major = nil, minor = nil, sub = nil)
+        @major, @minor, @sub = major, minor, sub
+      end
     end
+    class OS
+      def initialize(os_string)
+        @os_string = os_string
+        @exact_os = (match = /(Mac OS X|Linux|Windows)/.match(@os_string)) ? match[1] : nil
+      end
+      def to_s
+        @os_string
+      end
+      def osx?
+        @exact_os == 'Mac OS X'
+      end
+      def linux?
+        @exact_os == 'Linux'
+      end
+      def windows?
+        @exact_os == 'Windows'
+      end
+    end
-    @@safari = {
-            "1.0" => ["85.5", "85.6", "85.7"],
-            "1,0.3" => ["85.8.1", "85.8", "85"],
-            "1.2" => ["125", "125.1"],
-            "1.2.2" => ["85.8", "125.7", "125.8"],
-            "1.2.3" => ["100", "125.9"],
-            "1.2.4" => ["125", "125.11", "125.12", "125.12_Adobe", "125.5.5"],
-            "1.3" => ["312"],
-            "1.3.1" => ["312.3.3", "312.3.1", "312.3"],
-            "1.3.2" => ["312.5", "312.6", "312.5_Adobe"],
-            "2.0" => ["412", "412.2.2", "412.2_Adobe"],
-            "2.0.1" => ["412.5", "412.6", "412.5_Adobe"],
-            "2.0.2" => ["416.13", "416.12", "312", "416.13_Adobe", "416.12_Adobe"],
-            "2.0.3" => ["417.9.3", "417.8_Adobe", "417.9.2", "417.8", "412.2"],
-            "2.0.4" => ["419.3"],
-            "3.0" => ["523.13", "522.11.3", "523.12.9", "523.6.1", "522.11.1", "522.11", "522.8.3", "522.7"],
-            "3.0.1" => ["522.12.2"],
-            "3.0.2" => ["522.13.1", "522.12"],
-            "3.0.3" => ["522.15.5", "523.6", "522.12.1"],
-            "3.0.4" => ["523.11", "523.12.2", "523.10", "523.10.6", "523.15", "523.12"],
-            "3.1.1" => ["525.17", "525.18", "525.20"],
-            "3.2.1" => ["525.27.1"]
+    SafariSpecialCases = {
+      "1.0" =>   ["85.5", "85.6", "85.7"],
+      "1,0.3" => ["85.8.1", "85.8", "85"],
+      "1.2" =>   ["125", "125.1"],
+      "1.2.2" => ["85.8", "125.7", "125.8"],
+      "1.2.3" => ["100", "125.9"],
+      "1.2.4" => ["125", "125.11", "125.12", "125.12_Adobe", "125.5.5"],
+      "1.3" =>   ["312", "312.3.1"],
+      "1.3.1" => ["312.3.3", "312.3.1", "312.3", "125.8", "125.9"],
+      "1.3.2" => ["312.3.3", "312.5", "312.6", "312.5_Adobe"],
+      "2.0" =>   ["412", "412.2.2", "412.2_Adobe"],
+      "2.0.1" => ["412.5", "412.6", "412.5_Adobe"],
+      "2.0.2" => ["416.13", "416.12", "312", "416.13_Adobe", "416.12_Adobe", "412.5"],
+      "2.0.3" => ["417.9.3", "417.8_Adobe", "417.9.2", "417.8", "412.2"],
+      "2.0.4" => ["419.3"],
+      "3.0" =>   ["523.13", "522.11.3", "523.12.9", "523.6.1", "522.11.1", "522.11", "522.8.3", "522.7"],
+      "3.0.1" => ["522.12.2"],
+      "3.0.2" => ["522.13.1", "522.12"],
+      "3.0.3" => ["522.15.5", "523.6", "522.12.1"],
+      "3.0.4" => ["523.11", "523.12.2", "523.10", "523.10.6", "523.15", "523.12"],
+      "3.1.1" => ["525.17", "525.18", "525.20"],
+      "3.2.1" => ["525.27.1"]
     }
-    attr_reader :ostype, :browser, :os_version, :browser_version_major, :browser_version_minor, :browser_version_sub, :mobile_browser, :console_browser
+    attr_reader :browser, :os_version, :version, :mobile_browser, :console_browser, :agent, :os
     #
     #
     # =======================================
@@ -101,32 +127,31 @@ module SoldierOfCode
     #
     # returns:
     # ----------------
-    def parse(agent)
+    def initialize(agent)
+      @agent = agent
       pass1 = Regexp.new("^([^\\(]*)?[ ]*?(\\([^\\)]*\\))?[ ]*([^\\(]*)?[ ]*?(\\([^\\)]*\\))?[ ]*(.*)")
-      pass1.match(agent)
-      @product_token = $1 || ''
-      @detail = $2 || ''
-      @engine = $3 || ''
-      @renderer = $4 || ''
-      @identifier = $5 || ''
-      #puts "#{__FILE__}:#{__LINE__} #{__method__} [#{@product_token}] [#{@detail}] [#{@engine}] [#{@renderer}] [#{@identifier}]"
-      @platform = identify_platform(agent)
-      @mobile = is_mobile?(agent)
-      @ostype = identify_os
-      matched = process_safari(agent)
-      matched = process_firefox(agent) unless matched
-      matched = process_ie(agent) unless matched
-      matched = process_opera(agent) unless matched
-      matched = process_netscape(agent) unless matched
-      self
+      if matches = pass1.match(agent)
+        @product_token = matches[1] || ''
+        @detail = matches[2] || ''
+        @engine = matches[3] || ''
+        @renderer = matches[4] || ''
+        @identifier = matches[5] || ''
+        @platform = identify_platform(agent)
+        @mobile = is_mobile?(agent)
+        @os = OS.new(@detail)
+        @version = Version.new
+        [:safari, :firefox, :ie, :opera, :netscape].each do |type|
+          send(:"process_#{type}", agent)
+          break if complete?
+        end
+      end
     end
     #
     #
     # =======================================
@@ -139,11 +164,8 @@ module SoldierOfCode
     # returns:
     # ----------------
     def identify_platform(agent)
-      platform = "Desktop"
-      ["PLAYSTATION 3", "wii", "PlayStation Portable", "Xbox", "iPhone", "iPod", "BlackBerry", "Android", "HTC-", "LG", "Motorola", "Nokia", "Treo", "Pre/", "Samsung", "SonyEricsson"].each do |agt|
-        platform = agt if @platform=="Desktop" && agent.include?(agt)
-      end
-      platform
+      (match = /(PLAYSTATION 3|wii|PlayStation Portable|Xbox|iPhone|iPod|BlackBerry|Android|HTC-|LG|Motorola|Nokia|Treo|Pre\/|Samsung|SonyEricsson)/.match(agent)) ?
+        match[1] : 'Desktop'
     end
     #
@@ -158,29 +180,11 @@ module SoldierOfCode
     # returns:
     # ----------------
     def is_mobile?(agent)
-      ["iPhone", "iPod", "BlackBerry", "Android", "HTC-", "LG", "Motorola", "Nokia", "Treo", "Pre/", "Samsung", "SonyEricsson"].each do |mobile_agt|
-        return true if agent.include?(mobile_agt)
-      end
+      /(iPhone|iPod|BlackBerry|Android|HTC-|LG|Motorola|Nokia|Treo|Pre\/|Samsung|SonyEricsson)/.match(agent)
     end
-    #
-    #
-    # =======================================
-    # description:
-    # ----------------
-    #
-    # params:
-    # ----------------
-    #
-    # returns:
-    # ----------------
-    def identify_os
-      os_list = ["Mac OS X", "Linux", "Windows"]
-      os = nil
-      os_list.each do |o|
-        os = o if @detail.include?(o)
-      end
-      os
+    def complete?
+      @browser && @version.major
     end
     #
@@ -216,47 +220,78 @@ module SoldierOfCode
           end
         end
-        @@safari.each do |k, v|
+        SafariSpecialCases.each do |k, v|
           version_numbers = k.gsub(",", ".").split(".")
           v.each do |num|
             if identifier_sub == num
-              @browser_version_major = version_numbers[0] if version_numbers.size > 0
-              @browser_version_minor = version_numbers[1] if version_numbers.size > 1
-              @browser_version_sub = version_numbers[2] if version_numbers.size > 2
+              @version.update(*version_numbers)
             end
-            break if @browser_version_major
+            break if @version.major
           end
           # Special case 58.8 - check WebKit numbers
           # Special case 312 - check AppleWebKit
           # Special case 419.3 - could me mobile v3 check AppleWebKit for 420+
-          if identifier_sub == "312" then
-            engine_sub = @engine.sub("AppleWebKit/", "")
-            if engine_sub.include? "416.11" then
-              @browser_version_major = '2'
-              @browser_version_minor = '0'
-              @browser_version_sub = '2'
-            else
-            end
-          end
+          engine_id = @engine[/AppleWebKit\/([0-9.]+)/, 1]
-          if identifier_sub == "419.3" then
-            engine_sub = @engine.sub("AppleWebKit/", "")
-            if engine_sub.include?("420") then
-              @browser_version_major = '3'
-              @browser_version_minor = '0'
-              @browser_version_sub = nil
-            else
+          case identifier_sub
+          when "85.8"
+            case engine_id
+            when '125.2'     then @version.update('1', '2', '2')
+            end
+          when "125"
+            case engine_id
+            when '125.5.5'   then @version.update('1', '2', '4')
+            when '124'       then @version.update('1', '2')
+            when '312.5.2'   then @version.update('1', '3', '1')
+            when '312.1'     then @version.update('1', '3')
+            end
+          when '412.5'
+            case engine_id
+            when '416.12'    then @version.update('2','0','2')
+            end
+          when '416.13'
+            case engine_id
+            when '417.9'     then @version.update('2','0','3')
+            end
+          when '412.2'
+            case engine_id
+            when '412.6'     then @version.update('2','0')
+            end
+          when '312.3.1'
+            case engine_id
+            when '312.1'     then @version.update('1', '3')
+            when '312.5.1'   then @version.update('1', '3', '1')
+            end
+          when "125.8"
+            case engine_id
+            when '312.5.1'   then @version.update('1', '3', '1')
+            when '125.2'     then @version.update('1', '2', '2')
+            end
+          when "125.9"
+            case engine_id
+            when '125.4'     then @version.update('1', '2', '3')
+            when '125.5'     then @version.update('1', '2', '3')
+            when '312.5.1'   then @version.update('1', '3', '1')
+            end
+          when "312"
+            case engine_id
+            when '416.11'    then @version.update('2', '0', '2')
+            end
+          when "312.3.3"
+            case engine_id
+            when '312.8'     then @version.update('1', '3', '2')
+            end
+          when "419.3"
+            case engine_id
+            when "420"       then @version.update('3', '0')
             end
           end
           if (identifier_sub == "Safari") || (@identifier == "Safari/")then
-            engine_sub = @engine.sub("AppleWebKit/", "")
-            if engine_sub.include?("418.9") || engine_sub.include?("418.8") then
-              @browser_version_major = '2'
-              @browser_version_minor = '0'
-              @browser_version_sub = '4'
-            else
+            case engine_id
+            when "418.9", "418.8"
+              @version.update('2', '0', '4')
             end
           end
@@ -265,30 +300,24 @@ module SoldierOfCode
             @identifier.split(" ").each do |ident|
               ident_sub = ident.sub("Version\/", "") if ident.include?("Version")
               if ident_sub then
-                vs = ident_sub.gsub(",", ".").split(".")
-                @browser_version_major = vs[0] if vs.size > 0
-                @browser_version_minor = vs[1] if vs.size > 1
-                @browser_version_sub = vs[2] if vs.size > 2
+                @version.update(*ident_sub.split(/[.,]/))
               end
             end
           end
           if @identifier == "Safari/412 Privoxy/3.0" then
-            @browser_version_major = '2'
-            @browser_version_minor = '0'
-            @browser_version_sub = nil
+            @version.major = '2'
+            @version.minor = '0'
+            @version.sub = nil
           end
-          break if @browser_version_major
+          break if @version.major
         end
       end
-      if @browser == nil && agent_string.include?("Mac OS X") && agent_string.include?("AppleWebKit")
+      if @browser == nil && @os.osx? && agent_string.include?("AppleWebKit")
         @browser = "Safari"
       end
-      return true if @browser && @browser_version_major
-      false
     end
     #
@@ -309,31 +338,19 @@ module SoldierOfCode
       end
       if @detail.include?("MSIE")
         @detail.gsub(/[\\:\?'"%!@#\$\^&\*\(\)\+]/, '').split(";").each do |sec|
-          if sec.strip.starts_with?("MSIE ") then
-            s = sec.strip.sub("MSIE ", "").sub("06", "0.6").sub(",", ".").split(".")
-            @browser_version_major = s[0] if s.size > 0
-            @browser_version_minor = s[1] if s.size > 1
+          if sec.strip.index("MSIE ") == 0
+            @version.update(*sec.strip.sub("MSIE ", "").gsub(/0(\d)/, '0.\1').split(/[.,]/))
           end
-          break if @browser_version_major
+          break if @version.major
         end
       end
-      unless @browser_version_major
-        if agent.include?("MSIE 6.0")
-          @browser = "MSIE"
-          @browser_version_major = '6'
-          @browser_version_minor = '0'
-        end
-        if agent.include?("MSIE 7.0")
+      unless @version.major
+        if match = /MSIE ([6789])\.0/.match(agent)
           @browser = "MSIE"
-          @browser_version_major = '7'
-          @browser_version_minor = '0'
-        end
-        if agent.include?("MSIE 8.0")
-          @browser = "MSIE"
-          @browser_version_major = '8'
-          @browser_version_minor = '0'
+          @version.major = match[1]
+          @version.minor = '0'
         end
       end
     end
@@ -359,35 +376,33 @@ module SoldierOfCode
       if @identifier.include?("Firefox") || @renderer.include?("Firefox") || @engine.include?("Firefox")
         @browser = "Firefox"
         identifier_sub = nil
-        @identifier.gsub(/[\\:\?'"%!@#\$\^&\*\(\)\+]/, '').split(" ").each do |ident|
-          identifier_sub = ident.sub("Firefox\/", "").sub("Gecko/", "") if ident.include?("Firefox")
-          identifier_sub.gsub!(/[\+]/, '') if identifier_sub && identifier_sub.include?("+")
+        @identifier.gsub(/[\\:\?'"%!@#\$\^&\*\(\)\+]/, '').split(" ").find do |ident|
+          if ident.include?("Firefox")
+            identifier_sub = ident.sub("Firefox\/", "").sub("Gecko/", "")
+            identifier_sub.gsub!(/[\+]/, '')
+          end
+          identifier_sub
         end
-        if identifier_sub == nil && @renderer.include?("Firefox")
+        if identifier_sub.nil? && @renderer.include?("Firefox")
           renderer_gsub_gsub = @renderer.sub("\(", "").sub("\)", "")
           renderer_gsub_gsub.strip.split(",").each do |sec|
             identifier_sub = sec.sub("Firefox\/", "").strip if sec.include?("Firefox")
           end
         end
-        if identifier_sub == nil && @engine.include?("Firefox")
+        if identifier_sub.nil? && @engine.include?("Firefox")
           @engine.gsub(/[\\:\?'"%!@#\$\^&\*\(\)\+]/, '').split(" ").each do |ident|
             identifier_sub = ident.sub("Firefox\/", "").sub("Gecko/", "") if ident.include?("Firefox")
             identifier_sub.gsub!(/[\+]/, '') if identifier_sub && identifier_sub.include?("+")
           end
         end
+        identifier_sub.gsub!(/;.*/, '')
         if identifier_sub
-          version_numbers = identifier_sub.split(".")
-          @browser_version_major = version_numbers[0] if version_numbers.size > 0
-          @browser_version_minor = version_numbers[1] if version_numbers.size > 1
-          @browser_version_sub = version_numbers[2] if version_numbers.size > 2
+          @version.update(*identifier_sub.split("."))
         end
       end
-      return true if @browser && @browser_version_major
-      false
     end
     #
@@ -421,3 +436,5 @@ module SoldierOfCode
     end
   end
 end
+SOC = SoldierOfCode

data/test/msie/msie-6.0.txt CHANGED Viewed

@@ -15,7 +15,6 @@ Mozilla/4.0 (MSIE 6.0; Windows NT 5.0)
 Mozilla/4.0 (compatible;MSIE 6.0;Windows 98;Q312461)
 Mozilla/4.0 (Compatible; Windows NT 5.1; MSIE 6.0) (compatible; MSIE 6.0; Windows NT 5.1; .NET CLR 1.1.4322; .NET CLR 2.0.50727)
 Mozilla/4.0 (compatible; U; MSIE 6.0; Windows NT 5.1)
-Mozilla/4.0 (compatible; MSIE 6.1; Windows XP) (compatible; MSIE 6.0; Windows NT 5.1; .NET CLR 1.1.4322; .NET CLR 2.0.50727)
 Mozilla/4.0 (compatible; MSIE 6.0; Windows; U; Win98; en-US)
 Mozilla/4.0 (compatible; MSIE 6.0; Windows XP; InfoPath.2; .NET CLR 1.1.4322; .NET CLR 2.0.50727; .NET CLR 3.0.04506.648; .NET CLR 3.5.21022)
 Mozilla/4.0 (compatible; MSIE 6.0; Windows XP; DigExt)

data/test/safari/safari.txt CHANGED Viewed

@@ -1,6 +1,5 @@
 Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.0.3) Gecko/2008092816 Mobile Safari 1.1.3
 Mozilla/5.0 (Macintosh; U; PPC Mac OS X; fi-fi) AppleWebKit/420+ (KHTML, like Gecko) Safari/419.3
-Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en) AppleWebKit/312.8.1 (KHTML, like Gecko) Safari/312.6
 Mozilla/5.0 (Macintosh; U; PPC Mac OS X; de-de) AppleWebKit/419.2 (KHTML, like Gecko) Safari/419.3
 Mozilla/5.0 (Macintosh; U; PPC Mac OS X; de-de) AppleWebKit/418.9.1 (KHTML, like Gecko) Safari/419.3
 Mozilla/5.0 (Macintosh; U; PPC Mac OS X; de-ch) AppleWebKit/85 (KHTML, like Gecko) Safari/85

data/test/ss-test.rb CHANGED Viewed

@@ -1,154 +1,34 @@
 require "rubygems"
 require "rack/test"
 require "test/unit"
-require "../lib/spy-vs-spy"
+require 'dirge'
+require ~"../lib/spy_vs_spy"
 class SpyVsSpyTest < Test::Unit::TestCase
   include Rack::Test::Methods
   def app
-    SoldierOfCode::SpyVsSpy.new(self)
+    SOC::SpyVsSpy::Middleware.new(self)
   end
-  def test_safari_parse
-    basedir = File.dirname(__FILE__)+"/safari"
-    contains = Dir.new(basedir).entries
-    contains.delete(".")
-    contains.delete("..")
-    ua_count = 0
-    contains.each do |filename|
-      file = File.new("#{File.dirname(__FILE__)}/safari/#{filename}", "r")
-#      puts <<-r
-#filename: #{filename}
-#      r
-      rx =  Regexp.new("^safari(\-(([0-9])(.*)))\.txt")
-      rx.match(filename)
-      #puts "#{__FILE__}:#{__LINE__} #{__method__} #{$1} - #{$2} - #{$3} - #{$4} - #{$5} - #{$6} - #{$7}"
-      major_version = $3
-#      puts "#{__FILE__}:#{__LINE__} #{__method__} #{major_version}"
-      while (line = file.gets)
-#        puts "#{__FILE__}:#{__LINE__} #{__method__} #{line}"
-        r = SoldierOfCode::SpyVsSpy.new.parse(line)
-#        puts "#{__FILE__}:#{__LINE__} #{__method__} BROWSER: #{r.browser}"
-        assert r.browser == 'Safari'
-        if major_version && major_version.length > 0
-#          puts "#{__FILE__}:#{__LINE__} #{__method__} #{line}"
-#          puts "#{__FILE__}:#{__LINE__} #{__method__} #{r.browser_version_major} == #{major_version} ? #{r.browser_version_major == major_version}"
-          assert r.browser_version_major == major_version
+  def test_parse
+    Dir[~'**/*.txt'].each do |file|
+      browser_name, version_string = File.basename(file)[/^(.*)\.txt$/, 1].split('-')
+      puts ">>> #{browser_name} -- #{version_string}"
+      if version_string
+        major, minor, sub = version_string.split(/[,\.]/)
+        File.open(file) do |f|
+          f.each_line do |line|
+            puts "testing #{line}"
+            r = SoldierOfCode::SpyVsSpy.new(line)
+            assert_equal browser_name.downcase, r.browser.downcase
+            assert_equal major,        r.version.major
+            assert_equal minor,        r.version.minor
+            assert_equal sub,          r.version.sub
+          end
         end
-        ua_count+=1
       end
     end
-    puts "Number of safari agents tested: #{ua_count}"
   end
-  def test_firefox_parse
-    basedir = File.dirname(__FILE__)+"/firefox"
-    contains = Dir.new(basedir).entries
-    contains.delete(".")
-    contains.delete("..")
-    ua_count = 0
-    contains.each do |filename|
-      file = File.new("#{File.dirname(__FILE__)}/firefox/#{filename}", "r")
-#      puts <<-r
-#filename: #{filename}
-#      r
-      rx =  Regexp.new("^firefox(\-(([0-9])(.*)))\.txt")
-      rx.match(filename)
-      #puts "#{__FILE__}:#{__LINE__} #{__method__} #{$1} - #{$2} - #{$3} - #{$4} - #{$5} - #{$6} - #{$7}"
-      major_version = $3
-#      puts "#{__FILE__}:#{__LINE__} #{__method__} #{major_version}"
-      while (line = file.gets)
-#        puts "#{__FILE__}:#{__LINE__} #{__method__} #{line}"
-        r = SoldierOfCode::SpyVsSpy.new.parse(line)
-#        puts "#{__FILE__}:#{__LINE__} #{__method__} BROWSER: #{r.browser}"
-        assert r.browser == 'Firefox'
-        if major_version && major_version.length > 0
-#          puts "#{__FILE__}:#{__LINE__} #{__method__} #{line}"
-#          puts "#{__FILE__}:#{__LINE__} #{__method__} [#{r.browser_version_major}] == [#{major_version}] ? #{r.browser_version_major == major_version}"
-          assert r.browser_version_major == major_version
-        end
-        ua_count+=1
-      end
-    end
-    puts "Number of firefox agents tested: #{ua_count}"
-  end
-  def test_msie_parse
-    basedir = File.dirname(__FILE__)+"/msie"
-    contains = Dir.new(basedir).entries
-    contains.delete(".")
-    contains.delete("..")
-    ua_count = 0
-    contains.each do |filename|
-      file = File.new("#{File.dirname(__FILE__)}/msie/#{filename}", "r")
-#
-#      puts <<-r
-#filename: #{filename}
-#      r
-      rx =  Regexp.new("^msie(\-(([0-9])(.*)))\.txt")
-      rx.match(filename)
-      #puts "#{__FILE__}:#{__LINE__} #{__method__} #{$1} - #{$2} - #{$3} - #{$4} - #{$5} - #{$6} - #{$7}"
-      major_version = $3
-#      puts "#{__FILE__}:#{__LINE__} #{__method__} #{major_version}"
-      while (line = file.gets)
-#        puts "#{__FILE__}:#{__LINE__} #{__method__} #{line}"
-        r = SoldierOfCode::SpyVsSpy.new.parse(line)
-#        puts "#{__FILE__}:#{__LINE__} #{__method__} BROWSER: #{r.browser}"
-        assert r.browser == 'MSIE'
-        if major_version && major_version.length > 0
-#          puts "#{__FILE__}:#{__LINE__} #{__method__} #{line}"
-#          puts "#{__FILE__}:#{__LINE__} #{__method__} [#{r.browser_version_major}] == [#{major_version}] ? #{r.browser_version_major == major_version}"
-          assert r.browser_version_major == major_version
-        end
-        ua_count+=1
-      end
-    end
-    puts "Number of internet explorer agents tested: #{ua_count}"
-  end
 end

metadata CHANGED Viewed

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: spy-vs-spy
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
-- Kristan 'Krispy' Uccello
+- Kristan "Krispy" Uccello
 autorequire:
 bindir: bin
 cert_chain: []
@@ -13,26 +13,90 @@ date: 2009-11-23 00:00:00 -05:00
 default_executable:
 dependencies: []
-description: ""
-email: kaptiankrispy@soldierofcode.com
+description: Rack middleware to detect and provide more detail on the requesting user agent edit
+email: kuccello@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
+- LICENSE
 - README
 files:
+- Change.log
+- LICENSE
 - README
-- spy-vs-spy.gemspec
-- lib/spy-vs-spy.rb
+- Rakefile
+- VERSION
+- lib/spy_vs_spy.rb
+- test/firefox/firefox-3.1b2.txt
+- test/firefox/firefox-3.1b2pre.txt
+- test/firefox/firefox-3.1b3.txt
+- test/firefox/firefox-3.1b3pre.txt
+- test/firefox/firefox-3.5.1.txt
+- test/firefox/firefox-3.5.12.txt
+- test/firefox/firefox-3.5.2.txt
+- test/firefox/firefox-3.5.3.txt
+- test/firefox/firefox-3.5.3pre.txt
+- test/firefox/firefox-3.5.4.txt
+- test/firefox/firefox-3.5.5.txt
+- test/firefox/firefox-3.5.txt
+- test/firefox/firefox-3.5b4.txt
+- test/firefox/firefox-3.5b4pre.txt
+- test/firefox/firefox-3.6.txt
+- test/firefox/firefox-3.6a1pre.txt
+- test/firefox/firefox-3.6b1.txt
+- test/firefox/firefox-3.8.txt
+- test/msie/msie-5.5.txt
+- test/msie/msie-5.5b1.txt
+- test/msie/msie-6,0.txt
+- test/msie/msie-6.0.1.txt
+- test/msie/msie-6.0.txt
+- test/msie/msie-6.0b.txt
+- test/msie/msie-6.1.txt
+- test/msie/msie-7.0.txt
+- test/msie/msie-7.0b.txt
+- test/msie/msie-8.0.txt
+- test/safari/safari-1.0.3.txt
+- test/safari/safari-1.0.txt
+- test/safari/safari-1.2.2.txt
+- test/safari/safari-1.2.3.txt
+- test/safari/safari-1.2.4.txt
+- test/safari/safari-1.2.txt
+- test/safari/safari-1.3.1.txt
+- test/safari/safari-1.3.2.txt
+- test/safari/safari-1.3.txt
+- test/safari/safari-2.0.1.txt
+- test/safari/safari-2.0.2.txt
+- test/safari/safari-2.0.3.txt
+- test/safari/safari-2.0.4.txt
+- test/safari/safari-2.0.txt
+- test/safari/safari-3.0.1.txt
+- test/safari/safari-3.0.2.txt
+- test/safari/safari-3.0.3.txt
+- test/safari/safari-3.0.4.txt
+- test/safari/safari-3.0.txt
+- test/safari/safari-3.1.1.txt
+- test/safari/safari-3.1.2.txt
+- test/safari/safari-3.1.txt
+- test/safari/safari-3.2.1.txt
+- test/safari/safari-3.2.2.txt
+- test/safari/safari-3.2.3.txt
+- test/safari/safari-3.2.txt
+- test/safari/safari-4.0.1.txt
+- test/safari/safari-4.0.2.txt
+- test/safari/safari-4.0.3.txt
+- test/safari/safari-4.0.txt
+- test/safari/safari-4.0dp1.txt
+- test/safari/safari.txt
+- test/ss-test.rb
 has_rdoc: true
 homepage: http://github.com/kuccello/Spy-Vs-Spy
 licenses: []
 post_install_message:
 rdoc_options:
-- --main
-- README
+- --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -53,66 +117,6 @@ rubyforge_project:
 rubygems_version: 1.3.5
 signing_key:
 specification_version: 3
-summary: UserAgent Detection Middleware for Rack.
+summary: Rack middleware to detect and provide more detail on the requesting user agent edit
 test_files:
 - test/ss-test.rb
-- test/msie/msie-5.5.txt
-- test/msie/msie-5.5b1.txt
-- test/msie/msie-6,0.txt
-- test/msie/msie-6.0.1.txt
-- test/msie/msie-6.0.txt
-- test/msie/msie-6.0b.txt
-- test/msie/msie-6.1.txt
-- test/msie/msie-7.0.txt
-- test/msie/msie-7.0b.txt
-- test/msie/msie-8.0.txt
-- test/safari/safari-1.0.3.txt
-- test/safari/safari-1.2.3.txt
-- test/safari/safari-1.3.1.txt
-- test/safari/safari-2.0.1.txt
-- test/safari/safari-2.0.4.txt
-- test/safari/safari-3.0.2.txt
-- test/safari/safari-3.0.txt
-- test/safari/safari-3.1.txt
-- test/safari/safari-3.2.3.txt
-- test/safari/safari-4.0.2.txt
-- test/safari/safari-4.0dp1.txt
-- test/safari/safari-1.0.txt
-- test/safari/safari-1.2.4.txt
-- test/safari/safari-1.3.2.txt
-- test/safari/safari-2.0.2.txt
-- test/safari/safari-2.0.txt
-- test/safari/safari-3.0.3.txt
-- test/safari/safari-3.1.1.txt
-- test/safari/safari-3.2.1.txt
-- test/safari/safari-3.2.txt
-- test/safari/safari-4.0.3.txt
-- test/safari/safari.txt
-- test/safari/safari-1.2.2.txt
-- test/safari/safari-1.2.txt
-- test/safari/safari-1.3.txt
-- test/safari/safari-2.0.3.txt
-- test/safari/safari-3.0.1.txt
-- test/safari/safari-3.0.4.txt
-- test/safari/safari-3.1.2.txt
-- test/safari/safari-3.2.2.txt
-- test/safari/safari-4.0.1.txt
-- test/safari/safari-4.0.txt
-- test/firefox/firefox-3.1b2.txt
-- test/firefox/firefox-3.1b3.txt
-- test/firefox/firefox-3.5.1.txt
-- test/firefox/firefox-3.5.2.txt
-- test/firefox/firefox-3.5.3pre.txt
-- test/firefox/firefox-3.5.5.txt
-- test/firefox/firefox-3.5b4.txt
-- test/firefox/firefox-3.6.txt
-- test/firefox/firefox-3.6b1.txt
-- test/firefox/firefox-3.1b2pre.txt
-- test/firefox/firefox-3.1b3pre.txt
-- test/firefox/firefox-3.5.12.txt
-- test/firefox/firefox-3.5.3.txt
-- test/firefox/firefox-3.5.4.txt
-- test/firefox/firefox-3.5.txt
-- test/firefox/firefox-3.5b4pre.txt
-- test/firefox/firefox-3.6a1pre.txt
-- test/firefox/firefox-3.8.txt

data/spy-vs-spy.gemspec DELETED Viewed

@@ -1,76 +0,0 @@
-Gem::Specification.new do |s|
-  s.name = "spy-vs-spy"
-  s.version = "0.0.4"
-  s.date = "2009-11-23"
-  s.summary = "UserAgent Detection Middleware for Rack."
-  s.email = "kaptiankrispy@soldierofcode.com"
-  s.homepage = "http://github.com/kuccello/Spy-Vs-Spy"
-  s.description = ""
-  s.has_rdoc = true
-  s.authors = ["Kristan 'Krispy' Uccello"]
-  s.files = ["README",
-             "spy-vs-spy.gemspec",
-             "lib/spy-vs-spy.rb"]
-  s.test_files = ["test/ss-test.rb", "test/msie/msie-5.5.txt",
-                  "test/msie/msie-5.5b1.txt",
-                  "test/msie/msie-6,0.txt",
-                  "test/msie/msie-6.0.1.txt",
-                  "test/msie/msie-6.0.txt",
-                  "test/msie/msie-6.0b.txt",
-                  "test/msie/msie-6.1.txt",
-                  "test/msie/msie-7.0.txt",
-                  "test/msie/msie-7.0b.txt",
-                  "test/msie/msie-8.0.txt",
-                  "test/safari/safari-1.0.3.txt",
-                  "test/safari/safari-1.2.3.txt",
-                  "test/safari/safari-1.3.1.txt",
-                  "test/safari/safari-2.0.1.txt",
-                  "test/safari/safari-2.0.4.txt",
-                  "test/safari/safari-3.0.2.txt",
-                  "test/safari/safari-3.0.txt",
-                  "test/safari/safari-3.1.txt",
-                  "test/safari/safari-3.2.3.txt",
-                  "test/safari/safari-4.0.2.txt",
-                  "test/safari/safari-4.0dp1.txt",
-                  "test/safari/safari-1.0.txt",
-                  "test/safari/safari-1.2.4.txt",
-                  "test/safari/safari-1.3.2.txt",
-                  "test/safari/safari-2.0.2.txt",
-                  "test/safari/safari-2.0.txt",
-                  "test/safari/safari-3.0.3.txt",
-                  "test/safari/safari-3.1.1.txt",
-                  "test/safari/safari-3.2.1.txt",
-                  "test/safari/safari-3.2.txt",
-                  "test/safari/safari-4.0.3.txt",
-                  "test/safari/safari.txt",
-                  "test/safari/safari-1.2.2.txt",
-                  "test/safari/safari-1.2.txt",
-                  "test/safari/safari-1.3.txt",
-                  "test/safari/safari-2.0.3.txt",
-                  "test/safari/safari-3.0.1.txt",
-                  "test/safari/safari-3.0.4.txt",
-                  "test/safari/safari-3.1.2.txt",
-                  "test/safari/safari-3.2.2.txt",
-                  "test/safari/safari-4.0.1.txt",
-                  "test/safari/safari-4.0.txt",
-                  "test/firefox/firefox-3.1b2.txt",
-                  "test/firefox/firefox-3.1b3.txt",
-                  "test/firefox/firefox-3.5.1.txt",
-                  "test/firefox/firefox-3.5.2.txt",
-                  "test/firefox/firefox-3.5.3pre.txt",
-                  "test/firefox/firefox-3.5.5.txt",
-                  "test/firefox/firefox-3.5b4.txt",
-                  "test/firefox/firefox-3.6.txt",
-                  "test/firefox/firefox-3.6b1.txt",
-                  "test/firefox/firefox-3.1b2pre.txt",
-                  "test/firefox/firefox-3.1b3pre.txt",
-                  "test/firefox/firefox-3.5.12.txt",
-                  "test/firefox/firefox-3.5.3.txt",
-                  "test/firefox/firefox-3.5.4.txt",
-                  "test/firefox/firefox-3.5.txt",
-                  "test/firefox/firefox-3.5b4pre.txt",
-                  "test/firefox/firefox-3.6a1pre.txt",
-                  "test/firefox/firefox-3.8.txt"]
-  s.rdoc_options = ["--main", "README"]
-  s.extra_rdoc_files = ["README"]
-end