useragents 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40889d9e0aa4f92825ee4b8e627d68c01d13c7da
-  data.tar.gz: 8211f99b5d2411abb21849ba813133a55865b3d6
+  metadata.gz: 8d9c7bad86d98ede337bc118031aed3398fc665a
+  data.tar.gz: 7e5326d587c4a17e45cafdd8cf07bf964d6ea816
 SHA512:
-  metadata.gz: 7f49fc4b69104c0aeb0040583ddede0b8e58a7de67036ca3ea228693518e50a8fa7f97eea7eca93e4bfe3887791db4d668f320e00a3788f722945fd433c95db9
-  data.tar.gz: 119d492e1d6717fd3cc0a7277ab3ecb8c670aa6223bf357b35e604fa2ec8555ef95561b125a36051f16f930021cdeb5eb356a7c27d16554070c23135b4952292
+  metadata.gz: 19c630bac22513bd630599a64e6a37034de784883775f59ec64dcbe87fcbfb3a376993fd08cc2867410b838215dd2e79396edb10bfc95bbf02baf84f533f8aa9
+  data.tar.gz: 52b6c696c3b9f7fa3a43ec7e3dd4dcab8202019d0e72cdfaf24c1c9b3c5073de5830f1ee1a593216059bb2287c635d96b5a5ec2a2eebe99e034c22e83338c283

data/LICENSE

@@ -1,20 +1,20 @@
-The MIT License (MIT)
-
-Copyright (c) 2013 debbbbie
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+The MIT License (MIT)
+
+Copyright (c) 2013 debbbbie
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,30 +1,34 @@
-useragents-rb
-=============
-[![Build Status](https://travis-ci.org/debbbbie/useragents-rb.png?branch=master)](https://travis-ci.org/debbbbie/useragents-rb)
-
-Usually, spiders must disguise themselves with plenty of User-Agents, for some
-servers are smart. The gem `useragents` can give you that!
-
-It has frequently-used browsers such as Chrome, Firefox, Internet Explorer, Safari,
- Opera and so on, with frequently-used versions.
-
-The usage is simple, just install the gem at first, then `require 'useragents`,
-and at last, `UserAgents.rand()` works for you!
-
-Enjoy it!
-
-## Usage
-
-``` sh
-gem install useragents
-```
-
-```ruby
-require 'useragents'
-
-# Generate a random useragent for you
-UserAgents.rand()
-# => ""Mozilla/5.0 (Windows NT 6.2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1464.0 Safari/537.36"
-```
-
-Copyright © 2013 debbbbie, released under the MIT license
+useragents-rb
+=============
+[![Build Status](https://travis-ci.org/debbbbie/useragents-rb.png?branch=master)](https://travis-ci.org/debbbbie/useragents-rb)
+
+Usually, spiders must disguise themselves with plenty of User-Agents, for some
+servers are smart. The gem `useragents` can give you that!
+
+It has frequently-used browsers such as `Chrome`, `Firefox`, `Internet Explorer`, `Safari`,
+ `Opera` and so on, with frequently-used versions.
+
+The usage is simple, just install the gem at first, then `require 'useragents`,
+and at last, `UserAgents.rand()` works for you!
+
+Enjoy it!
+
+## Usage
+
+``` sh
+gem install useragents
+```
+
+```ruby
+require 'useragents'
+
+# Generate a random useragent for you
+UserAgents.rand()
+# => ""Mozilla/5.0 (Windows NT 6.2) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1464.0 Safari/537.36"
+```
+
+Copyright © 2013 debbbbie, released under the MIT license
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/debbbbie/useragents-rb/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+

data/lib/core_ext/blank.rb

@@ -1,20 +1,20 @@
-unless Object.respond_to? :blank?
-
-  class Object
-    # An object is blank if it's false, empty, or a whitespace string.
-    # For example, "", "   ", +nil+, [], and {} are all blank.
-    #
-    # This simplifies:
-    #
-    #   if address.nil? || address.empty?
-    #
-    # ...to:
-    #
-    #   if address.blank?
-    def blank?
-      respond_to?(:empty?) ? empty? : !self
-    end
-
-  end
-
+unless Object.respond_to? :blank?
+
+  class Object
+    # An object is blank if it's false, empty, or a whitespace string.
+    # For example, "", "   ", +nil+, [], and {} are all blank.
+    #
+    # This simplifies:
+    #
+    #   if address.nil? || address.empty?
+    #
+    # ...to:
+    #
+    #   if address.blank?
+    def blank?
+      respond_to?(:empty?) ? empty? : !self
+    end
+
+  end
+
 end

data/lib/useragents.rb

@@ -1,26 +1,21 @@
-require File.expand_path('../core_ext/blank', __FILE__)
-require 'zlib'
-
-module UserAgents
-
-  class << self
-
-    def list
-      @@list
-    end
-
-    def rand
-      @@list[ Kernel::rand(@@list.length) ]
-    end
-
-    def init()
-      Zlib::GzipReader.open(File.expand_path("../useragents.dat", __FILE__)) {|gz|
-        @@list = gz.read.split("\n")
-      }
-    end
-
-  end
-
-end
-
-UserAgents.init()
+require 'zlib'
+require_relative 'useragents/fetch'
+
+module UserAgents
+
+  FILE = File.expand_path '../useragents.txt', __FILE__
+
+  class << self
+
+    def list
+      @@list ||= File.readlines FILE
+    end
+
+    def rand
+      list.sample
+    end
+
+  end
+
+end
+

data/spec/useragents_spec.rb

@@ -1,25 +1,25 @@
-require 'spec_helper'
-
-describe UserAgents do
-  describe "self.list" do
-
-    it "should not be empty" do
-      UserAgents.list().blank?.should be(false)
-    end
-  end
-
-  describe "self.rand()" do
-    it "should be a String" do
-      UserAgents.rand().class.should be(String)
-    end
-  end
-
-end
-
-describe Object do
-  describe "[]" do
-    it "should be blank" do
-      [].blank?.should be(true)
-    end
-  end
-end
+require 'spec_helper'
+
+describe UserAgents do
+  describe "self.list" do
+
+    it "should not be empty" do
+      UserAgents.list().blank?.should be(false)
+    end
+  end
+
+  describe "self.rand()" do
+    it "should be a String" do
+      UserAgents.rand().class.should be(String)
+    end
+  end
+
+end
+
+describe Object do
+  describe "[]" do
+    it "should be blank" do
+      [].blank?.should be(true)
+    end
+  end
+end

data/useragents.gemspec

@@ -1,19 +1,19 @@
-Gem::Specification.new do |s|
-  s.name          = "useragents"
-  s.version       = "0.1.4"
-
-  s.authors       = "debbbbie"
-  s.date          = "2013-12-20"
-  s.description   = "Generate a random User-Agent for you"
-  s.email         = "debbbbie@163.com"
-  s.files         = ["useragents.gemspec", "lib/useragents.rb", "lib/core_ext/blank.rb", "lib/fetch.rb", "lib/useragents.dat", "spec/useragents_spec.rb", "README.md", "LICENSE"]
-  s.homepage      = "https://github.com/debbbbie/useragents-rb"
-  s.require_paths = ["lib"]
-  s.summary       = "Generate a random User-Agent for you, use for spiders or anything."
-  s.license       = 'MIT'
-
-  s.add_development_dependency "rspec"
-  #s.add_development_dependency "nokogiri"
-  s.add_development_dependency "useragent"
-
-end
+Gem::Specification.new do |s|
+  s.name          = 'useragents'
+  s.version       = '0.1.5'
+
+  s.authors       = 'debbbbie'
+  s.date          = '2013-12-20'
+  s.description   = 'Generate a random User-Agent for you'
+  s.email         = 'debbbbie@163.com'
+  s.files         = ['useragents.gemspec', 'lib/useragents.rb', 'lib/core_ext/blank.rb', 'spec/useragents_spec.rb', 'README.md', 'LICENSE']
+  s.homepage      = 'https://github.com/debbbbie/useragents-rb'
+  s.require_paths = ['lib']
+  s.summary       = 'Generate a random User-Agent for you, use for spiders or anything.'
+  s.license       = 'MIT'
+
+  s.add_dependency 'nokogiri'
+
+  s.add_development_dependency 'rspec'
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: useragents
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - debbbbie
@@ -11,31 +11,31 @@ cert_chain: []
 date: 2013-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: useragent
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Generate a random User-Agent for you
@@ -44,14 +44,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- useragents.gemspec
-- lib/useragents.rb
+- LICENSE
+- README.md
 - lib/core_ext/blank.rb
-- lib/fetch.rb
-- lib/useragents.dat
+- lib/useragents.rb
 - spec/useragents_spec.rb
-- README.md
-- LICENSE
+- useragents.gemspec
 homepage: https://github.com/debbbbie/useragents-rb
 licenses:
 - MIT
@@ -62,17 +60,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.6.7
 signing_key: 
 specification_version: 4
 summary: Generate a random User-Agent for you, use for spiders or anything.

data/lib/fetch.rb

@@ -1,38 +0,0 @@
-require 'useragent'
-module UserAgents
-  def fetch
-    require 'nokogiri'
-    require 'open-uri'
-    require 'zlib'
-
-    urls = [
-        'http://www.useragentstring.com/pages/Chrome/',
-        'http://www.useragentstring.com/pages/Firefox/',
-        'http://www.useragentstring.com/pages/Internet%20Explorer/',
-        'http://www.useragentstring.com/pages/Opera/',
-        'http://www.useragentstring.com/pages/Safari/'
-    ]
-
-    agents = urls.inject([]) do |sum, url|
-      puts "Requesting #{url}"
-      doc  = Nokogiri::HTML(open(url))
-      doc.css('#liste ul li a').each do|link|
-        str = link.content.strip
-        agent = UserAgent.parse(str)
-        case agent.browser
-          when "Chrome"           ; sum.push(str) if agent.version && agent.version >= '15'
-          when "Firefox"          ; sum.push(str) if agent.version && agent.version >= '9'
-          when "Internet Explorer"; sum.push(str) if agent.version && agent.version >= '7'
-          when "Opera"            ; sum.push(str) if agent.version && agent.version >= '10'
-          when "Safari"           ; sum.push(str) if agent.version && agent.version >= '5'
-        end
-      end
-      sum
-    end
-
-    Zlib::GzipWriter.open(File.expand_path('../useragents.dat', __FILE__)) do |gz|
-      gz.write agents.join("\n")
-    end
-    puts "Fetch complete, got useragent count #{agents.length}!"
-  end
-end