ruby-filemagic 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1403f497e908d066aeaeb6d235b1b947de376a3f
-  data.tar.gz: 546e5fa1ac73f1a69ebee0f9347ffc2171ebe65d
+  metadata.gz: 8defa2096e9b64ff01af2cb0cdfebfbf25fd8177
+  data.tar.gz: 6f3018740cf798e2fa4d54d343e8b4942e71f695
 SHA512:
-  metadata.gz: 1ea4401b1fcc93e015d4e7049928bc95381013f4e915f0e3a02ca30476d5f3a0454408b8da9ac875bf62427e6237630ac4cd8db2025347a86dae7ae04a65f004
-  data.tar.gz: 616165278b30cd859741a4a76dc752b6a798f5ac93951e294e0f4a5aaf228648f977d98899f165ccf28dfcc275cf087e6a7353f90f0511db32cfe4a60a04cde5
+  metadata.gz: 8b9ed685e46ac3c6516e95a96cc0ce9eeb1cc07053fa8a697853a6f963cee69e561492cd6e34d1d78b2b310f8eb0d02ea89c523e4da464f80544a21f461169ce
+  data.tar.gz: 30f8367ed63c08a609119d6fa0d69fcb904de20210cf1eb3fa598ec8d95dcd8c1916fbca6655e663b530ea4ce45e225bb202ee152c7810e78c1e2cb0e0e9704d

data/ChangeLog

@@ -2,6 +2,11 @@
 
 = Revision history for ruby-filemagic
 
+== 0.6.1 [2014-08-19]
+
+* Account for options passed to FileMagic.fm (issue #7 reported by Adam
+  Wróbel).
+
 == 0.6.0 [2014-05-16]
 
 * Required Ruby version >= 1.9.3.

data/README

@@ -2,7 +2,7 @@
 
 == VERSION
 
-This documentation refers to filemagic version 0.6.0
+This documentation refers to filemagic version 0.6.1
 
 
 == DESCRIPTION

data/lib/filemagic.rb

@@ -53,11 +53,13 @@ class FileMagic
 
     # Provide a "magic singleton".
     def fm(*flags)
-      if fm = @fm[flags = flags(flags)]
+      options = flags.last.is_a?(Hash) ? flags.pop : {}
+
+      if fm = @fm[key = [flags = flags(flags), options]]
         return fm unless fm.closed?
       end
 
-      @fm[flags] = new(flags)
+      @fm[key] = new(flags, options)
     end
 
     # Clear our instance cache.

data/lib/filemagic/ext.rb

@@ -20,15 +20,13 @@ module FileMagic::Ext
     end
 
     def mime_type(file, *flags)
-      flags.unshift :mime
-      file_type(file, *flags)
+      file_type(file, *flags.unshift(:mime))
     end
 
     alias_method :mime, :mime_type
 
     def content_type(file, *flags)
-      flags << { :simplified => true }
-      mime_type(file, *flags)
+      mime_type(file, *flags << { simplified: true })
     end
 
   end

data/lib/filemagic/version.rb

@@ -4,7 +4,7 @@ class FileMagic
 
     MAJOR = 0
     MINOR = 6
-    TINY  = 0
+    TINY  = 1
 
     class << self
 

data/test/filemagic_test.rb

@@ -160,7 +160,7 @@ magic file from #{FileMagic.path}
   def test_abbrev_mime_type
     fm = FileMagic.mime
 
-    assert !fm.simplified?
+    refute fm.simplified?
     assert_equal('text/plain; charset=us-ascii', fm.file(path_to('perl')))
 
     fm.simplified = true
@@ -173,6 +173,29 @@ magic file from #{FileMagic.path}
     ), fm.file(path_to('excel-example.xls')))
   end
 
+  def test_singleton
+    fm1 = FileMagic.fm
+    assert_equal(fm1, FileMagic.fm)
+
+    refute fm1.simplified?
+    assert_equal('ASCII text', fm1.file(path_to('perl')))
+
+    fm2 = FileMagic.fm(:mime)
+    assert_equal(fm2, FileMagic.fm(:mime))
+    refute_equal(fm2, fm1)
+
+    refute fm2.simplified?
+    assert_equal('text/plain; charset=us-ascii', fm2.file(path_to('perl')))
+
+    fm3 = FileMagic.fm(:mime, simplified: true)
+    assert_equal(fm3, FileMagic.fm(:mime, simplified: true))
+    refute_equal(fm3, fm2)
+    refute_equal(fm3, fm1)
+
+    assert fm3.simplified?
+    assert_equal('text/plain', fm3.file(path_to('perl')))
+  end
+
   # utility methods:
 
   def path_to(file, dir = File.dirname(__FILE__))

metadata

@@ -1,15 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: ruby-filemagic
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Travis Whitton
 - Jens Wille
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2014-05-16 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDMDCCAhigAwIBAgIBADANBgkqhkiG9w0BAQUFADA+MQswCQYDVQQDDAJ3dzEb
+  MBkGCgmSJomT8ixkARkWC2JsYWNrd2ludGVyMRIwEAYKCZImiZPyLGQBGRYCZGUw
+  HhcNMTMwMTMxMDkyMjIyWhcNMTQwMTMxMDkyMjIyWjA+MQswCQYDVQQDDAJ3dzEb
+  MBkGCgmSJomT8ixkARkWC2JsYWNrd2ludGVyMRIwEAYKCZImiZPyLGQBGRYCZGUw
+  ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDVXmfa6rbTwKOvtuGoROc1
+  I4qZjgLX0BA4WecYB97PjwLJmJ1hRvf9JulVCJYYmt5ZEPPXbgi9xLbcp6ofGmnC
+  i68/kbhcz20/fRUtIJ2phU3ypQTEd2pFddpL7SR2FxLkzvvg5E6nslGn7o2erDpO
+  8sm610A3xsgT/eNIr9QA7k4pHh18X1KvZKmmQR4/AjVyKmKawzauKUoHHepjvjVs
+  s0pVoM7UmOmrS4SafQ3OwUo37f19CVdN2/FW7z3e5+iYhKxdIFdhniX9iDWtA3Jn
+  7oUOtiolhCRK4P/c30UjTCDkRkOldsWciFUasROJ5VAV2SVv7FtGHoQLDZ/++tRr
+  AgMBAAGjOTA3MAkGA1UdEwQCMAAwHQYDVR0OBBYEFIAPWU4BEoYUe82hY/0EkoGd
+  Oo/WMAsGA1UdDwQEAwIEsDANBgkqhkiG9w0BAQUFAAOCAQEAf2YnB0mj42of22dA
+  MimgJCAEgB3H5aHbZ6B5WVnFvrC2UUnhP+/kLj/6UgOfqcasy4Xh62NVGuNrf7rF
+  7NMN87XwexGuU2GCpIMUd6VCTA7zMP2OWuXEcba7jT5OtiI55buO0J4CRtyeX1XF
+  qwlGgx4ItcGhMTlDFXj3IkpeVtjD8O7yWE21bHf9lLURmqK/r9KjoxrrVi7+cESJ
+  H19TDW3R9p594jCl1ykPs3dz/0Bk+r1HTd35Yw+yBbyprSJb4S7OcRRHCryuo09l
+  NBGyZvOBuqUp0xostWSk0dfxyn/YQ7eqvQRGBhK1VGa7Tg/KYqnemDE57+VOXrua
+  59wzaA==
+  -----END CERTIFICATE-----
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hen
@@ -104,21 +125,14 @@ licenses:
 metadata: {}
 post_install_message: |2+
 
-  ruby-filemagic-0.6.0 [2014-05-16]:
+  ruby-filemagic-0.6.1 [2014-08-19]:
 
-  * Required Ruby version >= 1.9.3.
-  * New method FileMagic#list (+magic_list+).
-  * New method FileMagic#load (+magic_load+).
-  * New method FileMagic.path (+magic_getpath+).
-  * New method FileMagic.magic_version.
-  * New method FileMagic.flags.
-  * New flag +no_check_builtin+.
-  * Tests print libmagic version and path.
-  * Internal refactoring.
+  * Account for options passed to FileMagic.fm (issue #7 reported by Adam
+    Wróbel).
 
 rdoc_options:
 - "--title"
-- ruby-filemagic Application documentation (v0.6.0)
+- ruby-filemagic Application documentation (v0.6.1)
 - "--charset"
 - UTF-8
 - "--line-numbers"
@@ -139,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2.x
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Ruby bindings to the magic(4) library