font_assets 0.1.12 → 0.1.14

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a6ca8b6811004929e8b01e4db352fe83a52c62b5
+  data.tar.gz: f36a914fcf8032afd8af38c9710bc0fb2eac698e
+SHA512:
+  metadata.gz: 3937a6ffd6bee8671c8da274db6aa829e146274ef10903adaece6be04691b41e668ae7c4ee98ca162ed51f1a7f5c61826a1228e8e0710cc84906c927e59ca1cc
+  data.tar.gz: ea058403dbcaa41b4f0b3f624994833de75e6d6f4d9457862b0bd72e8e183643c26819855024276f5011062e22092a98beb597e14409fa61320a7c536a13506e

data/.ruby-version

@@ -0,0 +1 @@
+2.3.1

data/README.md

@@ -10,6 +10,11 @@ two things:
 In addition, it will also respond to the pre-flight OPTIONS requests made by
 supporting browsers (Firefox).
 
+Important
+---------
+
+This gem only works if you are **NOT** precompiling your assets in production, because it requires asset requests to go through the Rails app, and if you precompile your assets then you are most likely serving them through a web server like NGINX. If this is the case, don't use this gem but instead look into configuring the CORS headers for font requests. For example, here is a way to [do that in NGINX](http://enable-cors.org/server_nginx.html).
+
 Install
 -------
 

data/lib/font_assets/middleware.rb

@@ -3,6 +3,7 @@ require 'font_assets/mime_types'
 
 module FontAssets
   class Middleware
+    attr_reader :origin, :options, :mime_types
 
     def initialize(app, origin, options={})
       @app = app
@@ -11,73 +12,90 @@ module FontAssets
       @mime_types = FontAssets::MimeTypes.new(Rack::Mime::MIME_TYPES)
     end
 
-    def access_control_headers
-      {
-        "Access-Control-Allow-Origin" => origin,
-        "Access-Control-Allow-Methods" => "GET",
-        "Access-Control-Allow-Headers" => "x-requested-with",
-        "Access-Control-Max-Age" => "3628800"
-      }
-    end
-
     def call(env)
-      @ssl_request = Rack::Request.new(env).scheme == "https"
-      # intercept the "preflight" request
-      if env["REQUEST_METHOD"] == "OPTIONS"
-        return [200, access_control_headers, []]
-      else
-        code, headers, body = @app.call(env)
-        set_headers! headers, body, env["PATH_INFO"]
-        [code, headers, body]
+      FontAssetsRequest.new(self, env).do_request do
+        @app.call(env)
       end
     end
 
+    class FontAssetsRequest
+      def initialize(middleware, env)
+        @middleware = middleware
+        @request = Rack::Request.new(env)
+      end
+
+      def do_request
+        if font_asset?
+          if @request.options?
+            return [200, access_control_headers, []]
+          else
+            code, headers, body = yield
 
-    private
+            headers.merge!(access_control_headers)
+            headers.merge!('Content-Type' => mime_type) if headers['Content-Type']
 
-    def origin
-      if !wildcard_origin? and allow_ssl? and ssl_request?
-        uri = URI(@origin)
-        uri.scheme = "https"
-        uri.to_s
-      else
-        @origin
+            [code, headers, body]
+          end
+        else
+          yield
+        end
       end
-    end
 
-    def wildcard_origin?
-      @origin == '*'
-    end
+      private
+      def access_control_headers
+        {
+          "Access-Control-Allow-Origin" => origin,
+          "Access-Control-Allow-Methods" => "GET",
+          "Access-Control-Allow-Headers" => "x-requested-with",
+          "Access-Control-Max-Age" => "3628800"
+        }
+      end
 
-    def ssl_request?
-      @ssl_request
-    end
+      def origin
+        if !wildcard_origin? and allow_ssl? and ssl_request?
+          uri = URI(@middleware.origin)
+          uri.scheme = "https"
+          uri.to_s
+        else
+          @middleware.origin
+        end
+      end
 
-    def allow_ssl?
-      @options[:allow_ssl]
-    end
+      def wildcard_origin?
+        @middleware.origin == '*'
+      end
 
-    def extension(path)
-      if path.nil? || path.length == 0
-        nil
-      else
-        "." + path.split("?").first.split(".").last
+      def ssl_request?
+        @request.scheme == "https"
       end
-    end
 
-    def font_asset?(path)
-      @mime_types.font? extension(path)
-    end
+      def allow_ssl?
+        @middleware.options[:allow_ssl]
+      end
 
-    def set_headers!(headers, body, path)
-      if ext = extension(path) and font_asset?(ext)
-        headers.merge!(access_control_headers)
-        headers.merge!('Content-Type' => mime_type(ext)) if headers['Content-Type']
+      def path
+        @request.path_info
+      end
+
+      def font_asset?
+        mime_types.font? extension
       end
-    end
 
-    def mime_type(extension)
-      @mime_types[extension]
+      def mime_type
+        mime_types[extension]
+      end
+
+      def mime_types
+        @middleware.mime_types
+      end
+
+      def extension
+        if path.nil? || path.length == 0
+          nil
+        else
+          "." + path.split("?").first.split(".").last
+        end
+      end
     end
   end
 end

data/lib/font_assets/railtie.rb

@@ -9,9 +9,9 @@ module FontAssets
       config.font_assets.options ||= { allow_ssl: true }
 
       insert_target = if defined?(ActionDispatch::Static)
-        'ActionDispatch::Static'
+        ActionDispatch::Static
       else
-        'Rack::Runtime'
+        Rack::Runtime
       end
 
       app.middleware.insert_before insert_target, FontAssets::Middleware, config.font_assets.origin, config.font_assets.options

data/lib/font_assets/version.rb

@@ -1,3 +1,3 @@
 module FontAssets
-  VERSION = "0.1.12"
+  VERSION = "0.1.14"
 end

data/spec/middleware_spec.rb

@@ -138,24 +138,41 @@ describe FontAssets::Middleware do
 
   context 'for OPTIONS requests' do
     let(:app) { load_app 'http://test.options' }
-    let(:response) { request app, '/test.ttf', :method => 'OPTIONS' }
 
-    context 'the response headers' do
-      subject { response[1] }
+    context 'to font assets' do
+      let(:response) { request app, '/test.ttf', :method => 'OPTIONS' }
 
-      its(["Access-Control-Allow-Headers"]) { should == "x-requested-with" }
-      its(["Access-Control-Max-Age"]) { should == "3628800" }
-      its(['Access-Control-Allow-Methods']) { should == 'GET' }
-      its(['Access-Control-Allow-Origin']) { should == 'http://test.options' }
+      context 'the response headers' do
+        subject { response[1] }
 
-      it 'should not contain a Content-Type' do
-        subject['Content-Type'].should be_nil
+        its(["Access-Control-Allow-Headers"]) { should == "x-requested-with" }
+        its(["Access-Control-Max-Age"]) { should == "3628800" }
+        its(['Access-Control-Allow-Methods']) { should == 'GET' }
+        its(['Access-Control-Allow-Origin']) { should == 'http://test.options' }
+
+        it 'should not contain a Content-Type' do
+          subject['Content-Type'].should be_nil
+        end
+      end
+
+      context 'the response body' do
+        subject { response[2] }
+        it { should be_empty }
       end
     end
 
-    context 'the response body' do
-      subject { response[2] }
-      it { should be_empty }
+    context 'to non-font assets' do
+      let(:response) { request app, '/test', method: 'OPTIONS' }
+
+      context 'the response headers' do
+        subject { response[1] }
+
+        its(["Access-Control-Allow-Headers"]) { should be_nil }
+        its(["Access-Control-Max-Age"]) { should be_nil }
+        its(['Access-Control-Allow-Methods']) { should be_nil }
+        its(['Access-Control-Allow-Origin']) { should be_nil }
+        its(['Content-Type']) { should == 'text/plain' }
+      end
     end
   end
 

metadata

@@ -1,46 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: font_assets
 version: !ruby/object:Gem::Version
-  version: 0.1.12
-  prerelease: 
+  version: 0.1.14
 platform: ruby
 authors:
 - Eric Allam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-14 00:00:00.000000000 Z
+date: 2016-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 description: Improve font serving in Rails 3.1
@@ -50,8 +45,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
+- ".ruby-version"
 - CHANGELOG.md
 - Gemfile
 - README.md
@@ -67,27 +63,26 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/rubymaverick/font_assets
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: font_assets
-rubygems_version: 1.8.23
+rubygems_version: 2.5.1
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Improve font serving in Rails 3.1
 test_files:
 - spec/middleware_spec.rb