jason 0.3.0 → 0.3.1

data/.travis.yml

@@ -1,4 +1,4 @@
-script: 'rake test'
+script: 'bundle exec rake test'
 rvm:
   - 1.8.7
   - 1.9.2

data/Rakefile

@@ -15,6 +15,6 @@ end
 task 'test:rails' do
   sh <<-CMD
     cd test/rails
-    rake
+    bundle exec rake
   CMD
 end

data/lib/jason.rb

@@ -32,6 +32,13 @@ module Jason
     "#{eruby_template(template).src}; Jason.process(_buf)"
   end
   
+  # Process a rendered buffer.
+  # 
+  # Removes any trailing commas and compresses the buffer.
+  # 
+  # Usually, you should not have to call this method.
+  # 
+  # @param [String] buffer
   def self.process(buffer)
     JSON.load(remove_trailing_commas(buffer)).to_json
   end
@@ -42,7 +49,11 @@ module Jason
     JSONEruby.new(template)
   end
   
+  # Based upon the string scanner found in jnunemaker's crack.
+  # 
+  # @see https://github.com/jnunemaker/crack crack
   def self.remove_trailing_commas(json)
+    json = json.dup
     comma_position = nil
     quoting = nil
     scanner = StringScanner.new(json)
@@ -56,7 +67,7 @@ module Jason
           quoting = nil
         end
       when ']', '}'
-        if comma_position && json[comma_position + 1...scanner.pos - 1] =~ /^\s*$/
+        if comma_position && json[comma_position + 1...scanner.pos - 1] =~ /\A\s*\z/
           json[comma_position] = ''
           scanner.pos -= 1
           comma_position = nil

data/lib/jason/version.rb

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

data/test/rails/test/test_helper.rb

@@ -1,5 +1,6 @@
 ENV['RAILS_ENV'] = 'test'
 require File.expand_path('../../config/environment', __FILE__)
+require 'journo'
 require 'rails/test_help'
 
 MiniTest::Unit.runner = Journo::SuiteRunner.new

data/test/test_jason.rb

@@ -3,18 +3,46 @@ require 'test_helper'
 class TestJason < MiniTest::Unit::TestCase
   test '.render without binding' do
     template = <<-EOF
-      {
-        "foo": "bar",
-        "baz": [
-          <% if true %>
-            "quz",
-          <% end %>
-          "quuz",
+{
+  "message": "OK",
+  "user": {
+    "id": <%= 'test' %>,
+    "name": <%= 'blah' %>,
+    <% if true %>
+      "link": [
+        <% if true %>
+          {
+            "rel": "self",
+            "href": <%= 'hablaba' %>
+          },
+        <% end %>
+        {
+          "rel": "checkins",
+          "href": <%= 'hablaba' %>
+        }
+      ]
+    <% end %>
+  }
+}
+EOF
+    
+    assert_equal({
+      'message' => 'OK',
+      'user' => {
+        'id' => 'test',
+        'name' => 'blah',
+        'link' => [
+          {
+            'rel' => 'self',
+            'href' => 'hablaba'
+          },
+          {
+            'rel' => 'checkins',
+            'href' => 'hablaba'
+          }
         ]
       }
-    EOF
-    
-    assert_equal({ 'foo' => 'bar', 'baz' => ['quz', 'quuz'] }, JSON.load(Jason.render(template)))
+    }, JSON.load(Jason.render(template)))
   end
   
   test '.render with binding' do

metadata

@@ -2,7 +2,7 @@
 name: jason
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Alexander Kern
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-31 00:00:00 -07:00
+date: 2011-06-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency