jekyll-viewsource 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfe5b3a8492efe8b96f105d0fae4520e30a61c6d
-  data.tar.gz: d7706594cecfbcdce75868c3bba4fb05f9338aac
+  metadata.gz: 405f987cb2179dc287faa09164395009a4905663
+  data.tar.gz: f702c8e22fa490b5fec0c3125eb1b9c3b522f22d
 SHA512:
-  metadata.gz: eeabd3bc6482ef6c6799f36a13b350a49e0fd035a872ac0523219ae18acf15bd50b0569b4315eecd3fed4b2915d29db608a2c47da783e33f0d0c2b808c7c3034
-  data.tar.gz: 6c5b099a1edf932c4157d5f5fc7e61349b3158c2b9467e3523178a2d8fbe5493697492790f4d90da5267cbe13f14c68184609800169a0b25015e23eb6b396861
+  metadata.gz: 26f45da8f28d82013226db98bd0fc84e0211ce426dfc0d5668510a373555e8c71aa31e7d3cf69db8c6a453ee8d705cb2dbc3a8354b78980173a9cda3518f39b1
+  data.tar.gz: 633c9aebe11d17da0199469881420a99591bbf2765ecf01750271000a0ac5c0cb301dd1ccba49dc80c8ce340245413e8b9a8e521c03c3be509c59831f2921dc6

data/README.md

@@ -4,6 +4,10 @@
 
 *Jekyll:ViewSource* is a plugin for [Jekyll](https://jekyllrb.com/) that generates plain or pretty Markdown and HTML source code pages from your content.
 
+## What's new?
+
+*v1.0.1* Improvements to lexer; cache location; inclusion in `_config.yml`
+
 ## Installation
 
 Add the gem to your application's Gemfile:
@@ -126,7 +130,7 @@ e.g.
 
 ## Cache
 
-*ViewSource* maintains a cache in a hidden folder inside your site source: `.plugins/jekyll-viewsource`. If you encounter problems that you think may be related to the cache, you may remove this.
+*ViewSource* maintains a cache in a hidden folder inside your home directory: `.jekyll-plugins/jekyll-viewsource`. If you encounter problems that you think may be related to the cache, you may remove this.
 
 ## Contributing
 

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "jekyll/viewsource"
+require "jekyll-viewsource"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/jekyll-viewsource.gemspec

@@ -1,7 +1,7 @@
 
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require "jekyll/viewsource/version"
+require "jekyll-viewsource/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "jekyll-viewsource"

data/lib/{jekyll/viewsource.rb → jekyll-viewsource.rb}

@@ -1,6 +1,6 @@
-require 'jekyll/viewsource/constants'
-require 'jekyll/viewsource/cache'
-require 'jekyll/viewsource/renderer'
+require 'jekyll-viewsource/constants'
+require 'jekyll-viewsource/cache'
+require 'jekyll-viewsource/renderer'
 
 module Jekyll
   module ViewSource

data/lib/{jekyll/viewsource → jekyll-viewsource}/cache.rb

@@ -1,17 +1,16 @@
-require 'jekyll/viewsource/renderer'
+require 'jekyll-viewsource/renderer'
 
 module Jekyll
   module ViewSource
 
     class Cache
-      DEFAULT_CACHE = ".plugins/jekyll-viewsource/cache".freeze
+      DEFAULT_CACHE = File.join(Dir.home, '.jekyll-plugins', 'jekyll-viewsource', 'cache').freeze
 
       def self.setup(site, cache)
         @site = site
 
         if cache
-          @cache_dir = File.join(@site.source,
-            (cache.is_a?(String) ? cache : DEFAULT_CACHE))
+          @cache_dir = (cache.is_a?(String) ? cache : DEFAULT_CACHE)
 
           ViewSource.debug 'startup', "Setting up cache at #{@cache_dir}" if Renderer.first_run
 

data/lib/jekyll-viewsource/lexer.rb

@@ -0,0 +1,62 @@
+require 'rouge'
+
+module Rouge
+  module Lexers
+    class ViewSource < Markdown
+      tag 'viewsource'
+
+      def liquid
+        @liquid ||= Liquid.new(options)
+      end
+
+      def javascript
+        @javascript ||= Javascript.new(options)
+      end
+
+      def html
+        @html ||= HTML.new(options)
+      end
+
+      prepend :root do
+        rule(%r[\s*(?<!:)//.*?$]) { delegate javascript }
+        rule(%r(\s*/[*].*?[*]/\s*)m) { delegate javascript }
+
+        rule(%r(\s*<!--.*?-->\s*)m) { delegate html }
+
+        rule %r(({%)(\s*)(macro)(\s+)(/.*?/\S*)(\s*)({)) do
+          groups Punctuation, Text::Whitespace, Name::Tag, Text::Whitespace, Str::Double, Text::Whitespace, Punctuation
+        end
+
+        rule %r((})(\s*)(%})) do
+          groups Punctuation, Text::Whitespace, Punctuation
+        end
+
+        rule %r(({%)(\s*)(constant)(\s+)(\S+)(\s*)(=?)(\s*)(['"]?)(.*?)(['"]?)(\s*)(%})) do
+          groups Punctuation, Text::Whitespace, Name::Tag, Text::Whitespace, 
+            Name::Attribute, Text::Whitespace, Punctuation, Text::Whitespace,
+            Punctuation, Str::Double, Punctuation, Text::Whitespace, Punctuation
+        end
+
+        rule %r((\s*)({%)(\s*)(hashkeys)(\s+)(\S+)(\s*)(%})) do
+          groups Text::Whitespace, Punctuation, Text::Whitespace, Name::Tag,
+          Text::Whitespace, Name::Attribute, Text::Whitespace, Punctuation
+        end
+
+        rule %r((\s*)({%)(\s*)(hashkeys)(\s+)(\S+)(\s*)({)(.*?)(})(\s*)(%})) do
+          groups Text::Whitespace, Punctuation, Text::Whitespace,
+          Name::Tag, Text::Whitespace, Name::Attribute, Text::Whitespace,
+          Punctuation, Text, Punctuation, Text::Whitespace, Punctuation
+        end
+
+        rule %r(({%)(\s*)(project)(\s*)(.*?)(\s*)(%})) do
+          groups Punctuation, Text::Whitespace, Name::Tag, Text::Whitespace, Text,
+            Text::Whitespace, Punctuation
+        end
+
+        rule(%r(.*?{%.*?%}.?)) { delegate liquid }
+        rule(%r(.*{{.*?}}.?)) { delegate liquid }
+      end
+
+    end
+  end
+end

data/lib/{jekyll/viewsource → jekyll-viewsource}/version.rb

@@ -1,5 +1,5 @@
 module Jekyll
   module ViewSource
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-viewsource
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Alex Ibrado
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-17 00:00:00.000000000 Z
+date: 2018-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jekyll
@@ -119,13 +119,13 @@ files:
 - bin/console
 - bin/setup
 - jekyll-viewsource.gemspec
-- lib/jekyll/viewsource.rb
-- lib/jekyll/viewsource/cache.rb
-- lib/jekyll/viewsource/constants.rb
-- lib/jekyll/viewsource/lexer.rb
-- lib/jekyll/viewsource/renderer.rb
-- lib/jekyll/viewsource/utils.rb
-- lib/jekyll/viewsource/version.rb
+- lib/jekyll-viewsource.rb
+- lib/jekyll-viewsource/cache.rb
+- lib/jekyll-viewsource/constants.rb
+- lib/jekyll-viewsource/lexer.rb
+- lib/jekyll-viewsource/renderer.rb
+- lib/jekyll-viewsource/utils.rb
+- lib/jekyll-viewsource/version.rb
 homepage: https://github.com/ibrado/jekyll-viewsource
 licenses:
 - MIT

data/lib/jekyll/viewsource/lexer.rb

@@ -1,32 +0,0 @@
-require 'rouge'
-
-module Rouge
-  module Lexers
-    class ViewSource < Markdown
-      tag 'viewsource'
-
-      def liquid
-        @liquid ||= Liquid.new(options)
-      end
-
-      def javascript
-        @javascript ||= Javascript.new(options)
-      end
-
-      def html
-        @html ||= HTML.new(options)
-      end
-
-      prepend :root do
-        rule(%r[\s*(?<!:)//.*?$]) { delegate javascript }
-        rule(%r(\s*/[*].*?[*]/\s*)m) { delegate javascript }
-
-        rule(%r(.*?%}.?)) { delegate liquid }
-        rule(%r(.*{{.*?}}.?)) { delegate liquid }
-
-        rule(%r(\s*<!--.*?-->\s*)m) { delegate html }
-      end
-
-    end
-  end
-end