filetype 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea7cc215335d49eb8a449ee4f7896963256396e3dd82808977f946785623cfb5
-  data.tar.gz: 62ebd38de6d7f69fea1da86ab071f16dfbb660822ff48cbc6b29f47cd7c03e62
+  metadata.gz: e1f383bb7d24cfa2687d6a0b884d14a0cc043edc65807ab09e514269e695aa3b
+  data.tar.gz: e507b06d44c40eaf2193ffdc7e15b7225c43b9e6ff4e3c9cf06d4a09f8f1f29b
 SHA512:
-  metadata.gz: d83e7ac6df8cb28b3c3429190fcad96317cde1f82017828305828ffbb389d18524d1b90728685949b0a0d79afbddaa20419a0361604044f9ff375c923086c792
-  data.tar.gz: 2da0a3ac276ab6c35e9fef4416616fa36b7d9738eab8ed192100ecdad16d81f7ece94a3e7d8c12710f3990839b8d44873cad66dede620687cb5de7906ae80a90
+  metadata.gz: f21e7981f237df5afebbae6d4f37b347e37784e4a654b91977d74e5e407d5a736e28e6256b5439c6692ffbbcbf927863b03d2213ec8abed1ff67ab8c1cf2d9ba
+  data.tar.gz: f084517910c9038fb545756e51ebe9a8ad2ca9206a13fac8c194b64380e7f8de1d3aa7a0a74ca75c762dd2626e5f5fadadda471d078fa1e0ccb42d0975d0f4de

data/lib/filetype.rb

@@ -1,7 +1,7 @@
 module Filetype
   module_function
 
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 
   FTYPES = {
     :actionscript => %w[ as mxml ],
@@ -72,16 +72,8 @@ module Filetype
   #   Filetype.get('Rakefile') #=> :rake
   # @return [Symbol] The language found or nil
   def get(fname)
-    fname = File.basename(fname)
     FTYPES.each do |ftype, rule|
-      case rule
-      when Array
-        return ftype if rule.include? ext(fname)
-      when Regexp
-        return ftype if fname.match rule
-      when String, Symbol
-        return ftype if fname == rule.to_s
-      end
+      return ftype if file_passes_rule?(fname, rule)
     end
     nil
   end
@@ -93,9 +85,8 @@ module Filetype
   #   Filetype.all('foo.h') #=> [:c, :cpp, :objc]
   # @return [Array] The list of languages found
   def all(fname)
-    fname = File.basename(fname)
     FTYPES.select do |ftype, rule|
-      ftype if rule.is_a?(Array) && rule.include?(ext(fname))
+      ftype if file_passes_rule?(fname, rule)
     end.keys
   end
 
@@ -119,4 +110,16 @@ module Filetype
     ext = File.extname(fname)[1..-1]
     ext.downcase if ext
   end
+
+  def self.file_passes_rule?(fname, rule)
+    base_fname = File.basename(fname)
+    case rule
+    when Array
+      return rule.include? ext(base_fname)
+    when Regexp
+      return base_fname.match rule
+    when String, Symbol
+      return base_fname == rule.to_s
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filetype
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Lee Jarvis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-30 00:00:00.000000000 Z
+date: 2022-03-31 00:00:00.000000000 Z
 dependencies: []
 description: Find a file type according to a filename or extension
 email: