brauser 2.1.4 → 3.0.0

data/spec/brauser/definition_spec.rb

@@ -0,0 +1,39 @@
+# encoding: utf-8
+#
+# This file is part of the brauser gem. Copyright (C) 2013 and above Shogun <shogun_panda@me.com>.
+# Licensed under the MIT license, which can be found at http://www.opensource.org/licenses/mit-license.php.
+#
+
+require "spec_helper"
+
+describe Brauser::Definition do
+  let(:definition) { ::Brauser::Definition.new(:tag, "Label", "ABC", /(abc)+/) }
+
+  describe "#initialize" do
+    it "should assign attributes" do
+      other = ::Brauser::Definition.new("A", "B", "C", "D")
+      expect(other.tag).to eq("A")
+      expect(other.label).to eq("B")
+      expect(other.primary).to eq("C")
+      expect(other.secondary).to eq("D")
+    end
+  end
+
+  describe "#match" do
+    it "should apply the correct matcher and return the correct value" do
+      expect(definition.match(:primary, nil, "ABC")).to eq("ABC")
+      expect(definition.match(:primary, nil, "CDE")).to be_nil
+      expect(definition.match(:secondary, nil, "abcabc")).to be_a(MatchData)
+      expect(definition.match(:secondary, nil, "abx")).to be_nil
+    end
+
+    it "should support a block matcher" do
+      definition.primary = Proc.new { |definition, a, b, c| a + b + c }
+      expect(definition.match(:primary, nil, 1, 2, 3)).to eq(6)
+    end
+
+    it "should return nil when the matcher is not valid" do
+      expect(definition.match(:tertiary)).to be_nil
+    end
+  end
+end

data/spec/brauser/hooks_spec.rb

@@ -15,13 +15,12 @@ describe Brauser::Hooks::RubyOnRails do
 
   it "should memoize browser" do
     browser = controller.browser
-    expect(browser).to be_a(Brauser::Browser)
+    expect(browser).to be_a(::Brauser::Browser)
     expect(controller.browser).to eq(browser)
   end
 
-  it "should redetect browser" do
+  it "should detect browser again" do
     browser = controller.browser
     expect(controller.browser(true)).not_to eq(browser)
-
   end
 end

data/spec/brauser/query_spec.rb

@@ -17,104 +17,100 @@ describe Brauser::Query do
     end
   end
 
-  let(:browser){ Brauser::Browser.new("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", "it;q=0.7, en;q=0.3") }
-  let(:query) { Brauser::Query.new(browser, true) }
+  let(:browser){ ::Brauser::Browser.new("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", "it;q=0.7, en;q=0.3") }
+  let(:query) { ::Brauser::Query.new(browser, true) }
 
   describe "#is" do
     it "should call the final corresponding method and then return self" do
-      query.should_receive(:is?).and_return(true)
+      query.should_receive(:is?).and_call_original
       expect(query.is(:msie)).to be(query)
     end
   end
 
   describe "#is?" do
     it "should call the browser's corresponding method and update the result" do
-      query.result = true
-      browser.should_receive(:is?).with(:msie, {}, []).and_return(false)
+      browser.should_receive(:is?).with(:msie, {}, []).and_call_original
       expect(query.is?(:msie)).to be_false
     end
   end
 
   describe "#v" do
     it "should call the final corresponding method and then return self" do
-      query.should_receive(:v?).and_return(true)
+      query.should_receive(:v?).and_call_original
       expect(query.v(">= 9")).to be(query)
     end
   end
 
   describe "#v?" do
     it "should call the browser's corresponding method and update the result" do
-      query.result = true
-      browser.should_receive(:v?).with(">= 9").and_return(false)
-      expect(query.v?(">= 9")).to be_false
+      browser.should_receive(:v?).with(">= 9").and_call_original
+      expect(query.v?(">= 9")).to be_true
     end
   end
 
   describe "#on" do
     it "should call the final corresponding method and then return self" do
-      query.should_receive(:on?).and_return(true)
+      query.should_receive(:on?).and_call_original
       expect(query.on(:osx)).to be(query)
     end
   end
 
   describe "#on?" do
     it "should call the browser's corresponding method and update the result" do
-      query.result = true
-      browser.should_receive(:on?).with(:osx).and_return(false)
-      expect(query.on?(:osx)).to be_false
+      browser.should_receive(:on?).with(:osx).and_call_original
+      expect(query.on?(:osx)).to be_true
     end
 
   end
 
   describe "#accepts" do
     it "should call the final corresponding method and then return self" do
-      query.should_receive(:accepts?).and_return(true)
+      query.should_receive(:accepts?).and_call_original
       expect(query.accepts("it")).to be(query)
     end
   end
 
   describe "#accepts?" do
     it "should call the browser's corresponding method and update the result" do
-      query.result = true
-      browser.should_receive(:accepts?).with("it").and_return(false)
-      expect(query.accepts?("it")).to be_false
+      browser.should_receive(:accepts?).with("es").and_call_original
+      expect(query.accepts?("es")).to be_false
     end
   end
 
   describe "concatenation" do
     before(:each) do
-      browser.instance_variable_set("@name", :chrome)
-      browser.instance_variable_set("@version", "7.1.2")
-      browser.instance_variable_set("@name", :windows)
+      browser.name = :chrome
+      browser.version = "7.1.2"
+      browser.platform = :windows
     end
 
     it "should call requested methods on the browser and return a query" do
-      browser.should_receive(:is).and_return(Brauser::Query.new(browser, true))
-      browser.should_receive(:v?).and_return(true)
-      browser.should_receive(:on?).and_return(true)
+      browser.should_receive(:is).and_call_original
+      browser.should_receive(:v?).and_call_original
+      browser.should_receive(:on?).and_call_original
 
-      expect(browser.is(:chrome).v(">= 7").on(:osx)).to be_a(Brauser::Query)
+      expect(browser.is(:chrome).v(">= 7").on(:osx)).to be_a(::Brauser::Query)
     end
 
     it "should call methods while result is true" do
-      browser.should_receive(:is).and_return(Brauser::Query.new(browser, true))
-      browser.should_receive(:v?).and_return(false)
+      browser.should_receive(:is).and_call_original
+      browser.should_receive(:v?).and_call_original
       browser.should_not_receive(:on?)
 
-      expect(browser.is(:chrome).v(">= 7").on(:osx)).to be_a(Brauser::Query)
+      expect(browser.is(:chrome).v(">= 9").on(:osx)).to be_a(::Brauser::Query)
     end
 
     it "when the last method is the question mark, it should return the evaluation to boolean" do
-      browser.should_receive(:is).and_return(Brauser::Query.new(browser, true))
-      browser.should_receive(:v?).and_return(true)
-      browser.should_receive(:on?).and_return(true)
+      browser.should_receive(:is).and_call_original
+      browser.should_receive(:v?).and_call_original
+      browser.should_receive(:on?).and_call_original
 
-      expect(browser.is(:chrome).v(">= 7").on?(:osx)).to be_true
+      expect(browser.is(:chrome).v(">= 7").on?(:osx)).to be_false
     end
 
     it "should return the result when ending the query with #result" do
-      browser.should_receive(:is).and_return(Brauser::Query.new(browser, true))
-      browser.should_receive(:v?).and_return(false)
+      browser.should_receive(:is).and_call_original
+      browser.should_receive(:v?).and_call_original
       browser.should_not_receive(:on?)
 
       expect(browser.is(:chrome).v(">= 9").on(:osx).result).to be_false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brauser
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 3.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-14 00:00:00.000000000 Z
+date: 2013-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lazier
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.1
+        version: 3.0.0
 description: A framework agnostic browser detection and querying helper.
 email:
 - shogun_panda@me.com
@@ -73,10 +73,12 @@ files:
 - doc/top-level-namespace.html
 - lib/brauser.rb
 - lib/brauser/browser.rb
+- lib/brauser/definition.rb
 - lib/brauser/hooks.rb
 - lib/brauser/query.rb
 - lib/brauser/version.rb
 - spec/brauser/browser_spec.rb
+- spec/brauser/definition_spec.rb
 - spec/brauser/hooks_spec.rb
 - spec/brauser/query_spec.rb
 - spec/brauser_spec.rb
@@ -103,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3325592739325196231
+      hash: -647433580112480760
 requirements: []
 rubyforge_project: brauser
 rubygems_version: 1.8.25
@@ -112,6 +114,7 @@ specification_version: 3
 summary: A framework agnostic browser detection and querying helper.
 test_files:
 - spec/brauser/browser_spec.rb
+- spec/brauser/definition_spec.rb
 - spec/brauser/hooks_spec.rb
 - spec/brauser/query_spec.rb
 - spec/brauser_spec.rb