tumblargh 0.2.0 → 0.2.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0e50e3d39c5dc3fb912cfcaf48113581fb644456
+  data.tar.gz: 66980f7b07a44cb19b191f86f3c1ff10fd6a31ac
+SHA512:
+  metadata.gz: a37b11aa4bc7d25724f36039cbf566e4f46362be27e13d655fadd4a039d69e9549bbc774150e034142302ccccd35db5b2cb4b6a7be812d04dab621fd0da95497
+  data.tar.gz: c318b3856836d9f07d7812624c877555963153585324a924f982dc84bf727b91c1a4ddd18c7454f85824efffa8f5258b412b35beaf55c9d14cc69796ff2e6803

data/CHANGELOG.md

@@ -0,0 +1,13 @@
+## 0.2.1
+
+- Block arguments, such as `{block:JumpPagination length="5"}` are now supported
+
+## 0.2.0
+
+- Middlman 3.0 support
+- Improved permalink page reliability
+- Chat/dialog post support
+
+## 0.1.0
+
+Initial release

data/Gemfile

@@ -1,15 +1,3 @@
-source "http://rubygems.org"
+source 'https://rubygems.org'
 
-gem 'activesupport', '>= 3.1'
-gem 'treetop'
-gem 'nokogiri'
-gem 'api_cache'
-
-
-group :development do
-  gem 'autotest-standalone'
-  gem 'jeweler'
-  gem 'rake'
-  gem 'rspec'
-  gem 'simplecov'
-end
+gemspec

data/Gemfile.lock

@@ -1,26 +1,28 @@
+PATH
+  remote: .
+  specs:
+    tumblargh (0.2.0)
+      activesupport (>= 3.1)
+      api_cache
+      nokogiri
+      treetop
+
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    activesupport (3.2.2)
-      i18n (~> 0.6)
+    activesupport (3.2.14)
+      i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     api_cache (0.2.3)
     autotest-standalone (4.5.9)
     diff-lcs (1.1.3)
-    git (1.2.5)
-    i18n (0.6.0)
-    jeweler (1.8.3)
-      bundler (~> 1.0)
-      git (>= 1.2.5)
-      rake
-      rdoc
-    json (1.6.6)
+    i18n (0.6.5)
+    mini_portile (0.5.1)
     multi_json (1.1.0)
-    nokogiri (1.5.2)
+    nokogiri (1.6.0)
+      mini_portile (~> 0.5.0)
     polyglot (0.3.3)
     rake (0.9.2.2)
-    rdoc (3.12)
-      json (~> 1.4)
     rspec (2.8.0)
       rspec-core (~> 2.8.0)
       rspec-expectations (~> 2.8.0)
@@ -33,7 +35,7 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
-    treetop (1.4.10)
+    treetop (1.4.14)
       polyglot
       polyglot (>= 0.3.1)
 
@@ -41,12 +43,8 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (>= 3.1)
-  api_cache
   autotest-standalone
-  jeweler
-  nokogiri
   rake
   rspec
   simplecov
-  treetop
+  tumblargh!

data/Rakefile

@@ -17,27 +17,7 @@ RSpec::Core::RakeTask.new(:coverage) do |t|
   t.pattern = "./spec/**/*_spec.rb" # don't need this, it's default.
 end
 
-
 desc "Open an irb session preloaded with this library"
 task :console do
   sh "irb -rubygems -I lib -r tumblargh.rb"
 end
-
-
-require 'jeweler'
-Jeweler::Tasks.new do |s|
-  s.name        = 'tumblargh'
-  s.summary     = 'Groan-less Tumblr theme development.'
-  s.description = "If you've ever had to build a Tumblr theme, you've probably cried out in pain while tweaking locally, copying, pasting into the theme editor, saving, switching tabs and finally refreshing and waiting for your tesing blog to reload. Tumblargh aims to reduce suffering involved with building a theme by offering a way to fully develop, lint and test Tumblr themes locally, with real posts from any existing Tumblog."
-  s.authors     = ['Jason Webster']
-  s.email       = 'jason@metalabdesign.com'
-  s.homepage    = 'http://github.com/jasonwebster/tumblargh'
-
-  s.files        = `git ls-files`.split("\n")
-  s.require_path = 'lib'
-end
-
-Jeweler::RubygemsDotOrgTasks.new
-
-
-

data/lib/tumblargh.rb

@@ -3,6 +3,7 @@ require 'active_support/core_ext/hash/indifferent_access'
 require 'active_support/core_ext/string/conversions'
 require 'active_support/core_ext/time/conversions'
 require 'active_support/inflector'
+require 'tumblargh/version'
 
 module Tumblargh
 

data/lib/tumblargh/grammar.rb

@@ -134,6 +134,10 @@ module Tumblr
   end
 
   module BlockStart0
+    def block_name
+      elements[1]
+    end
+
   end
 
   def _nt_block_start
@@ -157,44 +161,43 @@ module Tumblr
     end
     s0 << r1
     if r1
-      s2, i2 = [], index
-      loop do
-        if has_terminal?('\G[^\\s}:;]', true, index)
-          r3 = true
-          @index += 1
-        else
-          r3 = nil
-        end
-        if r3
-          s2 << r3
-        else
-          break
-        end
-      end
-      if s2.empty?
-        @index = i2
-        r2 = nil
-      else
-        r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
-      end
+      r2 = _nt_block_name
       s0 << r2
       if r2
-        if has_terminal?('}', false, index)
-          r4 = instantiate_node(SyntaxNode,input, index...(index + 1))
-          @index += 1
+        r4 = _nt_space
+        if r4
+          r3 = r4
         else
-          terminal_parse_failure('}')
-          r4 = nil
+          r3 = instantiate_node(SyntaxNode,input, index...index)
         end
-        s0 << r4
-        if r4
-          r6 = _nt_space
+        s0 << r3
+        if r3
+          r6 = _nt_block_arguments
           if r6
             r5 = r6
           else
             r5 = instantiate_node(SyntaxNode,input, index...index)
           end
           s0 << r5
+          if r5
+            if has_terminal?('}', false, index)
+              r7 = instantiate_node(SyntaxNode,input, index...(index + 1))
+              @index += 1
+            else
+              terminal_parse_failure('}')
+              r7 = nil
+            end
+            s0 << r7
+            if r7
+              r9 = _nt_space
+              if r9
+                r8 = r9
+              else
+                r8 = instantiate_node(SyntaxNode,input, index...index)
+              end
+              s0 << r8
+            end
+          end
         end
       end
     end
@@ -212,6 +215,10 @@ module Tumblr
   end
 
   module BlockEnd0
+    def block_name
+      elements[1]
+    end
+
   end
 
   def _nt_block_end
@@ -235,56 +242,229 @@ module Tumblr
     end
     s0 << r1
     if r1
-      s2, i2 = [], index
-      loop do
-        if has_terminal?('\G[^\\s}]', true, index)
-          r3 = true
+      r2 = _nt_block_name
+      s0 << r2
+      if r2
+        if has_terminal?('}', false, index)
+          r3 = instantiate_node(SyntaxNode,input, index...(index + 1))
           @index += 1
         else
+          terminal_parse_failure('}')
           r3 = nil
         end
+        s0 << r3
         if r3
-          s2 << r3
-        else
-          break
+          r5 = _nt_space
+          if r5
+            r4 = r5
+          else
+            r4 = instantiate_node(SyntaxNode,input, index...index)
+          end
+          s0 << r4
         end
       end
-      if s2.empty?
-        @index = i2
-        r2 = nil
+    end
+    if s0.last
+      r0 = instantiate_node(Tumblargh::Node::BlockEnd,input, i0...index, s0)
+      r0.extend(BlockEnd0)
+    else
+      @index = i0
+      r0 = nil
+    end
+
+    node_cache[:block_end][start_index] = r0
+
+    r0
+  end
+
+  def _nt_block_name
+    start_index = index
+    if node_cache[:block_name].has_key?(index)
+      cached = node_cache[:block_name][index]
+      if cached
+        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    s0, i0 = [], index
+    loop do
+      if has_terminal?('\G[^\\s}:;]', true, index)
+        r1 = true
+        @index += 1
       else
-        r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
+        r1 = nil
       end
-      s0 << r2
-      if r2
-        if has_terminal?('}', false, index)
-          r4 = instantiate_node(SyntaxNode,input, index...(index + 1))
+      if r1
+        s0 << r1
+      else
+        break
+      end
+    end
+    if s0.empty?
+      @index = i0
+      r0 = nil
+    else
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+    end
+
+    node_cache[:block_name][start_index] = r0
+
+    r0
+  end
+
+  def _nt_block_arguments
+    start_index = index
+    if node_cache[:block_arguments].has_key?(index)
+      cached = node_cache[:block_arguments][index]
+      if cached
+        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    s0, i0 = [], index
+    loop do
+      r1 = _nt_block_argument
+      if r1
+        s0 << r1
+      else
+        break
+      end
+    end
+    if s0.empty?
+      @index = i0
+      r0 = nil
+    else
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+    end
+
+    node_cache[:block_arguments][start_index] = r0
+
+    r0
+  end
+
+  module BlockArgument0
+  end
+
+  module BlockArgument1
+  end
+
+  def _nt_block_argument
+    start_index = index
+    if node_cache[:block_argument].has_key?(index)
+      cached = node_cache[:block_argument][index]
+      if cached
+        cached = SyntaxNode.new(input, index...(index + 1)) if cached == true
+        @index = cached.interval.end
+      end
+      return cached
+    end
+
+    i0, s0 = index, []
+    i1, s1 = index, []
+    s2, i2 = [], index
+    loop do
+      if has_terminal?('\G[a-zA-Z0-9]', true, index)
+        r3 = true
+        @index += 1
+      else
+        r3 = nil
+      end
+      if r3
+        s2 << r3
+      else
+        break
+      end
+    end
+    if s2.empty?
+      @index = i2
+      r2 = nil
+    else
+      r2 = instantiate_node(SyntaxNode,input, i2...index, s2)
+    end
+    s1 << r2
+    if r2
+      if has_terminal?('=', false, index)
+        r4 = instantiate_node(SyntaxNode,input, index...(index + 1))
+        @index += 1
+      else
+        terminal_parse_failure('=')
+        r4 = nil
+      end
+      s1 << r4
+      if r4
+        if has_terminal?('"', false, index)
+          r5 = instantiate_node(SyntaxNode,input, index...(index + 1))
           @index += 1
         else
-          terminal_parse_failure('}')
-          r4 = nil
+          terminal_parse_failure('"')
+          r5 = nil
         end
-        s0 << r4
-        if r4
-          r6 = _nt_space
-          if r6
-            r5 = r6
+        s1 << r5
+        if r5
+          s6, i6 = [], index
+          loop do
+            if has_terminal?('\G[a-zA-Z0-9]', true, index)
+              r7 = true
+              @index += 1
+            else
+              r7 = nil
+            end
+            if r7
+              s6 << r7
+            else
+              break
+            end
+          end
+          if s6.empty?
+            @index = i6
+            r6 = nil
           else
-            r5 = instantiate_node(SyntaxNode,input, index...index)
+            r6 = instantiate_node(SyntaxNode,input, i6...index, s6)
+          end
+          s1 << r6
+          if r6
+            if has_terminal?('"', false, index)
+              r8 = instantiate_node(SyntaxNode,input, index...(index + 1))
+              @index += 1
+            else
+              terminal_parse_failure('"')
+              r8 = nil
+            end
+            s1 << r8
           end
-          s0 << r5
         end
       end
     end
+    if s1.last
+      r1 = instantiate_node(SyntaxNode,input, i1...index, s1)
+      r1.extend(BlockArgument0)
+    else
+      @index = i1
+      r1 = nil
+    end
+    s0 << r1
+    if r1
+      r10 = _nt_space
+      if r10
+        r9 = r10
+      else
+        r9 = instantiate_node(SyntaxNode,input, index...index)
+      end
+      s0 << r9
+    end
     if s0.last
-      r0 = instantiate_node(Tumblargh::Node::BlockEnd,input, i0...index, s0)
-      r0.extend(BlockEnd0)
+      r0 = instantiate_node(SyntaxNode,input, i0...index, s0)
+      r0.extend(BlockArgument1)
     else
       @index = i0
       r0 = nil
     end
 
-    node_cache[:block_end][start_index] = r0
+    node_cache[:block_argument][start_index] = r0
 
     r0
   end