google-webfonts 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f25bcacd54d5215e32e042a398f6d509b8f12aaa
-  data.tar.gz: fdfdaf3395363ef350b76db9b011e7c15520f606
+SHA256:
+  metadata.gz: d67f80b14813326601c41f9f2865fdad8caa0b9d16b427a6eb1d20a0cd8ed89a
+  data.tar.gz: 0c20a66e55787843e8f5ddcc7d3c171eb604400fe07a464803008e42fcb7713f
 SHA512:
-  metadata.gz: bd56576397bf306107d3d52fd73383d37df8bb739bb43bfce026f066487bd18c873bdeadbafd6b4bb0a9cdaaab6e5e5bde1464be588f1669eeaf265d47901626
-  data.tar.gz: b73db19e8b453ec28bcbd102495bcb56dda24627b1d56715489f0ab6fe53b482aea2f6317035da7096726ea40dc0b303eb6c3adcf7411e0f529d9acc46c19f46
+  metadata.gz: 99976493264cffc8728c444d8dc8791bc8f3422733287a61c05d27bece777948fbec023167642cd7314fd438572110d52dc505d63e2d39f5448e1a2c963a9af1
+  data.tar.gz: d403b86434a2b6020c3440b9149588e1edcedbd64f3763e2568ac7a28d3375867e9dc420605835981f0428e0ac3598d042fa05d23c06880fc114fe1de239c72e

data/.gitignore

@@ -1,18 +1,13 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-.ruby-version
+/.bundle/
+/.yardoc
+/_yardoc/
+/coverage/
+/doc/
+/pkg/
+/spec/reports/
+/tmp/
+/.idea/
+/.code/
+.DS_Store
+/.ruby-gemset
+/.ruby-version

data/Gemfile

@@ -1,4 +1,8 @@
+# coding: utf-8
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in google-webfonts.gemspec
+git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }
+
 gemspec

data/Gemfile.lock

@@ -0,0 +1,41 @@
+PATH
+  remote: .
+  specs:
+    google-webfonts (0.3.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    ansi (1.5.0)
+    builder (3.2.3)
+    docile (1.3.0)
+    json (2.1.0)
+    minitest (5.3.5)
+    minitest-reporters (1.2.0)
+      ansi
+      builder
+      minitest (>= 5.0)
+      ruby-progressbar
+    rake (10.5.0)
+    ruby-progressbar (1.9.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    yard (0.9.12)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.16)
+  google-webfonts!
+  minitest (~> 5.0)
+  minitest-reporters (~> 1.2)
+  rake (~> 10.0)
+  simplecov (~> 0.16)
+  yard (~> 0.9)
+
+BUNDLED WITH
+   1.16.1

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Travis Haynes
+Copyright (c) 2018 Hi5 Development, LLC
 
 MIT License
 
@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1,7 +1,7 @@
 # Google::Webfonts
 
-Provides a helper for using [Google Webfonts](http://www.google.com/webfonts) in
-Rails or Sinatra, although it can be used outside of those frameworks as well.
+Provides a helper for using [Google Webfonts](http://www.google.com/webfonts)
+with the Ruby programming language.
 
 ## Installation
 
@@ -19,77 +19,103 @@ Or install it yourself as:
 
 ## Usage
 
-### Syntax
+```ruby
+include Google::Webfonts::Helper
 
-    google_webfonts_link_tag :font_name => [sizes], ...
+google_webfonts_link_tag font_name: [weights]
+```
 
 ### Examples
 
-Basic usage:
+#### Basic usage:
 
-    google_webfonts_link_tag :droid_sans        => [400, 700],
-                             :yanone_kaffeesatz => [300, 400]
+```ruby
+google_webfonts_link_tag droid_sans: [400, 700], yanone_kaffeesatz: [300, 400]
+```
 
-The sizes are optional, and do not have to be in an Array if you are only
-including one size. For example:
+The weights are optional, and do not have to be in an Array if you are only
+including one. For example:
 
-    google_webfonts_link_tag :droid_sans
-    # => generates a tag for Droid+Sans without specifying the font weight
-    
-    google_webfonts_link_tag :droid_sans => 400
-    # => generates a tag for Droid+Sans with 400 weight
-    
-    google_webfonts_link_tag :droid_sans => [400, 700]
-    # => generates a tag for Droid+Sans with 400 and 700 weights
+```ruby
+# Generate a tag for Droid+Sans without specifying the font weight.
+google_webfonts_link_tag :droid_sans
 
-You can also use a String instead of a Symbol if you'd prefer. For example:
+# Generate a tag for Droid+Sans with 400 weight.
+google_webfonts_link_tag :droid_sans => 400
 
-    google_webfonts_link_tag "Droid Sans", "Yanone Kaffeesatz" => 400
-    # includes Droid+Sans without a specified weight
-    # and Yanone+Kaffeesatz with weight 400
+# Generate a tag for Droid+Sans with 400 and 700 weights.
+google_webfonts_link_tag :droid_sans => [400, 700]
+```
+
+In certain cases it will be necessary to use Strings instead of Symbols for the 
+font names. The helper method titleizes the symbols when converting it to a 
+Google Webfonts compatible name. This does not work for every font name. For 
+example:  
+
+```ruby
+# If a Symbol was provided here, the "T" would be lower-case, which would 
+# result in an invalid link.
+google_webfonts_link_tag 'PT Sans'
+```
 
 ### Using in Rails
 
-No additional work required to use this gem in a Rails application. Just add
-it to your application's Gemfile, and it is automatically available in your
-views.
+Require the gem like this in your Gemfile when using with Rails:
+
+```ruby
+gem 'google-webfonts', require: 'google/webfonts/rails'
+```
 
-You will, however, need to `include Google::Webfonts::Helper` if you want to use
-it outside of a view.
+The `google_webfonts_link_tag` helper method will automatically be available 
+to your views. If you need to use it outside of the views, include this module:
+
+```ruby
+include Google::Webfonts::Helper
+```
 
 ### Using in Sinatra
 
 Here is a simple "Hello World" example for using Google::Webfonts in a Sinatra
 app:
 
-    # app.rb
-    require 'rubygems'
-    require 'sinatra'
-    require 'google-webfonts' # <= this must be required after 'sinatra'
-    
-    get '/' do
-      erb :index
-    end
+```ruby
+# app.rb
+require 'rubygems'
+require 'sinatra'
+
+# This must be required after requiring sinatra.
+require 'google/webfonts/sinatra'
+
+get '/' do
+  erb :index
+end
+```
 
 ###
 
-    # views/index.erb
-    <html>
-      <head>
-        <%= google_webfonts_link_tag "Droid Sans" %>
-      </head>
-      <body>
-        <p style="font-family: 'Droid+Sans', sans-serif;">
-          Hello World!
-        </p>
-      </body>
-    </html>
+```erb
+# views/index.erb
+<html>
+  <head>
+    <%= google_webfonts_link_tag "Droid Sans" %>
+  </head>
+  <body>
+    <p style="font-family: 'Droid+Sans', sans-serif;">
+      Hello World!
+    </p>
+  </body>
+</html>
+```
+
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. Then, 
+run `rake test` to run the tests. You can also run `bin/console` for an 
+interactive prompt that will allow you to experiment.
+
+To install this gem onto your local machine, run `bundle exec rake install`.
 
 ## Contributing
 
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Added some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Ensure what your code is well tested, and all the tests pass. (`rspec spec`)
-6. Create new Pull Request
+Bug reports and pull requests are welcome on GitHub at
+https://github.com/hi5dev/google-webfonts.

data/Rakefile

@@ -1,9 +1,12 @@
-require "bundler/gem_tasks"
+# coding: utf-8
+# frozen_string_literal: true
+
+require 'bundler/gem_tasks'
 require 'rake/testtask'
 
 Rake::TestTask.new do |t|
-  t.libs << "test"
+  t.libs += %w[lib test]
   t.test_files = FileList['test/**/*_test.rb']
 end
 
-task :default => [:test]
+task default: :test

data/bin/console

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+require 'bundler/setup'
+require 'google/webfonts'
+require 'irb'
+
+IRB.start(__FILE__)

data/bin/setup

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install

data/google-webfonts.gemspec

@@ -1,30 +1,34 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'google-webfonts/version'
+
+require 'google/webfonts/version'
 
 Gem::Specification.new do |spec|
-  spec.name = "google-webfonts"
+  spec.name = 'google-webfonts'
   spec.version = Google::Webfonts::VERSION
-  spec.authors = ["Travis Haynes"]
-  spec.email = ["travis.j.haynes@gmail.com"]
-
-  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.authors = ['Travis Haynes']
+  spec.email = ['travis@hi5dev.com']
+  spec.homepage = 'https://github.com/hi5dev/google-webfonts.git'
+  spec.summary = 'Simplifies creating link tags for Google Webfonts.'
 
-  spec.description = "Google Webfonts helper for Rails or Sinatra applications."
+  spec.files = `git ls-files -z`.split("\x0").reject do |file|
+    file.match(%r{^(test)/})
+  end
 
-  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.bindir = 'exe'
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'actionpack', '>= 3.0.0'
+  spec.executables = spec.files.grep(%r{^#{spec.bindir}/}) do |file|
+    File.basename(file)
+  end
 
-  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'
+  spec.add_development_dependency 'bundler', '~> 1.16'
+  spec.add_development_dependency 'minitest', '~> 5.0'
+  spec.add_development_dependency 'minitest-reporters', '~> 1.2'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'simplecov', '~> 0.16'
+  spec.add_development_dependency 'yard', '~> 0.9'
 end

data/lib/google-webfonts.rb

@@ -1,22 +1,10 @@
-require 'uri'
-require 'action_view'
-require 'active_support/core_ext'
-require 'action_dispatch/http/mime_type'
+# coding: utf-8
+# frozen_string_literal: true
 
-# Public: Module for Google helpers
-module Google
-  # Public: Module for Google Webfonts helpers
-  module Webfonts
-    HOST = 'fonts.googleapis.com'
-    PATH = '/css'
-  end
-end
+warn <<~TEXT
+  DEPRECATED: Requiring 'google-webfonts' has been deprecated since version
+  0.3.0, and will be removed in a future version. Require 'google/webfonts' 
+  instead.
+TEXT
 
-require 'google-webfonts/version'
-require 'google-webfonts/link_tag'
-require 'google-webfonts/helper'
-
-require 'google-webfonts/sinatra' if defined? Sinatra
-
-# include the webfonts helper methods in the Rails view helpers
-ActionView::Base.send :include, Google::Webfonts::Helper
+require 'google/webfonts'

data/lib/google-webfonts/sinatra.rb

@@ -1,3 +1,7 @@
-module Sinatra
-  helpers Google::Webfonts::Helper
-end
+warn <<~TEXT
+  DEPRECATED: Requiring 'google-webfonts/sinatra' has been deprecated since 
+  version 0.3.0, and will be removed in a future version. Require 
+  'google/webfonts/sinatra' instead.
+TEXT
+
+require 'google/webfonts/sinatra'

data/lib/google/webfonts.rb

@@ -0,0 +1,20 @@
+# coding: utf-8
+# frozen_string_literal: true
+
+require 'cgi'
+require 'uri'
+
+module Google
+  module Webfonts
+    # The host name for the Google Webfonts CDN.
+    CDN_HOST = 'https://fonts.googleapis.com'
+
+    # The path name for the Google Webfonts on the CDN.
+    CDN_PATH = 'css'
+
+    # Auto load all of the subclasses.
+    autoload :Helper, 'google/webfonts/helper'
+    autoload :LinkTag, 'google/webfonts/link_tag'
+    autoload :VERSION, 'google/webfonts/version'
+  end
+end

data/lib/google/webfonts/helper.rb

@@ -0,0 +1,32 @@
+module Google
+  module Webfonts
+    # Provides a helper method for creating HTML link tags for fonts hosted
+    # on Google's Webfonts CDN.
+    module Helper
+      # Generates a Google Webfonts link tag.
+      #
+      # @example Fonts without options.
+      #   google_webfonts_link_tag :droid_sans, :open_sans
+      #
+      # @example Strings can be used for font names.
+      #   # :pt_sans would be converted to 'Pt+Sans' (lower-case t), which is
+      #   # an invalid font name. Strings do not get titleized, so this font
+      #   # name would require a string instead of a Symbol.
+      #   google_webfonts_link_tag 'PT Sans'
+      #
+      # @example Specifying font weights.
+      #   google_webfonts_link_tag droid_sans: %w[400 500 bold bolditalic]
+      #
+      # @param [Array<String, Symbol, Hash{String, Symbol => Array<String>}>]
+      #   options Options for the fonts.
+      # @return [String] HTML with the <link> tag.
+      def google_webfonts_link_tag(*options)
+        # Do not create the link tag unless at least one font was given.
+        fail ArgumentError, 'expected at least one font' unless options.any?
+
+        # Create the HTML for the link tag.
+        Google::Webfonts::LinkTag.new(*options).to_s
+      end
+    end
+  end
+end

data/lib/google/webfonts/link_tag.rb

@@ -0,0 +1,153 @@
+# coding: utf-8
+# frozen_string_literal: true
+
+module Google
+  module Webfonts
+    # Used to simplify creating <link> tags for Google's Webfonts CDN.
+    #
+    # @example
+    #   tag = Google::Webfonts::LinkTag.new(:droid_sans => %w[400 500i])
+    #   html = tag.to_s
+    class LinkTag
+      attr_reader :options
+
+      # Creates a new {Google::Webfonts::LinkTag} instance.
+      #
+      # @return [Google::Webfonts::LinkTag] The new {LinkTag} instance.
+      def initialize(*options)
+        @options = parse_options(options).freeze
+      end
+
+      # When making headers or display texts on your website, you'll often
+      # want to stylize your text in a decorative way. To simplify your work,
+      # Google has provided a collection of font effects that you can use
+      # with minimal effort to produce beautiful display text.
+      #
+      # To use feature, simply add an +effect:+ option when initializing the
+      # link tag. Then add the corresponding class name to the HTML element(s)
+      # that you want to affect.
+      #
+      # At the time that version 0.3.0 of this gem was released, this was a
+      # beta feature provided by Google.
+      #
+      # @see https://developers.google.com/fonts/docs/getting_started
+      # @return [Array<String>] Any effects to applied to the font.
+      def effect
+        options[:effect]
+      end
+
+      # Parses the options provided to the initializer into a list of font
+      # families.
+      #
+      # @return [String] The font family formatted for Google Webfont's API.
+      def family
+        @family ||= family_options.map do |font_name, font_options|
+          name = parse_font_name(font_name)
+
+          options = font_options.sort.uniq
+
+          options.any? ? "#{name}:#{options.join(',')}" : name
+        end.join('|')
+      end
+
+      # Creates the hypertext reference (URL) to the font.
+      #
+      # @return [URI] URL to the font on Google's CDN.
+      def href
+        # Return the cached value when present.
+        return @href unless @href.nil?
+
+        # Create a URI to Google's CDN.
+        uri = URI.join(Google::Webfonts::CDN_HOST, Google::Webfonts::CDN_PATH)
+
+        uri.query = "family=#{family}"
+
+        uri.query += "&text=#{CGI.escape(text.join)}" unless text.nil?
+
+        uri.query += "&effect=#{CGI.escape(effect.join(','))}" unless effect.nil?
+
+        @href = uri
+      end
+
+      # Oftentimes, when you want to use a web font on your website or
+      # application, you know in advance which letters you'll need. This
+      # often occurs when you're using a web font in a logo or heading.
+      #
+      # In these cases, you should consider specifying a text= value in your
+      # font request URL. This allows Google to return a font file that's
+      # optimized for your request. In some cases, this can reduce the size
+      # of the font file by up to 90%.
+      #
+      # At the time that version 0.3.0 of this gem was released, this was a
+      # beta feature provided by Google.
+      #
+      # @see https://developers.google.com/fonts/docs/getting_started
+      # @return [Array<String>] Which letters to include in the font.
+      def text
+        options[:text]
+      end
+
+      # Converts the link tag to HTML.
+      #
+      # @return [String] HTML for the link tag.
+      def to_s
+        %(<link href="#{href}" rel="stylesheet">)
+      end
+
+      private
+
+      # Extracts the options for the font families.
+      #
+      # @return [Hash{String, Symbol => Array<Integer, String>}] The families.
+      def family_options
+        options.reject {|k,_| %i[effect text].include?(k) }
+      end
+
+      # Converts the Ruby-friendly font name provided to the initializer to a
+      # URL-encoded font name that Google's CDN will recognize.
+      #
+      # @param [String, Symbol] font_name The given font name.
+      # @return [String] A URI-encoded key name.
+      def parse_font_name(font_name)
+        # Strings only get URI-encoded.
+        return CGI.escape(font_name) if font_name.is_a?(String)
+
+        # Convert the font name into an array of its words.
+        words = "#{font_name}".split('_')
+
+        # Capitalize each word in the font name.
+        words.map!(&:capitalize)
+
+        # Convert back to a String, joined by spaces instead of underscores.
+        font_name = words.join(' ')
+
+        # URI-encode the font name.
+        CGI.escape(font_name)
+      end
+
+      # Parses the options given to the initializer into a Hash.
+      #
+      # @return [Hash{String, Symbol => Array}] Options for the LinkTag.
+      def parse_options(options)
+        {}.tap do |parsed|
+          options.each { |opt| parse_option(opt, parsed) }
+        end
+      end
+
+      # @param [Hash, String, Symbol] opt
+      # @param [Hash] parsed
+      # @return [Array<String, Array>]
+      # @raise [ArgumentError] If an option cannot be parsed.
+      def parse_option(opt, parsed)
+        # Font names without options are converted to names with empty options.
+        return parsed[opt] = [] if opt.is_a?(String) || opt.is_a?(Symbol)
+
+        # Add any option in a Hash, ensuring that its value is an Array.
+        return opt.each { |k, v| parsed[k] = Array(v) } if opt.is_a?(Hash)
+
+        # Reject unknown arguments.
+        fail ArgumentError, "invalid argument: #{opt.inspect}", caller
+      end
+    end
+  end
+end

data/lib/google/webfonts/rails.rb

@@ -0,0 +1,8 @@
+# coding: utf-8
+# frozen_string_literal: true
+
+# Load the library.
+require 'google/webfonts'
+
+# Include the webfonts helper methods in the Rails view helpers.
+ActionView::Base.include(Google::Webfonts::Helper)

data/lib/google/webfonts/sinatra.rb

@@ -0,0 +1,8 @@
+# coding: utf-8
+# frozen_string_literal: true
+
+# Load the library.
+require 'google/webfonts'
+
+# Add the Google Webfonts helper to Sinatra.
+Sinatra.helpers(Google::Webfonts::Helper)

data/lib/google/webfonts/version.rb

@@ -0,0 +1,9 @@
+# coding: utf-8
+# frozen_string_literal: true
+
+module Google
+  module Webfonts
+    # The gem's semantic version.
+    VERSION = '0.3.0'
+  end
+end

metadata

@@ -1,115 +1,124 @@
 --- !ruby/object:Gem::Specification
 name: google-webfonts
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Travis Haynes
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2014-04-17 00:00:00.000000000 Z
+date: 2018-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: actionpack
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :runtime
+        version: '1.16'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '1.16'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
-    - - <
+        version: '1.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.3.3
+        version: '0.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.3.3
+        version: '0.16'
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.2
+        version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.2
-description: Google Webfonts helper for Rails or Sinatra applications.
+        version: '0.9'
+description: 
 email:
-- travis.j.haynes@gmail.com
+- travis@hi5dev.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
+- bin/console
+- bin/setup
 - 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
-- 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
+- lib/google/webfonts.rb
+- lib/google/webfonts/helper.rb
+- lib/google/webfonts/link_tag.rb
+- lib/google/webfonts/rails.rb
+- lib/google/webfonts/sinatra.rb
+- lib/google/webfonts/version.rb
+homepage: https://github.com/hi5dev/google-webfonts.git
 licenses: []
 metadata: {}
 post_install_message: 
@@ -118,24 +127,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.7.3
 signing_key: 
 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:
-- 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
+summary: Simplifies creating link tags for Google Webfonts.
+test_files: []

data/lib/google-webfonts/helper.rb

@@ -1,44 +0,0 @@
-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
-      # 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.
-      #
-      # Examples
-      #
-      #   google_webfonts_link_tag "PT Sans"
-      #
-      #   google_webfonts_link_tag :droid_sans
-      #
-      #   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.
-      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

@@ -1,68 +0,0 @@
-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

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

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

@@ -1,21 +0,0 @@
-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

@@ -1,52 +0,0 @@
-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

@@ -1,25 +0,0 @@
-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

@@ -1,11 +0,0 @@
-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

@@ -1,16 +0,0 @@
-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