rack-user_agent 0.4.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d7c818afbe96660a99b0937583767e2bbb497e98
-  data.tar.gz: 6d21684f7ca29a3c107195c429a8a793ba5d927f
+SHA256:
+  metadata.gz: 196193c319b01ca515b88528abd0e71594f8d320679255234465022eb353bf5b
+  data.tar.gz: 9d46fb2122d7e4e971b056f8ce5d7ac9c5132f6fa8198665520a70661ec0d348
 SHA512:
-  metadata.gz: ed84768e2afe458c3d84f130d5b9d46254dc122457a4d7788b1a6cd06cd0633e7655a00b45c1983feee694d1d95c350e522db935c31ae6e0c29f55cfdf92a223
-  data.tar.gz: 040d9966b293957fdd2d37b44145404ef5e9d8724290a452d246da237e9618bc0b289e08b9ad75d252594d959e9a8195c56b44210d44e19872bdd80ce69c5d11
+  metadata.gz: a25fdf45a55784820fc006206c3ce7adfe106d66b56399ef779f089d94c7e9c9bd8d7e90dd98b6b32155a53d08af75fe9b6ffd06e3cfb11227a932b4d8bacae3
+  data.tar.gz: bdb3879111432d33451ef731bda1cd82fe70bf3586ed49ac873b7e73ad0aab96aa116b5fe7dfef274768ff6c3cdefa7e09b10a976d5ff8791e9fff0d0de5689e

data/.github/workflows/test.yml

@@ -0,0 +1,38 @@
+name: test
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+  schedule:
+    - cron: "00 15 * * *" # 7:00 PST (-8), 8:00 PDT (-7)
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - '2.5'
+          - '2.6'
+          - '2.7'
+          - '3.0'
+          - '3.1'
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - uses: actions/cache@v2
+        with:
+          path: vendor/bundle
+          key: ${{ runner.os }}-${{ matrix.ruby }}-gems-${{ hashFiles('**/Gemfile.lock') }}
+          restore-keys: ${{ runner.os }}-gems-
+      - name: bundle install
+        run: bundle config path vendor/bundle && bundle install -j$(nproc) --retry 3
+      - run: bundle exec rake

data/.github_changelog_generator

@@ -0,0 +1,2 @@
+user=k0kubun
+project=rack-user_agent

data/CHANGELOG.md

@@ -0,0 +1,104 @@
+# Changelog
+
+## [v0.5.3](https://github.com/k0kubun/rack-user_agent/tree/v0.5.3) (2022-01-22)
+
+[Full Changelog](https://github.com/k0kubun/rack-user_agent/compare/v0.5.2...v0.5.3)
+
+**Merged pull requests:**
+
+- Exclude sample directories from spec.files [\#12](https://github.com/k0kubun/rack-user_agent/pull/12) ([lnit](https://github.com/lnit))
+- Restrict minitest version to lower than 6 [\#11](https://github.com/k0kubun/rack-user_agent/pull/11) ([unasuke](https://github.com/unasuke))
+- Add/Remove Ruby versions on CI [\#10](https://github.com/k0kubun/rack-user_agent/pull/10) ([unasuke](https://github.com/unasuke))
+- Add undocument method to README.md [\#9](https://github.com/k0kubun/rack-user_agent/pull/9) ([cutmail](https://github.com/cutmail))
+
+## [v0.5.2](https://github.com/k0kubun/rack-user_agent/tree/v0.5.2) (2016-07-11)
+
+[Full Changelog](https://github.com/k0kubun/rack-user_agent/compare/v0.5.1...v0.5.2)
+
+**Merged pull requests:**
+
+- Support woothee 1.1+ [\#8](https://github.com/k0kubun/rack-user_agent/pull/8) ([amatsuda](https://github.com/amatsuda))
+
+## [v0.5.1](https://github.com/k0kubun/rack-user_agent/tree/v0.5.1) (2016-05-28)
+
+[Full Changelog](https://github.com/k0kubun/rack-user_agent/compare/v0.5.0...v0.5.1)
+
+**Merged pull requests:**
+
+- Detect as 'from\_ios' when os is iOS [\#7](https://github.com/k0kubun/rack-user_agent/pull/7) ([vividmuimui](https://github.com/vividmuimui))
+
+## [v0.5.0](https://github.com/k0kubun/rack-user_agent/tree/v0.5.0) (2016-05-17)
+
+[Full Changelog](https://github.com/k0kubun/rack-user_agent/compare/v0.4.2...v0.5.0)
+
+**Merged pull requests:**
+
+- Add methods to detect os [\#6](https://github.com/k0kubun/rack-user_agent/pull/6) ([knjko](https://github.com/knjko))
+
+## [v0.4.2](https://github.com/k0kubun/rack-user_agent/tree/v0.4.2) (2015-12-19)
+
+[Full Changelog](https://github.com/k0kubun/rack-user_agent/compare/v0.4.1...v0.4.2)
+
+**Merged pull requests:**
+
+- ActionDispatch::Request is not \< Rack::Request in Rails 5 [\#5](https://github.com/k0kubun/rack-user_agent/pull/5) ([amatsuda](https://github.com/amatsuda))
+
+## [v0.4.1](https://github.com/k0kubun/rack-user_agent/tree/v0.4.1) (2015-12-18)
+
+[Full Changelog](https://github.com/k0kubun/rack-user_agent/compare/v0.4.0...v0.4.1)
+
+**Merged pull requests:**
+
+- Rails 5 doesn't rack ActionDispatch::ParamsParser [\#4](https://github.com/k0kubun/rack-user_agent/pull/4) ([amatsuda](https://github.com/amatsuda))
+
+## [v0.4.0](https://github.com/k0kubun/rack-user_agent/tree/v0.4.0) (2015-12-18)
+
+[Full Changelog](https://github.com/k0kubun/rack-user_agent/compare/v0.3.1...v0.4.0)
+
+**Merged pull requests:**
+
+- Support rack 2.x [\#3](https://github.com/k0kubun/rack-user_agent/pull/3) ([amatsuda](https://github.com/amatsuda))
+
+## [v0.3.1](https://github.com/k0kubun/rack-user_agent/tree/v0.3.1) (2015-08-05)
+
+[Full Changelog](https://github.com/k0kubun/rack-user_agent/compare/v0.3.0...v0.3.1)
+
+**Merged pull requests:**
+
+- Add `from ipod?` to Detectors [\#2](https://github.com/k0kubun/rack-user_agent/pull/2) ([matsuhisa](https://github.com/matsuhisa))
+
+## [v0.3.0](https://github.com/k0kubun/rack-user_agent/tree/v0.3.0) (2015-07-01)
+
+[Full Changelog](https://github.com/k0kubun/rack-user_agent/compare/v0.2.3...v0.3.0)
+
+**Merged pull requests:**
+
+- expect that devise\_type is a symobol [\#1](https://github.com/k0kubun/rack-user_agent/pull/1) ([osdakira](https://github.com/osdakira))
+
+## [v0.2.3](https://github.com/k0kubun/rack-user_agent/tree/v0.2.3) (2014-11-25)
+
+[Full Changelog](https://github.com/k0kubun/rack-user_agent/compare/v0.2.2...v0.2.3)
+
+## [v0.2.2](https://github.com/k0kubun/rack-user_agent/tree/v0.2.2) (2014-11-21)
+
+[Full Changelog](https://github.com/k0kubun/rack-user_agent/compare/v0.2.1...v0.2.2)
+
+## [v0.2.1](https://github.com/k0kubun/rack-user_agent/tree/v0.2.1) (2014-11-21)
+
+[Full Changelog](https://github.com/k0kubun/rack-user_agent/compare/v0.2.0...v0.2.1)
+
+## [v0.2.0](https://github.com/k0kubun/rack-user_agent/tree/v0.2.0) (2014-11-21)
+
+[Full Changelog](https://github.com/k0kubun/rack-user_agent/compare/v0.1.0...v0.2.0)
+
+## [v0.1.0](https://github.com/k0kubun/rack-user_agent/tree/v0.1.0) (2014-11-21)
+
+[Full Changelog](https://github.com/k0kubun/rack-user_agent/compare/v0.0.1...v0.1.0)
+
+## [v0.0.1](https://github.com/k0kubun/rack-user_agent/tree/v0.0.1) (2014-11-20)
+
+[Full Changelog](https://github.com/k0kubun/rack-user_agent/compare/18b4495a925091bc97453ac54bee88b9da23a810...v0.0.1)
+
+
+
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

data/README.md

@@ -1,4 +1,4 @@
-# Rack::UserAgent [![Build Status](https://travis-ci.org/k0kubun/rack-user_agent.svg)](https://travis-ci.org/k0kubun/rack-user_agent)
+# Rack::UserAgent [![test](https://github.com/k0kubun/rack-user_agent/actions/workflows/test.yml/badge.svg)](https://github.com/k0kubun/rack-user_agent/actions/workflows/test.yml)
 
 Rack::Request extension for handling User-Agent.  
 Thanks to [woothee](https://github.com/woothee/woothee-ruby), Rack::UserAgent supports various User-Agents.
@@ -88,9 +88,12 @@ APIs compatible with [rack-smartphone\_detector](https://github.com/ihara2525/ra
 - request.smartphone\_version
 - request.from\_iphone?
 - request.from\_ipad?
+- request.from\_ipod?
 - request.from\_android?
 - request.from\_android\_tablet?
 - request.from\_windows\_phone?
+- request.from\_ios?
+- request.from\_android\_os?
 
 ## License
 

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? || os == "iOS"
+      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.3"
   end
 end

data/rack-user_agent.gemspec

@@ -19,10 +19,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "rack", ">= 1.5"
-  spec.add_dependency "woothee", "~> 1.0.0"
+  spec.add_dependency "woothee", ">= 1.0.0"
 
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", ">= 1.10"
+  spec.add_development_dependency "rake", ">= 10.0"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "rack-test"

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,13 +32,23 @@ 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"
       ]
     },
+    {
+      name: "UNKNOWN",
+      os: "iOS",
+      version: nil,
+      user_agents: [
+        "Blogos/1.13 CFNetwork/548.0.4 Darwin/11.0.0"
+      ]
+    },
     {
       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 +56,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 +64,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 +72,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 +80,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)"
@@ -110,7 +127,11 @@ describe "Rack::UserAgent::Detector" do
         info[:user_agents].each do |ua|
           header "User-Agent", ua
           get "/"
-          last_request.smartphone_version.must_equal info[:version]
+          if info[:version].nil?
+            assert_nil last_request.smartphone_version
+          else
+            last_request.smartphone_version.must_equal info[:version]
+          end
         end
       end
     end
@@ -146,6 +167,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 +197,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 +217,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.3
 platform: ruby
 authors:
 - Takashi Kokubun
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-12-19 00:00:00.000000000 Z
+date: 2022-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -28,42 +28,42 @@ dependencies:
   name: woothee
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
@@ -115,8 +115,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/test.yml"
+- ".github_changelog_generator"
 - ".gitignore"
-- ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -128,67 +130,6 @@ files:
 - lib/rack/user_agent/result.rb
 - lib/rack/user_agent/version.rb
 - rack-user_agent.gemspec
-- rails_sample/.gitignore
-- rails_sample/Gemfile
-- rails_sample/Gemfile.lock
-- rails_sample/README.rdoc
-- rails_sample/Rakefile
-- rails_sample/app/assets/images/.keep
-- rails_sample/app/assets/javascripts/application.js
-- rails_sample/app/assets/stylesheets/application.css
-- rails_sample/app/controllers/application_controller.rb
-- rails_sample/app/controllers/concerns/.keep
-- rails_sample/app/helpers/application_helper.rb
-- rails_sample/app/mailers/.keep
-- rails_sample/app/models/.keep
-- rails_sample/app/models/concerns/.keep
-- rails_sample/app/views/application/index.html.erb
-- rails_sample/app/views/layouts/application.html.erb
-- rails_sample/bin/bundle
-- rails_sample/bin/rails
-- rails_sample/bin/rake
-- rails_sample/bin/spring
-- rails_sample/config.ru
-- rails_sample/config/application.rb
-- rails_sample/config/boot.rb
-- rails_sample/config/database.yml
-- rails_sample/config/environment.rb
-- rails_sample/config/environments/development.rb
-- rails_sample/config/environments/production.rb
-- rails_sample/config/environments/test.rb
-- rails_sample/config/initializers/assets.rb
-- rails_sample/config/initializers/backtrace_silencers.rb
-- rails_sample/config/initializers/cookies_serializer.rb
-- rails_sample/config/initializers/filter_parameter_logging.rb
-- rails_sample/config/initializers/inflections.rb
-- rails_sample/config/initializers/mime_types.rb
-- rails_sample/config/initializers/session_store.rb
-- rails_sample/config/initializers/wrap_parameters.rb
-- rails_sample/config/locales/en.yml
-- rails_sample/config/routes.rb
-- rails_sample/config/secrets.yml
-- rails_sample/db/seeds.rb
-- rails_sample/lib/assets/.keep
-- rails_sample/lib/tasks/.keep
-- rails_sample/log/.keep
-- rails_sample/public/404.html
-- rails_sample/public/422.html
-- rails_sample/public/500.html
-- rails_sample/public/favicon.ico
-- rails_sample/public/robots.txt
-- rails_sample/test/controllers/.keep
-- rails_sample/test/fixtures/.keep
-- rails_sample/test/helpers/.keep
-- rails_sample/test/integration/.keep
-- rails_sample/test/mailers/.keep
-- rails_sample/test/models/.keep
-- rails_sample/test/test_helper.rb
-- rails_sample/vendor/assets/javascripts/.keep
-- rails_sample/vendor/assets/stylesheets/.keep
-- sinatra_sample/Gemfile
-- sinatra_sample/Gemfile.lock
-- sinatra_sample/app.rb
-- sinatra_sample/config.ru
 - spec/lib/rack/user_agent/checker_spec.rb
 - spec/lib/rack/user_agent/detector_spec.rb
 - spec/lib/rack/user_agent/result_spec.rb
@@ -198,7 +139,7 @@ homepage: https://github.com/k0kubun/rack-user_agent
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -213,9 +154,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+rubygems_version: 3.2.22
+signing_key:
 specification_version: 4
 summary: Rack::Request extension for handling User-Agent.
 test_files:
@@ -224,4 +164,3 @@ test_files:
 - spec/lib/rack/user_agent/result_spec.rb
 - spec/lib/rack/user_agent_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 

data/.travis.yml

@@ -1,12 +0,0 @@
-language: ruby
-sudo: false
-cache: bundler
-rvm:
-  - 2.0.0
-  - 2.1
-  - 2.2
-branches:
-  only:
-    - master
-script:
-  - "bundle exec rake"

data/rails_sample/.gitignore

@@ -1,16 +0,0 @@
-# See https://help.github.com/articles/ignoring-files for more about ignoring files.
-#
-# If you find yourself ignoring temporary files generated by your text editor
-# or operating system, you probably want to add a global ignore instead:
-#   git config --global core.excludesfile '~/.gitignore_global'
-
-# Ignore bundler config.
-/.bundle
-
-# Ignore the default SQLite database.
-/db/*.sqlite3
-/db/*.sqlite3-journal
-
-# Ignore all logfiles and tempfiles.
-/log/*.log
-/tmp

data/rails_sample/Gemfile

@@ -1,15 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rails', '4.1.5'
-gem 'sqlite3'
-gem 'sass-rails', '~> 4.0.3'
-gem 'uglifier', '>= 1.3.0'
-gem 'coffee-rails', '~> 4.0.0'
-gem 'jquery-rails'
-gem 'turbolinks'
-gem 'jbuilder', '~> 2.0'
-gem 'sdoc', '~> 0.4.0',          group: :doc
-gem 'spring',        group: :development
-gem 'pry'
-
-gem 'rack-user_agent', path: '..'