browscapper 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ede4118b2f3bcec3b30148e6bac3265215ca7c31
-  data.tar.gz: aa5ba1d31e8fae077eb4dd933f21e96d71d6ebb3
+  metadata.gz: dd9c677e74cca24388abf53368c52473a8ff239a
+  data.tar.gz: 1c10c846a8ce23085b7479e8ac6e7ea5139e0a7a
 SHA512:
-  metadata.gz: d943570726015c59daf03b4fb53e3addfe266350bf4802827eee56bf01f1df472c33bc9b831fea74bbb6b65eba03e70df30292989f700f56ceafc683e07b6252
-  data.tar.gz: ceece896924cd926fd69aa2943060d421374728688e85a91a250786ce7b4939171dd8008c4d67621c0e657af3d778574e753a7b071c99fdb853ff7a543127211
+  metadata.gz: 5ea30a48bf5cdbb87aa52182b46dd73278c82c03dec30931ea19d6bdf5b61b8210c5814414882ed211da3e11d7d709a795d496e111a80927fbb39ae2b3d0f3a1
+  data.tar.gz: 847ab8bf9659a4499bba78fd4f8db8a8f5d1c912ef9ed2172aae6ca6d7283d17467ac622db338bbec5cd698754b2a800c132a48bceb48e2f37b74a61accc2031

data/lib/browscapper/user_agent.rb

@@ -91,6 +91,8 @@ module Browscapper
     end
 
     def ==(other)
+      return false unless other.is_a?(self.class)
+
       ACCESSORS.each do |accessor|
         return false if self.send(accessor) != other.send(accessor)
       end

data/lib/browscapper/version.rb

@@ -1,6 +1,6 @@
 # encoding: BINARY
 
 module Browscapper
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end
 

data/lib/browscapper.rb

@@ -36,21 +36,17 @@ module Browscapper
       self
     end
 
-    def dump(format = :marshal)
-      @entries or Browscapper.load
-
-      Marshal.dump(@entries)
-    end
-
     def clear_cache
       MATCH_CACHE.clear
     end
 
     def matches(ua)
+      return nil if ua_empty?(ua)
+
       @entries or self.load
 
-      ua_str = ua.downcase
-      ua_len = ua.length
+      ua_str = ua.to_s.downcase
+      ua_len = ua_str.length
 
       MATCH_CACHE[ua] ||= @entries.select { |k, v|
         v[:pattern] =~ ua_str if v
@@ -62,6 +58,8 @@ module Browscapper
     end
 
     def match(ua)
+      return nil if ua_empty?(ua)
+
       if MATCH_CACHE[ua] && !MATCH_CACHE[ua].empty?
         MATCH_CACHE[ua].first
       else
@@ -70,5 +68,13 @@ module Browscapper
       end
     end
     alias :query :match
+
+    private
+      def ua_empty?(ua)
+        return true if ua.nil?
+        return true if ua.respond_to?(:empty) && ua.empty?
+
+        false
+      end
   end
 end

data/test/browscapper/user_agent_tests.rb

@@ -0,0 +1,27 @@
+# encoding: BINARY
+
+$: << File.dirname(__FILE__)
+require 'test_helper'
+
+class Browscapper::UserAgentTest < MiniTest::Unit::TestCase
+  def test_eqeq_equal
+    a = Browscapper::UserAgent.new(tablet: :foo)
+    b = Browscapper::UserAgent.new(tablet: :foo)
+
+    assert(a == b)
+  end
+
+  def test_eqeq_not_equal
+    a = Browscapper::UserAgent.new(tablet: true)
+    b = Browscapper::UserAgent.new(tablet: :foo)
+
+    refute(a == b)
+  end
+
+  def test_eqeq_not_a_user_agent
+    a = Browscapper::UserAgent.new(tablet: true)
+
+    refute(a == nil)
+    refute(a == :foo)
+  end
+end

data/test/browscapper_tests.rb

@@ -44,12 +44,35 @@ class BrowscapperTest < MiniTest::Unit::TestCase
 
   FIREFOX_ON_OSX.pattern = /^mozilla\/5\.0 \(macintosh; .*; .*mac os x.*; .*; rv:1\.9\.2.*\) gecko\/.* firefox\/3\.6.*$/
 
+  FIREFOX_ON_OSX_USER_AGENT_STRING = 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.2.8) Gecko/20100722 Firefox/3.6.8'.freeze
+
+  def setup
+    Browscapper.clear_cache
+  end
+
   def test_browscap_ini
-    Browscapper.load(File.join('vendor', 'browscap.ini'))
-    match = Browscapper.match('Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en-US; rv:1.9.2.8) Gecko/20100722 Firefox/3.6.8')
+    match = Browscapper.match(FIREFOX_ON_OSX_USER_AGENT_STRING)
 
     FIREFOX_ON_OSX.each do |k, v|
       assert(v == match[k], " Expected #{v.inspect} for #{k}, got #{match[k].inspect}")
     end
   end
+
+  def test_match_nil
+    assert_nil(Browscapper.match(nil))
+  end
+
+  def test_match_empty
+    assert_nil(Browscapper.match(""))
+  end
+
+  def test_match_to_s
+    value = OpenStruct.new
+
+    def value.to_s
+      FIREFOX_ON_OSX_USER_AGENT_STRING
+    end
+
+    assert_equal(FIREFOX_ON_OSX, Browscapper.match(value))
+  end
 end

data/test/test_helper.rb

@@ -23,4 +23,4 @@ if RUBY_VERSION >= '1.9'
   MiniTest::Reporters.use!(MiniTest::Reporters::SpecReporter.new)
 end
 
-
+Browscapper.load(File.join('vendor', 'browscap.ini'))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: browscapper
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - J Smith
@@ -48,6 +48,7 @@ files:
 - lib/browscapper/version.rb
 - lib/tasks/dump.rake
 - test/browscapper/reader_tests.rb
+- test/browscapper/user_agent_tests.rb
 - test/browscapper_tests.rb
 - test/test_helper.rb
 - vendor/browscap.ini
@@ -77,5 +78,6 @@ specification_version: 4
 summary: A browscap file parser and matcher.
 test_files:
 - test/browscapper/reader_tests.rb
+- test/browscapper/user_agent_tests.rb
 - test/browscapper_tests.rb
 - test/test_helper.rb