jbuilder 0.9.1 → 1.0.0

data/Gemfile

@@ -1,6 +1,8 @@
-source "http://rubygems.org"
+source :rubygems
 
 gemspec
 
-gem "actionpack"
-gem "rake"
+git 'git://github.com/rails/rails.git' do
+  gem 'railties'
+  gem 'actionpack'
+end

data/Gemfile-1.8

@@ -0,0 +1,5 @@
+source :rubygems
+
+gemspec
+
+gem 'actionpack', '~> 3.0'

data/README.md

@@ -1,4 +1,4 @@
-Jbuilder
+Jbuilder [![Build Status](https://travis-ci.org/rails/jbuilder.png)](https://travis-ci.org/rails/jbuilder)
 ========
 
 Jbuilder gives you a simple DSL for declaring JSON structures that beats massaging giant hash structures. This is particularly helpful when the generation process is fraught with conditionals and loops. Here's a simple example:
@@ -19,7 +19,7 @@ Jbuilder.encode do |json|
   end
 
   json.comments @message.comments, :content, :created_at
-  
+
   json.attachments @message.attachments do |attachment|
     json.filename attachment.filename
     json.url url_for(attachment)
@@ -30,7 +30,7 @@ end
 This will build the following structure:
 
 ``` javascript
-{ 
+{
   "content": "<p>This is <i>serious</i> monkey business",
   "created_at": "2011-10-29T20:45:28-05:00",
   "updated_at": "2011-10-29T20:45:28-05:00",
@@ -47,7 +47,7 @@ This will build the following structure:
     { "content": "Hello everyone!", "created_at": "2011-10-29T20:45:28-05:00" },
     { "content": "To you my good sir!", "created_at": "2011-10-29T20:47:28-05:00" }
   ],
-  
+
   "attachments": [
     { "filename": "forecast.xls", "url": "http://example.com/downloads/forecast.xls" },
     { "filename": "presentation.pdf", "url": "http://example.com/downloads/presentation.pdf" }
@@ -72,19 +72,19 @@ Jbuilder objects can be directly nested inside each other.  Useful for composing
 class Person
   # ... Class Definition ... #
   def to_builder
-    person = Jbuilder.new
-    person.(self, :name, :age)
-    person
+    Jbuilder.new do |person|
+      person.(self, :name, :age)
+    end
   end
 end
 
 class Company
   # ... Class Definition ... #
   def to_builder
-    company = Jbuilder.new
-    company.name name
-    company.president president.to_builder
-    company
+    Jbuilder.new do |company|
+      company.name name
+      company.president president.to_builder
+    end
   end
 end
 

data/Rakefile

@@ -4,7 +4,11 @@ require 'rake/testtask'
 Bundler.require
 
 Rake::TestTask.new do |test|
-  test.test_files = FileList["test/*_test.rb"]
+  if ::RUBY_VERSION < '1.9'
+    test.test_files = %w(test/jbuilder_template_test.rb test/jbuilder_test.rb)
+  else
+    test.test_files = FileList['test/*_test.rb']
+  end
 end
 
 task :default => :test

data/jbuilder.gemspec

@@ -1,11 +1,12 @@
 Gem::Specification.new do |s|
   s.name    = 'jbuilder'
-  s.version = '0.9.1'
+  s.version = '1.0.0'
   s.author  = 'David Heinemeier Hansson'
   s.email   = 'david@37signals.com'
   s.summary = 'Create JSON structures via a Builder-style DSL'
 
   s.add_dependency 'activesupport', '>= 3.0.0'
+  s.add_development_dependency 'rake', '~> 10.0.3'
 
   s.files = Dir["#{File.dirname(__FILE__)}/**/*"]
 end

data/lib/generators/rails/jbuilder_generator.rb

@@ -0,0 +1,39 @@
+require 'rails/generators/named_base'
+require 'rails/generators/resource_helpers'
+
+module Rails
+  module Generators
+    class JbuilderGenerator < NamedBase # :nodoc:
+      include Rails::Generators::ResourceHelpers
+
+      source_root File.expand_path('../templates', __FILE__)
+
+      argument :attributes, type: :array, default: [], banner: 'field:type field:type'
+
+      def create_root_folder
+        empty_directory File.join('app/views', controller_file_path)
+      end
+
+      def copy_view_files
+        %w(index show).each do |view|
+          filename = filename_with_extensions(view)
+          template filename, File.join('app/views', controller_file_path, filename)
+        end
+      end
+
+
+      protected
+        def filename_with_extensions(name)
+          [name, :json, :jbuilder] * '.'
+        end
+
+        def attributes_list_with_timestamps
+          attributes_list(attributes_names + %w(created_at updated_at))
+        end
+        
+        def attributes_list(attributes = attributes_names)
+          attributes.map { |a| ":#{a}"} * ', '
+        end
+    end
+  end
+end

data/lib/generators/rails/jbuilder_scaffold_controller_generator.rb

@@ -0,0 +1,11 @@
+require 'rails/generators/rails/scaffold_controller/scaffold_controller_generator'
+
+module Rails
+  module Generators
+    class JbuilderScaffoldControllerGenerator < ScaffoldControllerGenerator
+      source_root File.expand_path('../templates', __FILE__)
+
+      hook_for :json_template_engine, as: :scaffold
+    end
+  end
+end

data/lib/generators/rails/templates/controller.rb

@@ -0,0 +1,84 @@
+<% if namespaced? -%>
+require_dependency "<%= namespaced_file_path %>/application_controller"
+
+<% end -%>
+<% module_namespacing do -%>
+class <%= controller_class_name %>Controller < ApplicationController
+  before_action :set_<%= singular_table_name %>, only: [:show, :edit, :update, :destroy]
+
+  # GET <%= route_url %>
+  # GET <%= route_url %>.json
+  def index
+    @<%= plural_table_name %> = <%= orm_class.all(class_name) %>
+  end
+
+  # GET <%= route_url %>/1
+  # GET <%= route_url %>/1.json
+  def show
+  end
+
+  # GET <%= route_url %>/new
+  def new
+    @<%= singular_table_name %> = <%= orm_class.build(class_name) %>
+  end
+
+  # GET <%= route_url %>/1/edit
+  def edit
+  end
+
+  # POST <%= route_url %>
+  # POST <%= route_url %>.json
+  def create
+    @<%= singular_table_name %> = <%= orm_class.build(class_name, "#{singular_table_name}_params") %>
+
+    respond_to do |format|
+      if @<%= orm_instance.save %>
+        format.html { redirect_to @<%= singular_table_name %>, notice: <%= "'#{human_name} was successfully created.'" %> }
+        format.json { render action: 'show', status: :created, location: <%= "@#{singular_table_name}" %> }
+      else
+        format.html { render action: 'new' }
+        format.json { render json: <%= "@#{orm_instance.errors}" %>, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PATCH/PUT <%= route_url %>/1
+  # PATCH/PUT <%= route_url %>/1.json
+  def update
+    respond_to do |format|
+      if @<%= orm_instance.update("#{singular_table_name}_params") %>
+        format.html { redirect_to @<%= singular_table_name %>, notice: <%= "'#{human_name} was successfully updated.'" %> }
+        format.json { head :no_content }
+      else
+        format.html { render action: 'edit' }
+        format.json { render json: <%= "@#{orm_instance.errors}" %>, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE <%= route_url %>/1
+  # DELETE <%= route_url %>/1.json
+  def destroy
+    @<%= orm_instance.destroy %>
+    respond_to do |format|
+      format.html { redirect_to <%= index_helper %>_url }
+      format.json { head :no_content }
+    end
+  end
+
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_<%= singular_table_name %>
+      @<%= singular_table_name %> = <%= orm_class.find(class_name, "params[:id]") %>
+    end
+
+    # Never trust parameters from the scary internet, only allow the white list through.
+    def <%= "#{singular_table_name}_params" %>
+      <%- if attributes_names.empty? -%>
+      params[<%= ":#{singular_table_name}" %>]
+      <%- else -%>
+      params.require(<%= ":#{singular_table_name}" %>).permit(<%= attributes_names.map { |name| ":#{name}" }.join(', ') %>)
+      <%- end -%>
+    end
+end
+<% end -%>

data/lib/generators/rails/templates/index.json.jbuilder

@@ -0,0 +1,4 @@
+json.array!(@<%= plural_table_name %>) do |<%= singular_table_name %>|
+  json.extract! <%= singular_table_name %>, <%= attributes_list %>
+  json.url <%= singular_table_name %>_url(<%= singular_table_name %>)
+end

data/lib/generators/rails/templates/show.json.jbuilder

@@ -0,0 +1 @@
+json.extract! @<%= singular_table_name %>, <%= attributes_list_with_timestamps %>

data/lib/jbuilder.rb

@@ -16,7 +16,7 @@ end
 class Jbuilder < JbuilderProxy
   class KeyFormatter
     def initialize(*args)
-      @format = {}
+      @format = ::ActiveSupport::OrderedHash.new
       @cache = {}
 
       options = args.extract_options!
@@ -45,19 +45,29 @@ class Jbuilder < JbuilderProxy
   end
 
   # Yields a builder and automatically turns the result into a JSON string
-  def self.encode(*args)
-    jbuilder = new(*args)
-    yield jbuilder
-    jbuilder.target!
+  def self.encode(*args, &block)
+    new(*args, &block).target!
   end
 
   @@key_formatter = KeyFormatter.new
   @@ignore_nil    = false
 
-  def initialize(key_formatter = @@key_formatter.clone, ignore_nil = @@ignore_nil)
+  def initialize(*args)
     @attributes = ::ActiveSupport::OrderedHash.new
-    @key_formatter = key_formatter
-    @ignore_nil = ignore_nil
+
+    options = args.extract_options!
+    @key_formatter = options.fetch(:key_formatter, @@key_formatter.clone)
+    @ignore_nil = options.fetch(:ignore_nil, @@ignore_nil)
+
+    # old-style initialization compatibility
+    if args.any?
+      @key_formatter = args.shift
+      @ignore_nil = args.shift if args.any?
+      ::ActiveSupport::Deprecation.warn 'Initialization with positioned ' +
+        'arguments is deprecated. Use hash syntax instead.'
+    end
+
+    yield self if ::Kernel.block_given?
   end
 
   # Dynamically set a key value pair.
@@ -255,9 +265,12 @@ class Jbuilder < JbuilderProxy
     end
 
   private
-    def method_missing(method, value = nil, *args)
+
+    BLANK = ::Object.new
+
+    def method_missing(method, value = BLANK, *args)
       result = if ::Kernel.block_given?
-        if value
+        if BLANK != value
           # json.comments @post.comments { |comment| ... }
           # { "comments": [ { ... }, { ... } ] }
           _map_collection(value) { |element| if ::Proc.new.arity == 2 then yield self, element else yield element end }
@@ -279,7 +292,7 @@ class Jbuilder < JbuilderProxy
             value
           end
         else
-          if value.respond_to?(:each)
+          if value.kind_of?(::Enumerable)
             # json.comments(@post.comments, :content, :created_at)
             # { "comments": [ { "content": "hello", "created_at": "..." }, { "content": "world", "created_at": "..." } ] }
             _map_collection(value) do |element|
@@ -298,6 +311,8 @@ class Jbuilder < JbuilderProxy
     end
 
     def _map_collection(collection)
+      return [] if collection.nil?
+
       collection.map do |element|
         _scope { yield element }
       end
@@ -322,4 +337,9 @@ class Jbuilder < JbuilderProxy
     end
 end
 
-require "jbuilder_template" if defined?(ActionView::Template)
+require 'jbuilder_template' if defined?(ActionView::Template)
+
+begin
+  require 'railtie' if Rails::VERSION::MAJOR == 4
+rescue NameError
+end

data/lib/jbuilder_template.rb

@@ -1,7 +1,7 @@
 class JbuilderTemplate < Jbuilder
-  def initialize(context, *args)
+  def initialize(context, *args, &block)
     @context = context
-    super(*args)
+    super(*args, &block)
   end
 
   def partial!(options, locals = {})
@@ -37,7 +37,7 @@ class JbuilderTemplate < Jbuilder
       if @context.respond_to?(:fragment_name_with_digest)
         @context.fragment_name_with_digest(key)
       else
-        ::ActiveSupport::Cache.expand_cache_key(key.is_a?(::Hash) ? url_for(key).split("://").last : key, :jbuilder)
+        ::ActiveSupport::Cache.expand_cache_key(key.is_a?(::Hash) ? url_for(key).split('://').last : key, :jbuilder)
       end
     end
 end
@@ -53,4 +53,4 @@ class JbuilderHandler
   end
 end
 
-ActionView::Template.register_template_handler :jbuilder, JbuilderHandler
+ActionView::Template.register_template_handler :jbuilder, JbuilderHandler

data/lib/railtie.rb

@@ -0,0 +1,8 @@
+require 'rails/engine'
+
+class Jbuilder
+  class Engine < ::Rails::Engine
+    config.app_generators.scaffold_controller = :jbuilder_scaffold_controller
+    config.app_generators.json_template_engine = :jbuilder
+  end
+end

data/test/jbuilder_generator_test.rb

@@ -0,0 +1,32 @@
+require 'rails/generators/test_case'
+require 'generators/rails/jbuilder_generator'
+
+class JbuilderGeneratorTest < Rails::Generators::TestCase
+  tests Rails::Generators::JbuilderGenerator
+  arguments %w(Post title body:text)
+  destination File.expand_path('../tmp', File.dirname(__FILE__))
+  setup :prepare_destination
+
+  test 'views are generated' do
+    run_generator
+
+    %w(index show).each do |view|
+      assert_file "app/views/posts/#{view}.json.jbuilder"
+    end
+  end
+
+  test 'index content' do
+    run_generator
+
+    assert_file 'app/views/posts/index.json.jbuilder' do |content|
+      assert_match /json\.array!\(@posts\) do \|post\|/, content
+      assert_match /json\.extract! post, :title, :body, :created_at, :updated_at/, content
+      assert_match /json\.url post_url\(post\)/, content
+    end
+
+    assert_file 'app/views/posts/show.json.jbuilder' do |content|
+      assert_match /json\.extract! @post, :title, :body, :created_at, :updated_at/, content
+      assert_match /json\.url post_url\(@post\)/, content
+    end
+  end
+end

data/test/jbuilder_template_test.rb

@@ -2,7 +2,6 @@ require 'test/unit'
 require 'action_view'
 require 'action_view/testing/resolvers'
 require 'active_support/cache'
-
 require 'jbuilder'
 
 module Rails

data/test/jbuilder_test.rb

@@ -4,164 +4,171 @@ require 'active_support/inflector'
 
 require 'jbuilder'
 
+class JbuilderProxy
+  # Faking Object#instance_eval for 1.8
+  def instance_eval(code)
+    eval code
+  end
+end if ::RUBY_VERSION < '1.9'
+
 class JbuilderTest < ActiveSupport::TestCase
-  test "single key" do
+  test 'single key' do
     json = Jbuilder.encode do |json|
-      json.content "hello"
+      json.content 'hello'
     end
 
-    assert_equal "hello", MultiJson.load(json)["content"]
+    assert_equal 'hello', MultiJson.load(json)['content']
   end
 
-  test "single key with false value" do
+  test 'single key with false value' do
     json = Jbuilder.encode do |json|
       json.content false
     end
 
-    assert_equal false, MultiJson.load(json)["content"]
+    assert_equal false, MultiJson.load(json)['content']
   end
 
-  test "single key with nil value" do
+  test 'single key with nil value' do
     json = Jbuilder.encode do |json|
       json.content nil
     end
 
-    assert MultiJson.load(json).has_key?("content")
-    assert_equal nil, MultiJson.load(json)["content"]
+    assert MultiJson.load(json).has_key?('content')
+    assert_equal nil, MultiJson.load(json)['content']
   end
 
-  test "multiple keys" do
+  test 'multiple keys' do
     json = Jbuilder.encode do |json|
-      json.title "hello"
-      json.content "world"
+      json.title 'hello'
+      json.content 'world'
     end
 
     MultiJson.load(json).tap do |parsed|
-      assert_equal "hello", parsed["title"]
-      assert_equal "world", parsed["content"]
+      assert_equal 'hello', parsed['title']
+      assert_equal 'world', parsed['content']
     end
   end
 
-  test "extracting from object" do
-    person = Struct.new(:name, :age).new("David", 32)
+  test 'extracting from object' do
+    person = Struct.new(:name, :age).new('David', 32)
 
     json = Jbuilder.encode do |json|
       json.extract! person, :name, :age
     end
 
     MultiJson.load(json).tap do |parsed|
-      assert_equal "David", parsed["name"]
-      assert_equal 32, parsed["age"]
+      assert_equal 'David', parsed['name']
+      assert_equal 32, parsed['age']
     end
   end
 
-  test "extracting from object using call style for 1.9" do
-    person = Struct.new(:name, :age).new("David", 32)
+  test 'extracting from object using call style for 1.9' do
+    person = Struct.new(:name, :age).new('David', 32)
 
     json = Jbuilder.encode do |json|
       if ::RUBY_VERSION > '1.9'
-        instance_eval "json.(person, :name, :age)"
+        instance_eval 'json.(person, :name, :age)'
       else
-        instance_eval "json.call(person, :name, :age)"
+        instance_eval 'json.call(person, :name, :age)'
       end
     end
 
     MultiJson.load(json).tap do |parsed|
-      assert_equal "David", parsed["name"]
-      assert_equal 32, parsed["age"]
+      assert_equal 'David', parsed['name']
+      assert_equal 32, parsed['age']
     end
   end
 
-  test "extracting from hash" do
-    person = {:name => "Jim", :age => 34}
+  test 'extracting from hash' do
+    person = {:name => 'Jim', :age => 34}
 
     json = Jbuilder.encode do |json|
       json.extract! person, :name, :age
     end
 
     MultiJson.load(json).tap do |parsed|
-      assert_equal "Jim", parsed["name"]
-      assert_equal 34, parsed["age"]
+      assert_equal 'Jim', parsed['name']
+      assert_equal 34, parsed['age']
     end
   end
 
-  test "nesting single child with block" do
+  test 'nesting single child with block' do
     json = Jbuilder.encode do |json|
       json.author do
-        json.name "David"
+        json.name 'David'
         json.age  32
       end
     end
 
     MultiJson.load(json).tap do |parsed|
-      assert_equal "David", parsed["author"]["name"]
-      assert_equal 32, parsed["author"]["age"]
+      assert_equal 'David', parsed['author']['name']
+      assert_equal 32, parsed['author']['age']
     end
   end
 
-  test "nesting multiple children with block" do
+  test 'nesting multiple children with block' do
     json = Jbuilder.encode do |json|
       json.comments do
-        json.child! { json.content "hello" }
-        json.child! { json.content "world" }
+        json.child! { json.content 'hello' }
+        json.child! { json.content 'world' }
       end
     end
 
     MultiJson.load(json).tap do |parsed|
-      assert_equal "hello", parsed["comments"].first["content"]
-      assert_equal "world", parsed["comments"].second["content"]
+      assert_equal 'hello', parsed['comments'].first['content']
+      assert_equal 'world', parsed['comments'].second['content']
     end
   end
 
-  test "nesting single child with inline extract" do
+  test 'nesting single child with inline extract' do
     person = Class.new do
       attr_reader :name, :age
 
       def initialize(name, age)
         @name, @age = name, age
       end
-    end.new("David", 32)
+    end.new('David', 32)
 
     json = Jbuilder.encode do |json|
       json.author person, :name, :age
     end
 
     MultiJson.load(json).tap do |parsed|
-      assert_equal "David", parsed["author"]["name"]
-      assert_equal 32,      parsed["author"]["age"]
+      assert_equal 'David', parsed['author']['name']
+      assert_equal 32,      parsed['author']['age']
     end
   end
 
-  test "nesting multiple children from array" do
-    comments = [ Struct.new(:content, :id).new("hello", 1), Struct.new(:content, :id).new("world", 2) ]
+  test 'nesting multiple children from array' do
+    comments = [ Struct.new(:content, :id).new('hello', 1), Struct.new(:content, :id).new('world', 2) ]
 
     json = Jbuilder.encode do |json|
       json.comments comments, :content
     end
 
     MultiJson.load(json).tap do |parsed|
-      assert_equal ["content"], parsed["comments"].first.keys
-      assert_equal "hello", parsed["comments"].first["content"]
-      assert_equal "world", parsed["comments"].second["content"]
+      assert_equal ['content'], parsed['comments'].first.keys
+      assert_equal 'hello', parsed['comments'].first['content']
+      assert_equal 'world', parsed['comments'].second['content']
     end
   end
 
-  test "nesting multiple children from array when child array is empty" do
+  test 'nesting multiple children from array when child array is empty' do
     comments = []
 
     json = Jbuilder.encode do |json|
-      json.name "Parent"
+      json.name 'Parent'
       json.comments comments, :content
     end
 
     MultiJson.load(json).tap do |parsed|
-      assert_equal "Parent", parsed["name"]
-      assert_equal [], parsed["comments"]
+      assert_equal 'Parent', parsed['name']
+      assert_equal [], parsed['comments']
     end
   end
 
-  test "nesting multiple children from array with inline loop" do
-    comments = [ Struct.new(:content, :id).new("hello", 1), Struct.new(:content, :id).new("world", 2) ]
+  test 'nesting multiple children from array with inline loop' do
+    comments = [ Struct.new(:content, :id).new('hello', 1), Struct.new(:content, :id).new('world', 2) ]
 
     json = Jbuilder.encode do |json|
       json.comments comments do |comment|
@@ -170,14 +177,24 @@ class JbuilderTest < ActiveSupport::TestCase
     end
 
     MultiJson.load(json).tap do |parsed|
-      assert_equal ["content"], parsed["comments"].first.keys
-      assert_equal "hello", parsed["comments"].first["content"]
-      assert_equal "world", parsed["comments"].second["content"]
+      assert_equal ['content'], parsed['comments'].first.keys
+      assert_equal 'hello', parsed['comments'].first['content']
+      assert_equal 'world', parsed['comments'].second['content']
+    end
+  end
+
+  test 'handles nil-collections as empty arrays' do
+    json = Jbuilder.encode do |json|
+      json.comments nil do |comment|
+        json.content comment.content
+      end
     end
+
+    assert_equal [], MultiJson.load(json)['comments']
   end
 
-  test "nesting multiple children from array with inline loop with old api" do
-    comments = [ Struct.new(:content, :id).new("hello", 1), Struct.new(:content, :id).new("world", 2) ]
+  test 'nesting multiple children from array with inline loop with old api' do
+    comments = [ Struct.new(:content, :id).new('hello', 1), Struct.new(:content, :id).new('world', 2) ]
 
     json = Jbuilder.encode do |json|
       json.comments comments do |json, comment|
@@ -186,14 +203,14 @@ class JbuilderTest < ActiveSupport::TestCase
     end
 
     MultiJson.load(json).tap do |parsed|
-      assert_equal ["content"], parsed["comments"].first.keys
-      assert_equal "hello", parsed["comments"].first["content"]
-      assert_equal "world", parsed["comments"].second["content"]
+      assert_equal ['content'], parsed['comments'].first.keys
+      assert_equal 'hello', parsed['comments'].first['content']
+      assert_equal 'world', parsed['comments'].second['content']
     end
   end
 
-  test "nesting multiple children from array with inline loop on root" do
-    comments = [ Struct.new(:content, :id).new("hello", 1), Struct.new(:content, :id).new("world", 2) ]
+  test 'nesting multiple children from array with inline loop on root' do
+    comments = [ Struct.new(:content, :id).new('hello', 1), Struct.new(:content, :id).new('world', 2) ]
 
     json = Jbuilder.encode do |json|
       json.call(comments) do |comment|
@@ -202,13 +219,13 @@ class JbuilderTest < ActiveSupport::TestCase
     end
 
     MultiJson.load(json).tap do |parsed|
-      assert_equal "hello", parsed.first["content"]
-      assert_equal "world", parsed.second["content"]
+      assert_equal 'hello', parsed.first['content']
+      assert_equal 'world', parsed.second['content']
     end
   end
 
-  test "nesting multiple children from array with inline loop on root with old api" do
-    comments = [ Struct.new(:content, :id).new("hello", 1), Struct.new(:content, :id).new("world", 2) ]
+  test 'nesting multiple children from array with inline loop on root with old api' do
+    comments = [ Struct.new(:content, :id).new('hello', 1), Struct.new(:content, :id).new('world', 2) ]
 
     json = Jbuilder.encode do |json|
       json.call(comments) do |json, comment|
@@ -217,47 +234,47 @@ class JbuilderTest < ActiveSupport::TestCase
     end
 
     MultiJson.load(json).tap do |parsed|
-      assert_equal "hello", parsed.first["content"]
-      assert_equal "world", parsed.second["content"]
+      assert_equal 'hello', parsed.first['content']
+      assert_equal 'world', parsed.second['content']
     end
   end
 
-  test "array nested inside nested hash" do
+  test 'array nested inside nested hash' do
     json = Jbuilder.encode do |json|
       json.author do
-        json.name "David"
+        json.name 'David'
         json.age  32
 
         json.comments do
-          json.child! { json.content "hello" }
-          json.child! { json.content "world" }
+          json.child! { json.content 'hello' }
+          json.child! { json.content 'world' }
         end
       end
     end
 
     MultiJson.load(json).tap do |parsed|
-      assert_equal "hello", parsed["author"]["comments"].first["content"]
-      assert_equal "world", parsed["author"]["comments"].second["content"]
+      assert_equal 'hello', parsed['author']['comments'].first['content']
+      assert_equal 'world', parsed['author']['comments'].second['content']
     end
   end
 
-  test "array nested inside array" do
+  test 'array nested inside array' do
     json = Jbuilder.encode do |json|
       json.comments do
         json.child! do
           json.authors do
             json.child! do
-              json.name "david"
+              json.name 'david'
             end
           end
         end
       end
     end
 
-    assert_equal "david", MultiJson.load(json)["comments"].first["authors"].first["name"]
+    assert_equal 'david', MultiJson.load(json)['comments'].first['authors'].first['name']
   end
 
-  test "directly set an array nested in another array" do
+  test 'directly set an array nested in another array' do
     data = [ { :department => 'QA', :not_in_json => 'hello', :names => ['John', 'David'] } ]
     json = Jbuilder.encode do |json|
       json.array! data do |object|
@@ -272,7 +289,7 @@ class JbuilderTest < ActiveSupport::TestCase
     assert_not_equal 'hello', MultiJson.load(json)[0]['not_in_json']
   end
 
-  test "directly set an array nested in another array with old api" do
+  test 'directly set an array nested in another array with old api' do
     data = [ { :department => 'QA', :not_in_json => 'hello', :names => ['John', 'David'] } ]
     json = Jbuilder.encode do |json|
       json.array! data do |json, object|
@@ -287,20 +304,20 @@ class JbuilderTest < ActiveSupport::TestCase
     assert_not_equal 'hello', MultiJson.load(json)[0]['not_in_json']
   end
 
-  test "nested jbuilder objects" do
+  test 'nested jbuilder objects' do
     to_nest = Jbuilder.new
-    to_nest.nested_value "Nested Test"
+    to_nest.nested_value 'Nested Test'
     json = Jbuilder.encode do |json|
-      json.value "Test"
+      json.value 'Test'
       json.nested to_nest
     end
     parsed = MultiJson.load(json)
-    assert_equal "Test", parsed['value']
-    assert_equal "Nested Test", parsed["nested"]["nested_value"]
+    assert_equal 'Test', parsed['value']
+    assert_equal 'Nested Test', parsed['nested']['nested_value']
   end
 
-  test "top-level array" do
-    comments = [ Struct.new(:content, :id).new("hello", 1), Struct.new(:content, :id).new("world", 2) ]
+  test 'top-level array' do
+    comments = [ Struct.new(:content, :id).new('hello', 1), Struct.new(:content, :id).new('world', 2) ]
 
     json = Jbuilder.encode do |json|
       json.array!(comments) do |comment|
@@ -309,12 +326,12 @@ class JbuilderTest < ActiveSupport::TestCase
     end
 
     MultiJson.load(json).tap do |parsed|
-      assert_equal "hello", parsed.first["content"]
-      assert_equal "world", parsed.second["content"]
+      assert_equal 'hello', parsed.first['content']
+      assert_equal 'world', parsed.second['content']
     end
   end
 
-  test "empty top-level array" do
+  test 'empty top-level array' do
     comments = []
 
     json = Jbuilder.encode do |json|
@@ -326,29 +343,29 @@ class JbuilderTest < ActiveSupport::TestCase
     assert_equal [], MultiJson.load(json)
   end
 
-  test "dynamically set a key/value" do
+  test 'dynamically set a key/value' do
     json = Jbuilder.encode do |json|
-      json.set!(:each, "stuff")
+      json.set!(:each, 'stuff')
     end
 
-    assert_equal "stuff", MultiJson.load(json)["each"]
+    assert_equal 'stuff', MultiJson.load(json)['each']
   end
 
-  test "dynamically set a key/nested child with block" do
+  test 'dynamically set a key/nested child with block' do
     json = Jbuilder.encode do |json|
       json.set!(:author) do
-        json.name "David"
+        json.name 'David'
         json.age 32
       end
     end
 
     MultiJson.load(json).tap do |parsed|
-      assert_equal "David", parsed["author"]["name"]
-      assert_equal 32, parsed["author"]["age"]
+      assert_equal 'David', parsed['author']['name']
+      assert_equal 32, parsed['author']['age']
     end
   end
 
-  test "query like object" do
+  test 'query like object' do
     class Person
       attr_reader :name, :age
 
@@ -360,7 +377,7 @@ class JbuilderTest < ActiveSupport::TestCase
       include Enumerable
 
       def each(&block)
-        [Person.new("Bob", 30), Person.new("Frank", 50)].each(&block)
+        [Person.new('Bob', 30), Person.new('Frank', 50)].each(&block)
       end
       def empty?
         false
@@ -372,94 +389,108 @@ class JbuilderTest < ActiveSupport::TestCase
     end
 
     parsed = MultiJson.load(result)
-    assert_equal 2, parsed["relations"].length
-    assert_equal "Bob", parsed["relations"][0]["name"]
-    assert_equal 50, parsed["relations"][1]["age"]
+    assert_equal 2, parsed['relations'].length
+    assert_equal 'Bob', parsed['relations'][0]['name']
+    assert_equal 50, parsed['relations'][1]['age']
+  end
+
+  test 'initialize with positioned arguments (deprecated)' do
+    ::ActiveSupport::Deprecation.silence do
+      jbuilder = Jbuilder.new(1, 2)
+      assert_equal 1, jbuilder.instance_eval('@key_formatter')
+      assert_equal 2, jbuilder.instance_eval('@ignore_nil')
+    end
+  end
+
+  test 'initialize via options hash' do
+    jbuilder = Jbuilder.new(:key_formatter => 1, :ignore_nil => 2)
+    assert_equal 1, jbuilder.instance_eval('@key_formatter')
+    assert_equal 2, jbuilder.instance_eval('@ignore_nil')
   end
 
-  test "key_format! with parameter" do
+  test 'key_format! with parameter' do
     json = Jbuilder.new
     json.key_format! :camelize => [:lower]
-    json.camel_style "for JS"
+    json.camel_style 'for JS'
 
     assert_equal ['camelStyle'], json.attributes!.keys
   end
 
-  test "key_format! with parameter not as an array" do
+  test 'key_format! with parameter not as an array' do
     json = Jbuilder.new
     json.key_format! :camelize => :lower
-    json.camel_style "for JS"
+    json.camel_style 'for JS'
 
     assert_equal ['camelStyle'], json.attributes!.keys
   end
 
-  test "key_format! propagates to child elements" do
+  test 'key_format! propagates to child elements' do
     json = Jbuilder.new
     json.key_format! :upcase
-    json.level1 "one"
+    json.level1 'one'
     json.level2 do
-      json.value "two"
+      json.value 'two'
     end
 
     result = json.attributes!
-    assert_equal "one", result["LEVEL1"]
-    assert_equal "two", result["LEVEL2"]["VALUE"]
+    assert_equal 'one', result['LEVEL1']
+    assert_equal 'two', result['LEVEL2']['VALUE']
   end
 
-  test "key_format! resets after child element" do
+  test 'key_format! resets after child element' do
     json = Jbuilder.new
     json.level2 do
       json.key_format! :upcase
-      json.value "two"
+      json.value 'two'
     end
-    json.level1 "one"
+    json.level1 'one'
 
     result = json.attributes!
-    assert_equal "two", result["level2"]["VALUE"]
-    assert_equal "one", result["level1"]
+    assert_equal 'two', result['level2']['VALUE']
+    assert_equal 'one', result['level1']
   end
 
-  test "key_format! with no parameter" do
+  test 'key_format! with no parameter' do
     json = Jbuilder.new
     json.key_format! :upcase
-    json.lower "Value"
+    json.lower 'Value'
 
     assert_equal ['LOWER'], json.attributes!.keys
   end
 
-  test "key_format! with multiple steps" do
+  test 'key_format! with multiple steps' do
     json = Jbuilder.new
     json.key_format! :upcase, :pluralize
-    json.pill ""
+    json.pill ''
 
-    assert_equal ["PILLs"], json.attributes!.keys
+    assert_equal ['PILLs'], json.attributes!.keys
   end
 
-  test "key_format! with lambda/proc" do
+  test 'key_format! with lambda/proc' do
     json = Jbuilder.new
-    json.key_format! lambda { |key| key + " and friends" }
-    json.oats ""
+    json.key_format! lambda { |key| key + ' and friends' }
+    json.oats ''
 
-    assert_equal ["oats and friends"], json.attributes!.keys
+    assert_equal ['oats and friends'], json.attributes!.keys
   end
 
-  test "default key_format!" do
+  test 'default key_format!' do
     Jbuilder.key_format :camelize => :lower
     json = Jbuilder.new
-    json.camel_style "for JS"
+    json.camel_style 'for JS'
 
     assert_equal ['camelStyle'], json.attributes!.keys
-    Jbuilder.send(:class_variable_set, "@@key_formatter", Jbuilder::KeyFormatter.new)
+    Jbuilder.send(:class_variable_set, '@@key_formatter', Jbuilder::KeyFormatter.new)
   end
 
-  test "don't use default key formatter directly" do
+  test 'do not use default key formatter directly' do
     json = Jbuilder.new
-    json.key "value"
+    json.key 'value'
 
-    assert_equal [], Jbuilder.send(:class_variable_get, "@@key_formatter").instance_variable_get("@cache").keys
+    assert_equal [], Jbuilder.send(:class_variable_get, '@@key_formatter').instance_variable_get('@cache').keys
   end
 
-  test "ignore_nil! without a parameter" do
+  test 'ignore_nil! without a parameter' do
     json = Jbuilder.new
     json.ignore_nil!
     json.test nil
@@ -467,29 +498,29 @@ class JbuilderTest < ActiveSupport::TestCase
     assert_equal [], json.attributes!.keys
   end
 
-  test "ignore_nil! with parameter" do
+  test 'ignore_nil! with parameter' do
     json = Jbuilder.new
     json.ignore_nil! true
-    json.name "Bob"
+    json.name 'Bob'
     json.dne nil
 
-    assert_equal ["name"], json.attributes!.keys
+    assert_equal ['name'], json.attributes!.keys
 
     json = Jbuilder.new
     json.ignore_nil! false
-    json.name "Bob"
+    json.name 'Bob'
     json.dne nil
 
-    assert_equal ["name", "dne"], json.attributes!.keys
+    assert_equal ['name', 'dne'], json.attributes!.keys
   end
 
-  test "default ignore_nil!" do
+  test 'default ignore_nil!' do
     Jbuilder.ignore_nil
     json = Jbuilder.new
-    json.name "Bob"
+    json.name 'Bob'
     json.dne nil
 
-    assert_equal ["name"], json.attributes!.keys
-    Jbuilder.send(:class_variable_set, "@@ignore_nil", false)
+    assert_equal ['name'], json.attributes!.keys
+    Jbuilder.send(:class_variable_set, '@@ignore_nil', false)
   end
 end

data/test/scaffold_controller_generator_test.rb

@@ -0,0 +1,56 @@
+require 'rails/generators/test_case'
+require 'generators/rails/jbuilder_scaffold_controller_generator'
+
+class JbuilderScaffoldControllerGeneratorTest < Rails::Generators::TestCase
+  tests Rails::Generators::JbuilderScaffoldControllerGenerator
+  arguments %w(Post title body:text)
+  destination File.expand_path('../tmp', File.dirname(__FILE__))
+  setup :prepare_destination
+
+  test 'controller content' do
+    run_generator
+
+    assert_file 'app/controllers/posts_controller.rb' do |content|
+      assert_instance_method :index, content do |m|
+        assert_match /@posts = Post\.all/, m
+      end
+
+      assert_instance_method :show, content do |m|
+        assert m.blank?
+      end
+
+      assert_instance_method :new, content do |m|
+        assert_match /@post = Post\.new/, m
+      end
+
+      assert_instance_method :edit, content do |m|
+        assert m.blank?
+      end
+
+      assert_instance_method :create, content do |m|
+        assert_match /@post = Post\.new\(post_params\)/, m
+        assert_match /@post\.save/, m
+        assert_match /format\.html \{ redirect_to @post, notice: 'Post was successfully created\.' \}/, m
+        assert_match /format\.json \{ render action: 'show', status: :created, location: @post \}/, m
+        assert_match /format\.html \{ render action: 'new' \}/, m
+        assert_match /format\.json \{ render json: @post\.errors, status: :unprocessable_entity \}/, m
+      end
+
+      assert_instance_method :update, content do |m|
+        assert_match /format\.html \{ redirect_to @post, notice: 'Post was successfully updated\.' \}/, m
+        assert_match /format\.json \{ head :no_content \}/, m
+        assert_match /format\.html \{ render action: 'edit' \}/, m
+        assert_match /format\.json \{ render json: @post.errors, status: :unprocessable_entity \}/, m
+      end
+
+      assert_instance_method :destroy, content do |m|
+        assert_match /@post\.destroy/, m
+        assert_match /format\.html { redirect_to posts_url \}/, m
+        assert_match /format\.json \{ head :no_content \}/, m
+      end
+
+      assert_match(/def post_params/, content)
+      assert_match(/params\.require\(:post\)\.permit\(:title, :body\)/, content)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jbuilder
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-20 00:00:00.000000000 Z
+date: 2013-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -27,6 +27,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.0.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.0.3
 description: 
 email: david@37signals.com
 executables: []
@@ -34,16 +50,24 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ./Gemfile
-- ./Gemfile.lock
+- ./Gemfile-1.8
 - ./jbuilder-0.9.0.gem
 - ./jbuilder.gemspec
+- ./lib/generators/rails/jbuilder_generator.rb
+- ./lib/generators/rails/jbuilder_scaffold_controller_generator.rb
+- ./lib/generators/rails/templates/controller.rb
+- ./lib/generators/rails/templates/index.json.jbuilder
+- ./lib/generators/rails/templates/show.json.jbuilder
 - ./lib/jbuilder.rb
 - ./lib/jbuilder_template.rb
+- ./lib/railtie.rb
 - ./MIT-LICENSE
 - ./Rakefile
 - ./README.md
+- ./test/jbuilder_generator_test.rb
 - ./test/jbuilder_template_test.rb
 - ./test/jbuilder_test.rb
+- ./test/scaffold_controller_generator_test.rb
 homepage: 
 licenses: []
 post_install_message: 

data/Gemfile.lock

@@ -1,50 +0,0 @@
-PATH
-  remote: .
-  specs:
-    jbuilder (0.9.1)
-      activesupport (>= 3.0.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionpack (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-      builder (~> 3.0.0)
-      erubis (~> 2.7.0)
-      journey (~> 1.0.4)
-      rack (~> 1.4.0)
-      rack-cache (~> 1.2)
-      rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
-      builder (~> 3.0.0)
-    activesupport (3.2.8)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    builder (3.0.0)
-    erubis (2.7.0)
-    hike (1.2.1)
-    i18n (0.6.1)
-    journey (1.0.4)
-    multi_json (1.3.6)
-    rack (1.4.1)
-    rack-cache (1.2)
-      rack (>= 0.4)
-    rack-test (0.6.1)
-      rack (>= 1.0)
-    rake (0.9.2.2)
-    sprockets (2.1.3)
-      hike (~> 1.2)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    tilt (1.3.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  actionpack
-  jbuilder!
-  rake