jason 0.1.0 → 0.2.0

data/.gitignore

@@ -16,4 +16,7 @@ InstalledFiles
 # YARD artifacts
 .yardoc
 _yardoc
-doc/
+doc/
+
+# Gem-specific
+Gemfile.lock

data/.yardopts

@@ -0,0 +1,6 @@
+--readme          README.md
+--markup          markdown
+--markup-provider maruku
+--default-return  ""
+--title           "Jason Documentation"
+--hide-void-return

data/README.md

@@ -6,24 +6,28 @@ There's no easy way to create JSON templates in Ruby.
 
 ## Solution ##
 
-Use YAML and ERb to make the simplest thing that could possibly work.
+Use YAML and Ember to make the simplest thing that could possibly work.
 
 ## Installation ##
 
-Without bundler:
-
     gem install jason
 
-With bundler:
-
-    gem 'jason'
-
 ## Usage ##
 
-You write jason templates in plain YAML and ERb. Jason will take care of the
-(ultra-simple) conversion to JSON.
+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.
 
-    Jason.render("foo: bar") # => '{"foo": "bar"}'
+    Jason.render('foo: bar') # => '{"foo":"bar"}'
+    
+    Jason.render(<<-EOS
+    test:
+      % if true
+        - foo
+      - bar
+    EOS
+    ) # => '{"test":["foo","bar"]}'
 
 That's it.
 
@@ -34,12 +38,11 @@ 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 %>
+      % unless @we_started_the_fire
         - quz
         - quuz
-      <% end %>
     
-    # Renders: {"foo": "bar", "baz": ["quz", "quuz"]}
+    # Renders: {"foo":"bar","baz":["quz","quuz"]}
 
 ## Note on Patches/Pull Requests ##
 

data/jason.gemspec

@@ -10,20 +10,23 @@ Gem::Specification.new do |s|
   s.email       = ['alex@kernul.com']
   s.homepage    = 'https://github.com/CapnKernul/jason'
   s.summary     = %q{Insanely simple JSON templates}
-  s.description = %q{Create JSON templates using YAML and ERb}
-
+  s.description = %q{Create JSON templates using YAML and Ember}
+  
   s.rubyforge_project = 'jason'
-
+  
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
   
+  s.add_dependency 'ember'
+  
   s.add_development_dependency 'minitest', '~> 2.0'
-  s.add_development_dependency 'mocha', '~> 0.9'
-  s.add_development_dependency 'autotest', '~> 4.4'
-  s.add_development_dependency 'rails', '3.0.5'
-  s.add_development_dependency 'json', '~> 1.5'
-  s.add_development_dependency 'yard', '~> 0.6'
-  s.add_development_dependency 'maruku', '~> 0.6'
+  s.add_development_dependency 'mocha'
+  s.add_development_dependency 'rails', '3.0.7'
+  s.add_development_dependency 'json'
+  s.add_development_dependency 'yard'
+  s.add_development_dependency 'maruku'
+  s.add_development_dependency 'journo'
+  s.add_development_dependency 'test_declarative'
 end

data/lib/jason.rb

@@ -1,4 +1,4 @@
-require 'erb'
+require 'ember'
 require 'json'
 require 'yaml'
 
@@ -9,11 +9,16 @@ module Jason
   # @example
   #     Jason.render('foo: bar') # => '{"foo": "bar"}'
   # 
-  # @param template [String] the template to render
-  # @param binding [Binding] the binding to render the template in
+  # @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)
-    yaml = ERB.new(template).result(binding)
+    if binding
+      yaml = ember_template(template).render(binding)
+    else
+      yaml = ember_template(template).render
+    end
+    
     YAML::load(yaml).to_json
   end
   
@@ -21,10 +26,19 @@ module Jason
   # 
   # Eval the returned value to render the template within the current binding.
   # 
-  # @param template [String] the template to compile
+  # @param [String] template the template to compile
   # @return [String] the compiled template
   def self.compile(template)
-    "#{ERB.new(template).src}; YAML::load(_erbout).to_json"
+    "YAML::load(#{ember_template(template).program}).to_json"
+  end
+  
+  private
+  
+  def self.ember_template(template)
+    Ember::Template.new(template,
+      :unindent => true,
+      :infer_end => true,:shorthand => true
+    )
   end
 end
 

data/lib/jason/rails_template_handler.rb

@@ -10,7 +10,7 @@ module Jason
     
     # Compile the Rails template.
     # 
-    # @param template [Class] the Rails template class
+    # @param [Class] template the Rails template class
     # @return [String] the compiled template
     def call(template)
       Jason.compile(template.source)

data/lib/jason/version.rb

@@ -1,4 +1,3 @@
 module Jason
-  # Jason version number
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

data/test/rails/Gemfile

@@ -1,11 +1,11 @@
-source 'http://rubygems.org'
+source :rubygems
 
-gem 'rails', '3.0.5'
+gem 'rails', '3.0.7'
 gem 'jason', :path => '../../'
 
 group :development, :test do
   gem 'minitest', '~> 2.0'
-  gem 'mocha', '~> 0.9'
-  gem 'autotest', '~> 4.4'
-  gem 'json', '~> 1.5'
+  gem 'mocha'
+  gem 'json'
+  gem 'journo'
 end

data/test/rails/Gemfile.lock

@@ -2,47 +2,51 @@ PATH
   remote: ../../
   specs:
     jason (0.1.0)
+      ember
 
 GEM
   remote: http://rubygems.org/
   specs:
-    ZenTest (4.5.0)
     abstract (1.0.0)
-    actionmailer (3.0.5)
-      actionpack (= 3.0.5)
+    actionmailer (3.0.7)
+      actionpack (= 3.0.7)
       mail (~> 2.2.15)
-    actionpack (3.0.5)
-      activemodel (= 3.0.5)
-      activesupport (= 3.0.5)
+    actionpack (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
-      i18n (~> 0.4)
+      i18n (~> 0.5.0)
       rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
+      rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.5)
-      activesupport (= 3.0.5)
+    activemodel (3.0.7)
+      activesupport (= 3.0.7)
       builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.5)
-      activemodel (= 3.0.5)
-      activesupport (= 3.0.5)
+      i18n (~> 0.5.0)
+    activerecord (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.5)
-      activemodel (= 3.0.5)
-      activesupport (= 3.0.5)
-    activesupport (3.0.5)
-    arel (2.0.9)
-    autotest (4.4.6)
-      ZenTest (>= 4.4.1)
+    activeresource (3.0.7)
+      activemodel (= 3.0.7)
+      activesupport (= 3.0.7)
+    activesupport (3.0.7)
+    ansi (1.2.5)
+    arel (2.0.10)
     builder (2.1.2)
+    ember (0.3.1)
     erubis (2.6.6)
       abstract (>= 1.0.0)
     i18n (0.5.0)
+    journo (0.2.0)
+      ansi
+      minitest (~> 2.0)
+      ruby-progressbar
     json (1.5.1)
-    mail (2.2.15)
+    mail (2.2.19)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -51,37 +55,38 @@ GEM
     minitest (2.1.0)
     mocha (0.9.12)
     polyglot (0.3.1)
-    rack (1.2.2)
-    rack-mount (0.6.13)
+    rack (1.2.3)
+    rack-mount (0.6.14)
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.5)
-      actionmailer (= 3.0.5)
-      actionpack (= 3.0.5)
-      activerecord (= 3.0.5)
-      activeresource (= 3.0.5)
-      activesupport (= 3.0.5)
+    rails (3.0.7)
+      actionmailer (= 3.0.7)
+      actionpack (= 3.0.7)
+      activerecord (= 3.0.7)
+      activeresource (= 3.0.7)
+      activesupport (= 3.0.7)
       bundler (~> 1.0)
-      railties (= 3.0.5)
-    railties (3.0.5)
-      actionpack (= 3.0.5)
-      activesupport (= 3.0.5)
+      railties (= 3.0.7)
+    railties (3.0.7)
+      actionpack (= 3.0.7)
+      activesupport (= 3.0.7)
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.8.7)
+    ruby-progressbar (0.0.10)
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.25)
+    tzinfo (0.3.27)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  autotest (~> 4.4)
   jason!
-  json (~> 1.5)
+  journo
+  json
   minitest (~> 2.0)
-  mocha (~> 0.9)
-  rails (= 3.0.5)
+  mocha
+  rails (= 3.0.7)

data/test/rails/test/test_helper.rb

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

data/test/test_helper.rb

@@ -1,7 +1,11 @@
 require 'bundler/setup'
 require 'minitest/autorun'
-require 'minitest/pride'
 require 'mocha'
 require 'jason'
+require 'journo'
+require 'test_declarative'
 
-Dir[File.dirname(__FILE__) + '/support/**/*.rb'].each { |f| require f }
+Dir[File.dirname(__FILE__) + '/support/**/*.rb'].each { |f| require f }
+
+MiniTest::Unit.runner = Journo::SuiteRunner.new
+MiniTest::Unit.runner.reporters << Journo::Reporters::ProgressReporter.new

data/test/test_jason.rb

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

metadata

@@ -2,7 +2,7 @@
 name: jason
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Alexander Kern
@@ -10,40 +10,40 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-19 00:00:00 -07:00
+date: 2011-05-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: minitest
+  name: ember
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: "2.0"
-  type: :development
+        version: "0"
+  type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  name: minitest
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: "0.9"
+        version: "2.0"
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: autotest
+  name: mocha
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: "4.4"
+        version: "0"
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -54,7 +54,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 3.0.5
+        version: 3.0.7
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -63,9 +63,9 @@ dependencies:
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: "1.5"
+        version: "0"
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -74,9 +74,9 @@ dependencies:
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: "0.6"
+        version: "0"
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -85,12 +85,34 @@ dependencies:
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: "0.6"
+        version: "0"
   type: :development
   version_requirements: *id007
-description: Create JSON templates using YAML and ERb
+- !ruby/object:Gem::Dependency 
+  name: journo
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: test_declarative
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id009
+description: Create JSON templates using YAML and Ember
 email: 
 - alex@kernul.com
 executables: []
@@ -100,11 +122,10 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- .autotest
 - .gitignore
 - .travis.yml
+- .yardopts
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -112,7 +133,6 @@ files:
 - lib/jason.rb
 - lib/jason/rails_template_handler.rb
 - lib/jason/version.rb
-- test/rails/.autotest
 - test/rails/.gitignore
 - test/rails/Gemfile
 - test/rails/Gemfile.lock
@@ -170,7 +190,6 @@ signing_key:
 specification_version: 3
 summary: Insanely simple JSON templates
 test_files: 
-- test/rails/.autotest
 - test/rails/.gitignore
 - test/rails/Gemfile
 - test/rails/Gemfile.lock

data/.autotest

@@ -1,9 +0,0 @@
-require 'bundler/setup'
-
-Autotest.add_hook :initialize do |at|
-  at.testlib = 'minitest/unit'
-  
-  %w{test/rails}.each do |exception|
-    at.add_exception(exception)
-  end
-end

data/Gemfile.lock

@@ -1,93 +0,0 @@
-PATH
-  remote: .
-  specs:
-    jason (0.1.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    ZenTest (4.5.0)
-    abstract (1.0.0)
-    actionmailer (3.0.5)
-      actionpack (= 3.0.5)
-      mail (~> 2.2.15)
-    actionpack (3.0.5)
-      activemodel (= 3.0.5)
-      activesupport (= 3.0.5)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.4)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.5)
-      activesupport (= 3.0.5)
-      builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.5)
-      activemodel (= 3.0.5)
-      activesupport (= 3.0.5)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.5)
-      activemodel (= 3.0.5)
-      activesupport (= 3.0.5)
-    activesupport (3.0.5)
-    arel (2.0.9)
-    autotest (4.4.6)
-      ZenTest (>= 4.4.1)
-    builder (2.1.2)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    i18n (0.5.0)
-    json (1.5.1)
-    mail (2.2.17)
-      activesupport (>= 2.3.6)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    maruku (0.6.0)
-      syntax (>= 1.0.0)
-    mime-types (1.16)
-    minitest (2.1.0)
-    mocha (0.9.12)
-    polyglot (0.3.1)
-    rack (1.2.2)
-    rack-mount (0.6.14)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
-      rack (>= 1.0)
-    rails (3.0.5)
-      actionmailer (= 3.0.5)
-      actionpack (= 3.0.5)
-      activerecord (= 3.0.5)
-      activeresource (= 3.0.5)
-      activesupport (= 3.0.5)
-      bundler (~> 1.0)
-      railties (= 3.0.5)
-    railties (3.0.5)
-      actionpack (= 3.0.5)
-      activesupport (= 3.0.5)
-      rake (>= 0.8.7)
-      thor (~> 0.14.4)
-    rake (0.8.7)
-    syntax (1.0.0)
-    thor (0.14.6)
-    treetop (1.4.9)
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.26)
-    yard (0.6.8)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  autotest (~> 4.4)
-  jason!
-  json (~> 1.5)
-  maruku (~> 0.6)
-  minitest (~> 2.0)
-  mocha (~> 0.9)
-  rails (= 3.0.5)
-  yard (~> 0.6)

data/test/rails/.autotest

@@ -1,5 +0,0 @@
-require 'bundler/setup'
-
-Autotest.add_hook :initialize do |at|
-  at.testlib = 'minitest/unit'
-end