rack-simple_user_agent 0.2.2 → 0.3.0.rc

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ba7fef2f942164b42f111eaab0271530cf64af4
-  data.tar.gz: 3ad5b568e8675cad9b5295394129346564d0390e
+  metadata.gz: f74e2f39ed2880de537c8ddb79bb621fc4b77779
+  data.tar.gz: 2ecedea7096e497fd54fecb86492de264c766c37
 SHA512:
-  metadata.gz: 700eb49a714b3aeb5e8a9ea4b9fbe2b2e6f204a9fb13be20bbfe69d0757d1b58cbe862aca8af4f8a45a700026ef8abc47d4779f9737e5296029724189333751d
-  data.tar.gz: c8b6382f6e1dbf6b2a9a819d116ec7c6ae01886cef77d272d2c56821a5b526793df0357ba36f4cf45bc183d849d0124f4054845e5415b7f5c511d83375bbbd0d
+  metadata.gz: 344ae2ca1235942ee74786d72d6799a57adc230271de3a7cd60b69b0cc16f21e7fce4033e6bcf64d5636271bbc60baa88eaa3667a435456500b1b8de8ec5394e
+  data.tar.gz: 3aa63f8e36373f64593fd72b25d576400ac139ce789892a16260cc6c263f3497be72e4e48fdd1a0f0ad526a3922b2bb629ee16ad18ad7cecfef4054a775389e9

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 cache: bundler
 rvm:
-  - 2.2.4
+  - 2.2.5
   - 2.3.1
 before_install: gem install bundler -v 1.11.2

data/README.md

@@ -4,10 +4,9 @@
 [![Build Status](https://travis-ci.org/toshimaru/rack-simple_user_agent.svg)](https://travis-ci.org/toshimaru/rack-simple_user_agent)
 [![Coverage Status](https://coveralls.io/repos/github/toshimaru/rack-simple_user_agent/badge.svg)](https://coveralls.io/github/toshimaru/rack-simple_user_agent)
 [![Code Climate](https://codeclimate.com/github/toshimaru/rack-simple_user_agent/badges/gpa.svg)](https://codeclimate.com/github/toshimaru/rack-simple_user_agent)
+[![Dependency Status](https://gemnasium.com/badges/github.com/toshimaru/rack-simple_user_agent.svg)](https://gemnasium.com/github.com/toshimaru/rack-simple_user_agent)
 
-Rack::SimpleUserAgent is Rack::Request extension which detects user-agent from request user-agent string. No complicated logic for the detection, it simply(stupidly) checks if user-agent includes particular string.
-
-**[ANNOUNCEMENT] Current `request.from_smartphone?` behavior is going to be changed in the next version. Please don't use `request.from_smartphone?`, use `request.from_smartphone?`, `request.from_android?` instead depending on the use case.**
+Rack::SimpleUserAgent is Rack::Request extension which detects user-agent from user-agent string. No complicated logic for the detection, it simply(stupidly) checks if user-agent includes particular string or not.
 
 ## Installation
 
@@ -17,18 +16,37 @@ Add this line to your application's `Gemfile`:
 gem 'rack-simple_user_agent'
 ```
 
+## Available Detection Methods
+
+```
+request ─ from_smartdevice?
+        │ ├─ from_ios?
+        │ ├─ from_android?
+        │ └─ from_windows_phone?
+        │
+        ├ from_smartphone?
+        │ ├─ from_android_mobile?
+        │ ├─ from_iphone?
+        │ ├─ from_ipod?
+        │ └─ from_windows_phone?
+        │
+        ├ from_tablet?
+        │ ├─ from_ipad?
+        │ └─ from_android_tablet?
+        │
+        └ from_googlebot?
+          ├─ from_googlebot_news?
+          ├─ from_googlebot_images?
+          └─ from_googlebot_video?
+```
+
 ## Usage
 
 ### on Rails
 
-Installing `rack-simple_user_agent` automatically makes all detection methods available. These methods are useful when you use the Rails' [Action Pack Variants](http://guides.rubyonrails.org/4_1_release_notes.html#action-pack-variants) (as of Rails4.1).
+Installing `rack-simple_user_agent` automatically makes all detection methods available.
 
-For example, you can use below detection methods in your Rails application.
-
-- `request.from_smartphone?`
-- `request.from_android?`
-- `request.from_iphone?`
-- `request.from_windows_phone?`
+These methods are useful when you use the Rails' [Action Pack Variants](http://guides.rubyonrails.org/4_1_release_notes.html#action-pack-variants) (as of Rails4.1).
 
 ### on Sinatra
 
@@ -41,30 +59,16 @@ configure do
 end
 
 get "/" do
-  request.from_smartphone?
-  "Hello World!"
+  if request.from_smartphone?
+    "Hello World from smartphone"
+  elsif request.from_tablet?
+    "Hello World from tablet"
+  else
+    "Hello World"
+  end
 end
 ```
 
-## Available Detection Methods
-
-```
-request ── from_smartphone?
-         │ ├── from_android?
-         │ │   ├── from_android_mobile?
-         │ │   └── from_android_tablet?
-         │ ├── from_ios?
-         │ │   ├── from_ipad?
-         │ │   ├── from_iphone?
-         │ │   └── from_ipod?
-         │ └── from_windows_phone?
-         │
-         └ from_googlebot?
-           ├── from_googlebot_news?
-           ├── from_googlebot_images?
-           └── from_googlebot_video?
-```
-
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake test` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/rack/simple_user_agent/detectors/android.rb

@@ -0,0 +1,25 @@
+module Rack
+  class SimpleUserAgent
+    module Detectors
+      module Android
+        def from_android?
+          user_agent_string.include?("Android")
+        end
+
+        def from_android_tablet?
+          from_android? && !android_mobile?
+        end
+
+        def from_android_mobile?
+          from_android? && android_mobile?
+        end
+
+        private
+
+        def android_mobile?
+          !(user_agent =~ /Android.+Mobi(le)?/).nil?
+        end
+      end
+    end
+  end
+end

data/lib/rack/simple_user_agent/detectors/ios.rb

@@ -0,0 +1,23 @@
+module Rack
+  class SimpleUserAgent
+    module Detectors
+      module Ios
+        def from_ios?
+          from_iphone? || from_ipad? || from_ipod?
+        end
+
+        def from_iphone?
+          user_agent_string.include?("iPhone;")
+        end
+
+        def from_ipad?
+          user_agent_string.include?("iPad;")
+        end
+
+        def from_ipod?
+          user_agent_string.include?("iPod touch;")
+        end
+      end
+    end
+  end
+end

data/lib/rack/simple_user_agent/detectors/windows_phone.rb

@@ -0,0 +1,11 @@
+module Rack
+  class SimpleUserAgent
+    module Detectors
+      module WindowsPhone
+        def from_windows_phone?
+          user_agent_string.include?("Windows Phone")
+        end
+      end
+    end
+  end
+end

data/lib/rack/simple_user_agent/detectors.rb

@@ -1,13 +1,33 @@
-require "rack/simple_user_agent/detectors/helper"
+require "rack/simple_user_agent/detectors/android"
 require "rack/simple_user_agent/detectors/bot"
-require "rack/simple_user_agent/detectors/smartphone"
+require "rack/simple_user_agent/detectors/ios"
+require "rack/simple_user_agent/detectors/windows_phone"
 
 module Rack
   class SimpleUserAgent
     module Detectors
-      include Helper
-      include Smartphone
+      include Android
       include Bot
+      include Ios
+      include WindowsPhone
+
+      def from_smartdevice?
+        from_ios? || from_android? || from_windows_phone?
+      end
+
+      def from_smartphone?
+        from_iphone? || from_ipod? || from_android_mobile? || from_windows_phone?
+      end
+
+      def from_tablet?
+        from_ipad? || from_android_tablet?
+      end
+
+      private
+
+      def user_agent_string
+        user_agent.to_s
+      end
     end
   end
 end

data/lib/rack/simple_user_agent/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class SimpleUserAgent
-    VERSION = "0.2.2"
+    VERSION = "0.3.0.rc"
   end
 end

data/rack-simple_user_agent.gemspec

@@ -13,13 +13,13 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/toshimaru/rack-simple_user_agent"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|sample)/}) }
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 11.0"
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "minitest-reporters"
   spec.add_development_dependency "pry"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-simple_user_agent
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0.rc
 platform: ruby
 authors:
 - toshimaru
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-14 00:00:00.000000000 Z
+date: 2016-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -128,9 +128,10 @@ files:
 - bin/setup
 - lib/rack/simple_user_agent.rb
 - lib/rack/simple_user_agent/detectors.rb
+- lib/rack/simple_user_agent/detectors/android.rb
 - lib/rack/simple_user_agent/detectors/bot.rb
-- lib/rack/simple_user_agent/detectors/helper.rb
-- lib/rack/simple_user_agent/detectors/smartphone.rb
+- lib/rack/simple_user_agent/detectors/ios.rb
+- lib/rack/simple_user_agent/detectors/windows_phone.rb
 - lib/rack/simple_user_agent/railtie.rb
 - lib/rack/simple_user_agent/version.rb
 - rack-simple_user_agent.gemspec
@@ -149,9 +150,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1

data/lib/rack/simple_user_agent/detectors/helper.rb

@@ -1,14 +0,0 @@
-module Rack
-  class SimpleUserAgent
-    module Detectors
-      module Helper
-
-        private
-
-        def user_agent_string
-          user_agent.to_s
-        end
-      end
-    end
-  end
-end

data/lib/rack/simple_user_agent/detectors/smartphone.rb

@@ -1,49 +0,0 @@
-module Rack
-  class SimpleUserAgent
-    module Detectors
-      module Smartphone
-        def from_smartphone?
-          from_ios? || from_android? || from_windows_phone?
-        end
-
-        def from_ios?
-          from_iphone? || from_ipad? || from_ipod?
-        end
-
-        def from_iphone?
-          user_agent_string.include?("iPhone")
-        end
-
-        def from_ipad?
-          user_agent_string.include?("iPad")
-        end
-
-        def from_ipod?
-          user_agent_string.include?("iPod")
-        end
-
-        def from_android?
-          user_agent_string.include?("Android")
-        end
-
-        def from_android_tablet?
-          from_android? && !android_mobile?
-        end
-
-        def from_android_mobile?
-          from_android? && android_mobile?
-        end
-
-        def from_windows_phone?
-          user_agent_string.include?("Windows Phone")
-        end
-
-        private
-
-        def android_mobile?
-          !(user_agent =~ /Android.+Mobi(le)?/).nil?
-        end
-      end
-    end
-  end
-end