hotcell 0.1.0 → 0.2.0

data/ext/lexerc/lexerc.h

@@ -1,3 +1,5 @@
+#define regexp_possible rb_funcall(self, rb_intern("regexp_possible"), 0)
+
 #define emit_tag rb_funcall(self, rb_intern("emit_tag"), 0)
 #define emit_operator rb_funcall(self, rb_intern("emit_operator"), 0)
 #define emit_numeric rb_funcall(self, rb_intern("emit_numeric"), 0)
@@ -11,10 +13,3 @@
 #define raise_unterminated_string rb_funcall(self, rb_intern("raise_unterminated_string"), 0)
 #define raise_unterminated_regexp rb_funcall(self, rb_intern("raise_unterminated_regexp"), 0)
 #define raise_unexpected_symbol rb_funcall(self, rb_intern("raise_unexpected_symbol"), 0)
-
-#define regexp_ambiguity(block) { \
-    if (rb_funcall(self, rb_intern("regexp_possible?"), 0) == Qfalse) { \
-      emit_operator; \
-      block; \
-    } \
-  }

data/ext/lexerc/lexerc.rl

@@ -1,98 +1,17 @@
 %%{
   machine puffer_lexer;
 
-  plus = '+';
-  minus = '-';
-  multiply = '*';
-  power = '**';
-  divide = '/';
-  modulo = '%';
-  arithmetic = plus | minus | multiply | power | divide | modulo;
-
-  and = '&&';
-  or = '||';
-  not = '!';
-  equal = '==';
-  inequal = '!=';
-  gt = '>';
-  gte = '>=';
-  lt = '<';
-  lte = '<=';
-  logic = and | or | not | equal | inequal | gt | gte | lt | lte;
-
-  assign = '=';
-  comma = ',';
-  period = '.';
-  colon = ':';
-  question = '?';
-  semicolon = ';';
-  newline = '\n';
-  flow = assign | comma | period | colon | question | semicolon | newline;
-
-  array_open = '[';
-  array_close = ']';
-  hash_open = '{';
-  hash_close = '}';
-  bracket_open = '(';
-  bracket_close = ')';
-  structure = array_open | array_close | hash_open | hash_close | bracket_open | bracket_close;
-
-
-  escaped_symbol = '\\' any;
-
-  squote = "'";
-  snon_quote = [^\\'];
-  sstring = squote (snon_quote | escaped_symbol)* squote @lerr{ raise_unterminated_string; };
-
-  dquote = '"';
-  dnon_quote = [^\\"];
-  dstring = dquote (dnon_quote | escaped_symbol)* dquote @lerr{ raise_unterminated_string; };
-
-  rquote = '/';
-  rnon_quote = [^\\/];
-  regexp = rquote @{ regexp_ambiguity(fgoto expression;) }
-    (rnon_quote | escaped_symbol)* rquote alpha* @lerr{ raise_unterminated_regexp; };
-
-
-  numeric = '-'? digit* ('.' digit+)?;
-  identifer = (alpha | '_') (alnum | '_')* [?!]?;
-  operator = arithmetic | logic | flow | structure;
-  comment = '#' ([^\n}]+ | '}' [^}])*;
-  blank = [\t\v\f\r ];
-
-  tag_open = '{{' '!'?;
-  tag_close = '}}';
-  template = [^{]+ | '{';
-
-  template_comment_open = '{{#';
-  template_comment_close = '#}}';
-  template_comment_body = [^\#]+ | '#';
-
-
-  expression := |*
-    tag_close => { emit_tag; fret; };
-    operator => { emit_operator; };
-    numeric => { emit_numeric; };
-    identifer => { emit_identifer; };
-    sstring => { emit_sstring; };
-    dstring => { emit_dstring; };
-    regexp => { emit_regexp; };
-    comment => { emit_comment; };
-    blank;
-  *|;
-
-  template_comment := |*
-    template_comment_close => { emit_comment; fret; };
-    template_comment_body => { emit_comment; };
-  *|;
-
-  main := |*
-    tag_open => { emit_tag; fcall expression; };
-    template_comment_open => { emit_comment; fcall template_comment; };
-    template => { emit_template; };
-  *|;
+  action RegexpCheck {
+    if (regexp_possible == Qfalse) {
+      emit_operator;
+      fgoto expression;
+    }
+  }
+
+  include "lexer.rl";
 }%%
 
+
 #include <ruby.h>
 #include <lexerc.h>
 

data/lib/hotcell/commands/for.rb

@@ -15,7 +15,12 @@ module Hotcell
 
       def process context, variable, options
         forloop = options['loop'] == true ? 'loop' : options['loop']
-        items = Array.wrap(options['in'])
+        items = case options['in']
+        when Range, Hash
+          options['in'].to_a
+        else
+          Array.wrap(options['in'])
+        end
         length = items.size
 
         items.map.with_index do |item, index|
@@ -25,7 +30,7 @@ module Hotcell
           context.scoped scope do
             subnodes.first.try(:render, context)
           end
-        end
+        end.join
       end
 
       class Forloop < Hotcell::Manipulator

data/lib/hotcell/config.rb

@@ -5,13 +5,14 @@ module Hotcell
     include Singleton
 
     attr_reader :commands, :blocks, :helpers
-    attr_accessor :resolver
+    attr_accessor :resolver, :escape_tags
 
     def initialize
       @commands = {}
       @blocks = {}
       @helpers = []
       @resolver = Hotcell::Resolver.new
+      @escape_tags = false
     end
 
     # Adds command or block to the list of default commands or blocks returned

data/lib/hotcell/extensions.rb

@@ -16,6 +16,8 @@ end
 
 String.class_eval do
   include Hotcell::Manipulator::Mixin
+
+  manipulate :size, :length
 end
 
 Regexp.class_eval do
@@ -32,13 +34,23 @@ end
 
 Array.class_eval do
   include Hotcell::Manipulator::Mixin
+
+  manipulate :first, :last, :count, :size, :length
 end
 
 Hash.class_eval do
   include Hotcell::Manipulator::Mixin
 
+  manipulate :keys, :values, :count, :size, :length
+
   def manipulator_invoke method, *arguments
-    arguments.size == 0 && key?(method) ? self[method] : super
+    if method == '[]'
+      manipulator_invoke_brackets *arguments
+    elsif manipulator_invokable? method
+      send(method, *arguments)
+    elsif arguments.count == 0
+      self[method]
+    end
   end
 end
 

data/lib/hotcell/lexer.rb

@@ -6,8 +6,8 @@ module Hotcell
       '&&' => :AND, '||' => :OR, '!' => :NOT, '==' => :EQUAL, '!=' => :INEQUAL,
       '>' => :GT, '>=' => :GTE, '<' => :LT, '<=' => :LTE,
 
-      '=' => :ASSIGN, ',' => :COMMA, '.' => :PERIOD, ':' => :COLON, '?' => :QUESTION,
-      ';' => :SEMICOLON
+      '=' => :ASSIGN, ',' => :COMMA, '.' => :PERIOD, '..' => :RANGE, '...' => :RANGE,
+      ':' => :COLON, '?' => :QUESTION, ';' => :SEMICOLON
     }
 
     BOPEN = { '[' => :AOPEN, '{' => :HOPEN, '(' => :POPEN }
@@ -30,11 +30,6 @@ module Hotcell
       '\s' => "\s", '\r' => "\r", '\t' => "\t"
     }
 
-    TAGS = {
-      '{{' => :TOPEN, '{{!' => :TOPEN,
-      '}}' => :TCLOSE
-    }
-
     PREREGEXP = Set.new [
       :TOPEN, :NEWLINE, :SEMICOLON,
       :COLON, :COMMA, :PERIOD,
@@ -83,13 +78,13 @@ module Hotcell
     end
 
     def regexp_ambiguity
-      unless regexp_possible?
+      unless regexp_possible
         emit_operator
         yield
       end
     end
 
-    def regexp_possible?
+    def regexp_possible
       last = @token_array[-1]
       # Need more rules!
       !last || PREREGEXP.include?(last[0])
@@ -120,7 +115,7 @@ module Hotcell
 
     def emit_tag
       value = current_value
-      emit TAGS[value], value
+      emit (value == '}}' ? :TCLOSE : :TOPEN), value
     end
 
     def emit_comment

data/lib/hotcell/lexer.rl

@@ -0,0 +1,95 @@
+%%{
+  machine puffer_lexer;
+
+  plus = '+';
+  minus = '-';
+  multiply = '*';
+  power = '**';
+  divide = '/';
+  modulo = '%';
+  arithmetic = plus | minus | multiply | power | divide | modulo;
+
+  and = '&&';
+  or = '||';
+  not = '!';
+  equal = '==';
+  inequal = '!=';
+  gt = '>';
+  gte = '>=';
+  lt = '<';
+  lte = '<=';
+  logic = and | or | not | equal | inequal | gt | gte | lt | lte;
+
+  assign = '=';
+  comma = ',';
+  period = '.';
+  range = '..' '.'?;
+  colon = ':';
+  question = '?';
+  semicolon = ';';
+  newline = '\n';
+  flow = assign | comma | period | range | colon | question | semicolon | newline;
+
+  array_open = '[';
+  array_close = ']';
+  hash_open = '{';
+  hash_close = '}';
+  bracket_open = '(';
+  bracket_close = ')';
+  structure = array_open | array_close | hash_open | hash_close | bracket_open | bracket_close;
+
+
+  escaped_symbol = '\\' any;
+
+  squote = "'";
+  snon_quote = [^\\'];
+  sstring = squote (snon_quote | escaped_symbol)* squote @lerr{ raise_unterminated_string; };
+
+  dquote = '"';
+  dnon_quote = [^\\"];
+  dstring = dquote (dnon_quote | escaped_symbol)* dquote @lerr{ raise_unterminated_string; };
+
+  rquote = '/';
+  rnon_quote = [^\\/];
+  regexp = rquote @RegexpCheck
+    (rnon_quote | escaped_symbol)* rquote alpha* @lerr{ raise_unterminated_regexp; };
+
+
+  numeric = '-'? digit* ('.' digit+)?;
+  identifer = (alpha | '_') (alnum | '_')* [?!]?;
+  operator = arithmetic | logic | flow | structure;
+  comment = '#' ([^\n}]+ | '}' [^}])*;
+  blank = [\t\v\f\r ];
+
+  tag_open = '{{' ([!~^] | [re] ' ')?;
+  tag_close = '}}';
+  template = [^{]+ | '{';
+
+  template_comment_open = '{{#';
+  template_comment_close = '#}}';
+  template_comment_body = [^\#]+ | '#';
+
+
+  expression := |*
+    tag_close => { emit_tag; fret; };
+    operator => { emit_operator; };
+    numeric => { emit_numeric; };
+    identifer => { emit_identifer; };
+    sstring => { emit_sstring; };
+    dstring => { emit_dstring; };
+    regexp => { emit_regexp; };
+    comment => { emit_comment; };
+    blank;
+  *|;
+
+  template_comment := |*
+    template_comment_close => { emit_comment; fret; };
+    template_comment_body => { emit_comment; };
+  *|;
+
+  main := |*
+    tag_open => { emit_tag; fcall expression; };
+    template_comment_open => { emit_comment; fcall template_comment; };
+    template => { emit_template; };
+  *|;
+}%%