spy-vs-spy 0.0.3 → 0.0.4

data/lib/spy-vs-spy.rb

@@ -1,13 +1,25 @@
 =begin
   Copyright notice
   =============================================================================
-  Copyright (c) 2008-2009 Soldier Of Code
-
-  Material published by Soldier Of Code in this file is copyright Soldier Of Code
-  and may not be reproduced without permission. Copyright exists in all other
-  original material published on the internet by employees of Soldier Of Code and
-  may belong to the author or to Soldier Of Code. depending on the circumstances of
-  publication.
+  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.
   ==============================================================================
 
   This middleware is based on work initialy done by Jackson Miller with his
@@ -33,7 +45,7 @@ module SoldierOfCode
 
   class SpyVsSpy
 
-    def initialize(app)
+    def initialize(app=nil)
       @app = app
     end
 
@@ -50,9 +62,7 @@ module SoldierOfCode
       ParseUserAgent.new.parse(agent)
     end
 
-  end
-
-  class ParseUserAgent
+  
 
     @@safari = {
             "1.0" => ["85.5", "85.6", "85.7"],
@@ -409,198 +419,5 @@ module SoldierOfCode
     def process_netscape(agent)
 
     end
-
-=begin
-
-    def known_browser(browser)
-
-      browsers = %w[ Firefox Safari MSIE ]
-      flag = false
-      browsers.each do |b|
-        flag = true if b == browser
-      end
-
-      flag
-    end
-
-    def known_safari_agent_string(string)
-      agents = []
-      agents << "AppleWebKit"
-      agents << "iPhone"
-
-      agents.each do |agent|
-        return true if string.include?(agent)
-      end
-      false
-    end
-
-    def mobile_browser?(string)
-      agents = []
-      agents << "iPhone"
-
-      agents.each do |agent|
-        if string.include?(agent)
-          @mobile_browser = agent
-          return true
-        end
-      end
-      false
-    end
-
-    def console_browser?(string)
-      agents = []
-
-      agents.each do |agent|
-        if string.include?(agent)
-          @console_browser = agent
-          return true
-        end
-      end
-      false
-    end
-
-    def is_safari?(str)
-      s = []
-      s << "iPhone"
-      s << "Safari"
-
-      flag = false
-      s.each do |st|
-        flag = true if str.include?(st)
-      end
-      flag
-    end
-
-    def parse(user_agent)
-      if '-' == user_agent
-        raise 'Invalid User Agent'
-      end
-
-      @user_agent = user_agent
-
-      # fix Opera
-      #useragent =~ s/Opera (\d)/Opera\/$1/i;
-      useragent = @user_agent.gsub(/(Opera [\d])/, 'Opera\1')
-
-      # grab all Agent/version strings as 'agents'
-      @agents = Array.new
-      @user_agent.split(/\s+/).each {|string|
-        if string =~ /\//
-          @agents<< string
-        end
-      }
-
-      # cycle through the agents to set browser and version (MSIE is set later)
-      if @agents && @agents.length > 0
-        @agents.each {|agent|
-
-          parts = agent.split('/')
-          @browser = parts[0]
-          @browser_version = parts[1]
-
-          if @browser == 'Firefox'
-            @browser_version_major = parts[1].slice(0, 3)
-            @browser_version_minor = parts[1].sub(@browser_version_major, '').sub('.', '')
-
-          elsif @browser == 'Safari'
-            rx = Regexp.new("Version/([0-9]+)\.([0-9]+)\.([0-9]+)")
-            rx.match(user_agent)
-
-            @browser_version_major = $1
-            @browser_version_minor = $2
-            @browser_version_sub = $3
-
-            unless $1
-
-              v1_0_3 = []
-              v1_0_3 << "85.8.1"
-              v1_0_3 << "85"
-              v1_0_3 << "85.8"
-
-
-              vs = parts[1].split("\.")
-              vs1 = vs[0].to_i
-              if vs1 < 126
-                @browser_version_major = '1'
-
-                if vs[1].to_i < 8
-                  @browser_version_minor = '0'
-                  @browser_version_sub = '0'
-                elsif vs[1].to_i >= 8
-                  @browser_version_minor = '0'
-                  @browser_version_sub = '3'
-                end
-
-              end
-
-            end
-
-          else
-#            puts "#{__FILE__}:#{__LINE__} #{__method__} here---"
-            @browser_version_major = parts[1].slice(0, 1)
-          end
-        }
-      end
-
-
-      if !known_browser(@browser) then
-
-        @browser = 'Safari' if is_safari?(user_agent) || known_safari_agent_string(user_agent)
-
-      end
-
-      # I'm thinking of making this a lazy call....
-      mobile_browser?(user_agent)
-      console_browser?(user_agent)
-
-      # grab all of the properties (within parens)
-      # should be in relation to the agent if possible
-      @detail = @user_agent
-      @user_agent.gsub(/\((.*)\)/, '').split(/\s/).each {|part| @detail = @detail.gsub(part, '')}
-      @detail = @detail.gsub('(', '').gsub(')', '').lstrip
-      @properties = @detail.split(/;\s+/)
-
-      # cycle through the properties to set known quantities
-      @properties.each {|property|
-        if property =~ /^Win/
-          @ostype = 'Windows'
-          @os = property
-          if parts = property.split(/ /, 2)
-            if parts[1] =~ /^NT/
-              @ostype = 'Windows'
-              subparts = parts[1].split(/ /, 2)
-              if subparts[1] == '5'
-                @os_version = '2000'
-              elsif subparts[1] == '5.1'
-                @os_version = 'XP'
-              else
-                @os_version = subparts[1]
-              end
-            end
-          end
-        end
-        if property == 'Macintosh'
-          @ostype = 'Macintosh'
-          @os = property
-        end
-        if property =~ /OS X/
-          @ostype = 'Macintosh'
-          @os_version = 'OS X'
-          @os = property
-        end
-        if property =~ /^Linux/
-          @ostype = 'Linux'
-          @os = property
-        end
-        if property =~ /^MSIE/
-          @browser = 'MSIE'
-          @browser_version = property.gsub('MSIE ', '').lstrip
-          @browser_version_major, @browser_version_minor = @browser_version.split('.')
-        end
-      }
-      self
-    end
-
-=end
   end
 end

data/spy-vs-spy.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "spy-vs-spy"
-  s.version = "0.0.3"
+  s.version = "0.0.4"
   s.date = "2009-11-23"
   s.summary = "UserAgent Detection Middleware for Rack."
   s.email = "kaptiankrispy@soldierofcode.com"

data/test/ss-test.rb

@@ -35,7 +35,7 @@ class SpyVsSpyTest < Test::Unit::TestCase
       while (line = file.gets)
 
 #        puts "#{__FILE__}:#{__LINE__} #{__method__} #{line}"
-        r = SoldierOfCode::ParseUserAgent.new.parse(line)
+        r = SoldierOfCode::SpyVsSpy.new.parse(line)
 #        puts "#{__FILE__}:#{__LINE__} #{__method__} BROWSER: #{r.browser}"
         assert r.browser == 'Safari'
 
@@ -82,7 +82,7 @@ class SpyVsSpyTest < Test::Unit::TestCase
       while (line = file.gets)
 
 #        puts "#{__FILE__}:#{__LINE__} #{__method__} #{line}"
-        r = SoldierOfCode::ParseUserAgent.new.parse(line)
+        r = SoldierOfCode::SpyVsSpy.new.parse(line)
 #        puts "#{__FILE__}:#{__LINE__} #{__method__} BROWSER: #{r.browser}"
         assert r.browser == 'Firefox'
 
@@ -129,7 +129,7 @@ class SpyVsSpyTest < Test::Unit::TestCase
       while (line = file.gets)
 
 #        puts "#{__FILE__}:#{__LINE__} #{__method__} #{line}"
-        r = SoldierOfCode::ParseUserAgent.new.parse(line)
+        r = SoldierOfCode::SpyVsSpy.new.parse(line)
 #        puts "#{__FILE__}:#{__LINE__} #{__method__} BROWSER: #{r.browser}"
         assert r.browser == 'MSIE'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: spy-vs-spy
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Kristan 'Krispy' Uccello