RubyGems - google-webfonts - Versions diffs - 0.1.2 → 0.2.0 - Mend

google-webfonts 0.1.2 → 0.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (21) hide show

checksums.yaml +7 -0
data/.gitignore +1 -0
data/README.md +3 -1
data/Rakefile +8 -1
data/google-webfonts.gemspec +27 -23
data/lib/google-webfonts.rb +9 -3
data/lib/google-webfonts/helper.rb +26 -82
data/lib/google-webfonts/link_tag.rb +68 -0
data/lib/google-webfonts/version.rb +1 -1
data/test/lib/google-webfonts/helper_test.rb +21 -0
data/test/lib/google-webfonts/link_tag_test.rb +52 -0
data/test/lib/google-webfonts/sinatra_test.rb +25 -0
data/test/lib/google-webfonts_test.rb +11 -0
data/test/test_helper.rb +16 -0
metadata +69 -35
data/.rspec +0 -1
data/spec/google-webfonts/helper_spec.rb +0 -126
data/spec/google-webfonts/sinatra_spec.rb +0 -23
data/spec/google-webfonts/version_spec.rb +0 -7
data/spec/google-webfonts_spec.rb +0 -7
data/spec/spec_helper.rb +0 -3

checksums.yaml ADDED

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: f25bcacd54d5215e32e042a398f6d509b8f12aaa
+  data.tar.gz: fdfdaf3395363ef350b76db9b011e7c15520f606
+SHA512:
+  metadata.gz: bd56576397bf306107d3d52fd73383d37df8bb739bb43bfce026f066487bd18c873bdeadbafd6b4bb0a9cdaaab6e5e5bde1464be588f1669eeaf265d47901626
+  data.tar.gz: b73db19e8b453ec28bcbd102495bcb56dda24627b1d56715489f0ab6fe53b482aea2f6317035da7096726ea40dc0b303eb6c3adcf7411e0f529d9acc46c19f46

data/.gitignore CHANGED

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.ruby-version

data/README.md CHANGED

@@ -70,7 +70,9 @@ app:
     get '/' do
       erb :index
     end
+###
     # views/index.erb
     <html>
       <head>

data/Rakefile CHANGED

@@ -1,2 +1,9 @@
-#!/usr/bin/env rake
 require "bundler/gem_tasks"
+require 'rake/testtask'
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/**/*_test.rb']
+end
+task :default => [:test]

data/google-webfonts.gemspec CHANGED

@@ -1,26 +1,30 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path('../lib/google-webfonts/version', __FILE__)
+# coding: utf-8
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'google-webfonts/version'
-Gem::Specification.new do |gem|
-  gem.authors       = ["Travis Haynes"]
-  gem.email         = ["travis.j.haynes@gmail.com"]
-  gem.description   = "Google Webfonts helper for Rails or Sinatra applications."
-  gem.summary       = %q{Provides a helper for using Google Webfonts in Rails or
-Sinatra, although it can be used outside of those frameworks as well.}
-  gem.homepage      = "https://github.com/travishaynes/Google-Webfonts-Helper"
+Gem::Specification.new do |spec|
+  spec.name = "google-webfonts"
+  spec.version = Google::Webfonts::VERSION
+  spec.authors = ["Travis Haynes"]
+  spec.email = ["travis.j.haynes@gmail.com"]
-  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
-  gem.files         = `git ls-files`.split("\n")
-  gem.test_files    = `git ls-files -- {spec}/*`.split("\n")
-  gem.name          = "google-webfonts"
-  gem.require_paths = ["lib"]
-  gem.version       = Google::Webfonts::VERSION
-  gem.add_runtime_dependency      'actionpack',   '>= 3.0.0'
-  gem.add_development_dependency  'rspec',        '~> 2.8.0'
-  gem.add_development_dependency  'yard-tomdoc',  '~> 0.4.0'
-  gem.add_development_dependency  'sinatra',      '~> 1.3.2'
+  spec.summary = "Provides a helper for using Google Webfonts in Rails or " +
+                 "Sinatra, although it can be used outside of those " +
+                 "frameworks as well."
+  spec.description = "Google Webfonts helper for Rails or Sinatra applications."
+  spec.homepage = "https://github.com/travishaynes/Google-Webfonts-Helper"
+  spec.files = `git ls-files -z`.split("\x0")
+  spec.executables = spec.files.grep(%r{^bin/}) {|f| File.basename(f) }
+  spec.test_files = spec.files.grep(%r{^test/})
+  spec.require_paths = ['lib']
+  spec.add_runtime_dependency 'actionpack', '>= 3.0.0'
+  spec.add_development_dependency 'bundler', '>= 1.3.0', '< 2.0'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'minitest', '~> 5.3.3'
+  spec.add_development_dependency 'sinatra', '~> 1.3.2'
 end

data/lib/google-webfonts.rb CHANGED

@@ -1,14 +1,20 @@
-require "action_view"
+require 'uri'
+require 'action_view'
+require 'active_support/core_ext'
+require 'action_dispatch/http/mime_type'
 # Public: Module for Google helpers
 module Google
   # Public: Module for Google Webfonts helpers
   module Webfonts
+    HOST = 'fonts.googleapis.com'
+    PATH = '/css'
   end
 end
-require "google-webfonts/version"
-require "google-webfonts/helper"
+require 'google-webfonts/version'
+require 'google-webfonts/link_tag'
+require 'google-webfonts/helper'
 require 'google-webfonts/sinatra' if defined? Sinatra

data/lib/google-webfonts/helper.rb CHANGED

@@ -1,100 +1,44 @@
 module Google
   module Webfonts
     # Public: Helper module that includes the google_webfonts_link_tag method.
     # This module is automatically included in your Rails view helpers.
     module Helper
-      include ActionView::Helpers::TagHelper
       # Public: Generates a Google Webfonts link tag
-      #
+      #
+      # If you need to specify a font size, use a Hash. Symbols will be
+      # titleized, so if the font you're using uses a specialized case
+      # (e.g: "PT Sans"), then you'll need to use a String.
+      #
+      # You can specify subsets by using the :subset option. Note that this must
+      # be a Symbol. "Subset" and "subset" would be turned into a font.
+      #
       # options - The font options. This can be a String, Symbol, or Hash, or
-      #           a combination of all three. If you need to specify a font
-      #           size, use a Hash, otherwise a String or Symbol will work.
+      #           a combination of all three.
       #
       # Examples
       #
-      #   google_webfonts_link_tag "Droid Sans"
-      #   # => '<link href="http://fonts.googleapis.com/css?family=Droid+Sans" rel="stylesheet" type="text/css" />'
-      #
+      #   google_webfonts_link_tag "PT Sans"
+      #
       #   google_webfonts_link_tag :droid_sans
-      #   # => '<link href="http://fonts.googleapis.com/css?family=Droid+Sans" rel="stylesheet" type="text/css" />'
-      #
-      #   google_webfonts_link_tag :droid_sans => [400, 700]
-      #   # => '<link href="http://fonts.googleapis.com/css?family=Droid+Sans:400,700" rel="stylesheet" type="text/css" />'
-      #
-      #   google_webfonts_link_tag :droid_sans => [400, 700],
-      #                            :yanone_kaffeesatz => [300, 400]
-      #   # => '<link href="http://fonts.googleapis.com/css?family=Droid+Sans:400,700|Yanone+Kaffeesatz:300,400" rel="stylesheet" type="text/css" />'
-      #
-      #   google_webfonts_link_tag "Droid Sans",
-      #                            :yanone_kaffeesatz => 400
-      #   # => '<link href="http://fonts.googleapis.com/css?family=Droid+Sans|Yanone+Kaffeesatz:400" rel="stylesheet" type="text/css" />'
+      #
+      #   google_webfonts_link_tag droid_sans: [400, 700]
+      #
+      #   google_webfonts_link_tag droid_sans: [400, 700],
+      #                            yanone_kaffeesatz: 700
+      #
+      #   google_webfonts_link_tag :droid_sans,
+      #                            yanone_kaffeesatz: 400,
+      #                            "PT Sans" => [400, 700]
+      #
+      #   google_webfonts_link_tag :droid_sans, subset: %w[latin cyrillic]
       #
       # Returns a <link> tag for the Google Webfonts stylesheet.
       # Raises ArgumentError if no options are passed.
-      # Raises ArgumentError if an option is not a Symbol, String, or Hash.
-      # Raises ArgumentError if a size is not a String or Fixnum.
-      def google_webfonts_link_tag(*options)
-        raise ArgumentError, "expected at least one font" if options.empty?
-        fonts = []
-        options.each do |option|
-          case option.class.to_s
-          when "Symbol", "String"
-            # titleize the font name
-            font_name = option.to_s.titleize
-            # replace any spaces with pluses
-            font_name = font_name.gsub(" ", "+")
-            # include the font
-            fonts << font_name
-          when "Hash"
-            fonts += option.inject([]) do |result, (font_name, sizes)|
-              # ensure sizes is an Array
-              sizes = Array(sizes)
-              sizes.all? do |size|
-                unless size.class == Fixnum || size.class == String
-                  raise ArgumentError, "expected a Fixnum or String, got a #{size.class}"
-                end
-              end
-              # convert font name into a String
-              font_name = font_name.to_s
-              # replace underscores with spaces
-              # and titleize the font name
-              font_name = font_name.gsub("_", " ")
-              font_name = font_name.titleize
-              # convert the spaces into pluses
-              font_name = font_name.gsub(" ", "+")
-              # return font_name:sizes where
-              # sizes is a comma separated list
-              result << "#{font_name}:#{sizes.join(",")}"
-            end
-          else
-            raise ArgumentError, "expected a String, Symbol, or a Hash, got a #{option.class}"
-          end
-        end
-        # the fonts are separated by pipes
-        family = fonts.join("|")
-        # return the link tag
-        tag 'link', {
-            :rel  => :stylesheet,
-            :type => Mime::CSS,
-            :href => "http://fonts.googleapis.com/css?family=#{family}"
-          },
-          false,
-          false
+      def google_webfonts_link_tag(*opts)
+        raise ArgumentError, 'expected at least one font', caller if opts.empty?
+        LinkTag.new(request, *opts).result
       end
     end
   end
 end

data/lib/google-webfonts/link_tag.rb ADDED

@@ -0,0 +1,68 @@
+module Google
+  module Webfonts
+    class LinkTag
+      include ActionView::Helpers::TagHelper
+      attr_reader :result
+      alias_method :to_s, :result
+      def initialize(request, *opts)
+        @request = request
+        @subsets = []
+        @fonts = fonts_from_options(opts)
+        @result = tag(:link, link_options, false, false)
+      end
+      private
+      def fonts_from_options(opts)
+        opts.map {|option| parse_google_webfont_option(option) }.flatten
+      end
+      def parse_google_webfont_option(option)
+        case option
+        when Symbol, String then parse_google_webfont_name(option)
+        when Hash then parse_google_webfont_hash(option)
+        else ""
+        end
+      end
+      def parse_google_webfont_hash(hash)
+        add_subsets(hash.delete(:subset))
+        hash.inject([]) do |result, (font_name, sizes)|
+          font_name = parse_google_webfont_name(font_name)
+          result << "#{font_name}:#{Array(sizes).join(",")}"
+        end
+      end
+      def parse_google_webfont_name(name)
+        name = name.to_s.titleize if name.is_a?(Symbol)
+        name.gsub("_", " ")
+      end
+      def link_options
+        { rel: 'stylesheet',
+          type: Mime::CSS,
+          href: uri.to_s }
+      end
+      def add_subsets(subsets)
+        @subsets += Array(subsets)
+      end
+      def uri
+        u = @request.ssl? ? URI::HTTPS : URI::HTTP
+        u.build(host: HOST, path: PATH, query: uri_query)
+      end
+      def uri_query
+        {}.tap {|q|
+          q['family'] = @fonts.join("|")
+          q['subset'] = @subsets.join(",") if @subsets.any?
+        }.to_query
+      end
+    end
+  end
+end

data/lib/google-webfonts/version.rb CHANGED

@@ -1,6 +1,6 @@
 module Google
   module Webfonts
     # Public: Current version of the gem
-    VERSION = "0.1.2"
+    VERSION = "0.2.0"
   end
 end

data/test/lib/google-webfonts/helper_test.rb ADDED

@@ -0,0 +1,21 @@
+require 'test_helper'
+module Google
+  module Webfonts
+    class HelperTest < Minitest::Test
+      include Helper
+      def test_google_webfonts_link_tag
+        options = { droid_sans: [400, 700] }
+        link_tag = LinkTag.new(request, options)
+        assert_equal link_tag.result, google_webfonts_link_tag(options)
+      end
+      private
+      def request
+        OpenStruct.new(:ssl? => false)
+      end
+    end
+  end
+end

data/test/lib/google-webfonts/link_tag_test.rb ADDED

@@ -0,0 +1,52 @@
+require 'test_helper'
+module Google
+  module Webfonts
+    class LinkTagTest < Minitest::Test
+      def setup
+        @http_request = OpenStruct.new(:ssl? => false)
+        @https_request = OpenStruct.new(:ssl? => true)
+      end
+      def test_subsets
+        tag = LinkTag.new(@http_request, droid_sans: [400, 700],
+          subset: %w[latin cyrillic]).result
+        assert_tag tag, 'link',
+          href: 'http://fonts.googleapis.com/css?family=Droid+Sans%3A400%2C700&subset=latin%2Ccyrillic'
+      end
+      def test_uri_protocol
+        tag = LinkTag.new(@http_request, droid_sans: [400, 700]).result
+        assert_tag tag, 'link',
+          href: 'http://fonts.googleapis.com/css?family=Droid+Sans%3A400%2C700'
+        tag = LinkTag.new(@https_request, droid_sans: [400, 700]).result
+        assert_tag tag, 'link',
+          href: 'https://fonts.googleapis.com/css?family=Droid+Sans%3A400%2C700'
+      end
+      def test_with_font_sizes
+        tag = LinkTag.new(@http_request, droid_sans: [400, 700]).result
+        assert_tag tag, 'link',
+          href: 'http://fonts.googleapis.com/css?family=Droid+Sans%3A400%2C700'
+        tag = LinkTag.new(@http_request, droid_sans: [400, 700],
+          'PT Sans' => [400, 700]).result
+        assert_tag tag, 'link',
+          href: 'http://fonts.googleapis.com/css?family=Droid+Sans%3A400%2C700%7CPT+Sans%3A400%2C700'
+      end
+      def test_strings_are_not_titleized
+        tag = LinkTag.new(@http_request, 'PT Sans').result
+        assert_tag tag, 'link',
+          href: 'http://fonts.googleapis.com/css?family=PT+Sans'
+      end
+      def test_symbols_are_titleized
+        tag = LinkTag.new(@http_request, :droid_sans).result
+        assert_tag tag, 'link',
+          href: 'http://fonts.googleapis.com/css?family=Droid+Sans'
+      end
+    end
+  end
+end

data/test/lib/google-webfonts/sinatra_test.rb ADDED

@@ -0,0 +1,25 @@
+require 'test_helper'
+# create a Sinatra route for testing
+get("/") { google_webfonts_link_tag droid_sans: [400, 700] }
+class SinatraTest < Minitest::Test
+  include Rack::Test::Methods
+  def app
+    Sinatra::Application
+  end
+  def test_google_webfonts_link_tag_helper_loaded_in_sinatra
+    get "/"
+    options = { droid_sans: [400, 700] }
+    link_tag = Google::Webfonts::LinkTag.new(request, options)
+    assert_equal link_tag.result, last_response.body
+  end
+  private
+  def request
+    OpenStruct.new(:ssl? => false)
+  end
+end

data/test/lib/google-webfonts_test.rb ADDED

@@ -0,0 +1,11 @@
+require 'test_helper'
+class Google::WebfontsTest < Minitest::Test
+  def test_helper_is_included_in_action_view_base
+    assert ActionView::Base.ancestors.include?(Google::Webfonts::Helper)
+  end
+  def test_helper_is_included_in_sinatra
+    assert Sinatra::Application.ancestors.include?(Google::Webfonts::Helper)
+  end
+end

data/test/test_helper.rb ADDED

@@ -0,0 +1,16 @@
+ENV['RACK_ENV'] = 'test'
+require 'ostruct'
+require 'sinatra'
+require 'google-webfonts'
+require 'minitest/autorun'
+require 'minitest/unit'
+require 'rack/test'
+class Minitest::Test
+  def assert_tag(el, tag, props={})
+    assert el =~ /<#{tag}.*\/>/ , "expected a #{tag} tag"
+    assert props.all? {|key, value| el.include?("#{key}=\"#{value}\"") },
+      "tag's properties do not match"
+  end
+end

metadata CHANGED

@@ -1,60 +1,91 @@
 --- !ruby/object:Gem::Specification
 name: google-webfonts
 version: !ruby/object:Gem::Version
-  version: 0.1.2
-  prerelease:
+  version: 0.2.0
 platform: ruby
 authors:
 - Travis Haynes
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-03-25 00:00:00.000000000 Z
+date: 2014-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &17626300 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *17626300
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &17625580 !ruby/object:Gem::Requirement
-    none: false
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17625580
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard-tomdoc
-  requirement: &17624820 !ruby/object:Gem::Requirement
-    none: false
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 5.3.3
   type: :development
   prerelease: false
-  version_requirements: *17624820
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 5.3.3
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &17624100 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.3.2
   type: :development
   prerelease: false
-  version_requirements: *17624100
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.3.2
 description: Google Webfonts helper for Rails or Sinatra applications.
 email:
 - travis.j.haynes@gmail.com
@@ -63,7 +94,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rspec
 - Gemfile
 - LICENSE
 - README.md
@@ -71,37 +101,41 @@ files:
 - google-webfonts.gemspec
 - lib/google-webfonts.rb
 - lib/google-webfonts/helper.rb
+- lib/google-webfonts/link_tag.rb
 - lib/google-webfonts/sinatra.rb
 - lib/google-webfonts/version.rb
-- spec/google-webfonts/helper_spec.rb
-- spec/google-webfonts/sinatra_spec.rb
-- spec/google-webfonts/version_spec.rb
-- spec/google-webfonts_spec.rb
-- spec/spec_helper.rb
+- test/lib/google-webfonts/helper_test.rb
+- test/lib/google-webfonts/link_tag_test.rb
+- test/lib/google-webfonts/sinatra_test.rb
+- test/lib/google-webfonts_test.rb
+- test/test_helper.rb
 homepage: https://github.com/travishaynes/Google-Webfonts-Helper
 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:
-rubygems_version: 1.8.10
+rubygems_version: 2.2.1
 signing_key:
-specification_version: 3
+specification_version: 4
 summary: Provides a helper for using Google Webfonts in Rails or Sinatra, although
   it can be used outside of those frameworks as well.
-test_files: []
-has_rdoc:
+test_files:
+- test/lib/google-webfonts/helper_test.rb
+- test/lib/google-webfonts/link_tag_test.rb
+- test/lib/google-webfonts/sinatra_test.rb
+- test/lib/google-webfonts_test.rb
+- test/test_helper.rb

data/.rspec DELETED

	@@ -1 +0,0 @@
1	- --colour

data/spec/google-webfonts/helper_spec.rb DELETED

@@ -1,126 +0,0 @@
-require 'spec_helper'
-describe Google::Webfonts::Helper do
-  include Google::Webfonts::Helper
-  def validate(tag, family)
-    # should be a link tag
-    tag.should =~ /<link.*\/>/
-    # should include an href to the google webfonts api
-    tag.should =~ /href="http:\/\/fonts.googleapis.com\/css\?family=/
-    # should be a stylesheet
-    tag.should =~ /rel="stylesheet"/
-    # should be text/css
-    tag.should =~ /type="text\/css"/
-    # should include the expected font-family
-    tag.should =~ /#{family}/
-  end
-  describe "#google_webfonts_link_tag" do
-    context "with no arguments" do
-      it "should raise ArgumentError" do
-        expect { google_webfonts_link_tag }.to raise_error ArgumentError
-      end
-    end
-    context "with something other than a String, Symbol, or Hash" do
-      it "should raise ArgumentError" do
-        expect { google_webfonts_link_tag(1) }.to raise_error ArgumentError
-      end
-    end
-    context "when a size is something other than a String, or Fixnum" do
-      it "should raise ArgumentError" do
-        expect { google_webfonts_link_tag(:font => [:symbol]) }.to raise_error ArgumentError
-      end
-    end
-    specify "with 1 font as a String" do
-      validate google_webfonts_link_tag("hello"), "Hello"
-    end
-    specify "with 1 font as a Symbol" do
-      validate google_webfonts_link_tag(:hello), "Hello"
-    end
-    specify "with multiple fonts as Strings" do
-      validate google_webfonts_link_tag("hello", "world"), "Hello|World"
-    end
-    specify "with multiple fonts as a combination of Strings and Symbols" do
-      validate google_webfonts_link_tag("hello", :world), "Hello|World"
-    end
-    context "with a Hash and 1 font name" do
-      context "with a Symbol as the key" do
-        specify "with 1 font size" do
-          validate google_webfonts_link_tag(:hello => 100), "Hello:100"
-        end
-        specify "with 2 font sizes" do
-          validate google_webfonts_link_tag(:hello => [100, 200]), "Hello:100,200"
-        end
-      end
-      context "with a String as the key" do
-        specify "with 1 font size" do
-          validate google_webfonts_link_tag("hello" => 100), "Hello:100"
-        end
-        specify "with 2 font sizes" do
-          validate google_webfonts_link_tag("hello" => [100, 200]), "Hello:100,200"
-        end
-      end
-    end
-    context "with a Hash and 2 font names" do
-      context "with a Symbol as the key" do
-        specify "with 1 font size" do
-          validate google_webfonts_link_tag(:hello => 100, :world => 200), "Hello:100|World:200"
-        end
-        specify "with 2 font sizes" do
-          validate google_webfonts_link_tag(:hello => [100, 200], :world => [300, 400]), "Hello:100,200|World:300,400"
-        end
-      end
-      context "with a String as the key" do
-        specify "with 1 font size" do
-          validate google_webfonts_link_tag("hello" => 100, "world" => 200), "Hello:100|World:200"
-        end
-        specify "with 2 font sizes" do
-          validate google_webfonts_link_tag("hello" => [100, 200], "world" => [300, 400]), "Hello:100,200|World:300,400"
-        end
-      end
-    end
-    context "when the font name includes an underscore" do
-      it "should convert the underscore to a +" do
-        validate google_webfonts_link_tag(:droid_sans => [400, 700]), 'Droid\+Sans:400,700'
-      end
-    end
-    context "when the font name includes a space" do
-      it "should conver the space to a +" do
-        validate google_webfonts_link_tag("Droid Sans" => [400, 700]), 'Droid\+Sans:400,700'
-      end
-    end
-    context "with a combination of all acceptable values" do
-      it "should validate" do
-        validate google_webfonts_link_tag(
-          :font1, "font2", :font_3, "Font 4",
-          :font_5   => 100,
-          "font_6"  => [200, 300]
-        ), 'Font1|Font2|Font\+3|Font\+4|Font\+5:100|Font\+6:200,300'
-      end
-    end
-  end
-end

data/spec/google-webfonts/sinatra_spec.rb DELETED

@@ -1,23 +0,0 @@
-# set up a Sinatra route to test
-get("/") { google_webfonts_link_tag "Droid Sans" }
-describe "Sinatra" do
-  include Rack::Test::Methods
-  def app
-    Sinatra::Application
-  end
-  it "should include Google::Webfonts::Helper in Sinatra::Application" do
-    Sinatra::Application.ancestors.should include Google::Webfonts::Helper
-  end
-  it "should respond to google_webfonts_link_tag" do
-    tag = "<link href=\"http://fonts.googleapis.com/css?family=Droid+Sans\" rel=\"stylesheet\" type=\"text/css\" />"
-    get "/"
-    last_response.should be_ok
-    last_response.body.should eq tag
-  end
-end

data/spec/google-webfonts/version_spec.rb DELETED

@@ -1,7 +0,0 @@
-require 'spec_helper'
-describe Google::Webfonts::VERSION do
-  it "should be version 0.1.2" do
-    Google::Webfonts::VERSION.should eq "0.1.2"
-  end
-end

data/spec/google-webfonts_spec.rb DELETED

@@ -1,7 +0,0 @@
-require 'spec_helper'
-describe Google::Webfonts do
-  it "should include Helper in ActionView::Base" do
-    ActionView::Base.ancestors.should include Google::Webfonts::Helper
-  end
-end

data/spec/spec_helper.rb DELETED

@@ -1,3 +0,0 @@
-require 'rubygems'
-require 'sinatra'
-require "google-webfonts"