marcel 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03d3c8f05c85373df4e61e2ce4acb02cdf3a4626578b88f36b85591989a5a3c0
-  data.tar.gz: b67067ec727e59d4e9c209d63fca735e6ec51d4d11b99afa49b2196ec931ec94
+  metadata.gz: 216d21a724ab7262910321bd6556b885fcb1c5dc9f3f19d7e8e0a354b98456e1
+  data.tar.gz: 337b73e40e8d08a89be70b78377cf9d21c63f2dc4889a6eff18aa3b97bcd32af
 SHA512:
-  metadata.gz: 6e8c7402138d2fcb99857592755a0047a0197f8b8f349f9a3724244c328d8ad6be1908c0c93d6949b7910fbc8c6b56dff768dba4ffe88b0f7af53e262bb9ab7b
-  data.tar.gz: 5cfd25a1dc214ce60aa85ab06e0b8301a7149a762c48bfe74de13fd0c588102c70b5c58062d553e185a0113cb08554ad060440314dd79b5b5e0a46c4313deb24
+  metadata.gz: 72b64e06d3ca8cde9145ea39bda39e54ed35e2c9fc06cd0e42e1f1c26c85ed1d46d268b4515cfa8ab222f3259a13abfc988d498d343b94906c5b458febbf902c
+  data.tar.gz: 8e1c2ba8f0f15317d8a7388e7e81c650ff4e52ec5cc311863bd1404655a8b87a164f9f4fcf70d1eb8d8b31bc3661c644eb1d01965b533c853012626baac6df8d

data/.gitignore

@@ -1,13 +1 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-*.bundle
-*.so
-*.o
-*.a
-mkmf.log
+*.gem

data/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - 2.2
+  - 2.3
+  - 2.4
+  - 2.5
+before_install: gem update --system

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    marcel (0.3.0)
+    marcel (0.3.1)
       mimemagic (~> 0.3.2)
 
 GEM
@@ -23,4 +23,4 @@ DEPENDENCIES
   rake (~> 10.0)
 
 BUNDLED WITH
-   1.14.6
+   1.16.1

data/lib/marcel/mime_type.rb

@@ -27,28 +27,34 @@ class Marcel::MimeType
       def for_data(pathname_or_io)
         if pathname_or_io
           with_io(pathname_or_io) do |io|
-            MimeMagic.by_magic(io)&.type&.downcase
+            if magic = MimeMagic.by_magic(io)
+              magic.type.downcase
+            end
           end
         end
       end
 
       def for_name(name)
         if name
-          MimeMagic.by_path(name)&.type&.downcase
+          if magic = MimeMagic.by_path(name)
+            magic.type.downcase
+          end
         end
       end
 
       def for_extension(extension)
         if extension
-          MimeMagic.by_extension(extension)&.type&.downcase
+          if magic = MimeMagic.by_extension(extension)
+            magic.type.downcase
+          end
         end
       end
 
       def for_declared_type(declared_type)
         type = parse_media_type(declared_type)
 
-        if type != BINARY
-          type&.downcase
+        if type != BINARY && !type.nil?
+          type.downcase
         end
       end
 
@@ -90,4 +96,3 @@ class Marcel::MimeType
 end
 
 require 'marcel/mime_type/definitions'
-

data/lib/marcel/version.rb

@@ -1,3 +1,3 @@
 module Marcel
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/marcel.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '~> 2.3'
+  spec.required_ruby_version = '>= 2.2'
 
   spec.add_dependency 'mimemagic', '~> 0.3.2'
 

data/test/mime_type_test.rb

@@ -25,7 +25,7 @@ class Marcel::MimeTypeTest < Marcel::TestCase
   end
 
   test "gets content type from Tempfiles" do
-    Tempfile.open do |tempfile|
+    Tempfile.open("Marcel") do |tempfile|
       tempfile.write(File.read(@path))
       content_type = Marcel::MimeType.for tempfile
       assert_equal "image/gif", content_type

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marcel
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Tom Ward
@@ -88,6 +88,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - MIT-LICENSE
@@ -208,9 +209,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="