udger 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 28464c9d0822abeeb3455da475fe10ea832692fc
-  data.tar.gz: aee465243f6064ada0d14e6616afc88133f0f19f
+SHA256:
+  metadata.gz: 902e1d53a718e5de8c5f96b4a9414703923c55e36d7041012ffabfad3bb33e31
+  data.tar.gz: c6556e4ad3985f031a5028d9a5874d987001de6bab2025eec7d23bcb369f2853
 SHA512:
-  metadata.gz: 653c0d6ae1fc9ed506c43567a286189e2dbfa837e05961cda06b65ac318a1a943d577c8521ba28c8ee4b850f3328d9170484c2162053d847a8ee556319875775
-  data.tar.gz: de56778029ecb0e13899d88e30893190e377b8f6c741afe919b0e836a5f36b2f409f70499148b576c609300602a7b5a2bb0fb7a2f350dc547772cb238536a723
+  metadata.gz: b51f621303614ca70c1b9e5f7bc4bcc63a7e5bd77718ed90ca572703a252e07dddf5502bc5a49aeffd3a9766f351be434aaf27b9e7a28e2d61cf693cff2cb4a9
+  data.tar.gz: 97e244194d64c657381231cb7d75e2ec789a266acd4be3916de952dc21e8f424faf8f4f2179ae5724bdb50a86b56ca1ae03b44b88c58e63d58cd3f4bfda856a1

data/lib/udger/ip_parser.rb

@@ -11,13 +11,15 @@ module Udger
 
     def parse
       return unless @ip
+
       object.ip = @ip
       parse_ip_object
     end
 
     def parse_ip_object
-      ip_object = fetch_ip()
+      ip_object = fetch_ip
       return if ip_object.nil?
+
       object.ip_ver = ip_object.ipv4? ? 4 : 6
       query = "SELECT udger_crawler_list.id as botid,ip_last_seen,ip_hostname,ip_country,ip_city,ip_country_code,ip_classification,ip_classification_code,
                       name,ver,ver_major,last_seen,respect_robotstxt,family,family_code,family_homepage,family_icon,vendor,vendor_code,vendor_homepage,crawler_classification,crawler_classification_code
@@ -27,7 +29,10 @@ module Udger
                LEFT JOIN udger_crawler_class ON udger_crawler_class.id=udger_crawler_list.class_id
                WHERE ip=? ORDER BY sequence"
       data = db.execute(query, ip_object.to_s)
-      unless data.empty?
+      if data.empty?
+        object.ip_classification = 'Unrecognized'
+        object.ip_classification_code = 'Unrecognized'
+      else
         result = data[0]
         object.ip_classification = result['ip_classification']
         object.ip_classification_code = result['ip_classification_code']
@@ -53,9 +58,6 @@ module Udger
         object.crawler_category = result['crawler_classification']
         object.crawler_category_code = result['crawler_classification_code']
         object.crawler_respect_robotstxt = result['respect_robotstxt']
-      else
-        object.ip_classification = 'Unrecognized'
-        object.ip_classification_code = 'Unrecognized'
       end
 
       if object.ip_ver == 4
@@ -73,6 +75,7 @@ module Udger
       ip_int = ip_object.to_i
       data = db.execute(query, ip_int, ip_int)
       return if data.empty?
+
       result = data[0]
       object.datacenter_name = result['name']
       object.datacenter_name_code = result['name_code']
@@ -92,6 +95,7 @@ module Udger
 
       data = db.execute(query)
       return if data.empty?
+
       result = data[0]
       object.datacenter_name = result['name']
       object.datacenter_name_code = result['name_code']
@@ -100,7 +104,7 @@ module Udger
 
     def fetch_ip
       IPAddr.new @ip
-    rescue
+    rescue StandardError
       nil
     end
   end

data/lib/udger/parser.rb

@@ -3,10 +3,8 @@ require 'lru_redux'
 module Udger
   class Parser
     DB_FILENAME = 'udgerdb_v3.dat'.freeze
-    attr_reader :db
-    attr_reader :data_dir
-    attr_accessor :cache
-    attr_accessor :lru_cache_size
+    attr_reader :db, :data_dir
+    attr_accessor :cache, :lru_cache_size
 
     def initialize(data_dir = nil, lru_cache_size: 10_000, cache: true, ua_services: [])
       @data_dir = data_dir || __dir__
@@ -17,12 +15,12 @@ module Udger
       @lru_cache = lru_cache_size.zero? && !cache ? {} : LruRedux::Cache.new(lru_cache_size)
     end
 
-
     def parse_ua(ua_string)
       if @cache
         cache_string = ua_string.hash
         cache_value = @lru_cache[cache_string]
         return cache_value if cache_value
+
         result = parse_ua_no_cache(ua_string)
         @lru_cache[cache_string] = result
         result
@@ -42,7 +40,7 @@ module Udger
     def parse_ua_params(parse)
       parsers = parse.empty?
       @match_ua = {}
-      [:crawler, :client, :os, :device, :device_market].each do |p|
+      %i[crawler client os device device_market].each do |p|
         @match_ua[p] = parsers || parse.include?(p)
       end
     end

data/lib/udger/ua_parser.rb

@@ -2,14 +2,14 @@ module Udger
   class UaParser < BaseParser
     attr_accessor :db, :ua_string, :object
 
-    def initialize(db, ua_string, crawler: true, client: true, os: true, device: true, device_market: true)
+    def initialize(db, ua_string, kargs = {})
       super(db)
 
-      @match_crawler = crawler
-      @match_client = client
-      @match_os = os
-      @match_device = device
-      @match_device_market = device_market
+      @match_crawler = kargs.fetch(:crawler, true)
+      @match_client = kargs.fetch(:client, true)
+      @match_os = kargs.fetch(:os, true)
+      @match_device = kargs.fetch(:device, true)
+      @match_device_market = kargs.fetch(:device_market, true)
 
       @ua_string = ua_string
       @object = UserAgent.new
@@ -21,6 +21,7 @@ module Udger
 
     def parse
       return unless ua_string
+
       object.ua_string = ua_string
       crawler_data = @match_crawler ? parse_crawler : []
       if !crawler_data.empty?
@@ -36,7 +37,6 @@ module Udger
       end
     end
 
-
     private
 
     def parse_crawler
@@ -135,6 +135,7 @@ module Udger
 
       data = db.execute(query, @client_id)
       return if data.empty?
+
       result = data[0]
       @os_id = result['os_id']
       object.os = result['name']
@@ -151,7 +152,6 @@ module Udger
     end
 
     def parse_device
-
       query = 'SELECT deviceclass_id,regstring,name,name_code,icon,icon_big
                FROM udger_deviceclass_regex
                JOIN udger_deviceclass_list ON udger_deviceclass_list.id=udger_deviceclass_regex.deviceclass_id
@@ -167,30 +167,29 @@ module Udger
       end
 
       # If there is no @client_class_id and @match_client is not enabled
-      if @client_class_id == -1 && !@match_client
-        parse_client
-      end
+      parse_client if @client_class_id == -1 && !@match_client
 
       if @deviceclass_id.zero? && @client_class_id != -1
-          query = 'SELECT deviceclass_id,name,name_code,icon,icon_big
+        query = 'SELECT deviceclass_id,name,name_code,icon,icon_big
                    FROM udger_deviceclass_list
                    JOIN udger_client_class ON udger_client_class.deviceclass_id=udger_deviceclass_list.id
                    WHERE udger_client_class.id=?'
-          data = db.execute(query, @client_class_id)
-          unless data.empty?
-            result = data[0]
-            @deviceclass_id = result['deviceclass_id']
-            object.device_class = result['name']
-            object.device_class_code = result['name_code']
-            object.device_class_icon = result['icon']
-            object.device_class_icon_big = result['icon_big']
-            object.device_class_info_url = "https://udger.com/resources/ua-list/device-detail?device=#{result['name']}"
-          end
+        data = db.execute(query, @client_class_id)
+        unless data.empty?
+          result = data[0]
+          @deviceclass_id = result['deviceclass_id']
+          object.device_class = result['name']
+          object.device_class_code = result['name_code']
+          object.device_class_icon = result['icon']
+          object.device_class_icon_big = result['icon_big']
+          object.device_class_info_url = "https://udger.com/resources/ua-list/device-detail?device=#{result['name']}"
+        end
       end
     end
 
     def devise_market_name
       return unless object.os_family_code
+
       # TODO: santize code
       query = "SELECT id,regstring FROM udger_devicename_regex WHERE
                ((os_family_code='" + object.os_family_code + "' AND os_code='-all-')
@@ -216,6 +215,5 @@ module Udger
         end
       end
     end
-
   end
 end

data/lib/udger/version.rb

@@ -1,3 +1,3 @@
 module Udger
-  VERSION = "0.1.0"
+  VERSION = '0.1.1'.freeze
 end

data/udger.gemspec

@@ -30,10 +30,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'sqlite3', '~> 1.3'
+  spec.add_dependency 'sqlite3', '~> 1.4'
   spec.add_dependency 'lru_redux', '~> 1.1'
 
-  spec.add_development_dependency 'bundler', '~> 1.14'
+  spec.add_development_dependency 'bundler', '~> 2.1'
   spec.add_development_dependency 'simplecov', '~> 0.14'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: udger
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Bojan Milosavljevic
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-07-14 00:00:00.000000000 Z
+date: 2022-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: lru_redux
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ homepage: https://github.com/TowerData/udger-ruby
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -137,9 +137,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.2.33
+signing_key:
 specification_version: 4
 summary: Udger user agent library
 test_files: []