sass-tumblr 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb54b0d8dd6e225ba0e605c85c31d57cdc95f14f
-  data.tar.gz: 4542170588022e142cbff36676ea304bcc4533c8
+  metadata.gz: 948359a7892f1e7936ae432c5e5b63ee02f96b97
+  data.tar.gz: 77fbfac1adb8b075d71b014ddfdb236d4a8eeed1
 SHA512:
-  metadata.gz: 3c90e15ae3a63bd4d41d9441f48f81ce33e08e65b9362c71dea7a69daac8425bd4f40b68ad5f599d4fcd9839c9019692653cd9d1c4a44deac0b4374228dd00ce
-  data.tar.gz: 2d6d3e23e9c3725969e2255ab94c5e6c23bd3e328c603b421e1b627d31667728a70e1f489ea15adbf6877ad7fc6f1d77778499f820b9dfc69a51d85a09e04ded
+  metadata.gz: 5de741d2b137ac36729cdbbd1e03b69e537aaf11e2821082a38817729659b2dbfb7a348013328f5431acee671ec6d470e9c243dd0a1befb83d2a3c1461828dea
+  data.tar.gz: aff359448f023512c241e2d159f8f65f32d8c0b8ad5b7cb27fb56e6f035d8fdc659f37abea0b025a464e2023b2133143bbad270a1429b3258cd79a24ab36184c

data/README.md

@@ -1,15 +1,43 @@
 sass-tumblr
 ===========
 
-Ignore [Tumblr template tags](https://www.tumblr.com/docs/en/custom_themes) like ``a { color: {color:Text}; }`` while parsing SCSS.
+Ignore [Tumblr template tags](https://www.tumblr.com/docs/en/custom_themes) like ``a { color: {color:Text}; }`` while parsing SCSS with [Sass](http://sass-lang.com/) gem.
+At this moment, old [indent base sass](http://sass-lang.com/documentation/file.INDENTED_SYNTAX.html) is not supported.
 
 Usage
 -----
 
-Add dependency to your Gemfile.
+Use [Bundler](http://bundler.io/) and add a dependency to your `Gemfile`.
 
-    gem "sass-tumblr"
+    $ gem "sass-tumblr"
 
 Then require ``sass_tumblr`` in appropriate way.
 
-    require 'sass_tumblr'
+    require "sass_tumblr"
+
+
+Example
+-------
+
+Parse SCSS with Tumblr template tags using `rib`.
+
+    $ bundle exec irb
+    irb> require "sass_tumblr"
+    irb> puts Sass::Engine.new("body {color: {color:Text}}", :syntax => :scss).render
+    body {
+      color: {color:Text}; }
+
+Limitations
+-----------
+
+At this moment, all Tumblr tags in SCSS must be one of next format.
+Basically it follows [Tumbler template document](https://www.tumblr.com/docs/en/custom_themes), but not all existing templates are following this rule.
+
+    {CapitalizedTagName}
+    {CustomCSS}
+    {color:Capitalized Key Name}
+    {font:Capitalized Key Name}
+    {text:Capitalized Key Name}
+    {image:Capitalized Key Name}
+
+Also `{block:KeyName}` and `{/block:KeyName}` may not work.

data/lib/sass_tumblr.rb

@@ -4,29 +4,33 @@ module Sass
   module SCSS
     module RX
       # Pattern to match Tumblr tag.
-      TUMBLR_VAR = /({[a-zA-Z0-9_]+(?::[a-zA-Z0-9_]+)?})/
+      TUMBLR_TAG = /({(?:[A-Z][a-zA-Z0-9\-]*|(color|font|select|text|image):[A-Z][a-zA-Z0-9\-_ ]*)})/
+      # Handle special `{CustomCSS}' tag as a comment,
+      # which can appear independently in CSS.
+      TUMBLR_CUSTOM_CSS_TAG = /{CustomCSS}/i
+      COMMENT = /#{COMMENT.source}|#{TUMBLR_CUSTOM_CSS_TAG}/
     end
 
     # See lib/sass/scss/static_parser.rb
     class StaticParser
-      # Handle Tumblr variable tags in CSS selector
+      # Handle Tumblr tags in CSS selector
       # Used from CssParser directly, from StaticParser and Parser via RuleNode#try_to_parse_non_interpolated_rules.
       alias :qualified_name_without_tumblr :qualified_name
       def qualified_name(allow_star_name = false)
-        if var = tok(TUMBLR_VAR)
-          return nil, var
+        if tag = tok(TUMBLR_TAG)
+          return nil, tag
         else
           qualified_name_without_tumblr(allow_star_name)
         end
       end
 
-      # Handle Tumblr variable tags in CSS key
+      # Handle Tumblr tags in CSS key
       # Used from CssParser and StaticParser
       # This is needed even we've patched in Parser class since it's also overridden in StaticParser.
       alias :interp_ident_without_tumblr :interp_ident
       def interp_ident(ident = IDENT)
-        if var = tok(TUMBLR_VAR)
-          [var]
+        if tag = tok(TUMBLR_TAG)
+          [tag]
         else
           interp_ident_without_tumblr(ident)
         end
@@ -35,29 +39,43 @@ module Sass
 
     # See lib/sass/scss/parser.rb
     class Parser
-      # Handle Tumblr variable tags in CSS selector
+      # Handle Tumblr tags in CSS selector
       # Used from StaticParser and Parser.
       alias :almost_any_value_token_without_tumblr :almost_any_value_token
       def almost_any_value_token
-        tok(TUMBLR_VAR) || almost_any_value_token_without_tumblr
+        tok(TUMBLR_TAG) || almost_any_value_token_without_tumblr
       end
 
-      # Handle Tumblr variable tags in CSS key
+      # Handle Tumblr tags in CSS key
       # Used from StaticParser and Parser.
       alias :interp_ident_without_tumblr :interp_ident
       def interp_ident(ident = IDENT)
-        if var = tok(TUMBLR_VAR)
-          [var]
+        if tag = tok(TUMBLR_TAG)
+          [tag]
         else
           interp_ident_without_tumblr(ident)
         end
       end
 
-      # Avoid to parse first "{" as a block in declaration for Tumblr variable tags in CSS value
+      # Handlt Tumblr custom css tag
+      # Treat the tag as comment and yet visible in compact style.
+      alias :process_comment_without_tumblr :process_comment
+      def process_comment(text, node)
+        case text
+        when TUMBLR_CUSTOM_CSS_TAG
+          comment = Sass::Tree::CommentNode.new([text], :loud)
+          comment.line = @line
+          node << comment
+        else
+          process_comment_without_tumblr(text, node)
+        end
+      end
+
+      # Avoid to parse first "{" as a block in declaration for Tumblr tags in CSS value
       # Used from all parsers.
       alias :value_without_tumblr! :value!
       def value!
-        if var = tok?(TUMBLR_VAR)
+        if tok?(TUMBLR_TAG)
           sass_script(:parse)
         else
           value_without_tumblr!
@@ -69,12 +87,12 @@ module Sass
   # See lib/sass/script/lexer.rb
   module Script
     class Lexer
-      # Handle Tumblr variable tags in CSS value
+      # Handle Tumblr tags in CSS value
       # Parse as ident token (like `middle', `top') in the parser.
       # Used from all parsers.
       alias :ident_without_tumblr_var :ident
       def ident
-        if scan(TUMBLR_VAR)
+        if scan(TUMBLR_TAG)
           [:ident, @scanner[1]]
         else
           ident_without_tumblr_var

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sass-tumblr
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Yoshimasa Niwa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-17 00:00:00.000000000 Z
+date: 2015-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sass