brauser 3.2.2 → 3.2.3

data/lib/brauser/definition.rb

@@ -39,13 +39,14 @@ module Brauser
     # @return [Object|NilClass] A match if matcher succeeded, `nil` otherwise.
     def match(type, *args)
       matcher = self.send(type || :primary) rescue nil
+      target = args[1]
 
       if matcher.is_a?(::Regexp) then
-        matcher.match(args[1])
+        matcher.match(target)
       elsif matcher.respond_to?(:call) then
         matcher.call(*args)
-      elsif matcher
-        args[1] == matcher ? args[1] : nil
+      elsif target == matcher
+        target
       else
         nil
       end

data/lib/brauser/query.rb

@@ -24,7 +24,8 @@ module Brauser
 
     # Checks if the browser is a specific version.
     #
-    # @param versions [String|Hash] A string in the form `operator version && ...` (example: `>= 7 && < 4`) or an hash with specific version to match against, in form `{:operator => version}`, where operator is one of `:lt, :lte, :eq, :gt, :gte`.
+    # @param versions [String|Hash] A string in the form `operator version && ...` (example: `>= 7 && < 4`) or an hash with specific version to match against,
+    #   in form `{:operator => version}`, where operator is one of `:lt, :lte, :eq, :gt, :gte`.
     # @return [Query] The query itself.
     def v(versions = {})
       @result = v?(versions)
@@ -71,7 +72,8 @@ module Brauser
     #
     # This version returns a boolean and it is equal to append a call to `#result` to the method `#v`.
     #
-    # @param versions [String|Hash] A string in the form `operator version && ...` (example: `>= 7 && < 4`) or an hash with specific version to match against, in form `{:operator => version}`, where operator is one of `:lt, :lte, :eq, :gt, :gte`.
+    # @param versions [String|Hash] A string in the form `operator version && ...` (example: `>= 7 && < 4`) or an hash with specific version to match against,
+    #   in form `{:operator => version}`, where operator is one of `:lt, :lte, :eq, :gt, :gte`.
     # @return [Boolean] `true` if current browser matches, `false` otherwise.
     def v?(versions = {})
       @result ? @target.v?(versions) : @result

data/lib/brauser/version.rb

@@ -16,7 +16,7 @@ module Brauser
     MINOR = 2
 
     # The patch version.
-    PATCH = 2
+    PATCH = 3
 
     # The current version of brauser.
     STRING = [MAJOR, MINOR, PATCH].compact.join(".")

data/spec/brauser/browser_spec.rb

@@ -500,6 +500,22 @@ describe Brauser::Browser do
     end
   end
 
+  describe "#supported?" do
+    it "should check if the browser is supported starting from a definition map" do
+      browser.parse_agent("Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_0) AppleWebKit/537.1 (KHTML, like Gecko) Chrome/21.0.1180.82 Safari/537.1")
+      expect(browser.supported?(chrome: 21)).to be_true
+      expect(browser.supported?(chrome: 31)).to be_false
+      expect(browser.supported?(chrome: "21.2")).to be_false
+      expect(browser.supported?(firefox: 11)).to be_false
+    end
+
+    it "should load definition files from a YAML file" do
+      path = File.dirname(__FILE__) + "/../supported.yml"
+      browser.parse_agent("Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_0) AppleWebKit/537.1 (KHTML, like Gecko) Chrome/21.0.1180.82 Safari/537.1")
+      expect(browser.supported?(path)).to be_true
+    end
+  end
+
   describe "#initalize" do
     it "initialized definitions" do
       expect(::Brauser::Browser).to receive(:add_default_browsers)

data/spec/supported.yml

@@ -0,0 +1,3 @@
+---
+chrome: 21
+firefox: 31

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brauser
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 3.2.3
 platform: ruby
 authors:
 - Shogun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-18 00:00:00.000000000 Z
+date: 2013-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lazier
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.3.1
+        version: 3.3.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.3.1
+        version: 3.3.9
 description: A framework agnostic browser detection and querying helper.
 email:
 - shogun@cowtech.it
@@ -35,6 +35,7 @@ files:
 - .travis-gemfile
 - .travis.yml
 - .yardopts
+- CHANGELOG.md
 - Gemfile
 - README.md
 - Rakefile
@@ -83,8 +84,10 @@ files:
 - spec/brauser/query_spec.rb
 - spec/coverage_helper.rb
 - spec/spec_helper.rb
+- spec/supported.yml
 homepage: http://sw.cow.tc/brauser
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -113,4 +116,5 @@ test_files:
 - spec/brauser/query_spec.rb
 - spec/coverage_helper.rb
 - spec/spec_helper.rb
+- spec/supported.yml
 has_rdoc: