which_browser 0.1.2 → 0.2.0

data/.travis.yml

@@ -0,0 +1,8 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - rbx
+  - rbx-2.0
+  - ree
+  - jruby

data/LICENSE

@@ -0,0 +1,27 @@
+Copyright (c) 2011 Spencer Steffen and Citrus Media Group.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above copyright notice,
+      this list of conditions and the following disclaimer in the documentation
+      and/or other materials provided with the distribution.
+
+    * Neither the name of Citrus Media Group nor the names of its
+      contributors may be used to endorse or promote products derived from this
+      software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/README.md

@@ -1,5 +1,7 @@
-Which Browser
-=============
+# Which Browser [![Build Status](https://secure.travis-ci.org/citrus/which_browser.png)](http://travis-ci.org/citrus/which_browser)
+
+### Check for user agents like a boss!
+
 
 Which Browser adds a few helper methods to a rack request so you can write cleaner browser-related logic.
 
@@ -7,6 +9,7 @@ For example, the age old battle against IE 5 & 6 can be handled like so:
   
     stylesheet_link_tag "ie" if request.ie_lt7?
 
+
 And for a nice browser warning:
 
     - if request.ie6?
@@ -17,8 +20,7 @@ And for a nice browser warning:
 
 Or in your rails controller, decide which layout:
 
-    render :layout => request.mobile_safari? ? 'mobile' : 'application' 
-
+    render :layout => request.mobile? ? 'mobile' : 'application' 
 
 
 Here's some other popular helpers:
@@ -28,29 +30,46 @@ Here's some other popular helpers:
     request.ie_lt6?
     request.ie_gte7?
     
+    request.mobile?
     request.ipad?
     request.ipod?
     request.iphone?
     request.mobile_safari?
 
 
+Installation
+------------
+
+As usual, just use the `gem install` command:
+
+    (sudo) gem install which_browser
+    
+Or add which_browser as a gem in your Gemfile:
+
+    gem 'which_browser', '>= 0.2.0' 
+
+Then run `bundle install`
+
 
 Testing
 -------
 
-Shouda tests can be run with:
+Tests can be run with:
 
     git clone git://github.com/citrus/which_browser.git
-    rake
+    cd which_browser
+    bundle
+    bundle exec rake
 
-There is also a ramaze app in test/dummy for a demo, development and real-life testing. Install ramaze (`gem install ramaze`) if you don't have it, then run:
+There is also a sinatra app in `test/dummy` for a demo and real-life testing. Install sinatra (`gem install sinatra`) if you don't have it, then run:
 
+    cd which_browser
     ruby test/dummy/app.rb 
 
-Now open your browser to [http://localhost:7000](http://localhost:7000)
+Now open your browser to [http://localhost:4567](http://localhost:4567) and fiddle with your user agent.
 
 
 License
 -------
 
-Copyright (c) 2011 Spencer Steffen, released under the New BSD License All rights reserved.
+Copyright (c) 2011 Spencer Steffen and Citrus, released under the New BSD License All rights reserved.

data/lib/which_browser/version.rb

@@ -1,3 +1,3 @@
 module WhichBrowser
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/lib/which_browser.rb

@@ -15,6 +15,10 @@ module WhichBrowser
      test_user_agent(/Linux/)
   end
   
+  def mobile?
+     test_user_agent(/Mobile|webOS/)
+  end
+  
   
   # =============================================
   # iOS Methods
@@ -74,6 +78,8 @@ module WhichBrowser
   end
   
     
+  
+    
   private
     
     def method_missing(method, *args, &block)
@@ -132,10 +138,10 @@ module WhichBrowser
     end
     
     def extract_version_with(regex)
-      v = (self.user_agent.match(regex) || [])[1].to_f
-      0 < v ? v : false      
+      v = self.user_agent.to_s.match(regex)[1].to_f rescue 0
+      0 < v ? v : false
     end
     
 end
 
-Rack::Request.send(:include, WhichBrowser)
+Rack::Request.send(:include, WhichBrowser)

data/test/dummy/app.rb

@@ -1,34 +1,36 @@
-require 'rubygems'
-require 'ramaze'
+begin
+  require 'rubygems'
+  require 'sinatra'
+rescue LoadError => e
+  puts "Please install sinatra before running this demo."
+  puts "Try: `gem install sinatra`"
+end
 
 require File.expand_path("../../../lib/which_browser", __FILE__)
-
-class MainController < Ramaze::Controller
-  def index
-    
-    # add other methods you'd like to see to the list:
-    [
-      :user_agent,
-      :ie?, 
-      :ie6?, 
-      :ie_lt6?, 
-      :ie_lte7?, 
-      :ie_gte6?, 
-      :safari?, 
-      :safari_version,
-      :ff?, 
-      :ff_version,
-      :opera?,
-      :chrome?,
-      :chrome?,
-      :pc?,
-      :mac?,
-      :linux?
-    ].collect{ |method|
-      v = request.send(method)
-      %(#{method} &nbsp; <span style="color: #{v == false ? 'red' : 'green' }; font-weight: #{v == false ? 'normal' : 'bold'}">#{v}</span>)
-    }.join("<br/>")
-  end
+  
+get "/" do
+  # add other methods you'd like to see to the list:
+  [
+    :user_agent,
+    :ie?, 
+    :ie6?, 
+    :ie_lt6?, 
+    :ie_lte7?, 
+    :ie_gte6?, 
+    :safari?, 
+    :safari_version,
+    :mobile_safari?,
+    :ff?, 
+    :ff_version,
+    :opera?,
+    :chrome?,
+    :chrome?,
+    :pc?,
+    :mac?,
+    :linux?,
+    :mobile?
+  ].collect{ |method|
+    v = request.send(method)
+    %(#{method} &nbsp; <span style="color: #{v == false ? 'red' : 'green' }; font-weight: #{v == false ? 'normal' : 'bold'}">#{v}</span>)
+  }.join("<br/>")
 end
-
-Ramaze.start(:mode => :dev)

data/test/helper.rb

@@ -1,15 +1,8 @@
-begin
-  require 'rubygems'
-  require 'bundler/setup'
-	require 'test/unit'
-	require 'rack'
-	require 'shoulda'
-	require 'which_browser'
-rescue LoadError => e
-	puts "Load error!"
-	puts e.inspect
-	exit
-end
+require 'rubygems'
+require 'minitest/autorun'
+require 'minitest/should'
+require 'rack'
+require 'which_browser'
 
 USER_AGENTS = {}
 

data/test/test_chrome.rb

@@ -1,6 +1,6 @@
-require_relative 'helper'
+require File.expand_path('../helper', __FILE__)
 	
-class TestChrome < Test::Unit::TestCase
+class TestChrome < MiniTest::Unit::TestCase
 
   # chrome tests
   

data/test/test_firefox.rb

@@ -1,6 +1,6 @@
-require_relative 'helper'
+require File.expand_path('../helper', __FILE__)
 	
-class TestFirefox < Test::Unit::TestCase
+class TestFirefox < MiniTest::Unit::TestCase
 
   # firefox tests
   

data/test/test_internet_explorer.rb

@@ -1,6 +1,6 @@
-require_relative 'helper'
+require File.expand_path('../helper', __FILE__)
 	
-class TestInternetExplorer < Test::Unit::TestCase
+class TestInternetExplorer < MiniTest::Unit::TestCase
   
   # ie tests
   

data/test/test_os.rb

@@ -0,0 +1,25 @@
+require File.expand_path('../helper', __FILE__)
+	
+class TestOS < MiniTest::Unit::TestCase
+  
+  should "be on mac" do
+  	request = get_request(:Chrome, '8.0.552.237')
+  	assert request.mac?
+  end
+  
+  should "be on pc" do
+  	request = get_request(:IE, '6.0')
+  	assert request.pc?
+  end
+  
+  should "be on linux" do
+  	request = get_request(:Chrome, '4.0.202.2')  	
+  	assert request.linux?
+  end
+  
+  should "be on mobile" do
+  	request = get_request(:MobileSafari, 'iPhone')  	
+  	assert request.mobile?
+  end
+  
+end

data/test/test_safari.rb

@@ -1,6 +1,6 @@
-require_relative 'helper'
+require File.expand_path('../helper', __FILE__)
 	
-class TestSafari < Test::Unit::TestCase
+class TestSafari < MiniTest::Unit::TestCase
 
   # safari tests
 

data/which_browser.gemspec

@@ -8,9 +8,9 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Spencer Steffen"]
   s.email       = ["spencer@citrusme.com"]
-  s.homepage    = ""
-  s.summary     = %q{Which Browser adds a few helper methods to a rack request.}
-  s.description = %q{Which Browser adds a few helper methods to a rack request.}
+  s.homepage    = "https://github.com/citrus/which_browser"
+  s.summary     = %q{Which Browser adds a few helper methods to a rack request making it easier to determine which browser is being used by the client.}
+  s.description = %q{Which Browser adds a few helper methods to a rack request making it easier to determine which browser is being used by the client.}
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- test/*`.split("\n")
@@ -19,7 +19,8 @@ Gem::Specification.new do |s|
   
   s.add_dependency('rack', '>= 1.0.1')
   
-	s.add_development_dependency('shoulda', '>= 2.11.3')
-	s.add_development_dependency('ramaze',  '>= 2011.01.30')
+	s.add_development_dependency('rake',            '>= 0.8.7')
+	s.add_development_dependency('minitest',        '>= 2.1.0')
+	s.add_development_dependency('minitest_should', '>= 0.1.1')
 	
 end

metadata

@@ -2,7 +2,7 @@
 name: which_browser
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors: 
 - Spencer Steffen
@@ -10,12 +10,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-08 00:00:00 -08:00
-default_executable: 
+date: 2011-12-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
-  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -23,30 +21,42 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.0.1
   type: :runtime
+  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: shoulda
-  prerelease: false
+  name: rake
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.11.3
+        version: 0.8.7
   type: :development
+  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: ramaze
-  prerelease: false
+  name: minitest
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2011.01.30
+        version: 2.1.0
   type: :development
+  prerelease: false
   version_requirements: *id003
-description: Which Browser adds a few helper methods to a rack request.
+- !ruby/object:Gem::Dependency 
+  name: minitest_should
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.1.1
+  type: :development
+  prerelease: false
+  version_requirements: *id004
+description: Which Browser adds a few helper methods to a rack request making it easier to determine which browser is being used by the client.
 email: 
 - spencer@citrusme.com
 executables: []
@@ -57,7 +67,9 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .travis.yml
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - lib/which_browser.rb
@@ -67,11 +79,10 @@ files:
 - test/test_chrome.rb
 - test/test_firefox.rb
 - test/test_internet_explorer.rb
-- test/test_requests.rb
+- test/test_os.rb
 - test/test_safari.rb
 - which_browser.gemspec
-has_rdoc: true
-homepage: ""
+homepage: https://github.com/citrus/which_browser
 licenses: []
 
 post_install_message: 
@@ -84,25 +95,31 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: -4551958323863309221
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: -4551958323863309221
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
-summary: Which Browser adds a few helper methods to a rack request.
+summary: Which Browser adds a few helper methods to a rack request making it easier to determine which browser is being used by the client.
 test_files: 
 - test/dummy/app.rb
 - test/helper.rb
 - test/test_chrome.rb
 - test/test_firefox.rb
 - test/test_internet_explorer.rb
-- test/test_requests.rb
+- test/test_os.rb
 - test/test_safari.rb

data/test/test_requests.rb

@@ -1,10 +0,0 @@
-require_relative 'helper'
-	
-class TestRequests < Test::Unit::TestCase
-  
-  should "return test user agent" do
-  	request = get_request(:Safari, '4.0.1') 	
-  	assert_equal true, request.test_user_agent(/Safari/)
-  end
-    
-end