browse-everything 0.5.1 → 0.5.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MDI4OTA0NjYwZWJkMGNiN2M2MzQ4MGYyMzBjM2M4OWE0MjAzMjQ1Yw==
+    N2UyMTc2ZWFhNGRhNjAxYzgwNzI1YTkzMjgyNTVjOGUwMThjZTEyZA==
   data.tar.gz: !binary |-
-    MWZlNzMyMjAxMzYyNzVkZTMwYWE1ZTJkOGY0ZTljMzkwNTIzYjliNA==
+    ZjRiNTM4NDhlZTlmMWE0ODQ4ZDM1ODJhN2I3Mzc3OGY0MmI4OTE3Mg==
 SHA512:
   metadata.gz: !binary |-
-    NTI5YzUyYjI4OTE0NDIxOGRlY2IwNTBkOGEzNGViY2E2YWI2ZmFkMmZlMzQ2
-    ZDdkNTQ0OTRjZmI0NDk0ODQxMjUyOTkwNTJjZmI1NWMyNjg3OGFhODViY2Rh
-    NjFhOWVhMzg0ZjEyMTdhZDllNjk5MTA4MjBlMjJkNjc0NjRmZGU=
+    MmMwMjVjNjFmM2Q5ZmVmMTdjYzVlZWI1MzQ2MWM5M2RjNTc0YmMxNjAzYmYw
+    NDIzNTQ3NDA2MDQwM2IzODc3ZDQ2OTg0NDczMWJmMTgyYzQ3ZmU3NzQyZDBj
+    YTg4NTQyNDBlMzk2YjFkNGZmMjVlMzc3YWQ1NGM0ZDZhNGI1YWE=
   data.tar.gz: !binary |-
-    MjNkMjk3NzRjNzNlZTc4NzYwNDlhZjY0ZmM5YmQ5ODAxOTBjNTJlNGVmZjdh
-    Nzk0ZWEzOTU0ODI3ZTVlNWFiZjFkYTEzNDc3Mzc4MGIzNzY2YzJlNzYwMzQ3
-    NzUyYTUyMGYxYzJkYWU4ZGM4ZWU0OGQwYzM5NTU5MTA0M2ViYjU=
+    NmQ1NmNkYzcyZDM3NmE0ZTlmNTY1ODkxZGFlZWIxMjhkYmYxNjE1YmM4ODVm
+    ZDFmYTYyZDI1NGQ0MmZmNDIyZDRjY2E0Y2QxOWRkYmUwNzAzZjAzNjJiMmFl
+    MDBiYzg4NWQ2OGVhYTIxMGFjYTIyODRiMzg5OTMwODQyNTJmNzE=

data/HISTORY.md

@@ -1,3 +1,6 @@
+### 0.5.2 (2014-07-30)
+- Allow MIME type filtering to work on Rack < 1.5.0
+
 ### 0.5.1 (2014-07-30)
 - Fix for busted responsive layouts when using Bootstrap 2.x
 

data/app/helpers/browse_everything_helper.rb

@@ -8,10 +8,33 @@ module BrowseEverythingHelper
     fields.join("\n").html_safe
   end
 
+  # Extracted from Rack::Mime 1.5.2 for use with earlier versions
+  # of Rack/Rails
+  def mime_match?(value, matcher)
+    v1, v2 = value.split('/', 2)
+    m1, m2 = matcher.split('/', 2)
+
+    if m1 == '*'
+      if m2.nil? || m2 == '*'
+        return true
+      elsif m2 == v2
+        return true
+      else
+        return false
+      end
+    end
+
+    return false if v1 != m1
+
+    return true if m2.nil? || m2 == '*'
+
+    m2 == v2
+  end
+
   def is_acceptable?(file)
     acceptable = params[:accept] || '*/*'
     acceptable_types = acceptable.split(/,\s*/)
     acceptable_types << 'application/x-directory'
-    acceptable_types.any? { |type| Rack::Mime.match?(file.type, type) }
+    acceptable_types.any? { |type| mime_match?(file.type, type) }
   end
 end

data/lib/browse_everything/version.rb

@@ -1,3 +1,3 @@
 module BrowseEverything
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/spec/unit/browse_everything_helper_spec.rb

@@ -0,0 +1,40 @@
+require File.expand_path('../../spec_helper',__FILE__)
+
+describe BrowseEverythingHelper do
+
+  let(:test_class) {
+    Class.new do
+      include BrowseEverythingHelper
+      attr_reader :params
+      def initialize params
+        @params = params
+      end
+    end
+  }
+
+  let(:test_file) { BrowseEverything::FileEntry.new 0, '/path/to/file.mp4', 'file.mp4', 12345, Time.now, false }
+  
+  it "should match a full type" do
+    expect(test_class.new(accept: 'video/mp4').is_acceptable?(test_file)).to eq(true)
+  end
+  
+  it "should match a wildcard type" do
+    expect(test_class.new(accept: 'video/*').is_acceptable?(test_file)).to eq(true)
+  end
+  
+  it "should not match the wrong full type" do
+    expect(test_class.new(accept: 'video/mpeg').is_acceptable?(test_file)).to eq(false)
+  end
+
+  it "should not match the wrong wildcard type" do
+    expect(test_class.new(accept: 'audio/*').is_acceptable?(test_file)).to eq(false)
+  end
+
+  it "should match a type list" do
+    expect(test_class.new(accept: 'audio/*, video/mp4').is_acceptable?(test_file)).to eq(true)
+  end
+
+  it "should not match the wrong type list" do
+    expect(test_class.new(accept: 'audio/*, application/json').is_acceptable?(test_file)).to eq(false)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: browse-everything
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Carolyn Cole
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-30 00:00:00.000000000 Z
+date: 2014-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -363,6 +363,7 @@ files:
 - spec/support/app/views/file_handler/main.html.erb
 - spec/support/lib/generators/test_app_generator.rb
 - spec/unit/base_spec.rb
+- spec/unit/browse_everything_helper_spec.rb
 - spec/unit/browser_spec.rb
 - spec/unit/drop_box_spec.rb
 - spec/unit/file_entry_spec.rb
@@ -411,6 +412,7 @@ test_files:
 - spec/support/app/views/file_handler/main.html.erb
 - spec/support/lib/generators/test_app_generator.rb
 - spec/unit/base_spec.rb
+- spec/unit/browse_everything_helper_spec.rb
 - spec/unit/browser_spec.rb
 - spec/unit/drop_box_spec.rb
 - spec/unit/file_entry_spec.rb