jason 0.2.0 → 0.3.0

data/README.md

@@ -6,7 +6,7 @@ There's no easy way to create JSON templates in Ruby.
 
 ## Solution ##
 
-Use YAML and Ember to make the simplest thing that could possibly work.
+Use Erubis to make the simplest thing that could possibly work.
 
 ## Installation ##
 
@@ -14,21 +14,31 @@ Use YAML and Ember to make the simplest thing that could possibly work.
 
 ## Usage ##
 
-You write jason templates in plain YAML and Ember. Jason will take care of the
-(ultra-simple) conversion to JSON. You can use the Ember shorthand syntax, leave
-off the `end` of blocks, and use natural indentation, since Ember will
-automatically unindent blocks for you.
+You write jason templates in a fashion similar to regular old JSON with a
+notable exception: trailing commas in arrays and objects are automatically
+removed. This allows you to easily create JSON templates using iterators.
 
-    Jason.render('foo: bar') # => '{"foo":"bar"}'
+    Jason.render('{ "foo": "bar" }') # => '{"foo":"bar"}'
     
     Jason.render(<<-EOS
-    test:
-      % if true
-        - foo
-      - bar
+    {
+      "test": [
+        <% if true %>
+          "foo",
+        <% end %>
+        "bar", <%# Notice how this trailing comma is perfectly valid. %>
+      ]
+    }
     EOS
     ) # => '{"test":["foo","bar"]}'
 
+Jason also redefines the `<%= expr %>` Erubis delimiter so that it converts the
+expression to a JSON value by calling `#to_json` on the expression. If you'd
+like to use regular interpolation, use the `<%== expr %>` delimiter instead.
+
+    Jason.render('<%= 'test' %>') # => '"test"'
+    Jason.render('"<%== 'test' %>"') # => '"test"'
+
 That's it.
 
 ## Usage with Rails ##
@@ -36,11 +46,15 @@ That's it.
 Name your view template with the extension `jason`. Everything else is the same.
 
     # in view_name.jason
-    foo: bar
-    baz:
-      % unless @we_started_the_fire
-        - quz
-        - quuz
+    {
+      "foo": "bar",
+      "baz": [
+        <% unless @we_started_the_fire %>
+          "quz",
+          "quuz",
+        <% end %>
+      ]
+    }
     
     # Renders: {"foo":"bar","baz":["quz","quuz"]}
 

data/jason.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
   
-  s.add_dependency 'ember'
+  s.add_dependency 'erubis'
   
   s.add_development_dependency 'minitest', '~> 2.0'
   s.add_development_dependency 'mocha'

data/lib/jason.rb

@@ -1,6 +1,6 @@
-require 'ember'
+require 'erubis'
 require 'json'
-require 'yaml'
+require 'strscan'
 
 # Renders and compiles Jason templates.
 module Jason
@@ -14,12 +14,12 @@ module Jason
   # @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.
@@ -29,20 +29,49 @@ module Jason
   # @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'

data/lib/jason/json_eruby.rb

@@ -0,0 +1,14 @@
+require 'erubis'
+
+module Jason
+  class JSONEruby < Erubis::Eruby
+    def add_expr(src, code, indicator)
+      case indicator
+      when '='
+        add_expr_literal(src, "(#{code}).to_json")
+      when '=='
+        add_expr_literal(src, code)
+      end
+    end
+  end
+end

data/lib/jason/version.rb

@@ -1,3 +1,3 @@
 module Jason
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/test/rails/app/views/test/index.jason

@@ -1,2 +1,4 @@
-instance: <%= @instance_var %>
-local: <%= local_var %>
+{
+  "instance": <%= @instance_var %>,
+  "local": <%= local_var %>,
+}

data/test/test_jason.rb

@@ -1,41 +1,51 @@
 require 'test_helper'
 
 class TestJason < MiniTest::Unit::TestCase
-  test '#render without binding' do
+  test '.render without binding' do
     template = <<-EOF
-      foo: bar
-      baz:
-        % if true
-          - quz
-        - quuz
+      {
+        "foo": "bar",
+        "baz": [
+          <% if true %>
+            "quz",
+          <% end %>
+          "quuz",
+        ]
+      }
     EOF
     
-    assert_equal({'foo' => 'bar', 'baz' => ['quz', 'quuz']}, JSON.load(Jason.render(template)))
+    assert_equal({ 'foo' => 'bar', 'baz' => ['quz', 'quuz'] }, JSON.load(Jason.render(template)))
   end
   
-  test '#render with binding' do
+  test '.render with binding' do
     test_string = 'bar'
     template = <<-EOF
-      foo: <%= test_string %>
+      { "foo": <%= test_string %>, }
     EOF
     
-    assert_equal({'foo' => 'bar' }, JSON.load(Jason.render(template, binding)))
+    assert_equal({ 'foo' => 'bar' }, JSON.load(Jason.render(template, binding)))
   end
   
-  test '#compile' do
+  test '.compile' do
     test_string = 'bar'
     template = <<-EOF
-      foo: <%= test_string %>
+      { "foo": "<%== test_string %>", }
     EOF
     
-    assert_equal({'foo' => 'bar' }, JSON.load(eval(Jason.compile(template))))
+    assert_equal({ 'foo' => 'bar' }, JSON.load(eval(Jason.compile(template))))
   end
-end
-
-puts Jason.render(<<-EOS
-test:
-  % if true
-    - foo
-  - bar
-EOS
-)
+  
+  test '.process' do
+    template = <<-EOF
+      {
+        "foo": "bar",
+        "baz": [
+          "quz",
+          "quuz",
+        ],
+      }
+    EOF
+    
+    assert_equal({ 'foo' => 'bar', 'baz' => ['quz', 'quuz'] }, JSON.load(Jason.process(template)))
+  end
+end

data/test/test_json_eruby.rb

@@ -0,0 +1,12 @@
+require 'test_helper'
+
+class TestJSONEruby < MiniTest::Unit::TestCase
+  test '= and == indicators' do
+    template = <<-EOS
+<%== 'blah' %>
+<%= 'blah' %>
+EOS
+    eruby = Jason::JSONEruby.new(template)
+    assert_equal "blah\n\"blah\"\n", eruby.result
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: jason
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Alexander Kern
@@ -10,11 +10,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-29 00:00:00 -07:00
+date: 2011-05-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: ember
+  name: erubis
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -131,6 +131,7 @@ files:
 - Rakefile
 - jason.gemspec
 - lib/jason.rb
+- lib/jason/json_eruby.rb
 - lib/jason/rails_template_handler.rb
 - lib/jason/version.rb
 - test/rails/.gitignore
@@ -161,6 +162,7 @@ files:
 - test/rails/test/test_helper.rb
 - test/test_helper.rb
 - test/test_jason.rb
+- test/test_json_eruby.rb
 has_rdoc: true
 homepage: https://github.com/CapnKernul/jason
 licenses: []
@@ -218,3 +220,4 @@ test_files:
 - test/rails/test/test_helper.rb
 - test/test_helper.rb
 - test/test_jason.rb
+- test/test_json_eruby.rb