jason.rb in jason-0.3.0

- old
+ new

@@ -1,8 +1,8 @@
-require 'ember'
+require 'erubis'
 require 'json'
-require 'yaml'
+require 'strscan'
 
 # Renders and compiles Jason templates.
 module Jason
   # Render a template.
   # 
@@ -12,38 +12,67 @@
   # @param [String] template the template to render
   # @param [Binding] binding the binding to render the template in
   # @return [String] the rendered template
   def self.render(template, binding = nil)
     if binding
-      yaml = ember_template(template).render(binding)
+      yaml = eruby_template(template).result(binding)
     else
-      yaml = ember_template(template).render
+      yaml = eruby_template(template).result
     end
     
-    YAML::load(yaml).to_json
+    process(yaml)
   end
   
   # Compile a template.
   # 
   # Eval the returned value to render the template within the current binding.
   # 
   # @param [String] template the template to compile
   # @return [String] the compiled template
   def self.compile(template)
-    "YAML::load(#{ember_template(template).program}).to_json"
+    "#{eruby_template(template).src}; Jason.process(_buf)"
   end
   
+  def self.process(buffer)
+    JSON.load(remove_trailing_commas(buffer)).to_json
+  end
+  
   private
   
-  def self.ember_template(template)
-    Ember::Template.new(template,
-      :unindent => true,
-      :infer_end => true,:shorthand => true
-    )
+  def self.eruby_template(template)
+    JSONEruby.new(template)
   end
+  
+  def self.remove_trailing_commas(json)
+    comma_position = nil
+    quoting = nil
+    scanner = StringScanner.new(json)
+    
+    while scanner.scan_until(/(\\['"]|['",\]\}])/)
+      case char = scanner[1]
+      when '"', "'"
+        if !quoting
+          quoting = char
+        elsif quoting == char
+          quoting = nil
+        end
+      when ']', '}'
+        if comma_position && json[comma_position + 1...scanner.pos - 1] =~ /^\s*$/
+          json[comma_position] = ''
+          scanner.pos -= 1
+          comma_position = nil
+        end
+      when ','
+        comma_position = scanner.pos - 1 unless quoting
+      end
+    end
+    
+    json
+  end
 end
 
 require 'jason/version'
+require 'jason/json_eruby'
 
 if defined? ActionView::Template
   require 'jason/rails_template_handler'
 end
\ No newline at end of file