rack-user_agent 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7c818afbe96660a99b0937583767e2bbb497e98
-  data.tar.gz: 6d21684f7ca29a3c107195c429a8a793ba5d927f
+  metadata.gz: e77ace242d9acad266c01d710575a5bf6345b4db
+  data.tar.gz: 3d403a258cec9b2d03a17dbe1726919114972205
 SHA512:
-  metadata.gz: ed84768e2afe458c3d84f130d5b9d46254dc122457a4d7788b1a6cd06cd0633e7655a00b45c1983feee694d1d95c350e522db935c31ae6e0c29f55cfdf92a223
-  data.tar.gz: 040d9966b293957fdd2d37b44145404ef5e9d8724290a452d246da237e9618bc0b289e08b9ad75d252594d959e9a8195c56b44210d44e19872bdd80ce69c5d11
+  metadata.gz: b83e2cc607bf898700702f4d0c18cb74cd728daeba143f16c81eafd72401130cec4c82db0fbde84df86ef4d469ab6efde626be53d0b2951bc4cfe229d3abe116
+  data.tar.gz: a18eeb7ad762ce313c26e6a97f9f91cb827bba4bf050a424ff872a65de43115fb28accc60a54bbda6486efc8181b7f8aa9f7e09bf59b44bb3f727698e016d1b6

data/.travis.yml

@@ -5,6 +5,7 @@ rvm:
   - 2.0.0
   - 2.1
   - 2.2
+  - 2.3.0
 branches:
   only:
     - master

data/lib/rack/user_agent/detector.rb

@@ -24,6 +24,10 @@ module Rack
         os == "iPod"
       end
 
+      def from_ios?
+        from_iphone? || from_ipad? || from_ipod?
+      end
+
       def from_android?
         os == "Android" && android_mobile?
       end
@@ -32,6 +36,10 @@ module Rack
         os == "Android" && !android_mobile?
       end
 
+      def from_android_os?
+        from_android? || from_android_tablet?
+      end
+
       def from_windows_phone?
         os == "Windows Phone OS"
       end

data/lib/rack/user_agent/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class UserAgent
-    VERSION = "0.4.2"
+    VERSION = "0.5.0"
   end
 end

data/spec/lib/rack/user_agent/detector_spec.rb

@@ -8,6 +8,7 @@ describe "Rack::UserAgent::Detector" do
   SMARTPHONES = [
     {
       name: "iPhone",
+      os: "iOS",
       version: "5.1.1",
       user_agents: [
         "Mozilla/5.0 (iPhone; CPU iPhone OS 5_1_1 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9B206 Safari/7534.48.3",
@@ -15,6 +16,7 @@ describe "Rack::UserAgent::Detector" do
     },
     {
       name: "iPhone",
+      os: "iOS",
       version: "6.0",
       user_agents: [
         "Mozilla/5.0 (iPhone; CPU iPhone OS 6_0 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A403 Safari/8536.25",
@@ -22,6 +24,7 @@ describe "Rack::UserAgent::Detector" do
     },
     {
       name: "iPad",
+      os: "iOS",
       version: "6.0",
       user_agents: [
         "Mozilla/5.0 (iPad; CPU OS 6_0 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A403 Safari/8536.25"
@@ -29,6 +32,7 @@ describe "Rack::UserAgent::Detector" do
     },
     {
       name: "iPod",
+      os: "iOS",
       version: "8.0",
       user_agents: [
         "Mozilla/5.0 (iPod touch; CPU iPhone OS 8_0 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Version/8.0 Mobile/12A365 Safari/600.1.4"
@@ -36,6 +40,7 @@ describe "Rack::UserAgent::Detector" do
     },
     {
       name: "Android",
+      os: "Android",
       version: "4.0.1",
       user_agents: [
         "Mozilla/5.0 (Linux; U; Android 4.0.1; ja-jp; Galaxy Nexus Build/ITL41D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30",
@@ -43,6 +48,7 @@ describe "Rack::UserAgent::Detector" do
     },
     {
       name: "Android",
+      os: "Android",
       version: "4.2.1",
       user_agents: [
         "Opera/9.80 (Android 4.2.1; Linux; Opera Mobi/ADR-1301080958) Presto/2.11.355 Version/12.10"
@@ -50,6 +56,7 @@ describe "Rack::UserAgent::Detector" do
     },
     {
       name: "Android",
+      os: "Android",
       version: nil,
       user_agents: [
         "Mozilla/5.0 (Android; Mobile; rv:18.0) Gecko/18.0 Firefox/18.0",
@@ -57,6 +64,7 @@ describe "Rack::UserAgent::Detector" do
     },
     {
       name: "Android Tablet",
+      os: "Android",
       version: "4.1.1",
       user_agents: [
         "Mozilla/5.0 (Linux; Android 4.1.1; Nexus 7 Build/JRO03S) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.166 Safari/535.19"
@@ -64,6 +72,7 @@ describe "Rack::UserAgent::Detector" do
     },
     {
       name: "Windows Phone",
+      os: "Windows Phone",
       version: "7.5",
       user_agents: [
         "Mozilla/5.0 (compatible; MSIE 9.0; Windows Phone OS 7.5; Trident/5.0; IEMobile/9.0; FujitsuToshibaMobileCommun; IS12T; KDDI)"
@@ -146,6 +155,16 @@ describe "Rack::UserAgent::Detector" do
     end
   end
 
+  describe "#from_ios?" do
+    it "returns true if the request comes from ios" do
+      user_agents("iOS", key: :os).each do |ua|
+        header "User-Agent", ua
+        get "/"
+        last_request.from_ios?.must_equal true
+      end
+    end
+  end
+
   describe "#from_android?" do
     it "returns true if the request comes from android mobile" do
       user_agents("Android").each do |ua|
@@ -166,6 +185,16 @@ describe "Rack::UserAgent::Detector" do
     end
   end
 
+  describe "#from_android_os?" do
+    it "returns true if the request comes from android os" do
+      user_agents("Android", key: :os)  .each do |ua|
+        header "User-Agent", ua
+        get "/"
+        last_request.from_android_os?.must_equal true
+      end
+    end
+  end
+
   describe "#from_windows_phone?" do
     it "returns true if the request comes from windows phone" do
       user_agents("Windows Phone").each do |ua|
@@ -176,7 +205,8 @@ describe "Rack::UserAgent::Detector" do
     end
   end
 
-  def user_agents(name)
-    SMARTPHONES.find { |info| info[:name] == name }[:user_agents]
+  def user_agents(word, key: :name)
+    SMARTPHONES.find_all { |info| info[key] == word }
+      .flat_map { |info| info[:user_agents]}
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-user_agent
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-19 00:00:00.000000000 Z
+date: 2016-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -214,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Rack::Request extension for handling User-Agent.
@@ -224,4 +224,3 @@ test_files:
 - spec/lib/rack/user_agent/result_spec.rb
 - spec/lib/rack/user_agent_spec.rb
 - spec/spec_helper.rb
-has_rdoc: