erbal 1.2 → 1.3

data/ext/erbal/erbal.c

@@ -66,7 +66,7 @@ VALUE rb_erbal_initialize(int argc, VALUE *argv, VALUE self) {
   rb_erbal_setup_option(self, parser, &parser->unsafe_concat_method, "unsafe_concat_method", "concat");
   rb_erbal_setup_option(self, parser, &parser->safe_concat_keyword, "safe_concat_keyword", "");
 
-	if (strcmp(RSTRING(parser->safe_concat_method)->ptr, RSTRING(parser->unsafe_concat_method)->ptr) == 0) {
+	if (strcmp(RSTRING_PTR(parser->safe_concat_method), RSTRING_PTR(parser->unsafe_concat_method)) == 0) {
     parser->concat_methods_identical = 1;
 	} else {
 	  parser->concat_methods_identical = 0;

data/ext/erbal/parser.c

@@ -45,7 +45,7 @@ inline void erbal_parser_tag_open_with_dash(erbal_parser *parser) {
 }
 
 inline void erbal_parser_tag_open_choose_concat(erbal_parser *parser) {
-  if (strcmp(RSTRING(parser->safe_concat_keyword)->ptr, "") == 0 || strcmp(RSTRING(parser->keyword)->ptr, RSTRING(parser->safe_concat_keyword)->ptr) != 0) {
+  if (strcmp(RSTRING_PTR(parser->safe_concat_keyword), "") == 0 || strcmp(RSTRING_PTR(parser->keyword), RSTRING_PTR(parser->safe_concat_keyword)) != 0) {
     /* Keyword doesn't match, reset the buffer to the start of the expression match and act as if a keyword wasn't seen. */
     p = parser->keyword_preceding_whitespace - 1;
     erbal_parser_tag_open_for_unsafe_concat(parser);
@@ -123,7 +123,7 @@ inline void erbal_parser_tag_close(erbal_parser *parser) {
 
 inline VALUE erbal_escape_special_chars(erbal_parser *parser) {
   VALUE buf = rb_str_buf_new(0);
-  int i, n, slashes_seen = 0;
+  unsigned int i, n, slashes_seen = 0;
   char *current_char;
 
   for (i = 0; i < parser->state->chars_seen; i++) {
@@ -210,7 +210,7 @@ inline void erbal_parser_finish(erbal_parser *parser) {
   rb_str_concat(parser->src, parser->buffer_name);
 
   if (parser->debug) {
-    printf("ERBAL DEBUG: %s\n", RSTRING(rb_inspect(parser->src))->ptr);
+    printf("ERBAL DEBUG: %s\n", RSTRING_PTR(rb_inspect(parser->src)));
   }
 }
 
@@ -233,7 +233,7 @@ void erbal_parser_init(VALUE self, erbal_parser *parser) {
 }
 
 void erbal_parser_exec(erbal_parser *parser) {
-  p = RSTRING(parser->str)->ptr;
+  p = RSTRING_PTR(parser->str);
   pe = p + strlen(p);
   
 #line 240 "parser.c"

data/ext/erbal/parser.rl

@@ -59,7 +59,7 @@ inline void erbal_parser_tag_open_with_dash(erbal_parser *parser) {
 }
 
 inline void erbal_parser_tag_open_choose_concat(erbal_parser *parser) {
-  if (strcmp(RSTRING(parser->safe_concat_keyword)->ptr, "") == 0 || strcmp(RSTRING(parser->keyword)->ptr, RSTRING(parser->safe_concat_keyword)->ptr) != 0) {
+  if (strcmp(RSTRING_PTR(parser->safe_concat_keyword), "") == 0 || strcmp(RSTRING_PTR(parser->keyword), RSTRING_PTR(parser->safe_concat_keyword)) != 0) {
     /* Keyword doesn't match, reset the buffer to the start of the expression match and act as if a keyword wasn't seen. */
     p = parser->keyword_preceding_whitespace - 1;
     erbal_parser_tag_open_for_unsafe_concat(parser);
@@ -137,7 +137,7 @@ inline void erbal_parser_tag_close(erbal_parser *parser) {
 
 inline VALUE erbal_escape_special_chars(erbal_parser *parser) {
   VALUE buf = rb_str_buf_new(0);
-  int i, n, slashes_seen = 0;
+  unsigned int i, n, slashes_seen = 0;
   char *current_char;
 
   for (i = 0; i < parser->state->chars_seen; i++) {
@@ -224,7 +224,7 @@ inline void erbal_parser_finish(erbal_parser *parser) {
   rb_str_concat(parser->src, parser->buffer_name);
 
   if (parser->debug) {
-    printf("ERBAL DEBUG: %s\n", RSTRING(rb_inspect(parser->src))->ptr);
+    printf("ERBAL DEBUG: %s\n", RSTRING_PTR(rb_inspect(parser->src)));
   }
 }
 
@@ -238,7 +238,7 @@ void erbal_parser_init(VALUE self, erbal_parser *parser) {
 }
 
 void erbal_parser_exec(erbal_parser *parser) {
-  p = RSTRING(parser->str)->ptr;
+  p = RSTRING_PTR(parser->str);
   pe = p + strlen(p);
   %% write exec;
   erbal_parser_finish(parser);

data/tasks/gem.rake

@@ -2,7 +2,7 @@ require 'rake/gempackagetask'
 require 'yaml'
 
 WIN_SUFFIX = ENV['WIN_SUFFIX'] || 'i386-mswin32'
-ERBAL_VERSION = '1.2'
+ERBAL_VERSION = '1.3'
 
 task :clean => :clobber_package
 

metadata

@@ -1,12 +1,11 @@
 --- !ruby/object:Gem::Specification 
 name: erbal
 version: !ruby/object:Gem::Version 
-  hash: 11
   prerelease: false
   segments: 
   - 1
-  - 2
-  version: "1.2"
+  - 3
+  version: "1.3"
 platform: ruby
 authors: 
 - Ian Leitch
@@ -14,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-11 00:00:00 +11:00
+date: 2011-01-29 00:00:00 +11:00
 default_executable: 
 dependencies: []
 
@@ -59,7 +58,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -68,7 +66,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"