octopress-filters 1.2.0 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47d40082d204354809525e9551ddbd6eab622278
-  data.tar.gz: f67ec62b70dfad459b14250060562daedfaf762c
+  metadata.gz: 2c03a48072acdfaa98fc2e5df1a3762bcdf35e40
+  data.tar.gz: 5d4a041d2041a0d07fe96d63a63af55c9c0e6582
 SHA512:
-  metadata.gz: 423d42bc07b4525ffb331d9665b721eae432b8fe88d090c5c19b9d12406c17705e550fbddc5fce5f1807f046ad3d7ee1d9162b01e0338a3eaf00bedf0afe2f91
-  data.tar.gz: 010ce83f7446fa3d690e3e20ed85088f708e110d07fbfd56ebf254be3b0367ebb32ebb5bbd9e41062ba8271ba3980dc2d81ef09cdc83a9b97901008e727c6ac5
+  metadata.gz: 71dd711640a5c418a61b37693be4aa5b8c5799d79c1b1500dc1bc5c324337ad87de3d0585a62df87b08dd73f29485103226b4f776bdec440ab53accca5dc60a9
+  data.tar.gz: 93532fdce07a3ae9e072b7aa002b3dd6168468d6b95abdea56352e66db7845310b560610ff0d40a344454056cb830b0c6af67cc8e08a6130aa53334ca8640782

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+### 1.2.2 - 2015-01-23
+
+- Added support for baseurl
+
+### 1.2.1 - 2015-01-11
+
+- Added support for Octopress docs
+
 ### 1.2.0 - 2014-08-31
 
 - Added `strip_url_protocol` which converts `http://bog.com` to `blog.com`.

data/README.md

@@ -20,22 +20,24 @@ A set of handy liquid filters used by Octopress.
 
 ## Installation
 
-Add this line to your application's Gemfile:
+If you're using bundler add this gem to your site's Gemfile in the `:jekyll_plugins` group:
 
-    gem 'octopress-filters'
+    group :jekyll_plugins do
+      gem 'octopress-filters'
+    end
 
-And then execute:
+Then install the gem with Bundler
 
     $ bundle
 
-Or install it yourself as:
+To install manually without bundler:
 
     $ gem install octopress-filters
 
-Next add it to your gems list in Jekyll's `_config.yml`
+Then add the gem to your Jekyll configuration.
 
     gems:
-      - octopress-filters
+      -octopress-filters
 
 ## Examples
 
@@ -44,7 +46,9 @@ Next add it to your gems list in Jekyll's `_config.yml`
 Any relative links in your site will be expanded with the `url` configuration in Jekyll's `_config.yml`. This filter only affects urls
 beginning with `/` inside of `href` or `src` attributes.
 
-    {{ post.content | full_urls }}
+```
+{{ post.content | full_urls }}
+```
 
 You might use this if you're working on an RSS feed, you'll need to be sure all relative urls in your content are expanded to full urls.
 
@@ -52,51 +56,70 @@ You might use this if you're working on an RSS feed, you'll need to be sure all
 
 This filter prepends input with the `url` configuration in Jekyll's `_config.yml`.
 
-    {{ post.url | full_url }}
+```
+{{ post.url | full_url }}
+```
 
 ### Canonical url
 
 This filter expands the url to be a full url, then removes "index.html" if it is present. Here are some examples.
 
-    {{ "about/index.html" | canonical_url }}  //=> http://example.com/about/
-    {{ "about.html" | canonical_url }}        //=> http://example.com/about.html
-    {{ "/" | canonical_url }}                 //=> http://example.com/
+```
+{{ "about/index.html" | canonical_url }}  //=> http://example.com/about/
+{{ "about.html" | canonical_url }}        //=> http://example.com/about.html
+{{ "/" | canonical_url }}                 //=> http://example.com/
+
+```
 
 ### Titlecase
 
-    {{ post.title | titlecase }}  //=> This Is a Properly Capitalized Title
+```
+{{ post.title | titlecase }}  //=> This Is a Properly Capitalized Title
+```
 
 ### Smartquote
 
-    {{ post.content | smartquotes }}
+```
+{{ post.content | smartquotes }}
+```
 
 ### Unorphan
 
-    {{ post.title | unorphan }}  //=> This Is a Properly Capitalized Title
+```
+{{ post.title | unorphan }}  //=> This Is a Properly Capitalized Title
+```
 
 ### Sluggify/Classify
 
-    <article class="{{ post.class | classify }}">
+```
+<article class="{{ post.class | classify }}">
+```
 
 ### Compact newlines
 
-    {{ content | compact_newlines }}
+```
+{{ content | compact_newlines }}
+```
 
 ### Join lines
 
-    {% capture page_title %}
-    {{ page.title }}
-    {{ site.header.title }}
-    {% endcapture %}
+```
+{% capture page_title %}
+{{ page.title }}
+{{ site.header.title }}
+{% endcapture %}
 
-    <head>
-      <title>{{ page_title | join_lines: " - " }}</title>
-      …
+<head>
+  <title>{{ page_title | join_lines: " - " }}</title>
+  …
+```
 
 ### Strip url protocol
 
-    {{ site.url }}                        # https://some-site.com/
-    {{ site.url | strip_url_protocol }}   # some-site.com/
+```
+{{ site.url }}                        # https://some-site.com/
+{{ site.url | strip_url_protocol }}   # some-site.com/
+```
 
 ## Contributing
 

data/lib/octopress-filters.rb

@@ -13,15 +13,15 @@ module Octopress
     # Returns the site's config root or '/' if the config isn't set
     #
     def root
-      root_url = Octopress.site.config['root']
-      root_url.nil? ? '/' : File.join('/', root_url)
+      baseurl = Octopress.site.config['baseurl'] || Octopress.site.config['root']
+      baseurl.nil? ? '/' : File.join('/', baseurl)
     end
 
     def site_url
       @url ||= begin
-        Octopress.site.config['url']
+        File.join(Octopress.site.config['url'], root)
       rescue
-        raise IOError.new "Please add your site's published url to your _config.yml, eg url: http://example.com/"
+        raise IOError.new "Please add your site's published url to your _config.yml, eg url: http://example.com"
       end
     end
 
@@ -65,7 +65,7 @@ module Octopress
     # Convert url input into a standard canonical url
     #
     def canonical_url(input)
-      full_url(input).downcase.sub(/index\.html/, '')
+      full_url(input).downcase.sub(/index\.\w+$/i, '')
     end
 
     # Prepend all urls with the full site url
@@ -99,11 +99,20 @@ module Octopress
     #
     def expand_url(input, url=nil)
       url ||= root
-      if input =~ /^#{url}/
+      url = if input =~ /^#{url}/
         input
       else
         File.join(url, input)
       end
+
+      # If url has a file.extension
+      if url =~ /\.\w+$/
+        url
+      else
+        # The url ends with a directory
+        # Add trailing slash if necessary
+        File.join(url, '/')
+      end
     end
 
     # Prepend all absolute urls with a url fragment
@@ -133,3 +142,14 @@ end
 
 
 Liquid::Template.register_filter Octopress::Filters
+
+if defined? Octopress::Docs
+  Octopress::Docs.add({
+    name:        "Octopress Filters",
+    gem:         "octopress-filters",
+    version:     Octopress::Filters::VERSION,
+    description: "A set of nice liquid filters used by Octopress",
+    path:        File.expand_path(File.join(File.dirname(__FILE__), "../")),
+    source_url:  "https://github.com/octopress/filters"
+  })
+end

data/lib/octopress-filters/version.rb

@@ -1,7 +1,5 @@
 module Octopress
-  module Tags
-    module Filters
-      VERSION = "1.2.0"
-    end
+  module Filters
+    VERSION = "1.2.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octopress-filters
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.2
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-01 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -112,55 +112,29 @@ dependencies:
   name: octopress-filter-tag
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
-description: A set of handy liquid filters used by Octopress
+        version: '0'
+description: 
 email:
 - brandon@imathis.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
-- Gemfile
 - LICENSE.txt
 - README.md
-- Rakefile
 - lib/octopress-filters.rb
 - lib/octopress-filters/hooks.rb
 - lib/octopress-filters/version.rb
-- octopress-filters.gemspec
-- test/.clash.yml
-- test/Gemfile
-- test/_config.yml
-- test/_expected/canonical.html
-- test/_expected/classify.html
-- test/_expected/compact_newlines.html
-- test/_expected/full_urls.html
-- test/_expected/join_lines.html
-- test/_expected/smartquotes.html
-- test/_expected/strip_url_protocol.html
-- test/_expected/titlecase.html
-- test/_expected/unorphan.html
-- test/canonical.html
-- test/classify.html
-- test/compact_newlines.html
-- test/full_urls.html
-- test/join_lines.html
-- test/smartquotes.html
-- test/strip_url_protocol.html
-- test/titlecase.html
-- test/unorphan.html
 homepage: https://github.com/octopress/filters
 licenses:
 - MIT
@@ -185,25 +159,4 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A set of handy liquid filters used by Octopress
-test_files:
-- test/.clash.yml
-- test/Gemfile
-- test/_config.yml
-- test/_expected/canonical.html
-- test/_expected/classify.html
-- test/_expected/compact_newlines.html
-- test/_expected/full_urls.html
-- test/_expected/join_lines.html
-- test/_expected/smartquotes.html
-- test/_expected/strip_url_protocol.html
-- test/_expected/titlecase.html
-- test/_expected/unorphan.html
-- test/canonical.html
-- test/classify.html
-- test/compact_newlines.html
-- test/full_urls.html
-- test/join_lines.html
-- test/smartquotes.html
-- test/strip_url_protocol.html
-- test/titlecase.html
-- test/unorphan.html
+test_files: []

data/.gitignore

@@ -1,23 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp
-*.bundle
-*.so
-*.o
-*.a
-mkmf.log
-_site

data/.travis.yml

@@ -1,5 +0,0 @@
-language: ruby
-rvm:
-  - 2.0.0
-  - 1.9.3
-script: cd test && bundle exec clash

data/Gemfile

@@ -1,4 +0,0 @@
-source 'https://rubygems.org'
-
-# Specify your gem's dependencies in octopress_render_tag.gemspec
-gemspec

data/Rakefile

@@ -1,2 +0,0 @@
-require "bundler/gem_tasks"
-

data/octopress-filters.gemspec

@@ -1,30 +0,0 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'octopress-filters/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = "octopress-filters"
-  spec.version       = Octopress::Tags::Filters::VERSION
-  spec.authors       = ["Brandon Mathis"]
-  spec.email         = ["brandon@imathis.com"]
-  spec.summary       = %q{A set of handy liquid filters used by Octopress}
-  spec.description   = %q{A set of handy liquid filters used by Octopress}
-  spec.homepage      = "https://github.com/octopress/filters"
-  spec.license       = "MIT"
-
-  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|features)/})
-  spec.require_paths = ["lib"]
-
-  spec.add_runtime_dependency "jekyll"
-  spec.add_runtime_dependency "rubypants-unicode"
-  spec.add_runtime_dependency "titlecase"
-  spec.add_runtime_dependency "octopress-hooks", "~> 2.0"
-
-  spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "clash"
-  spec.add_development_dependency "octopress-filter-tag", "~> 1.0"
-end

data/test/.clash.yml

@@ -1,2 +0,0 @@
-build: true
-compare: _expected _site

data/test/Gemfile

@@ -1,7 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'octopress-filters', path: '../'
-gem 'pry-debugger'
-gem 'octopress-filter-tag'
-gem 'rubypants'
-gem 'clash'

data/test/_config.yml

@@ -1,15 +0,0 @@
-# Site settings
-title: Your awesome title
-email: your-email@domain.com
-baseurl: ""
-url: "http://yourdomain.com"
-timezone: UTC
-
-exclude:
-  - Gemfile*
-
-# Build settings
-markdown: kramdown
-gems:
-  - octopress-filters
-  - octopress-filter-tag

data/test/_expected/canonical.html

@@ -1,4 +0,0 @@
-http://yourdomain.com/canonical.html
-http://yourdomain.com/
-http://yourdomain.com/foo/
-http://yourdomain.com/foo/

data/test/_expected/classify.html

@@ -1,5 +0,0 @@
-
-
-<div class="this-is-a-silly-classname"></div>
-<div class="this-is-a-silly-classname"></div>
-

data/test/_expected/compact_newlines.html

@@ -1,6 +0,0 @@
-There
-Is
-A
-Lot
-Of
-Whitespace

data/test/_expected/full_urls.html

@@ -1,2 +0,0 @@
-<a href="http://yourdomain.com/about">About</a>
-<script src="http://yourdomain.com/javascripts/foo.js"></script>

data/test/_expected/join_lines.html

@@ -1,2 +0,0 @@
-this,has,commas,man
-

data/test/_expected/smartquotes.html

@@ -1,27 +0,0 @@
-“A first example”
-“A first “nested” example”
-”.
-“a
-’.
-‘a
-<p>He said, “‘Quoted’ words in a larger quote.”</p>
-“I like the 70’s”
-“I like the ’70s”
-“I like the ‘70!”
-
-pre”post
-pre “post
-pre&nbsp;“post
-pre–“post
-pre–”!
-
-pre’post
-pre ‘post
-pre&nbsp;‘post
-pre–‘post
-pre–’!
-<b>‘</b>
-foo<b>’</b>
-
-<pre>"this shouldn't be curled"</pre>
-<code>"this shouldn't be curled"</code>

data/test/_expected/strip_url_protocol.html

@@ -1,2 +0,0 @@
-yourdomain.com
-foo.bar.com/goggles

data/test/_expected/titlecase.html

@@ -1 +0,0 @@
-This Title Could Use Some Capitals

data/test/_expected/unorphan.html

@@ -1 +0,0 @@
-This title is long so it might wrap

data/test/canonical.html

@@ -1,6 +0,0 @@
----
----
-{{ page.url | canonical_url }}
-{{ "/index.html" | canonical_url }}
-{{ "foo/index.html" | canonical_url }}
-{{ "/foo/index.html" | canonical_url }}

data/test/classify.html

@@ -1,7 +0,0 @@
----
----
-{% assign class = "this is a silly classname" %}
-
-<div class="{{ class | classify }}"></div>
-<div class="{{ class | sluggify }}"></div>
-

data/test/compact_newlines.html

@@ -1,15 +0,0 @@
----
----
-{% filter compact_newlines %}
-There
-
-Is
-
-A
-
-Lot
-
-Of
-
-Whitespace
-{% endfilter %}

data/test/full_urls.html

@@ -1,6 +0,0 @@
----
----
-{% filter full_urls %}
-<a href="/about">About</a>
-<script src="/javascripts/foo.js"></script>
-{% endfilter %}

data/test/join_lines.html

@@ -1,9 +0,0 @@
----
----
-{% filter join_lines: ',' %}
-this
-has
-commas
-man
-{% endfilter %}
-

data/test/smartquotes.html

@@ -1,31 +0,0 @@
----
----
-{% filter smartquotes %}
-"A first example"
-"A first "nested" example"
-".
-"a
-'.
-'a
-<p>He said, "'Quoted' words in a larger quote."</p>
-"I like the 70's"
-"I like the '70s"
-"I like the '70!"
-
-pre"post
-pre "post
-pre&nbsp;"post
-pre--"post
-pre--"!
-
-pre'post
-pre 'post
-pre&nbsp;'post
-pre--'post
-pre--'!
-<b>'</b>
-foo<b>'</b>
-
-<pre>"this shouldn't be curled"</pre>
-<code>"this shouldn't be curled"</code>
-{% endfilter %}

data/test/strip_url_protocol.html

@@ -1,6 +0,0 @@
----
----
-{{ site.url | strip_url_protocol }}
-{% filter strip_url_protocol %}
-https://foo.bar.com/goggles
-{% endfilter %}

data/test/titlecase.html

@@ -1,5 +0,0 @@
----
-title: this title could use some capitals
----
-
-{{ page.title | titlecase }}

data/test/unorphan.html

@@ -1,5 +0,0 @@
----
-title: This title is long so it might wrap
----
-
-{{ page.title | unorphan }}