device_detector_regexes 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 458ba73e56fa8816165641a61acdbf1657742c65c943f78a5ac0bd5507bddbd6
-  data.tar.gz: 9fce9bbad7375ab3c799595a7bb90333563b9d712041c257b53930893664e57b
+  metadata.gz: 24497676df61d5343c44418e2f8c4c8904eed8947cb5db1212196ac542ab91e0
+  data.tar.gz: c9bd55656c6e3daee2a7d995d3f057b5ea87b09f4e0c423a5d90eaa0df77e1d2
 SHA512:
-  metadata.gz: e5928c890ed125c14fe5a1ca0dd5bf591108099e086b7513a4a33f8d6f02889fa922e9ca14b05eced518111738454b44a1fedb5a5dcb31e4c62fbebe70e48d69
-  data.tar.gz: f44a1309a9851c466656f5b33f778be57bdc772e521c2b18c9b38173ebad84a5cf1a130832486aa007741bee70a506b8fa94b22a1fd6a37436a49f7c0e105076
+  metadata.gz: e5fafe5b9c03bd69c37ee0240d9c4fd86210ed3e20ae55d089be998c809e3cd1e5d445077ee8d7d939ce3307ddb2c760479166d997f4d0f271808f0c3e62e738
+  data.tar.gz: 4e130d6639c97c4afb210477289bdde0be6bbce0f1ca15df2e24199ab51e947c94b82f11452782ea9dbc03b32bbf115f58bac4d72dc1dcb32633200dfc513940

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change log
 
+## [0.1.4]
+Add an abillity to skip the piwik dd prefix, refactoring
+
 ## [0.1.3]
 Update missing Gemfile.lock
 

data/Gemfile.lock

@@ -1,23 +1,13 @@
 PATH
   remote: .
   specs:
-    device_detector_regexes (0.1.2)
+    device_detector_regexes (0.1.4)
       device_detector
-      dry-configurable
-      rake
 
 GEM
   remote: https://rubygems.org/
   specs:
-    concurrent-ruby (1.1.6)
     device_detector (1.0.3)
-    dry-configurable (0.11.3)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 0.4, >= 0.4.7)
-      dry-equalizer (~> 0.2)
-    dry-core (0.4.9)
-      concurrent-ruby (~> 1.0)
-    dry-equalizer (0.3.0)
     rake (12.3.3)
 
 PLATFORMS

data/README.md

@@ -21,32 +21,27 @@ Or install it yourself as:
 
 ## Usage
 
-Specify the folder that will contain the mapped device_detector [regexes folder](https://github.com/podigee/device_detector/tree/develop/regexes)
-
-```bash
-rake map_into\["my_folder_name"\]
-```
-
-Somewhere in your code
+Map device_detector [regexes folder](https://github.com/podigee/device_detector/tree/develop/regexes) into your custom folder
 
 ```ruby
-DeviceDetectorRegexes.config.dir = "path/to/my/folder/name"
+DeviceDetector.configure do |config|
+  config.dir = "path/to/your/custom/folder"
+end
 ```
 
-Voila! Just add new regexes to the appropriate file
+Add new regexes to the appropriate file
 
 ```yaml
-# my_folder_name/regexes/client/mobile_apps.yml
+# your/custom/folder/regexes/client/mobile_apps.yml
 
 # [] # leave an empty array here if the file is empty
-- regex: 'Foo(?:[ /]([\d\.]+))?'
+- regex: 'Foo(?:[ /]([\d\.]+))'
   name: 'Bar'
   version: '$1'
+  prefix: false # do not append piwik dd prefix
 ```
 
 ```ruby
-# bin/console
-
 client = DeviceDetector.new("Foo/2.1.2; Android: 9; Model:PAR-LX1; okhttp/3.12.8")
 client.name         # => "Bar"
 client.full_version # => "2.1.2"

data/device_detector_regexes.gemspec

@@ -27,6 +27,4 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "device_detector"
-  spec.add_dependency "dry-configurable"
-  spec.add_dependency "rake"
 end

data/lib/device_detector_regexes.rb

@@ -1,11 +1,45 @@
 require "device_detector"
-require "dry/configurable"
 
-Gem.find_files('device_detector_regexes/*.rb').each { |path| require path }
+module DeviceDetectorRegexes; end
 
-module DeviceDetectorRegexes
+class DeviceDetector
+  class << self
+    class Configuration
+      def dir
+        @dir || Dir.pwd
+      end
 
-  extend Dry::Configurable
+      def dir=(dir)
+        @dir = Pathname(dir)
+      end
+    end
+  end
+end
+
+class DeviceDetector::Parser
+  def filepaths
+    filenames.each_with_object([]) do |filename, filenames|
+
+      # push custom files first due to higher precedence lookup than default files
+      custom_file_path = File.expand_path(filename, File.join(DeviceDetector.config.dir, "regexes"))
+      if File.exists?(custom_file_path)
+        filenames << [filename.to_sym, custom_file_path]
+      end
+
+      filenames << [filename.to_sym, File.join(ROOT, "regexes", filename)]
+    end
+  end
+
+  def parse_regexes(path, raw_regexes)
+    raw_regexes.map do |meta|
+      fail "invalid device spec: #{meta.inspect}" unless meta[:regex].is_a? String
+      meta[:regex] = build_regex(meta[:regex], meta[:prefix])
+      meta[:path] = path
+      meta
+    end
+  end
 
-  setting(:dir, Dir.pwd) { |dir| Pathname(dir) }
+  def build_regex(src, prefix = true)
+    Regexp.new (prefix ? '(?:^|[^A-Z0-9\-_]|[^A-Z0-9\-]_|sprd-)(?:' + src + ')' : src), Regexp::IGNORECASE
+  end
 end

data/lib/device_detector_regexes/device_detector.rb

@@ -0,0 +1,14 @@
+# module DeviceDetectorRegexes
+    # def self.included(base)
+      # base.extend(Dry::Configurable)
+      # base.instance_eval do
+        # setting(:custom_dir, "/Users/kirill/Work/device_detector_regexes") { |dir| Pathname(dir) }
+      # end
+      # base.extend(ClassMethods)
+    # end
+
+    # module ClassMethods
+      # extend Dry::Configurable
+      # setting(:custom_dir, Dir.pwd) { |dir| Pathname(dir) }
+    # end
+# end

data/lib/device_detector_regexes/version.rb

@@ -1,3 +1,3 @@
 module DeviceDetectorRegexes
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: device_detector_regexes
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Kirill Karpinovsky
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-15 00:00:00.000000000 Z
+date: 2020-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: device_detector
@@ -24,34 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: dry-configurable
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: DeviceDetectorRegexes is an extension for device_detector gem that makes
   it easy to add new regular expressions
 email:
@@ -75,7 +47,7 @@ files:
 - bin/setup
 - device_detector_regexes.gemspec
 - lib/device_detector_regexes.rb
-- lib/device_detector_regexes/parser.rb
+- lib/device_detector_regexes/device_detector.rb
 - lib/device_detector_regexes/version.rb
 homepage: https://github.com/karpinovsky/device_detector_regexes
 licenses:

data/lib/device_detector_regexes/parser.rb

@@ -1,18 +0,0 @@
-module DeviceDetectorRegexes
-  class ::DeviceDetector::Parser
-    private
-
-    def filepaths
-      filenames.each_with_object([]) do |filename, filenames|
-
-        # push custom files first due to higher precedence lookup than default files
-        custom_file_path = File.expand_path(filename, File.join(DeviceDetectorRegexes.config.dir, 'regexes'))
-        if File.exists?(custom_file_path)
-          filenames << [filename.to_sym, custom_file_path]
-        end
-
-        filenames << [filename.to_sym, File.join(ROOT, 'regexes', filename)]
-      end
-    end
-  end
-end