RubyGems - rackamole - Versions diffs - 0.2.6 → 0.2.7 - Mend

rackamole 0.2.6 → 0.2.7

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 (13) hide show

data/HISTORY +5 -1
data/lib/rackamole/mole.rb +5 -14
data/lib/rackamole/store/mongo_db.rb +2 -1
data/lib/rackamole/utils/agent_detect.rb +73 -0
data/lib/rackamole.rb +1 -1
data/spec/expected_results/mole_exception.log +2 -1
data/spec/expected_results/mole_feature.log +2 -1
data/spec/expected_results/mole_perf.log +2 -1
data/spec/rackamole/mole_spec.rb +58 -38
data/spec/rackamole/store/log_spec.rb +22 -16
data/spec/rackamole/store/mongo_db_spec.rb +12 -2
data/spec/rackamole/utils/agent_detect_spec.rb +105 -0
metadata +4 -2

data/HISTORY CHANGED Viewed

@@ -33,4 +33,8 @@
 * Added options for excluding certain mole information for being logged see mole_excludes option.
 * Eliminated unwise defaults. From now, the option :app_name must be specified when initializing.
   The option :db_name must also be present if the mongo store is used.
-  Keep in mind for rackamole to work with wackamole your db name must follow: mole_{app_name}_{environment}_mdb.
+  Keep in mind for rackamole to work with wackamole your db name must follow: mole_{app_name}_{environment}_mdb.
+0.2.7
+* Bug fixes and cleanup
+* Added user_agent parsing. now extracting os/platform/version as well as browser type and version.

data/lib/rackamole/mole.rb CHANGED Viewed

@@ -280,13 +280,16 @@ module Rack
       # Optional elements...
       mole?( :software  , info, env['SERVER_SOFTWARE'] )
       mole?( :ip        , info, ip )
-      mole?( :browser   , info, id_browser( user_agent ) )
       mole?( :url       , info, request.url )
       mole?( :path      , info, request.path )
       mole?( :status    , info, status )
       mole?( :headers   , info, headers )
       mole?( :body      , info, response.body ) if response
+      # Gather up browser and client machine info
+      agent_info = Rackamole::Utils::AgentDetect.parse( user_agent )
+      %w(browser machine).each { |type| mole?(type.to_sym, info, agent_info[type.to_sym] ) }
       # Dump request params
       unless request.params.empty?
         info[:params] = filter_params( request.params, options[:param_excludes] || [] )
@@ -324,19 +327,7 @@ module Rack
       end
       results
     end
-    # Attempts to detect browser type from agent info.
-    # BOZO !! Probably more efficient way to do this...
-    def browser_types() @browsers ||= [ 'Firefox', 'Safari', 'MSIE 8.0', 'MSIE 7.0', 'MSIE 6.0', 'Opera', 'Chrome' ] end
-    def id_browser( user_agent )
-      return "N/A" if !user_agent or user_agent.empty?
-      browser_types.each do |b|
-        return b if user_agent.match( /.*?#{b.gsub(/\./,'\.')}.*?/ )
-      end
-      "N/A"
-    end
     # Trim stack trace
     def trim_stack( boom )
       boom.backtrace[0...4]

data/lib/rackamole/store/mongo_db.rb CHANGED Viewed

@@ -197,7 +197,8 @@ module Rackamole
             :time_id      => :tid,
             :user_id      => :uid,
             :user_name    => :una,
-            :browser      => :bro,
+            :browser      => :bro,
+            :machine      => :mac,
             :host         => :hos,
             :software     => :sof,
             :request_time => :rti,

data/lib/rackamole/utils/agent_detect.rb ADDED Viewed

@@ -0,0 +1,73 @@
+# This agent business is a cluster fuck. Won't even pretend detection will
+# be accurate. But at least an honest try...
+# BOZO !! Need to handle iphone, android, etc...
+module Rackamole::Utils
+  class AgentDetect
+    # browsers...
+    def self.browsers() %w[Opera Firefox Chrome Safari MSIE]; end
+    # Parses user agent to extract browser and machine info
+    def self.parse( agent )
+      browsers.each do |browser|
+        return extract( agent, browser ) if check?( agent, browser )
+      end
+      defaults
+    end
+    # =========================================================================
+    private
+      # Check for known browsers
+      def self.check?( agent, browser )
+        agent.match( /#{browser}/ )
+      end
+      # Pre populate info hash
+      def self.defaults
+        info = { :browser => {}, :machine => {} }
+        %w[name version].each { |t| info[:browser][t.to_sym] = "N/A" }
+        %w[platform os version local].each { |t| info[:machine][t.to_sym] = "N/A" }
+        info
+      end
+      # Extract machine and browser info
+      def self.extract( agent, browser )
+        @info = defaults
+        begin
+          extract_browser( agent, browser )
+          extract_platform( agent )
+        rescue => boom
+          $stderr.puts "Unable to parse user agent `#{agent}"
+          $stderr.puts boom
+          boom.backtrace.each { |l| $stderr.puts l }
+        end
+        @info
+      end
+      # Extract browser and version
+      def self.extract_browser( agent, browser )
+        @info[:browser][:name] = browser
+        match = agent.match( /#{browser}[\/|\s]([\d|\.?]+)/ )
+        @info[:browser][:version] = match[1] if match and match[1]
+      end
+      # Extracts machine info
+      def self.extract_platform( agent )
+        match = agent.match( /\((.*)\)/ )
+        return unless match and match[1]
+        machine_info = match[1]
+        tokens       = machine_info.split( ";" )
+        unless tokens.empty?
+          platform = tokens[0].strip
+          @info[:machine][:platform] = platform
+          index = 1
+          index += 1 if tokens[1].match( /[MSIE|U]/ )
+          os = tokens[index].match( /(.+)\s([\w\d|\.]+)/ )
+          @info[:machine][:os]      = os[1].strip
+          @info[:machine][:version] = os[2].strip
+        end
+      end
+  end
+end

data/lib/rackamole.rb CHANGED Viewed

@@ -1,7 +1,7 @@
 module Rackamole
   # :stopdoc:
-  VERSION = '0.2.6'
+  VERSION = '0.2.7'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:

data/spec/expected_results/mole_exception.log CHANGED Viewed

@@ -4,7 +4,8 @@ Type                 : 2
 App_name             : "Test app"
 Environment          : :test
 Ip                   : "1.1.1.1"
-Browser              : "Ibrowse"
+Browser              : {"name"=>"Ibrowse", "version"=>"1.X"}
+Machine              : {"platform"=>"Blee", "os"=>"Windoze", "version"=>"10.0"}
 User_id              : 100
 User_name            : "Fernand"
 Request_time         : 1.0

data/spec/expected_results/mole_feature.log CHANGED Viewed

@@ -4,7 +4,8 @@ Type                 : 0
 App_name             : "Test app"
 Environment          : :test
 Ip                   : "1.1.1.1"
-Browser              : "Ibrowse"
+Browser              : {"name"=>"Ibrowse", "version"=>"1.X"}
+Machine              : {"platform"=>"Blee", "os"=>"Windoze", "version"=>"10.0"}
 User_id              : 100
 User_name            : "Fernand"
 Request_time         : 1.0

data/spec/expected_results/mole_perf.log CHANGED Viewed

@@ -4,7 +4,8 @@ Type                 : 1
 App_name             : "Test app"
 Environment          : :test
 Ip                   : "1.1.1.1"
-Browser              : "Ibrowse"
+Browser              : {"name"=>"Ibrowse", "version"=>"1.X"}
+Machine              : {"platform"=>"Blee", "os"=>"Windoze", "version"=>"10.0"}
 User_id              : 100
 User_name            : "Fernand"
 Request_time         : 1.0

data/spec/rackamole/mole_spec.rb CHANGED Viewed

@@ -10,7 +10,7 @@ describe Rack::Mole do
     @test_env   = {
       'rack.session'         => { :user_id => 100, :username => "fernand" },
       'HTTP_X_FORWARDED_FOR' => '1.1.1.1',
-      'HTTP_USER_AGENT'      => "Firefox"
+      'HTTP_USER_AGENT'      => "Mozilla/5.0 (X11; U; Linux i686 (x86_64); en-US; rv:1.8.0.12) Gecko/20080326 CentOS/1.5.0.12-14.el5.centos Firefox/1.5.0.12"
     }
     @opts       = {
       :app_name       => "Test App",
@@ -184,11 +184,12 @@ describe Rack::Mole do
       @test_store.mole_result[:session].should_not  be_nil
       @test_store.mole_result[:session].keys.should have(2).items
       @test_store.mole_result[:status].should       == 200
+      @test_store.mole_result[:machine].should_not  be_nil
       # Excluded
       @test_store.mole_result[:headers].should      be_nil
       @test_store.mole_result[:body].should         be_nil
-      @test_store.mole_result[:browser].should      be_nil
+      @test_store.mole_result[:browser].should      be_nil
       @test_store.mole_result[:ip].should           be_nil
       @test_store.mole_result[:url].should          be_nil
     end
@@ -202,23 +203,27 @@ describe Rack::Mole do
     it "should set the mole meta correctly" do
       get "/fred/blee", nil, @test_env
-      @test_store.mole_result[:app_name].should     == "Test App"
-      @test_store.mole_result[:environment].should  == :test
-      @test_store.mole_result[:user_id].should      be_nil
-      @test_store.mole_result[:user_name].should    == 'fernand'
-      @test_store.mole_result[:ip].should           == '1.1.1.1'
-      @test_store.mole_result[:browser].should      == 'Firefox'
-      @test_store.mole_result[:method].should       == 'GET'
-      @test_store.mole_result[:url].should          == 'http://example.org/fred/blee'
-      @test_store.mole_result[:path].should         == '/fred/blee'
-      @test_store.mole_result[:type].should         == Rackamole.feature
-      @test_store.mole_result[:params].should       be_nil
-      @test_store.mole_result[:session].should_not  be_nil
-      @test_store.mole_result[:session].keys.should have(2).items
-      @test_store.mole_result[:status].should       == 200
-      @test_store.mole_result[:headers].should      == { "Content-Type" => "text/plain" }
-      @test_store.mole_result[:body].should         be_nil
+      @test_store.mole_result[:app_name].should           == "Test App"
+      @test_store.mole_result[:environment].should        == :test
+      @test_store.mole_result[:user_id].should            be_nil
+      @test_store.mole_result[:user_name].should          == 'fernand'
+      @test_store.mole_result[:ip].should                 == '1.1.1.1'
+      @test_store.mole_result[:browser][:name].should     == "Firefox"
+      @test_store.mole_result[:browser][:version].should  == '1.5.0.12'
+      @test_store.mole_result[:machine][:platform].should == 'X11'
+      @test_store.mole_result[:machine][:os].should       == 'Linux'
+      @test_store.mole_result[:machine][:version].should  == 'i686'
+      @test_store.mole_result[:method].should             == 'GET'
+      @test_store.mole_result[:url].should                == 'http://example.org/fred/blee'
+      @test_store.mole_result[:path].should               == '/fred/blee'
+      @test_store.mole_result[:type].should               == Rackamole.feature
+      @test_store.mole_result[:params].should             be_nil
+      @test_store.mole_result[:session].should_not        be_nil
+      @test_store.mole_result[:session].keys.should       have(2).items
+      @test_store.mole_result[:status].should             == 200
+      @test_store.mole_result[:headers].should            == { "Content-Type" => "text/plain" }
+      @test_store.mole_result[:body].should               be_nil
     end
     it "mole an exception correctly" do
@@ -227,12 +232,12 @@ describe Rack::Mole do
       rescue => boom
         @test_env['mole.exception'] = boom
         get "/crap/out", nil, @test_env
-        @test_store.mole_result[:type].should  == Rackamole.fault
-        @test_store.mole_result[:stack].should have(4).items
-        @test_store.mole_result[:fault].should == 'Oh snap!'
+        @test_store.mole_result[:type].should     == Rackamole.fault
+        @test_store.mole_result[:stack].should    have(4).items
+        @test_store.mole_result[:fault].should    == 'Oh snap!'
         last_request.env['mole.stash'].should_not be_nil
-        fault = last_request.env['mole.stash'].send( :find_fault, "/", "./spec/rackamole/mole_spec.rb:226" )
-        fault.should_not be_nil
+        fault = last_request.env['mole.stash'].send( :find_fault, "/", "./spec/rackamole/mole_spec.rb:231" )
+        fault.should_not   be_nil
         fault.count.should == 1
       end
     end
@@ -390,20 +395,35 @@ describe Rack::Mole do
   end
   # ---------------------------------------------------------------------------
-  describe '#id_browser' do
-    before :all do
-      @rack = Rack::Mole.new( nil, :app_name => "test app" )
-    end
-    it "should detect a browser type correctly" do
-      browser = @rack.send( :id_browser, "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; .NET CLR 1.1.4322; .NET CLR 2.0.50727; .NET CLR 3.0.04506.30; .NET CLR 3.0.04506.648; InfoPath.2; MS-RTC LM 8; SPC 3.1 P1 Ta)")
-      browser.should == 'MSIE 7.0'
-    end
-    it "should return unknow if can't detect it" do
-      @rack.send( :id_browser, 'IBrowse' ).should == 'N/A'
-    end
-  end
+  # describe '#id_browser' do
+  #   before :all do
+  #     @rack = Rack::Mole.new( nil, :app_name => "test app" )
+  #   end
+  #
+  #   it "should detect a browser type correctly" do
+  #     agents =
+  #     [
+  #       "Mozilla/5.0 (iPhone; U; CPU iPhone OS 3_0_1 like Mac OS X; en-us) AppleWebKit/528.18 (KHTML, like Gecko)"
+  #       "Opera/9.61 (Windows NT 5.1; U; ru) Presto/2.1.1"
+  #       "Mozilla/4.0 (compatible; MSIE 5.00; Windows 98)",
+  #       "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; (R1 1.5); .NET CLR 1.1.4322)",
+  #       "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_2; en-US) AppleWebKit/532.5 (KHTML, like Gecko) Chrome/4.0.249.49 Safari/532.5",
+  #       "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_2; en-us) AppleWebKit/531.9 (KHTML, like Gecko) Version/4.0.3 Safari/531.9",
+  #       "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; .NET CLR 1.1.4322; .NET CLR 2.0.50727; .NET CLR 3.0.04506.30; .NET CLR 3.0.04506.648; InfoPath.2; MS-RTC LM 8; SPC 3.1 P1 Ta)",
+  #       "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.1.7) Gecko/20091221 Firefox/3.5.7"
+  #     ]
+  #     # results = ["Chrome - 4.0.249.49", "Safari - 531.9", "MSIE 7.0", "Firefox - 3.5.7"]
+  #     # results = ["Chrome", "Safari", "MSIE 7.0", "Firefox"]
+  #     agents.each do |agent|
+  #       browser = @rack.send( :id_browser, agent )
+  #       browser.should == results.shift
+  #     end
+  #   end
+  #
+  #   it "should return unknow if can't detect it" do
+  #     @rack.send( :id_browser, 'IBrowse' ).should == 'N/A'
+  #   end
+  # end
   # ---------------------------------------------------------------------------
   describe 'YAML load' do

data/spec/rackamole/store/log_spec.rb CHANGED Viewed

@@ -9,26 +9,32 @@ describe Rackamole::Store::Log do
       @store = Rackamole::Store::Log.new( @test_file )
       @args = OrderedHash.new
-      @args[:type]         = Rackamole.feature
-      @args[:app_name]     = "Test app"
-      @args[:environment]  = :test
-      @args[:ip]           = "1.1.1.1"
-      @args[:browser]      = "Ibrowse"
-      @args[:user_id]      = 100
-      @args[:user_name]    = "Fernand"
-      @args[:request_time] = 1.0
-      @args[:url]          = "http://test_me/"
-      @args[:path]         = "/fred"
-      @args[:method]       = 'GET'
-      @args[:params]       = { :blee => "duh".to_json }
-      @args[:session]      = { :fred => 10.to_json }
+      @args[:type]               = Rackamole.feature
+      @args[:app_name]           = "Test app"
+      @args[:environment]        = :test
+      @args[:ip]                 = "1.1.1.1"
+      @args[:browser]            = OrderedHash.new
+      @args[:browser][:name]     = "Ibrowse"
+      @args[:browser][:version]  = "1.X"
+      @args[:machine]            = OrderedHash.new
+      @args[:machine][:platform] = "Blee"
+      @args[:machine][:os]       = "Windoze"
+      @args[:machine][:version]  = "10.0"
+      @args[:user_id]            = 100
+      @args[:user_name]          = "Fernand"
+      @args[:request_time]       = 1.0
+      @args[:url]                = "http://test_me/"
+      @args[:path]               = "/fred"
+      @args[:method]             = 'GET'
+      @args[:params]             = { :blee => "duh".to_json }
+      @args[:session]            = { :fred => 10.to_json }
     end
     it "should mole a feature correctly" do
       @store.mole( @args )
-      results = File.read( @test_file ).gsub( /.* Mole \:\s/, '' )
-      expected = File.read( File.join( File.dirname(__FILE__), %w[.. .. expected_results mole_feature.log] ) )
-      expected.should == results
+      results = File.read( @test_file ).gsub( /.* Mole \:\s/, '' )
+      expected = File.read( File.join( File.dirname(__FILE__), %w[.. .. expected_results mole_feature.log] ) )
+      expected.should == results
     end
     it "should mole an exception correctly" do

data/spec/rackamole/store/mongo_db_spec.rb CHANGED Viewed

@@ -23,7 +23,13 @@ describe Rackamole::Store::MongoDb do
       @args[:environment]  = :test
       @args[:perf_issue]   = false
       @args[:ip]           = "1.1.1.1"
-      @args[:browser]      = "Ibrowse"
+      @args[:browser]            = OrderedHash.new
+      @args[:browser][:name]     = "Ibrowse"
+      @args[:browser][:version]  = "1.X"
+      @args[:machine]            = OrderedHash.new
+      @args[:machine][:platform] = "Blee"
+      @args[:machine][:os]       = "Windoze"
+      @args[:machine][:version]  = "10.0"
       @args[:user_id]      = 100
       @args[:user_name]    = "Fernand"
       @args[:request_time] = 1.0
@@ -52,7 +58,11 @@ describe Rackamole::Store::MongoDb do
       log['fid'].should_not be_nil
       log['par'].should     == { 'blee' => 'duh'.to_json }
       log['ip'].should      == '1.1.1.1'
-      log['bro'].should     == 'Ibrowse'
+      log['bro']['name'].should     == "Ibrowse"
+      log['bro']['version'].should  == "1.X"
+      log['mac']['platform'].should == "Blee"
+      log['mac']['os'].should       == "Windoze"
+      log['mac']['version'].should  == "10.0"
       log['url'].should     == 'http://test_me/'
       log['met'].should     == 'GET'
       log['ses'].should     == { 'fred' => '10' }

data/spec/rackamole/utils/agent_detect_spec.rb ADDED Viewed

@@ -0,0 +1,105 @@
+require File.join(File.dirname(__FILE__), %w[.. .. spec_helper] )
+describe Rackamole::Utils::AgentDetect do
+  describe "os" do
+    it "should detect the os and version correctly" do
+      agents = [
+        "Opera/8.65 (X11; Linux i686; U; ru)",
+        "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1) Opera 8.65 [en]",
+        "Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.0.7) Gecko/2009021910 Firefox/1.5.0.12 (.NET CLR 3.5.30729)",
+        "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5; en-US; rv:1.9.0.6) Gecko/2009011912 Firefox/1.5.0.12 Ubiquity/0.1.5",
+        "Mozilla/5.0 (X11; U; Linux i686 (x86_64); en-US; rv:1.8.0.12) Gecko/20080326 CentOS/1.5.0.12-14.el5.centos Firefox/1.5.0.12",
+        "Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US) AppleWebKit/532.0 (KHTML, like Gecko) Chrome/3.0.195.24 Safari/532.0",
+        "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_5_6; en-US) AppleWebKit/532.0 (KHTML, like Gecko) Chrome/3.0.195.24 Safari/532.0",
+        "Mozilla/5.0 (iPod; U; CPU like Mac OS X; fr) AppleWebKit/420.1 (KHTML, like Gecko) Version/3.0 Mobile/4A102 Safari/522.12",
+        "Mozilla/5.0 (iPhone; U; CPU like Mac OS X; en) AppleWebKit/420.1 (KHTML, like Gecko) Version/3.0 Mobile/3B48b Safari/522.12",
+        "Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0; .NET CLR 1.1.4322; .NET CLR 2.0.50727; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729)",
+        "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; SV1; CPT-IE401SP1; .NET CLR 1.0.3705; .NET CLR 1.1.4322; InfoPath.1; .NET CLR 2.0.50727; .NET CLR 3.0.04506.30)",
+        "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; .NET CLR 2.0.50727; .NET CLR 3.0.04506.30; .NET CLR 1.1.4322; InfoPath.2)",
+        "Mozilla/4.0 (compatible; MSIE 5.00; Windows 98)"
+      ]
+      expectations = [
+        {
+          :browser => { :name => "Opera", :version => "8.65" },
+          :machine => { :platform => "X11", :os => "Linux", :version => "i686", :local => "N/A" }
+        },
+        {
+          :browser => { :name => "Opera", :version => "8.65" },
+          :machine => { :platform => "compatible", :os => "Windows NT", :version => "5.1", :local => "N/A" }
+        },
+        {
+          :browser => { :name => "Firefox", :version => "1.5.0.12" },
+          :machine => { :platform => "Windows", :os => "Windows NT", :version => "6.0", :local => "en-US" }
+        },
+        {
+          :browser => { :name => "Firefox", :version => "1.5.0.12" },
+          :machine => { :platform => "Macintosh", :os => "Intel Mac OS X", :version => "10.5", :local => "en-US" }
+        },
+        {
+          :browser => { :name => "Firefox", :version => "1.5.0.12" },
+          :machine => { :platform => "X11", :os => "Linux", :version => "i686", :local => "en-US" }
+        },
+        {
+          :browser => { :name => "Chrome", :version => "3.0.195.24" },
+          :machine => { :platform => "Windows", :os => "Windows NT", :version => "5.1", :local => "en-US" }
+        },
+        {
+          :browser => { :name => "Chrome", :version => "3.0.195.24" },
+          :machine => { :platform => "Macintosh", :os => "Intel Mac OS X", :version => "10_5_6", :local => "en-US" }
+        },
+        {
+          :browser => { :name => "Safari", :version => "522.12" },
+          :machine => { :platform => "iPod", :os => "CPU like Mac OS", :version => "X", :local => "fr" }
+        },
+        {
+          :browser => { :name => "Safari", :version => "522.12" },
+          :machine => { :platform => "iPhone", :os => "CPU like Mac OS", :version => "X", :local => "en" }
+        },
+        {
+          :browser => { :name => "MSIE", :version => "8.0" },
+          :machine => { :platform => "compatible", :os => "Windows NT", :version => "5.1", :local => "N/A" }
+        },
+        {
+          :browser => { :name => "MSIE", :version => "7.0" },
+          :machine => { :platform => "compatible", :os => "Windows NT", :version => "5.1", :local => "N/A" }
+        },
+        {
+          :browser => { :name => "MSIE", :version => "6.0" },
+          :machine => { :platform => "compatible", :os => "Windows NT", :version => "5.1", :local => "N/A" }
+        },
+        {
+          :browser => { :name => "MSIE", :version => "5.00" },
+          :machine => { :platform => "compatible", :os => "Windows", :version => "98", :local => "N/A" }
+        }
+      ]
+      count = 0
+      agents.each do |agent|
+        info = Rackamole::Utils::AgentDetect.parse( agent )
+        expected = expectations[count]
+        info.should_not be_nil
+        %w(name version).each        { |t| info[:browser][t.to_sym].should == expected[:browser][t.to_sym] }
+        %w(platform os version).each { |t| info[:machine][t.to_sym].should == expected[:machine][t.to_sym] }
+        count += 1
+      end
+    end
+  end
+  describe "failure" do
+    it "should not crap out if the user agent is not parsable" do
+      info = Rackamole::Utils::AgentDetect.parse( "Firefox" )
+      %w(browser machine).each { |k| info[k.to_sym].each_pair { |i,v| v.should == (i == :name ? "Firefox" : "N/A") } }
+    end
+    it "should produce an empty info object if nothing can be detected" do
+      agents = [
+        "Oper/8.65 (X11 Linux i686 U ru)",
+      ]
+      agents.each do |agent|
+        info = Rackamole::Utils::AgentDetect.parse( agent )
+        info.should_not be_nil
+        %w(browser machine).each { |k| info[k.to_sym].each_pair { |i,v| v.should == "N/A" } }
+      end
+    end
+  end
+end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rackamole
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Fernand Galiana
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-01-21 00:00:00 -07:00
+date: 2010-01-28 00:00:00 -07:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -130,6 +130,7 @@ files:
 - lib/rackamole/store.rb
 - lib/rackamole/store/log.rb
 - lib/rackamole/store/mongo_db.rb
+- lib/rackamole/utils/agent_detect.rb
 - spec/expected_results/mole_exception.log
 - spec/expected_results/mole_feature.log
 - spec/expected_results/mole_perf.log
@@ -143,6 +144,7 @@ files:
 - spec/rackamole/stash/perf_spec.rb
 - spec/rackamole/store/log_spec.rb
 - spec/rackamole/store/mongo_db_spec.rb
+- spec/rackamole/utils/agent_detect_spec.rb
 - spec/rackamole_spec.rb
 - spec/spec_helper.rb
 - spec/test_configs/flawed_config.yml