fistface 1.0.1 → 1.0.2

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZTUxMWRhZmIyOGY3OGE3YzJmMzVlZTY1MWI0ZmI4ZTc5YzRkYzc2OQ==
+  data.tar.gz: !binary |-
+    ZmJjZjVmMjE5MDhhNzk2MjBlN2JiOGI0NTUzOWY0MTI0MWVhZTk5Zg==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MTQ1M2Q3OTJlODFlMzU1NTkyZjBiYzkxYjMxNjk0NGUzNGUyYjgzZWQ1OGM4
+    MDM0ZTVhMGU5YjY3N2M0OGRkZDEwZjEyZWFkN2IyNzc3NDA3ZmEyYmRlOTZm
+    ODBkZjQ4ZWZkZWJiYzkzZGM1NDNlNTBjNTU2MTNjYjc1YzZlYTM=
+  data.tar.gz: !binary |-
+    YjBiYzU5NjUyMmQ4YjdkZTgzZDc3OTcyYTlmMzk1NDU1OThmNDY2N2EwNWE0
+    NDRjNTc2ZjBmNmU1YjRmMzkxMTc2NWY2MDE3OWI4OTIzNzVkY2MyMTMwNTc5
+    ZmI2YWEwNDIwODgzYTE4NzQ2ZDQ0MmNkMTEzNjExZjNmMTAyMzI=

data/Gemfile.lock

@@ -7,31 +7,31 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.1.2)
+    diff-lcs (1.2.1)
     rack (1.3.1)
     rack-test (0.6.0)
       rack (>= 1.0)
-    rake (0.9.2.2)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
+    rake (10.0.3)
+    rspec (2.13.0)
+      rspec-core (~> 2.13.0)
+      rspec-expectations (~> 2.13.0)
+      rspec-mocks (~> 2.13.0)
+    rspec-core (2.13.1)
+    rspec-expectations (2.13.0)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.13.0)
     sinatra (1.2.7)
       rack (~> 1.1)
-      tilt (< 2.0, >= 1.2.2)
+      tilt (>= 1.2.2, < 2.0)
     tilt (1.3.3)
-    timecop (0.3.5)
+    timecop (0.6.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   fistface!
-  rack-test
-  rake
-  rspec
-  timecop
+  rack-test (~> 0.6)
+  rake (~> 10.0)
+  rspec (~> 2.13)
+  timecop (~> 0.6)

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright 2011 thoughtbot, inc.
+Copyright 2010-2013 thoughtbot, inc.
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -24,24 +24,32 @@ Setup
 
 Create a Gemfile:
 
-    source "http://rubygems.org"
-    gem "sinatra",  "~> 1.1"
-    gem "fistface", "~> 1.0"
+    source 'http://rubygems.org'
+    gem 'sinatra',  '~> 1.1'
+    gem 'fistface', '~> 1.0'
 
 Create a rackup file (config.ru):
 
     require 'rubygems'
     require 'bundler'
     Bundler.require
-    run FistFace
+    run Sinatra::FistFace
+    run Sinatra::Application
 
-Prepare the production environment:
+Prepare the app for production:
 
     bundle install
     git init
     git add .
-    git commit -m "Creating a Fist Face instance"
-    heroku create
+    git commit -m 'Creating a Fist Face instance'
+
+Create the production environment. Use Heroku's Bamboo stack in order to use
+[Varnish](https://devcenter.heroku.com/articles/http-caching):
+
+    heroku create your-app-name-here --stack bamboo-mri-1.9.2
+
+Add your S3 bucket:
+
     heroku config:add S3_URL=https://your-bucket.s3.amazonaws.com
 
 Do not include a trailing slash.
@@ -106,4 +114,4 @@ The names and logos for thoughtbot are trademarks of thoughtbot, inc.
 License
 -------
 
-Fist Face is Copyright © 2011 thoughtbot. It is free software, and may be redistributed under the terms specified in the MIT-LICENSE file.
+Fist Face is Copyright © 2010-2013 thoughtbot, inc. It is free software, and may be redistributed under the terms specified in the MIT-LICENSE file.

data/fistface.gemspec

@@ -1,27 +1,22 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "fistface/version"
+$:.push File.expand_path('../lib', __FILE__)
+require 'fistface/version'
 
 Gem::Specification.new do |s|
-
-  # Dependencies
   s.add_dependency('sinatra', '~> 1.1')
-  s.add_development_dependency("rspec")
-  s.add_development_dependency("rack-test")
-  s.add_development_dependency("timecop")
-  s.add_development_dependency("rake")
-
-  #Configuration
-  s.name        = 'fistface'
-  s.version     = Fistface::VERSION
-  s.authors     = ['Dan Croak']
-  s.email       = 'support@thoughtbot.com'
-  s.homepage    = 'http://github.com/thoughtbot/fistface'
-  s.summary     = 'DIY @font-face web service'
+  s.add_development_dependency('rack-test', '~> 0.6')
+  s.add_development_dependency('rake', '~> 10.0')
+  s.add_development_dependency('rspec', '~> 2.13')
+  s.add_development_dependency('timecop', '~> 0.6')
+  s.authors = ['Dan Croak']
   s.description = 'Pow. Right in the kisser.'
-
-  s.files         = `git ls-files`.split("\n")
-  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  s.require_paths = ["lib"]
+  s.email = 'support@thoughtbot.com'
+  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.files = `git ls-files`.split("\n")
+  s.homepage = 'http://github.com/thoughtbot/fistface'
+  s.name = 'fistface'
+  s.require_paths = ['lib']
+  s.summary = 'DIY @font-face web service'
+  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.version = FistFace::VERSION
 end

data/lib/fistface.rb

@@ -6,30 +6,29 @@ module Sinatra
 
     def self.registered(app)
       app.before do
-        one_year_in_seconds = 31536000
-
-        headers 'Cache-Control'               => "public, max-age=#{one_year_in_seconds}",
-                'Expires'                     => (Time.now + one_year_in_seconds).httpdate,
-                'Access-Control-Allow-Origin' => '*'
+        expires 31536000, :public
+        headers 'Access-Control-Allow-Origin' => '*'
       end
 
       app.get '/:font_face.css' do
-        headers['Content-Type'] = 'text/css'
+        content_type 'text/css'
         open("#{ENV['S3_URL']}/#{params[:font_face]}.css").read
       end
 
       app.get '/:directory/:font_face' do
-        headers['Content-Type'] = case params[:font_face]
-                                    when /\.ttf$/  then 'font/truetype'
-                                    when /\.otf$/  then 'font/opentype'
-                                    when /\.woff$/ then 'font/woff'
-                                    when /\.eot$/  then 'application/vnd.ms-fontobject'
-                                    when /\.svg$/  then 'image/svg+xml'
-                                  end
+        content_type(
+          case params[:font_face]
+            when /\.ttf$/  then 'font/truetype'
+            when /\.otf$/  then 'font/opentype'
+            when /\.woff$/ then 'font/woff'
+            when /\.eot$/  then 'application/vnd.ms-fontobject'
+            when /\.svg$/  then 'image/svg+xml'
+          end
+        )
         open("#{ENV['S3_URL']}/#{params[:directory]}/#{params[:font_face]}").read
       end
-
     end
   end
+
   register FistFace
-end
+end

data/lib/fistface/version.rb

@@ -1,3 +1,3 @@
-module Fistface
-  VERSION = "1.0.1"
+module FistFace
+  VERSION = '1.0.2'
 end

data/spec/fistface_spec.rb

@@ -1,38 +1,38 @@
 require 'spec_helper'
 
-describe "FistFace" do
+describe 'FistFace' do
   include Rack::Test::Methods
 
   def app
     @app ||= Sinatra::Application
   end
 
-  context "when I GET a font stylesheet by convention of font-name.css" do
+  context 'when I GET a font stylesheet by convention of font-name.css' do
     before do
       Timecop.freeze(first_of_january)
 
-      get "chunk.css"
+      get 'chunk.css'
     end
 
     after { Timecop.return }
 
-    it "responds with HTTP status OK" do
+    it 'responds with HTTP status OK' do
       last_response.should be_ok
     end
 
-    it "has the @font-face declaration in the CSS body" do
+    it 'has the @font-face declaration in the CSS body' do
       last_response.body.should == File.read('spec/fixtures/chunk.css')
     end
 
-    it "is in the CSS Content-Type" do
-      last_response.content_type.should == 'text/css'
+    it 'is in the CSS Content-Type' do
+      last_response.content_type.should == 'text/css;charset=utf-8'
     end
 
-    it "wildcards the Access-Control-Allow-Origin header so Firefox can access the file" do
+    it 'wildcards the Access-Control-Allow-Origin header so Firefox can access the file' do
       last_response.headers['Access-Control-Allow-Origin'].should == '*'
     end
 
-    it "HTTP caches the file for a year in Varnish" do
+    it 'HTTP caches the file for a year in HTTP accelerators like Varnish' do
       last_response.headers['Cache-Control'].should == 'public, max-age=31536000'
     end
 
@@ -41,28 +41,28 @@ describe "FistFace" do
     end
   end
 
-  context "when I GET a font file by convention of font-name/font-name.ttf" do
+  context 'when I GET a font file by convention of font-name/font-name.ttf' do
     before do
       Timecop.freeze(first_of_january)
 
-      get "chunk/chunk.ttf"
+      get 'chunk/chunk.ttf'
     end
 
     after { Timecop.return }
 
-    it "responds with HTTP status OK" do
+    it 'responds with HTTP status OK' do
       last_response.should be_ok
     end
 
-    it "is in the truetype Content-Type" do
+    it 'is in the truetype Content-Type' do
       last_response.content_type.should == 'font/truetype'
     end
 
-    it "wildcards the Access-Control-Allow-Origin header so Firefox can access the file" do
+    it 'wildcards the Access-Control-Allow-Origin header so Firefox can access the file' do
       last_response.headers['Access-Control-Allow-Origin'].should == '*'
     end
 
-    it "HTTP caches the file for a year in Varnish" do
+    it 'HTTP caches the file for a year in Varnish' do
       last_response.headers['Cache-Control'].should == 'public, max-age=31536000'
     end
 
@@ -71,39 +71,39 @@ describe "FistFace" do
     end
   end
 
-  context "when I GET an opentype font" do
-    before { get "chunk/chunk.otf" }
+  context 'when I GET an opentype font' do
+    before { get 'chunk/chunk.otf' }
 
-    it "is in the opentype Content-Type" do
+    it 'is in the opentype Content-Type' do
       last_response.content_type.should == 'font/opentype'
     end
   end
 
-  context "when I GET a web open font format font" do
-    before { get "chunk/chunk.woff" }
+  context 'when I GET a web open font format font' do
+    before { get 'chunk/chunk.woff' }
 
-    it "is in the web open font format Content-Type" do
+    it 'is in the web open font format Content-Type' do
       last_response.content_type.should == 'font/woff'
     end
   end
 
-  context "when I GET an embedded opentype font" do
-    before { get "chunk/chunk.eot" }
+  context 'when I GET an embedded opentype font' do
+    before { get 'chunk/chunk.eot' }
 
-    it "is in the embedded opentype Content-Type" do
+    it 'is in the embedded opentype Content-Type' do
       last_response.content_type.should == 'application/vnd.ms-fontobject'
     end
   end
 
-  context "when I GET an svg font" do
-    before { get "chunk/chunk.svg" }
+  context 'when I GET an svg font' do
+    before { get 'chunk/chunk.svg' }
 
-    it "is in the svg Content-Type" do
+    it 'is in the svg Content-Type' do
       last_response.content_type.should == 'image/svg+xml'
     end
   end
 
   def first_of_january
-    Date.parse("January 1, 2011")
+    Date.parse('January 1, 2011')
   end
 end

data/spec/spec_helper.rb

@@ -5,4 +5,4 @@ require 'rack/test'
 require 'timecop'
 
 ENV['RACK_ENV'] = 'test'
-ENV['S3_URL']   = 'spec/fixtures'
+ENV['S3_URL'] = 'spec/fixtures'

metadata

@@ -1,71 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: fistface
 version: !ruby/object:Gem::Version
-  version: 1.0.1
-  prerelease: 
+  version: 1.0.2
 platform: ruby
 authors:
 - Dan Croak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-03 00:00:00.000000000Z
+date: 2013-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &70296433657120 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70296433657120
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70296433656700 !ruby/object:Gem::Requirement
-    none: false
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70296433656700
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: &70296433656240 !ruby/object:Gem::Requirement
-    none: false
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
-  version_requirements: *70296433656240
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: timecop
-  requirement: &70296433655820 !ruby/object:Gem::Requirement
-    none: false
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: *70296433655820
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.13'
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70296433655400 !ruby/object:Gem::Requirement
-    none: false
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.6'
   type: :development
   prerelease: false
-  version_requirements: *70296433655400
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.6'
 description: Pow. Right in the kisser.
 email: support@thoughtbot.com
 executables: []
@@ -91,33 +105,26 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/thoughtbot/fistface
 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'
-      segments:
-      - 0
-      hash: 1911532667743223418
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1911532667743223418
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 2.0.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: DIY @font-face web service
 test_files:
 - spec/fistface_spec.rb