jekyll-typogrify 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce31a9b1d9e6acc63c62db986e074ca115af2dfd
-  data.tar.gz: b5cdc776bd5c20fa8a3e600f7a615c97f5aaf1c5
+  metadata.gz: adc86d464ffe5ba4aa8e6488b75dd88a40eb1a6b
+  data.tar.gz: 92567898604f6bef389a3df613966f88353f39d6
 SHA512:
-  metadata.gz: f3d7416811a35901877ade9b523202488c83cc8fd2178139187bcdd23883d13352c5c0a62d6c9a3050b121eeeb002a8828e7b9d51b43876acf803b0aff8da66b
-  data.tar.gz: 54c784d7fd842b457415b85df084367ac97d2231355a754258432a52c96a0e0e041384bde0ef8b14112b5d18466bc2adeeecd3202f31897078ce8c4ab44841a8
+  metadata.gz: 6a2b56115bebc4c8fdb271d6f0ef6c4cb6c8349fbe58f538dbd09efd3fa9b7ae146ec9895da681cf11555f457aebee163c50b2f49292b047f73b2e0b943ed787
+  data.tar.gz: 24bb2593043c63c5de622eb52ec0d161f365446da3cd21e802bbd884e6ca5742491b2edc70b2f05087a3ae2710c92193745230380f6e58171fbc06bed70fe9cf

data/.travis.yml

@@ -12,4 +12,4 @@ after_script:
 after_success:
   - gem install package_cloud
   - bundle exec rake build
-  - package_cloud push myles/jekyll-typogrify pkg/jekyll-typogrify-0.3.2.gem
+  - package_cloud push myles/jekyll-typogrify pkg/jekyll-typogrify-0.3.3.gem

data/Gemfile.lock

@@ -1,72 +1,89 @@
 PATH
   remote: .
   specs:
-    jekyll-typogrify (0.3.2)
+    jekyll-typogrify (0.3.3)
       titlecase
       typogruby
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.0)
-      public_suffix (~> 2.0, >= 2.0.2)
-    codeclimate-test-reporter (1.0.0)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    codeclimate-test-reporter (1.0.8)
+      simplecov (<= 0.13)
     colorator (1.1.0)
-    diff-lcs (1.2.5)
+    concurrent-ruby (1.0.5)
+    diff-lcs (1.3)
     docile (1.1.5)
-    ffi (1.9.14)
+    em-websocket (0.5.1)
+      eventmachine (>= 0.12.9)
+      http_parser.rb (~> 0.6.0)
+    eventmachine (1.2.5)
+    ffi (1.9.18)
     forwardable-extended (2.6.0)
-    jekyll (3.3.0)
+    http_parser.rb (0.6.0)
+    i18n (0.9.1)
+      concurrent-ruby (~> 1.0)
+    jekyll (3.7.0)
       addressable (~> 2.4)
       colorator (~> 1.0)
+      em-websocket (~> 0.5)
+      i18n (~> 0.7)
       jekyll-sass-converter (~> 1.0)
-      jekyll-watch (~> 1.1)
-      kramdown (~> 1.3)
-      liquid (~> 3.0)
+      jekyll-watch (~> 2.0)
+      kramdown (~> 1.14)
+      liquid (~> 4.0)
       mercenary (~> 0.3.3)
       pathutil (~> 0.9)
-      rouge (~> 1.7)
+      rouge (>= 1.7, < 4)
       safe_yaml (~> 1.0)
-    jekyll-sass-converter (1.4.0)
+    jekyll-sass-converter (1.5.1)
       sass (~> 3.4)
-    jekyll-watch (1.5.0)
-      listen (~> 3.0, < 3.1)
-    json (2.0.2)
-    kramdown (1.12.0)
-    liquid (3.0.6)
-    listen (3.0.8)
+    jekyll-watch (2.0.0)
+      listen (~> 3.0)
+    json (2.1.0)
+    kramdown (1.16.2)
+    liquid (4.0.0)
+    listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
     mercenary (0.3.6)
-    pathutil (0.14.0)
+    pathutil (0.16.1)
       forwardable-extended (~> 2.6)
-    public_suffix (2.0.3)
+    public_suffix (3.0.1)
     rake (10.5.0)
-    rb-fsevent (0.9.8)
-    rb-inotify (0.9.7)
-      ffi (>= 0.5.0)
-    rouge (1.11.1)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rb-fsevent (0.10.2)
+    rb-inotify (0.9.10)
+      ffi (>= 0.5.0, < 2)
+    rouge (3.1.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.0)
+    ruby_dep (1.5.0)
     rubypants (0.6.0)
     safe_yaml (1.0.4)
-    sass (3.4.22)
-    simplecov (0.12.0)
+    sass (3.5.5)
+      sass-listen (~> 4.0.0)
+    sass-listen (4.0.0)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+    simplecov (0.13.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
+    simplecov-html (0.10.2)
     titlecase (0.1.1)
     typogruby (1.0.18)
       rubypants
@@ -86,4 +103,4 @@ DEPENDENCIES
   typogruby
 
 BUNDLED WITH
-   1.12.5
+   1.16.0

data/README.md

@@ -1,12 +1,12 @@
-[![Build Status](https://travis-ci.org/myles/jekyll-typogrify.svg?branch=v0.3.1)](https://travis-ci.org/myles/jekyll-typogrify)
-[![Build Status](https://ci.appveyor.com/api/projects/status/bw6g4akc9x8g1x33/branch/master?svg=true)](https://ci.appveyor.com/project/MylesBraithwaite/jekyll-typogrify/branch/v0.3.1)
+[![Build Status](https://travis-ci.org/myles/jekyll-typogrify.svg?branch=develop)](https://travis-ci.org/myles/jekyll-typogrify)
+[![Build Status](https://ci.appveyor.com/api/projects/status/bw6g4akc9x8g1x33/branch/master?svg=true)](https://ci.appveyor.com/project/MylesBraithwaite/jekyll-typogrify/branch/develop)
 [![Gem Version](https://badge.fury.io/rb/jekyll-typogrify.svg)](http://badge.fury.io/rb/jekyll-typogrify)
 [![Code Climate](https://codeclimate.com/github/myles/jekyll-typogrify/badges/gpa.svg)](https://codeclimate.com/github/myles/jekyll-typogrify)
 [![Test Coverage](https://codeclimate.com/github/myles/jekyll-typogrify/badges/coverage.svg)](https://codeclimate.com/github/myles/jekyll-typogrify/coverage)
 
 # Jekyll::Typogrify
 
-Improves typography on your Jekyll site using [typogruby](http://avdgaag.github.io/typogruby/) and [titlecase](https://github.com/samsouder/titlecase).
+Improves typography on your Jekyll site using [typogruby](http://avdgaag.github.io/typogruby/), [titlecase](https://github.com/samsouder/titlecase), and some other useful functions.
 
 | Before | After |
 | ------ | ----- |
@@ -57,6 +57,17 @@ Surrounds two or more consecutive capital letters, perhaps with interspersed dig
 <h1><span class="caps">A.B.C.</span> Corp.</h1>
 ```
 
+#### Custom Capitalisation
+
+Typogruby `cap` module doesn't support having hyphens so there is a custom
+module:
+
+```html
+<h1>{{ "North American P-51 Mustang" | jt_caps }}</h1>
+
+<h1>North American <span class="caps">P-51</span> Mustang</h1>
+```
+
 ### Entities
 
 Converts special characters (excluding HTML tags) to HTML entities.

data/appveyor.yml

@@ -1,4 +1,4 @@
-version: v0.3.2-{build}-{branch}
+version: v0.3.3-{branch}-{build}
 
 environment:
   matrix:

data/jekyll-typogrify.gemspec

@@ -6,8 +6,8 @@ require 'jekyll/typogrify/version'
 Gem::Specification.new do |spec|
   spec.name          = "jekyll-typogrify"
   spec.version       = Jekyll::Typogrify::VERSION
-  spec.summary       = %q{A Jekyll plugin that bring the functions of typogruby.}
-  spec.description   = %q{A Jekyll plugin that bring the functions of typogruby.}
+  spec.summary       = %q{A Jekyll plugin that improves the typography of your Liquid templates.}
+  spec.description   = %q{A Jekyll plugin that improves the typography of your Liquid templates.}
   spec.license       = "MIT"
 
   spec.authors       = ["Myles Braithwaite"]

data/lib/jekyll/typogrify.rb

@@ -1,5 +1,6 @@
 require "jekyll/typogrify/version"
 
+require 'rubypants'
 require 'typogruby'
 require 'titlecase'
 require 'liquid'
@@ -14,7 +15,7 @@ module Jekyll
     def amp(text)
       return Typogruby.amp(text.to_s)
     end
-    
+
     # surrounds two or more consecutive capital letters, perhaps with
     # interspersed digits and periods in a span with a styled class.
     #
@@ -23,7 +24,7 @@ module Jekyll
     def caps(text)
       return Typogruby.caps(text.to_s)
     end
-    
+
     # Converts special characters (excluding HTML tags) to HTML entities.
     #
     # @param [String] text input text
@@ -32,7 +33,7 @@ module Jekyll
     def entities(text)
       return Typogruby.entities(text.to_s)
     end
-    
+
     # main function to do all the functions from the method.
     #
     # @param [String] text input text
@@ -40,27 +41,27 @@ module Jekyll
     def improve(text)
       return Typogruby.improve(text.to_s)
     end
-    
+
     # encloses initial single or double quote, or their entities
     # (optionally preceeded by a block element and perhaps an inline element)
     # with a span that can be styled.
     #
     # @param [String] text input text
     # @return [String] input text with initial quotes wrapped
-    
+
     def initial_quotes(text)
       return Typogruby.initial_quotes(text.to_s)
     end
-    
+
     # Applies smartypants to a given piece of text
-    # 
+    #
     # @see https://rubygems.org/gems/rubypants
     # @param [String] text input text
     # @return [String] input text with smartypants applied
     def smartypants(text)
       return Typogruby.smartypants(text.to_s)
     end
-    
+
     # replaces space(s) before the last word (or tag before the last word)
     # before an optional closing element (<tt>a</tt>, <tt>em</tt>,
     # <tt>span</tt>, strong) before a closing tag (<tt>p</tt>, <tt>h[1-6]</tt>,
@@ -73,7 +74,7 @@ module Jekyll
     def widont(text)
       return Typogruby.widont(text.to_s)
     end
-    
+
     # convert a given piece of text to titlecase
     #
     # @param [String] text input text
@@ -81,7 +82,7 @@ module Jekyll
     def titlecase(text)
       return text.to_s.titlecase
     end
-    
+
     # wraps words in a span class that can look like something else
     #
     # @param [String] text input text
@@ -92,6 +93,46 @@ module Jekyll
         "#{before}<span class=\"fix-letter-spacing\">#{str}</span>"
       }
     end
+
+    # surrounds two or more consecutive capital letters, perhaps with
+    # interspersed digits and periods in a span with a styled class.
+    #
+    # @param [String] text input text
+    # @return [String] input text with caps wrapped
+    def jt_caps(text)
+      return custom_caps(text.to_s)
+    end
+
+    private
+
+    # custom modules to jekyll-typogrify
+
+    # surrounds two or more consecutive capital letters, perhaps with
+    # interspersed digits and periods in a span with a styled class.
+    #
+    # @param [String] text input text
+    # @return [String] input text with caps wrapped
+    def custom_caps(text)
+      # $1 and $2 are excluded HTML tags, $3 is the part before the caps and $4 is the caps match
+      text.gsub(%r{
+          (<[^/][^>]*?>)|                                      # Ignore any opening tag, so we don't mess up attribute values
+          (\s|&nbsp;|^|'|"|>|)                                 # Make sure our capture is preceded by whitespace or quotes
+          ([A-Z\d](?:(\.|'|-|&|&amp;|&\#38;)?[A-Z\d][\.']?){1,}) # Capture capital words, with optional dots, numbers or ampersands in between
+          (?!\w)                                               # ...which must not be followed by a word character.
+        }x) do |str|
+        tag, before, caps = $1, $2, $3
+
+        # Do nothing with the contents if ignored tags, the inside of an opening HTML element
+        # so we don't mess up attribute values, or if our capture is only digits.
+        if tag || caps =~ /^\d+\.?$/
+          str
+        elsif $3 =~ /^[\d\.]+$/
+          before + caps
+        else
+          before + '<span class="caps">' + caps + '</span>'
+        end
+      end
+    end
   end
 end
 

data/lib/jekyll/typogrify/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module Typogrify
-    VERSION = "0.3.2"
+    VERSION = "0.3.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-typogrify
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Myles Braithwaite
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-06 00:00:00.000000000 Z
+date: 2018-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typogruby
@@ -94,7 +94,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A Jekyll plugin that bring the functions of typogruby.
+description: A Jekyll plugin that improves the typography of your Liquid templates.
 email:
 - me@mylesbraithwaite.com
 executables: []
@@ -144,8 +144,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
-summary: A Jekyll plugin that bring the functions of typogruby.
+summary: A Jekyll plugin that improves the typography of your Liquid templates.
 test_files: []