device_detector_regexes 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1727b4d4025bf43493520490e4bd470bed76a8979dc8af6c53991a80235f87fb
-  data.tar.gz: cfc6c8366cfe134ea61e88f1125d0b2a7e6de530813581b627345bd9f9b1c0f0
+  metadata.gz: 259016a25baf4a3a0c0337fbb095f839d552d360ec1562d29b40da0bc7c6fc3e
+  data.tar.gz: d07e661f1f540ec039a5c0069a9c0582da886b1fd9c1eff3381122894257b7cc
 SHA512:
-  metadata.gz: 0ca935290e414e7b09a868b7965a497de6cc6e8930d046ce3aa41ab5b0bd8043cb639398341fe274792a3162dfe20bd7e711c34c33276c5d06dbd4a20f6342d1
-  data.tar.gz: 26afa858ce8524e85f5a01da29be093ed6797a97f07e95900e274ccc5cea1f153f97e3c5247afde1f96f11ab53108e60c12abd08c3a9a258578deb32a8040b51
+  metadata.gz: f706f2da25d3053aed27c2bbbc8105c7afe22ee4f449e7d7c689956e76a48fe2b6346f1a754a2a8931b1ecdbaff29e8a847a981903f9041d5bcd17bef244c0ab
+  data.tar.gz: 5f502de8b2c9a306f9dadd60847e61c064d1221ce9e61e2eac56bd2658a0595b174a3315440e7e2f2ec5747bdf086ee9bad5883f2eca676f1a52e10a62f27eb6

data/CHANGELOG.md

@@ -1,4 +1,7 @@
 # Change log
 
+## [0.1.2]
+Fix custom regexes precedence lookup over default ones
+
 ## [0.1.1]
 Remove dependencies versions restrictions for better compatibility

data/lib/device_detector_regexes.rb

@@ -1,26 +1,11 @@
-require "device_detector_regexes/version"
-
 require "device_detector"
 require "dry/configurable"
 
+Gem.find_files('device_detector_regexes/*.rb').each { |path| require path }
+
 module DeviceDetectorRegexes
+
   extend Dry::Configurable
 
   setting(:dir, Dir.pwd) { |dir| Pathname(dir) }
-
-  class DeviceDetector::Parser
-    private
-
-    def filepaths
-      filenames.each_with_object([]) do |filename, filenames|
-        filenames << [filename.to_sym, File.join(ROOT, 'regexes', filename)]
-
-        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
-      end
-    end
-  end
 end

data/lib/device_detector_regexes/parser.rb

@@ -0,0 +1,18 @@
+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

data/lib/device_detector_regexes/version.rb

@@ -1,3 +1,3 @@
 module DeviceDetectorRegexes
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: device_detector_regexes
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Kirill Karpinovsky
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-12 00:00:00.000000000 Z
+date: 2020-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: device_detector
@@ -75,6 +75,7 @@ files:
 - bin/setup
 - device_detector_regexes.gemspec
 - lib/device_detector_regexes.rb
+- lib/device_detector_regexes/parser.rb
 - lib/device_detector_regexes/version.rb
 homepage: https://github.com/karpinovsky/device_detector_regexes
 licenses: