multi_mime 1.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5efc9d64b3c707b8ae9ce324808872e6c8a3cc85
-  data.tar.gz: 8e8f1a3f5316ea7f5e4cf78d07160ab29d1bbbcc
+  metadata.gz: 283efbc22a54d1e6c7966a912d6dc10ef5a18bb3
+  data.tar.gz: 0b56e2dfae1e0811531ac0d65da3850c4328be3e
 SHA512:
-  metadata.gz: fe30cc3af9523823eeeeaadc1d8ced587d0944479e6d59d020b7dd0c022c6f727c0114042c00a977df440e0ce1e420a48ca18ffd9d34776144b282740a22cec6
-  data.tar.gz: 07ecf389df86c3a12e4d0bad9db367bc99a0b3afdf2ff5a1364cae33608830bb522843c63a30725825d48ac9e62b30742c8f23dbd41c1b0810ee3c5c0b874bb7
+  metadata.gz: 91ffaa1e34ddaee7b6b981e30ed06fbc47c2046415371ff8e60b8e4044cc1d68769780c49a53792d4a6900881bc844a7739d2fcda2891879521f07129e8d4e05
+  data.tar.gz: a86a627ab130712773aa5949800ed4b9aa4b4233e7362c5bd4fae34c180df652b976fa8ea533d9dd4a5691f86265bc043f11d3c3daea0ddede68a1adb9dcf06f

data/.travis.yml

@@ -3,18 +3,20 @@ cache: bundler
 bundler_args: --without development
 rvm:
   - ruby-head
+  - ruby
   - jruby-head
+  - jruby
   - 2.1.0
   - 2.0.0
   - 1.9.3
-  - rbx-19mode
-  - jruby-19mode
+  - rbx-2
 matrix:
   fast_finish: true
   allow_failures:
     - rvm: ruby-head
+    - rvm: ruby
     - rvm: jruby-head
-    - rvm: rbx-19mode
-    - rvm: jruby-19mode
+    - rvm: jruby
+    - rvm: rbx-2
 notifications:
   email: false

data/CONTRIBUTING.md

@@ -36,10 +36,8 @@ Ideally, a bug report should include a pull request with failing specs.
 4. Run `bundle exec rake spec`. If your specs pass, return to step 3.
 5. Implement your feature or bug fix.
 6. Run `bundle exec rake spec`. If your specs fail, return to step 5.
-7. Run `open coverage/index.html`. If your changes are not completely covered
-   by your tests, return to step 3.
-8. Add, commit, and push your changes.
-9. [Submit a pull request.][pr]
+7. Add, commit, and push your changes.
+8. [Submit a pull request.][pr]
 
 [fork]: http://help.github.com/fork-a-repo/
 [branch]: http://learn.github.com/p/branching.html

data/Gemfile

@@ -7,10 +7,6 @@ gem 'actionpack', '~> 3.2'
 gem 'rack'
 gem 'mimemagic'
 
-group :developement do
-  gem 'rubocop', github: 'bbatsov/rubocop'
-end
-
 group :test do
   gem 'rake', '~> 10.0'
   gem 'fakefs', '~> 0.4.3'

data/README.md

@@ -2,7 +2,7 @@
 
 A generic swappable back-end for MIME type detection
 
-Lots of ruby libraries utilize mime type detection in some form. In order to best support multiple mime type detection libraries, `multi_mime` is a general-purpose, swappable, MIME type detection backend library.
+Lots of ruby libraries utilize MIME type detection in some form. In order to best support multiple MIME type detection libraries, `multi_mime` is a general-purpose, swappable, MIME type detection backend library.
 
 eg [MultiJson](https://github.com/intridea/multi_json) for MIME types.
 
@@ -18,7 +18,7 @@ require 'multi_mime'
 
 ## Features / Usage Examples
 
-Part of utilizing various mime type libraries is the need for a common interface. `MultiMime` provides just that with various methods.
+Part of utilizing various MIME type libraries is the need for a common interface. `MultiMime` provides just that with following methods.
 
 ```ruby
 MultiMime.type_for('text/html') # 'text/html'
@@ -30,7 +30,7 @@ MultiMime.type_for_extension('.html') # 'text/html'
 MultiMime.type_for_path('/usr/local/foo/bar/foo.html') # 'text/html'
 # alias :by_path
 
-MultiMime.type_for_file( File.open('foo.html', 'w') ) # 'text/html'
+MultiMime.type_for_file(File.open('foo.html', 'w')) # 'text/html'
 # alias :by_file
 ```
 
@@ -54,6 +54,8 @@ MultiMime.adapter # MultiMime::Adapters::MimeTypes
 MultiMime.type_for_extension('.json') # 'application/json'
 ```
 
+When MultiMime fails to load the specified adapter, it'll throw `MultiMime::AdapterError` which inherits from `ArgumentError`.
+
 ## Badges
 
 [![Gem Version](http://img.shields.io/gem/v/multi_mime.svg)][gem]
@@ -61,7 +63,7 @@ MultiMime.type_for_extension('.json') # 'application/json'
 [![Code Quality](http://img.shields.io/codeclimate/github/karlfreeman/multi_mime.svg)][codeclimate]
 [![Gittip](http://img.shields.io/gittip/karlfreeman.svg)][gittip]
 
-## Supported Mime Engines
+## Supported MIME Engines
 
 * [MIME::Types](https://github.com/halostatue/mime-types)
 * [MagicMime](https://github.com/minad/mimemagic)

data/lib/multi_mime.rb

@@ -1,3 +1,5 @@
+require 'thread'
+require 'multi_mime/adapter_error'
 module MultiMime
   extend self
 
@@ -26,16 +28,13 @@ module MultiMime
         next
       end
     end
-
-    Kernel.warn '[WARNING] MultiMime hasn\'t been able to detect an adapter'
-
+    fail 'MultiMime hasn\'t been able to detect a default_adapter'
     nil
   end
 
   # Get the current adapter class.
   def adapter
-    return @adapter if defined?(@adapter) && @adapter
-    use default_adapter # load default adapter
+    use(default_adapter) unless defined?(@adapter) # load default adapter
     @adapter
   end
 
@@ -47,7 +46,9 @@ module MultiMime
   #  * mime_type
   #  * rack_mime
   def use(new_adapter)
-    @adapter = load_adapter(new_adapter)
+    Thread.exclusive do
+      @adapter = load_adapter(new_adapter)
+    end
   end
   alias_method :adapter=, :use
 
@@ -132,8 +133,7 @@ module MultiMime
         end
       end
       if adapter_clazz.nil?
-        Kernel.warn '[WARNING] MultiMime hasn\'t been able to detect an adapter'
-        load_adapter nil
+        raise ::LoadError, new_adapter
       else
         return adapter_clazz
       end
@@ -142,14 +142,10 @@ module MultiMime
     when Class, Module
       new_adapter
     else
-      fail 'Did not recognize your adapter specification. Please specify either a symbol or a class.'
+      raise ::LoadError, new_adapter
     end
+  rescue ::LoadError => exception
+    raise AdapterError.build(exception)
   end
 
-  def with_adapter(new_adapter)
-    old_adapter, self.adapter = adapter, new_adapter
-    yield
-  ensure
-    self.adapter = old_adapter
-  end
 end

data/lib/multi_mime/adapter_error.rb

@@ -0,0 +1,15 @@
+module MultiMime
+  class AdapterError < ArgumentError
+    attr_reader :cause
+
+    def self.build(original_exception)
+      message = "Did not recognize your adapter specification (#{original_exception.message})."
+      new(message).tap do |exception|
+        exception.instance_eval do
+          @cause = original_exception
+          set_backtrace original_exception.backtrace
+        end
+      end
+    end
+  end
+end

data/lib/multi_mime/version.rb

@@ -1,3 +1,3 @@
 module MultiMime
-  VERSION = '1.0' unless defined?(MultiMime::VERSION)
+  VERSION = '1.0.1' unless defined?(MultiMime::VERSION)
 end

data/multi_mime.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.5'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'kramdown', '>= 0.14'
-  spec.add_development_dependency 'rubocop'
+  spec.add_development_dependency 'rubocop', '~> 0.19'
   spec.add_development_dependency 'pry'
   spec.add_development_dependency 'yard'
 end

data/spec/spec_helper.rb

@@ -13,23 +13,24 @@ RSpec.configure do |config|
   config.expect_with :rspec do |c|
     c.syntax = :expect
   end
-end
 
-def jruby?
-  defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
-end
+  def jruby?
+    defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
+  end
 
-def undefine_constants(*consts)
-  values = {}
-  consts.each do |const|
-    if Object.const_defined?(const)
-      values[const] = Object.const_get(const)
-      Object.send :remove_const, const
+  def undefine_constants(*consts)
+    values = {}
+    consts.each do |const|
+      if Object.const_defined?(const)
+        values[const] = Object.const_get(const)
+        Object.send :remove_const, const
+      end
+    end
+    yield
+  ensure
+    values.each do |const, value|
+      Object.const_set const, value
     end
   end
-  yield
-ensure
-  values.each do |const, value|
-    Object.const_set const, value
-  end
-end
+
+end

data/spec/unit/multi_mime_spec.rb

@@ -2,8 +2,13 @@ require 'spec_helper'
 
 describe MultiMime do
 
-  context :validations do
+  it 'should be thread safe' do
+    t1 = Thread.new { adapter = MultiMime.adapter; sleep 0.1; adapter }
+    t2 = Thread.new { MultiMime.adapter }
+    expect(t1.value).to eql t2.value
+  end
 
+  context :validations do
     describe :type_for do
       specify { expect { MultiMime.type_for(nil) }.to raise_error(ArgumentError) }
     end
@@ -21,10 +26,13 @@ describe MultiMime do
       specify { expect { MultiMime.type_for_file('.html') }.to raise_error(ArgumentError) }
     end
 
+    describe :adapter= do
+      specify { expect { MultiMime.adapter = Time.new }.to raise_error(MultiMime::AdapterError, /Did not recognize your adapter specification/) }
+      specify { expect { MultiMime.adapter = 'foo' }.to raise_error(MultiMime::AdapterError, /Did not recognize your adapter specification/) }
+    end
   end
 
   context :alias do
-
     describe :by_type do
       subject { MultiMime.instance_method(:by_type) }
       it { should == MultiMime.instance_method(:type_for) }
@@ -44,13 +52,10 @@ describe MultiMime do
       subject { MultiMime.instance_method(:by_file) }
       it { should == MultiMime.instance_method(:type_for_file) }
     end
-
   end
 
   context :defaults do
-
     describe 'MIME::Types' do
-
       around do |example|
         undefine_constants(:MimeMagic, :Mime, :Rack) { example.call }
         MultiMime.reset_adapter
@@ -60,11 +65,9 @@ describe MultiMime do
         require 'mime/types'
         expect(MultiMime.default_adapter).to eq :mime_types
       end
-
     end
 
     describe 'MimeMagic' do
-
       around do |example|
         undefine_constants(:MIME, :Mime, :Rack) { example.call }
         MultiMime.reset_adapter
@@ -74,11 +77,9 @@ describe MultiMime do
         require 'mimemagic'
         expect(MultiMime.default_adapter).to eq :mimemagic
       end
-
     end
 
     describe 'Mime::Type' do
-
       around do |example|
         undefine_constants(:MIME, :MimeMagic, :Rack) { example.call }
         MultiMime.reset_adapter
@@ -88,11 +89,9 @@ describe MultiMime do
         require 'action_dispatch/http/mime_type'
         expect(MultiMime.default_adapter).to eq :mime_type
       end
-
     end
 
     describe 'Rack::Mime' do
-
       around do |example|
         undefine_constants(:MIME, :Mime, :MimeMagic) { example.call }
         MultiMime.reset_adapter
@@ -102,7 +101,6 @@ describe MultiMime do
         require 'rack/mime'
         expect(MultiMime.default_adapter).to eq :rack_mime
       end
-
     end
 
   end
@@ -112,5 +110,4 @@ describe MultiMime do
       it_behaves_like 'an adapter', adapter
     end
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multi_mime
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: 1.0.1
 platform: ruby
 authors:
 - Karl Freeman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -56,16 +56,16 @@ dependencies:
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.19'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +114,7 @@ files:
 - Rakefile
 - lib/multi_mime.rb
 - lib/multi_mime/adapter.rb
+- lib/multi_mime/adapter_error.rb
 - lib/multi_mime/adapters/mime_type.rb
 - lib/multi_mime/adapters/mime_types.rb
 - lib/multi_mime/adapters/mimemagic.rb
@@ -158,4 +159,3 @@ test_files:
 - spec/support/pry.rb
 - spec/support/timecop.rb
 - spec/unit/multi_mime_spec.rb
-has_rdoc: